From aa7398f4006e25ffa8a8ae6eb2750b8c7e7433db Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 29 Mar 2024 15:49:56 -0400 Subject: [PATCH 1/4] move compiler.cjs to compiler/index.js --- .prettierignore | 2 +- packages/svelte/.gitignore | 2 +- packages/svelte/compiler/package.json | 3 +++ packages/svelte/package.json | 4 ++-- packages/svelte/rollup.config.js | 2 +- sites/svelte-5-preview/src/lib/workers/bundler/index.js | 6 ++---- sites/svelte-5-preview/src/lib/workers/compiler/index.js | 6 ++---- .../src/routes/svelte/[...path]/+server.js | 9 +++++---- 8 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 packages/svelte/compiler/package.json diff --git a/.prettierignore b/.prettierignore index 45e12c6e3fbc..820ce0e6b6da 100644 --- a/.prettierignore +++ b/.prettierignore @@ -15,7 +15,7 @@ packages/svelte/tests/hydration/samples/*/_before_head.html packages/svelte/tests/hydration/samples/*/_after.html packages/svelte/tests/hydration/samples/*/_after_head.html packages/svelte/types -packages/svelte/compiler.cjs +packages/svelte/compiler/index.js playgrounds/demo/src playgrounds/sandbox/input/**.svelte playgrounds/sandbox/output diff --git a/packages/svelte/.gitignore b/packages/svelte/.gitignore index 8b3d7652a17c..d0c4ba8d6144 100644 --- a/packages/svelte/.gitignore +++ b/packages/svelte/.gitignore @@ -1,6 +1,6 @@ /types/*.map /types/compiler -/compiler.cjs +/compiler/index.js /action.d.ts /animate.d.ts diff --git a/packages/svelte/compiler/package.json b/packages/svelte/compiler/package.json new file mode 100644 index 000000000000..a0df0c867783 --- /dev/null +++ b/packages/svelte/compiler/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/packages/svelte/package.json b/packages/svelte/package.json index ad5d260b7f6d..f3381ca3271d 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -12,7 +12,7 @@ "src", "!src/**/*.test.*", "types", - "compiler.cjs", + "compiler/index.js", "*.d.ts", "README.md" ], @@ -34,7 +34,7 @@ }, "./compiler": { "types": "./types/index.d.ts", - "require": "./compiler.cjs", + "require": "./compiler/index.js", "default": "./src/compiler/index.js" }, "./easing": { diff --git a/packages/svelte/rollup.config.js b/packages/svelte/rollup.config.js index 5a9a220411ad..3e36190f9cbd 100644 --- a/packages/svelte/rollup.config.js +++ b/packages/svelte/rollup.config.js @@ -9,7 +9,7 @@ import './scripts/generate-version.js'; export default defineConfig({ input: 'src/compiler/index.js', output: { - file: 'compiler.cjs', + file: 'compiler/index.js', format: 'umd', name: 'svelte' }, diff --git a/sites/svelte-5-preview/src/lib/workers/bundler/index.js b/sites/svelte-5-preview/src/lib/workers/bundler/index.js index bd0ee9d67e15..80e14badbfbf 100644 --- a/sites/svelte-5-preview/src/lib/workers/bundler/index.js +++ b/sites/svelte-5-preview/src/lib/workers/bundler/index.js @@ -48,10 +48,8 @@ self.addEventListener( const { version } = await fetch(`${svelte_url}/package.json`).then((r) => r.json()); console.log(`Using Svelte compiler version ${version}`); - // unpkg doesn't set the correct MIME type for .cjs files - // https://github.com/mjackson/unpkg/issues/355 - const compiler = await fetch(`${svelte_url}/compiler.cjs`).then((r) => r.text()); - (0, eval)(compiler + '\n//# sourceURL=compiler.cjs@' + version); + const compiler = await fetch(`${svelte_url}/compiler/index.js`).then((r) => r.text()); + (0, eval)(compiler + '\n//# sourceURL=compiler/index.js@' + version); svelte = globalThis.svelte; diff --git a/sites/svelte-5-preview/src/lib/workers/compiler/index.js b/sites/svelte-5-preview/src/lib/workers/compiler/index.js index d3d7e475d189..d264e702a05e 100644 --- a/sites/svelte-5-preview/src/lib/workers/compiler/index.js +++ b/sites/svelte-5-preview/src/lib/workers/compiler/index.js @@ -29,10 +29,8 @@ self.addEventListener( .then((r) => r.json()) .catch(() => ({ version: 'experimental' })); - // unpkg doesn't set the correct MIME type for .cjs files - // https://github.com/mjackson/unpkg/issues/355 - const compiler = await fetch(`${svelte_url}/compiler.cjs`).then((r) => r.text()); - (0, eval)(compiler + '\n//# sourceURL=compiler.cjs@' + version); + const compiler = await fetch(`${svelte_url}/compiler/index.js`).then((r) => r.text()); + (0, eval)(compiler + '\n//# sourceURL=compiler/index.js@' + version); svelte = globalThis.svelte; diff --git a/sites/svelte-5-preview/src/routes/svelte/[...path]/+server.js b/sites/svelte-5-preview/src/routes/svelte/[...path]/+server.js index 7e0c82b33d84..8ac64dd22359 100644 --- a/sites/svelte-5-preview/src/routes/svelte/[...path]/+server.js +++ b/sites/svelte-5-preview/src/routes/svelte/[...path]/+server.js @@ -1,10 +1,11 @@ -import compiler_cjs from '../../../../../../packages/svelte/compiler.cjs?url'; +import compiler_cjs from '../../../../../../packages/svelte/compiler/index.js?url'; import package_json from '../../../../../../packages/svelte/package.json?url'; import { read } from '$app/server'; const files = import.meta.glob('../../../../../../packages/svelte/src/**/*.js', { eager: true, - as: 'url' + query: '?url', + import: 'default' }); const prefix = '../../../../../../packages/svelte/'; @@ -13,14 +14,14 @@ export const prerender = true; export function entries() { const entries = Object.keys(files).map((path) => ({ path: path.replace(prefix, '') })); - entries.push({ path: 'compiler.cjs' }, { path: 'package.json' }); + entries.push({ path: 'compiler/index.js' }, { path: 'package.json' }); return entries; } // service worker requests files under this path to load the compiler and runtime export async function GET({ params }) { let url = ''; - if (params.path === 'compiler.cjs') { + if (params.path === 'compiler/index.js') { url = compiler_cjs; } else if (params.path === 'package.json') { url = package_json; From 242831029c75308588444b5437d72d794d5fca00 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 29 Mar 2024 15:50:37 -0400 Subject: [PATCH 2/4] changeset --- .changeset/metal-clouds-raise.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/metal-clouds-raise.md diff --git a/.changeset/metal-clouds-raise.md b/.changeset/metal-clouds-raise.md new file mode 100644 index 000000000000..9693100fb3c7 --- /dev/null +++ b/.changeset/metal-clouds-raise.md @@ -0,0 +1,5 @@ +--- +'svelte': patch +--- + +breaking: move compiler.cjs to compiler/index.js From 68bc25a4c4d287d964adba27fea829b8b4798a74 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 30 Mar 2024 09:46:35 -0400 Subject: [PATCH 3/4] prettier --- packages/svelte/compiler/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/svelte/compiler/package.json b/packages/svelte/compiler/package.json index a0df0c867783..5bbefffbabee 100644 --- a/packages/svelte/compiler/package.json +++ b/packages/svelte/compiler/package.json @@ -1,3 +1,3 @@ { - "type": "commonjs" + "type": "commonjs" } From 6c77ba988c6089ee4765de5a39b1398d79443580 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 30 Mar 2024 11:14:01 -0400 Subject: [PATCH 4/4] ugh --- .eslintignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintignore b/.eslintignore index fbab8fbc0d02..3b486d3f0773 100644 --- a/.eslintignore +++ b/.eslintignore @@ -11,6 +11,7 @@ **/vite.config.js **/vite.prod.config.js **/node_modules +**/compiler/index.js **/tests/** @@ -20,4 +21,4 @@ documentation/** # contains a fork of the REPL which doesn't adhere to eslint rules sites/svelte-5-preview/** # Wasn't checked previously, reenable at some point -sites/svelte.dev/** +sites/svelte.dev/**