chore: cherry pick v4 bug fix to v3 (#11110)

* fix(config): exclude config.assetsInclude empty array (#10941) fixes #10926 * feat(css): upgrade postcss-modules (#10987) * fix(mpa): support mpa fallback (#10985) fixes #10966 * fix: export preprocessCSS in CJS (#11067) * chore: update license Co-authored-by: sun0day <sun_day500@163.com> Co-authored-by: Jason Quense <monastic.panic@gmail.com> Co-authored-by: sun0day <ivan.xu@applovin.com>
vitejs · Nov 30, 2022 · c93a526 · c93a526
1 parent bc3b5a9
commit c93a526
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 29 deletions.
diff --git 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
@@ -1860,6 +1853,28 @@ License: MIT
 By: antonk52
 Repository: https://github.com/antonk52/lilconfig
 
+> MIT License
+> 
+> Copyright (c) 2022 Anton Kastritskiy
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+> SOFTWARE.
+
 ---------------------------------------
 
 ## loader-utils

diff --git a/packages/vite/index.cjs b/packages/vite/index.cjs
@@ -15,7 +15,8 @@ const asyncFunctions = [
   'resolveConfig',
   'optimizeDeps',
   'formatPostcssSourceMap',
-  'loadConfigFromFile'
+  'loadConfigFromFile',
+  'preprocessCSS'
 ]
 asyncFunctions.forEach((name) => {
   module.exports[name] = (...args) =>

diff --git 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/config.ts b/packages/vite/src/node/config.ts
@@ -529,9 +529,11 @@ export async function resolveConfig(
     ? path.join(path.dirname(pkgPath), `node_modules/.vite`)
     : path.join(resolvedRoot, `.vite`)
 
-  const assetsFilter = config.assetsInclude
-    ? createFilter(config.assetsInclude)
-    : () => false
+  const assetsFilter =
+    config.assetsInclude &&
+    (!(config.assetsInclude instanceof Array) || config.assetsInclude.length)
+      ? createFilter(config.assetsInclude)
+      : () => false
 
   // create an internal resolver to be used in special scenarios, e.g.
   // optimizer & handling css @imports

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -907,9 +907,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/packages/vite/src/node/server/middlewares/htmlFallback.ts b/packages/vite/src/node/server/middlewares/htmlFallback.ts
@@ -14,17 +14,15 @@ export function htmlFallbackMiddleware(
     rewrites: [
       {
         from: /\/$/,
-        to({ parsedUrl }: any) {
+        to({ parsedUrl, request }: any) {
           const rewritten =
             decodeURIComponent(parsedUrl.pathname) + 'index.html'
 
           if (fs.existsSync(path.join(root, rewritten))) {
             return rewritten
-          } else {
-            if (spaFallback) {
-              return `/index.html`
-            }
           }
+
+          return spaFallback ? `/index.html` : request.url
         }
       }
     ]

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml