From 68297f78f75e5c82ae4fff82976d8871d4ae3def Mon Sep 17 00:00:00 2001 From: await-ovo <13152410380@163.com> Date: Fri, 16 Jun 2023 14:20:15 +0800 Subject: [PATCH] chore: update postcss-load-config (#880) * chore: update postcss-load-config * chore: install pnpm@7 in CI * use pnpm v8 --------- Co-authored-by: EGOIST --- package.json | 2 +- pnpm-lock.yaml | 40 ++++++++++++++++++++++++++++++++++------ test/index.test.ts | 27 +++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index d94abb25..68b264e0 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "execa": "^5.0.0", "globby": "^11.0.3", "joycon": "^3.0.1", - "postcss-load-config": "^3.0.1", + "postcss-load-config": "^4.0.1", "resolve-from": "^5.0.0", "rollup": "^3.2.5", "source-map": "0.8.0-beta.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e57ea95c..4e810ef3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ dependencies: specifier: ^3.0.1 version: 3.0.1 postcss-load-config: - specifier: ^3.0.1 - version: 3.1.0 + specifier: ^4.0.1 + version: 4.0.1(postcss@8.4.12) resolve-from: specifier: ^5.0.0 version: 5.0.0 @@ -1514,12 +1514,14 @@ packages: engines: {node: '>=8'} dependencies: import-from: 3.0.0 + dev: true /import-from@3.0.0: resolution: {integrity: sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==} engines: {node: '>=8'} dependencies: resolve-from: 5.0.0 + dev: true /inflight@1.0.6: resolution: {integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=} @@ -1605,6 +1607,12 @@ packages: /lilconfig@2.0.4: resolution: {integrity: sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==} engines: {node: '>=10'} + dev: true + + /lilconfig@2.1.0: + resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} + engines: {node: '>=10'} + dev: false /lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} @@ -1696,7 +1704,6 @@ packages: resolution: {integrity: sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - dev: true /nanoid@3.3.4: resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==} @@ -1766,7 +1773,6 @@ packages: /picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} - dev: true /picomatch@2.3.0: resolution: {integrity: sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==} @@ -1803,6 +1809,24 @@ packages: import-cwd: 3.0.0 lilconfig: 2.0.4 yaml: 1.10.2 + dev: true + + /postcss-load-config@4.0.1(postcss@8.4.12): + resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} + engines: {node: '>= 14'} + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 2.1.0 + postcss: 8.4.12 + yaml: 2.3.1 + dev: false /postcss-simple-vars@6.0.3(postcss@8.4.12): resolution: {integrity: sha512-fkNn4Zio8vN4vIig9IFdb8lVlxWnYR769RgvxCM6YWlFKie/nQaOcaMMMFz/s4gsfHW4/5bJW+i57zD67mQU7g==} @@ -1820,7 +1844,6 @@ packages: nanoid: 3.3.1 picocolors: 1.0.0 source-map-js: 1.0.2 - dev: true /postcss@8.4.14: resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==} @@ -1960,7 +1983,6 @@ packages: /source-map-js@1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} - dev: true /source-map-support@0.5.21: resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} @@ -2326,6 +2348,12 @@ packages: /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} + dev: true + + /yaml@2.3.1: + resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} + engines: {node: '>= 14'} + dev: false /yocto-queue@1.0.0: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} diff --git a/test/index.test.ts b/test/index.test.ts index 0ba15d58..6e8f0804 100644 --- a/test/index.test.ts +++ b/test/index.test.ts @@ -1274,4 +1274,31 @@ test('custom inject style function', async () => { expect(outFiles).toEqual(['input.js', 'input.mjs']) expect(await getFileContent('dist/input.mjs')).toContain('__custom_inject_style__(`.hello{color:red}\n`)') expect(await getFileContent('dist/input.js')).toContain('__custom_inject_style__(`.hello{color:red}\n`)') +}) + + +test('should load postcss esm config', async () => { + const { outFiles, getFileContent } = await run(getTestName(), { + 'input.ts': ` + import './foo.css' + `, + 'package.json': `{ + "type": "module" + }`, + 'postcss.config.js': ` + export default { + plugins: {'postcss-simple-vars': {}} + } + `, + 'foo.css': ` + $color: blue; + + .foo { + color: $color; + } + `, + }) + + expect(outFiles).toEqual(['input.cjs', 'input.css']) + expect(await getFileContent('dist/input.css')).toContain('color: blue;') }) \ No newline at end of file