From 892916d040a035edde1add93c192e0b0c5c9dd86 Mon Sep 17 00:00:00 2001 From: Jason Quense Date: Sat, 19 Nov 2022 10:42:28 -0500 Subject: [PATCH] feat(css): upgrade postcss-modules (#10987) --- packages/vite/LICENSE.md | 7 ------- packages/vite/package.json | 2 +- packages/vite/src/node/plugins/css.ts | 4 ++-- pnpm-lock.yaml | 17 ++++++++--------- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/packages/vite/LICENSE.md b/packages/vite/LICENSE.md index 3cbbd7d9679694..301184bed69013 100644 --- a/packages/vite/LICENSE.md +++ b/packages/vite/LICENSE.md @@ -1576,13 +1576,6 @@ Repository: https://github.com/http-party/node-http-proxy.git --------------------------------------- -## icss-replace-symbols -License: ISC -By: Glen Maddern -Repository: git+https://github.com/css-modules/icss-replace-symbols.git - ---------------------------------------- - ## icss-utils License: ISC By: Glen Maddern diff --git a/packages/vite/package.json b/packages/vite/package.json index 855b5d93412caf..82d6734da29dec 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -109,7 +109,7 @@ "picomatch": "^2.3.1", "postcss-import": "^15.0.0", "postcss-load-config": "^4.0.1", - "postcss-modules": "^5.0.0", + "postcss-modules": "^6.0.0", "resolve.exports": "^1.1.0", "sirv": "^2.0.2", "source-map-js": "^1.0.2", diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 35f2e01a6701ad..3be227204d9b40 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -916,9 +916,9 @@ async function compileCSS( modulesOptions.getJSON(cssFileName, _modules, outputFileName) } }, - async resolve(id: string) { + async resolve(id: string, importer: string) { for (const key of getCssResolversKeys(atImportResolvers)) { - const resolved = await atImportResolvers[key](id) + const resolved = await atImportResolvers[key](id, importer) if (resolved) { return path.resolve(resolved) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index be062b690b86f3..695a97639fc542 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -258,7 +258,7 @@ importers: postcss: ^8.4.19 postcss-import: ^15.0.0 postcss-load-config: ^4.0.1 - postcss-modules: ^5.0.0 + postcss-modules: ^6.0.0 resolve: ^1.22.1 resolve.exports: ^1.1.0 rollup: ~3.3.0 @@ -322,7 +322,7 @@ importers: picomatch: 2.3.1 postcss-import: 15.0.0_postcss@8.4.19 postcss-load-config: 4.0.1_postcss@8.4.19 - postcss-modules: 5.0.0_postcss@8.4.19 + postcss-modules: 6.0.0_postcss@8.4.19 resolve.exports: 1.1.0 sirv: 2.0.2 source-map-js: 1.0.2 @@ -1218,6 +1218,9 @@ importers: dependencies: tailwindcss: 3.2.4 + playground/transform-plugin: + specifiers: {} + playground/tsconfig-json: specifiers: {} @@ -5751,10 +5754,6 @@ packages: dev: true optional: true - /icss-replace-symbols/1.1.0: - resolution: {integrity: sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==} - dev: true - /icss-utils/5.1.0_postcss@8.4.19: resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} engines: {node: ^10 || ^12 || >= 14} @@ -7313,13 +7312,13 @@ packages: postcss: 8.4.19 dev: true - /postcss-modules/5.0.0_postcss@8.4.19: - resolution: {integrity: sha512-rGvpTDOM3//3Ysn3Xtvhzaj8ab984wKCpP02TEF559tLbUjNay3RQDpPxb7BREmfBtJm3/1WbQOZ7fSXwYLZ/w==} + /postcss-modules/6.0.0_postcss@8.4.19: + resolution: {integrity: sha512-7DGfnlyi/ju82BRzTIjWS5C4Tafmzl3R79YP/PASiocj+aa6yYphHhhKUOEoXQToId5rgyFgJ88+ccOUydjBXQ==} peerDependencies: postcss: ^8.0.0 dependencies: generic-names: 4.0.0 - icss-replace-symbols: 1.1.0 + icss-utils: 5.1.0_postcss@8.4.19 lodash.camelcase: 4.3.0 postcss: 8.4.19 postcss-modules-extract-imports: 3.0.0_postcss@8.4.19