From 1a993f718285258c0af334d9561e269644e01fc9 Mon Sep 17 00:00:00 2001 From: Wesley de Bruijn Date: Thu, 14 Sep 2023 08:19:30 +0200 Subject: [PATCH 1/2] fix: sort imports to ensure consistent hash --- .../src/build/webpack/loaders/next-flight-client-entry-loader.ts | 1 + 1 file changed, 1 insertion(+) 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 index 0be3b6fa2b75c..df85d5065c200 100644 --- 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 @@ -28,6 +28,7 @@ export default function transformSource(this: any) { (request) => `import(/* webpackMode: "eager" */ ${JSON.stringify(request)})` ) + .sort((a, b) => a.localeCompare(b)) .join(';\n') const buildInfo = getModuleBuildInfo(this._module) From aedef4bf01b20fb6c4729a9ac51ecff74b53e075 Mon Sep 17 00:00:00 2001 From: Wesley de Bruijn Date: Thu, 14 Sep 2023 19:50:14 +0200 Subject: [PATCH 2/2] fix: dont affect css import order --- .../build/webpack/loaders/next-flight-client-entry-loader.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index df85d5065c200..ef24afd5a81f8 100644 --- 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,11 +24,11 @@ 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)})` ) - .sort((a, b) => a.localeCompare(b)) .join(';\n') const buildInfo = getModuleBuildInfo(this._module)