diff --git a/.changeset/gorgeous-carrots-do.md b/.changeset/gorgeous-carrots-do.md new file mode 100644 index 000000000000..75b344ac35b5 --- /dev/null +++ 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 index 2aa36a2452c4..3ebb45324d03 100644 --- 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 index 2d88582be5e4..7564de03ee9c 100644 --- 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 index 556c999c9007..75ea691df713 100644 --- 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 index e75fdd97a85f..e23c8f96d17b 100644 --- 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