fix: move sort to loader to also sort query string

vercel · Sep 15, 2023 · d34a143 · d34a143
1 parent 15292da
commit d34a143
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts b/packages/next/src/build/webpack/loaders/next-flight-client-entry-loader.ts
@@ -24,7 +24,6 @@ export default function transformSource(this: any) {
   const code = requests
     // Filter out CSS files in the SSR compilation
     .filter((request) => (isServer ? !regexCSS.test(request) : true))
-    .sort((a, b) => (regexCSS.test(b) ? 1 : a.localeCompare(b)))
     .map(
       (request) =>
         `import(/* webpackMode: "eager" */ ${JSON.stringify(request)})`

diff --git a/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts b/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts
@@ -26,6 +26,7 @@ import {
   getActions,
   isClientComponentEntryModule,
   isCSSMod,
+  regexCSS,
 } from '../loaders/utils'
 import { traverseModules, forEachEntryModule } from '../utils'
 import { normalizePathSep } from '../../../shared/lib/page-path/normalize-path-sep'
@@ -668,7 +669,9 @@ export class FlightClientEntryPlugin {
     let shouldInvalidate = false
 
     const loaderOptions: NextFlightClientEntryLoaderOptions = {
-      modules: clientImports,
+      modules: clientImports.sort((a, b) =>
+        regexCSS.test(b) ? 1 : a.localeCompare(b)
+      ),
       server: false,
     }