give module id an invalid name to prevent invalid replacement (#3546)

* give module id an invalid name to prevent invalid replacement - fixes #3526 * changeset * Update packages/adapter-netlify/index.js * Update packages/adapter-netlify/index.js
sveltejs · Jan 26, 2022 · 90664c9 · 90664c9
1 parent aed5366
commit 90664c9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.changeset/gorgeous-carrots-do.md b/.changeset/gorgeous-carrots-do.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-netlify': patch
+---
+
+Fix string replacement in CJS builds
diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js
@@ -51,7 +51,7 @@ export default function ({ split = false } = {}) {
 			const redirects = [];
 
 			const replace = {
-				APP: './server/app.js'
+				'0APP': './server/app.js' // digit prefix prevents CJS build from using this as a variable name, which would also get replaced
 			};
 
 			if (esm) {

diff --git a/packages/adapter-netlify/rollup.config.js b/packages/adapter-netlify/rollup.config.js
@@ -19,6 +19,7 @@ export default [
 			}
 		],
 		plugins: [nodeResolve(), commonjs(), json()],
-		external: ['APP', ...require('module').builtinModules]
+		external: (id) => id === '0APP' || id.startsWith('node:'),
+		preserveEntrySignatures: true
 	}
 ];
diff --git a/packages/adapter-netlify/src/handler.d.ts b/packages/adapter-netlify/src/handler.d.ts
@@ -1,3 +1,3 @@
-declare module 'APP' {
+declare module '0APP' {
 	export { App } from '@sveltejs/kit';
 }
diff --git a/packages/adapter-netlify/src/handler.js b/packages/adapter-netlify/src/handler.js
@@ -1,5 +1,5 @@
 import './shims';
-import { App } from 'APP';
+import { App } from '0APP';
 
 /**
  * @param {import('@sveltejs/kit').SSRManifest} manifest