[fix] externalize middlewares.js when not using entryPoint (#2484)

sveltejs · Sep 24, 2021 · 84e0dec · 84e0dec
1 parent ea0e6e9
commit 84e0dec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.changeset/eight-hats-worry.md b/.changeset/eight-hats-worry.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-node': patch
+---
+
+[fix] regression where builds not using `entryPoint` stopped having `middlewares.js` external
diff --git a/packages/adapter-node/index.js b/packages/adapter-node/index.js
@@ -90,8 +90,11 @@ export default function ({
 						name: 'fix-middlewares-exclude',
 						setup(build) {
 							// Match an import of "middlewares.js" and mark it as external
+							const internal_middlewares_path = resolve('.svelte-kit/node/middlewares.js');
+							const build_middlewares_path = resolve(out, 'middlewares.js');
 							build.onResolve({ filter: /\/middlewares\.js$/ }, ({ path, resolveDir }) => {
-								if (resolve(resolveDir, path) === resolve(out, 'middlewares.js')) {
+								const resolved = resolve(resolveDir, path);
+								if (resolved === internal_middlewares_path || resolved === build_middlewares_path) {
 									return { path: './middlewares.js', external: true };
 								}
 							});