From 5325b35e833c377ad4eab8ba179b55469b555b9b Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 26 Oct 2022 11:16:49 -0700 Subject: [PATCH 1/3] Drop CJS version of adapter-netlify --- .changeset/bright-countries-jump.md | 5 +++++ packages/adapter-netlify/index.js | 2 +- packages/adapter-netlify/rollup.config.js | 6 +----- packages/adapter-netlify/src/edge.js | 2 +- packages/adapter-netlify/src/serverless.js | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 .changeset/bright-countries-jump.md diff --git a/.changeset/bright-countries-jump.md b/.changeset/bright-countries-jump.md new file mode 100644 index 000000000000..338ebc530675 --- /dev/null +++ b/.changeset/bright-countries-jump.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/adapter-netlify': patch +--- + +Drop CJS version of adapter-netlify diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js index 8cb617cb88b9..5ab07627d714 100644 --- a/packages/adapter-netlify/index.js +++ b/packages/adapter-netlify/index.js @@ -154,7 +154,7 @@ async function generate_lambda_functions({ builder, publish, split }) { builder.writeServer('.netlify/server'); const replace = { - '0SERVER': './server/index.js' // digit prefix prevents CJS build from using this as a variable name, which would also get replaced + 'SERVER': './server/index.js' }; builder.copy(`${files}/esm`, '.netlify', { replace }); diff --git a/packages/adapter-netlify/rollup.config.js b/packages/adapter-netlify/rollup.config.js index 254881caf4b2..6140df08141d 100644 --- a/packages/adapter-netlify/rollup.config.js +++ b/packages/adapter-netlify/rollup.config.js @@ -9,17 +9,13 @@ const config = { shims: 'src/shims.js' }, output: [ - { - dir: 'files/cjs', - format: 'cjs' - }, { dir: 'files/esm', format: 'esm' } ], plugins: [nodeResolve({ preferBuiltins: true }), commonjs(), json()], - external: (id) => id === '0SERVER' || id.startsWith('node:'), + external: (id) => id === 'SERVER' || id.startsWith('node:'), preserveEntrySignatures: 'exports-only' }; diff --git a/packages/adapter-netlify/src/edge.js b/packages/adapter-netlify/src/edge.js index 819c6047e825..9303bd692117 100644 --- a/packages/adapter-netlify/src/edge.js +++ b/packages/adapter-netlify/src/edge.js @@ -1,4 +1,4 @@ -import { Server } from '0SERVER'; +import { Server } from 'SERVER'; import { manifest, prerendered } from 'MANIFEST'; const server = new Server(manifest); diff --git a/packages/adapter-netlify/src/serverless.js b/packages/adapter-netlify/src/serverless.js index f898796b8902..c10246b981e1 100644 --- a/packages/adapter-netlify/src/serverless.js +++ b/packages/adapter-netlify/src/serverless.js @@ -1,5 +1,5 @@ import './shims'; -import { Server } from '0SERVER'; +import { Server } from 'SERVER'; import { split_headers } from './headers'; /** From c1ca415c3e72e44db807d47b5849329a7a2a70f6 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 26 Oct 2022 12:45:55 -0700 Subject: [PATCH 2/3] revert 0SERVER change --- packages/adapter-netlify/index.js | 2 +- packages/adapter-netlify/rollup.config.js | 2 +- packages/adapter-netlify/src/edge.js | 2 +- packages/adapter-netlify/src/serverless.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js index 5ab07627d714..8cb617cb88b9 100644 --- a/packages/adapter-netlify/index.js +++ b/packages/adapter-netlify/index.js @@ -154,7 +154,7 @@ async function generate_lambda_functions({ builder, publish, split }) { builder.writeServer('.netlify/server'); const replace = { - 'SERVER': './server/index.js' + '0SERVER': './server/index.js' // digit prefix prevents CJS build from using this as a variable name, which would also get replaced }; builder.copy(`${files}/esm`, '.netlify', { replace }); diff --git a/packages/adapter-netlify/rollup.config.js b/packages/adapter-netlify/rollup.config.js index 6140df08141d..07ad43d6ec0f 100644 --- a/packages/adapter-netlify/rollup.config.js +++ b/packages/adapter-netlify/rollup.config.js @@ -15,7 +15,7 @@ const config = { } ], plugins: [nodeResolve({ preferBuiltins: true }), commonjs(), json()], - external: (id) => id === 'SERVER' || id.startsWith('node:'), + external: (id) => id === '0SERVER' || id.startsWith('node:'), preserveEntrySignatures: 'exports-only' }; diff --git a/packages/adapter-netlify/src/edge.js b/packages/adapter-netlify/src/edge.js index 9303bd692117..819c6047e825 100644 --- a/packages/adapter-netlify/src/edge.js +++ b/packages/adapter-netlify/src/edge.js @@ -1,4 +1,4 @@ -import { Server } from 'SERVER'; +import { Server } from '0SERVER'; import { manifest, prerendered } from 'MANIFEST'; const server = new Server(manifest); diff --git a/packages/adapter-netlify/src/serverless.js b/packages/adapter-netlify/src/serverless.js index c10246b981e1..f898796b8902 100644 --- a/packages/adapter-netlify/src/serverless.js +++ b/packages/adapter-netlify/src/serverless.js @@ -1,5 +1,5 @@ import './shims'; -import { Server } from 'SERVER'; +import { Server } from '0SERVER'; import { split_headers } from './headers'; /** From 195d8cc1ee0241a0fd5d2e6f4040eee2e104c257 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 27 Oct 2022 14:25:21 -0400 Subject: [PATCH 3/3] Update rollup.config.js --- packages/adapter-netlify/rollup.config.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/adapter-netlify/rollup.config.js b/packages/adapter-netlify/rollup.config.js index 07ad43d6ec0f..7eca711c728c 100644 --- a/packages/adapter-netlify/rollup.config.js +++ b/packages/adapter-netlify/rollup.config.js @@ -8,12 +8,10 @@ const config = { serverless: 'src/serverless.js', shims: 'src/shims.js' }, - output: [ - { - dir: 'files/esm', - format: 'esm' - } - ], + output: { + dir: 'files/esm', + format: 'esm' + }, plugins: [nodeResolve({ preferBuiltins: true }), commonjs(), json()], external: (id) => id === '0SERVER' || id.startsWith('node:'), preserveEntrySignatures: 'exports-only'