From cd60be31db89fe469ecfec83534b9c2407e1c43c Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 11:20:33 +0800 Subject: [PATCH 1/9] chore: add test --- packages/e2e-tests/kit-node/.env | 1 + packages/e2e-tests/kit-node/.gitignore | 1 + packages/e2e-tests/kit-node/__tests__/kit.spec.ts | 4 ++++ packages/e2e-tests/kit-node/src/routes/index.svelte | 5 +++-- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 packages/e2e-tests/kit-node/.env create mode 100644 packages/e2e-tests/kit-node/.gitignore diff --git a/packages/e2e-tests/kit-node/.env b/packages/e2e-tests/kit-node/.env new file mode 100644 index 000000000..eaeee2ddb --- /dev/null +++ b/packages/e2e-tests/kit-node/.env @@ -0,0 +1 @@ +VITE_FOO=FOOBARENV \ No newline at end of file diff --git a/packages/e2e-tests/kit-node/.gitignore b/packages/e2e-tests/kit-node/.gitignore new file mode 100644 index 000000000..1e18f275e --- /dev/null +++ b/packages/e2e-tests/kit-node/.gitignore @@ -0,0 +1 @@ +!.env \ No newline at end of file diff --git a/packages/e2e-tests/kit-node/__tests__/kit.spec.ts b/packages/e2e-tests/kit-node/__tests__/kit.spec.ts index 4bd1a1e3a..5bd8d9014 100644 --- a/packages/e2e-tests/kit-node/__tests__/kit.spec.ts +++ b/packages/e2e-tests/kit-node/__tests__/kit.spec.ts @@ -28,12 +28,16 @@ describe('kit-node', () => { expect(await getText('h1')).toBe('Hello world!'); expect(await getText('#load')).toBe('SERVER_LOADED'); expect(await getText('#mount')).toBe('BEFORE_MOUNT'); + expect(await getText('#i18n')).toBe('WELCOME'); + expect(await getText('#env')).toBe('FOOBARENV'); // also get page as text to confirm const html = await (await fetch(page.url())).text(); expect(html).toMatch('Hello world!'); expect(html).toMatch('SERVER_LOADED'); expect(html).toMatch('BEFORE_MOUNT'); + expect(html).toMatch('WELCOME'); + expect(html).toMatch('FOOBARENV'); // wait a bit for hydration to kick in await sleep(550); diff --git a/packages/e2e-tests/kit-node/src/routes/index.svelte b/packages/e2e-tests/kit-node/src/routes/index.svelte index b885cd535..2c5272ac8 100644 --- a/packages/e2e-tests/kit-node/src/routes/index.svelte +++ b/packages/e2e-tests/kit-node/src/routes/index.svelte @@ -32,7 +32,7 @@ mount_status = 'AFTER_MOUNT'; }); setSomeContext(); - addMessages('en', { welcome: 'hello' }); + addMessages('en', { welcome: 'WELCOME' }); init({ fallbackLocale: 'en', initialLocale: 'en' @@ -50,7 +50,8 @@
after-child
{load_status}
{mount_status}
-
{$_('welcome')}
+
{$_('welcome')}
+
{import.meta.env.VITE_FOO}
From 6a75765002a29c53a9ddc738499a8e5d07dcfe95 Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 11:27:42 +0800 Subject: [PATCH 2/9] chore: update svelte --- package.json | 2 +- .../autoprefixer-browerslist/package.json | 2 +- .../e2e-tests/configfile-custom/package.json | 2 +- .../e2e-tests/configfile-esm/package.json | 2 +- .../e2e-tests/custom-extensions/package.json | 2 +- packages/e2e-tests/hmr/package.json | 2 +- packages/e2e-tests/kit-node/package.json | 2 +- .../package-json-svelte-field/package.json | 2 +- .../preprocess-with-vite/package.json | 2 +- .../e2e-tests/svelte-preprocess/package.json | 2 +- packages/e2e-tests/vite-ssr-esm/package.json | 2 +- packages/e2e-tests/vite-ssr/package.json | 2 +- packages/playground/big/package.json | 2 +- packages/playground/kit-demo-app/package.json | 2 +- .../optimizedeps-include/package.json | 2 +- packages/playground/windicss/package.json | 2 +- packages/vite-plugin-svelte/package.json | 2 +- pnpm-lock.yaml | 120 +++++++++--------- 18 files changed, 77 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index eedce7d9c..659b79fcf 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "rimraf": "^3.0.2", "semver": "^7.3.5", "sirv": "^1.0.18", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "ts-jest": "^27.0.7", "typescript": "^4.4.4", "vite": "^2.6.7" diff --git a/packages/e2e-tests/autoprefixer-browerslist/package.json b/packages/e2e-tests/autoprefixer-browerslist/package.json index 9e3763453..d75526cb2 100644 --- a/packages/e2e-tests/autoprefixer-browerslist/package.json +++ b/packages/e2e-tests/autoprefixer-browerslist/package.json @@ -15,7 +15,7 @@ "autoprefixer": "^10.3.7", "postcss": "^8.3.9", "postcss-load-config": "^3.1.0", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "svelte-preprocess": "^4.9.8", "vite": "^2.6.7" } diff --git a/packages/e2e-tests/configfile-custom/package.json b/packages/e2e-tests/configfile-custom/package.json index 61f74749a..92dc80d2b 100644 --- a/packages/e2e-tests/configfile-custom/package.json +++ b/packages/e2e-tests/configfile-custom/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/packages/e2e-tests/configfile-esm/package.json b/packages/e2e-tests/configfile-esm/package.json index 6c85bf72e..7737c1d08 100644 --- a/packages/e2e-tests/configfile-esm/package.json +++ b/packages/e2e-tests/configfile-esm/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "svelte-preprocess": "^4.9.8", "vite": "^2.6.7" }, diff --git a/packages/e2e-tests/custom-extensions/package.json b/packages/e2e-tests/custom-extensions/package.json index 8b9d24a0c..32b9108a7 100644 --- a/packages/e2e-tests/custom-extensions/package.json +++ b/packages/e2e-tests/custom-extensions/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/packages/e2e-tests/hmr/package.json b/packages/e2e-tests/hmr/package.json index e0a770db8..d97cec16c 100644 --- a/packages/e2e-tests/hmr/package.json +++ b/packages/e2e-tests/hmr/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", "node-fetch": "^2.6.5", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/packages/e2e-tests/kit-node/package.json b/packages/e2e-tests/kit-node/package.json index 485f002a1..1c18a245c 100644 --- a/packages/e2e-tests/kit-node/package.json +++ b/packages/e2e-tests/kit-node/package.json @@ -11,7 +11,7 @@ "@sveltejs/adapter-node": "^1.0.0-next.55", "@sveltejs/kit": "^1.0.0-next.184", "e2e-test-dep-svelte-api-only": "workspace:*", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "svelte-i18n": "^3.3.13" }, "type": "module", diff --git a/packages/e2e-tests/package-json-svelte-field/package.json b/packages/e2e-tests/package-json-svelte-field/package.json index 252e8f580..d487b8b8d 100644 --- a/packages/e2e-tests/package-json-svelte-field/package.json +++ b/packages/e2e-tests/package-json-svelte-field/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/packages/e2e-tests/preprocess-with-vite/package.json b/packages/e2e-tests/preprocess-with-vite/package.json index faf77cba4..9f154b6a6 100644 --- a/packages/e2e-tests/preprocess-with-vite/package.json +++ b/packages/e2e-tests/preprocess-with-vite/package.json @@ -11,7 +11,7 @@ "@sveltejs/vite-plugin-svelte": "workspace:*", "sass": "^1.43.2", "stylus": "^0.55.0", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/packages/e2e-tests/svelte-preprocess/package.json b/packages/e2e-tests/svelte-preprocess/package.json index 28a6aab85..51337c84c 100644 --- a/packages/e2e-tests/svelte-preprocess/package.json +++ b/packages/e2e-tests/svelte-preprocess/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "svelte-preprocess": "^4.9.8", "typescript": "^4.4.4", "vite": "^2.6.7" diff --git a/packages/e2e-tests/vite-ssr-esm/package.json b/packages/e2e-tests/vite-ssr-esm/package.json index 9c39e9617..21af2d77e 100644 --- a/packages/e2e-tests/vite-ssr-esm/package.json +++ b/packages/e2e-tests/vite-ssr-esm/package.json @@ -19,7 +19,7 @@ "express": "^4.17.1", "npm-run-all": "^4.1.5", "serve-static": "^1.14.1", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/packages/e2e-tests/vite-ssr/package.json b/packages/e2e-tests/vite-ssr/package.json index 4b335cc65..f8d8d2ec5 100644 --- a/packages/e2e-tests/vite-ssr/package.json +++ b/packages/e2e-tests/vite-ssr/package.json @@ -17,7 +17,7 @@ "e2e-test-dep-esm-only": "workspace:*", "express": "^4.17.1", "serve-static": "^1.14.1", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/packages/playground/big/package.json b/packages/playground/big/package.json index 2477e594e..a662d6034 100644 --- a/packages/playground/big/package.json +++ b/packages/playground/big/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/packages/playground/kit-demo-app/package.json b/packages/playground/kit-demo-app/package.json index 2374d42e8..97f8e4264 100644 --- a/packages/playground/kit-demo-app/package.json +++ b/packages/playground/kit-demo-app/package.json @@ -10,7 +10,7 @@ "devDependencies": { "@sveltejs/adapter-node": "^1.0.0-next.55", "@sveltejs/kit": "^1.0.0-next.184", - "svelte": "^3.43.2" + "svelte": "^3.44.0" }, "type": "module", "dependencies": { diff --git a/packages/playground/optimizedeps-include/package.json b/packages/playground/optimizedeps-include/package.json index cb1ac164a..0f3649378 100644 --- a/packages/playground/optimizedeps-include/package.json +++ b/packages/playground/optimizedeps-include/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "tinro": "^0.6.7", "vite": "^2.6.7" } diff --git a/packages/playground/windicss/package.json b/packages/playground/windicss/package.json index ded9fc161..22713ddec 100644 --- a/packages/playground/windicss/package.json +++ b/packages/playground/windicss/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", "diff-match-patch": "^1.0.5", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7", "vite-plugin-windicss": "^1.4.11" } diff --git a/packages/vite-plugin-svelte/package.json b/packages/vite-plugin-svelte/package.json index 26ca56283..f759768ce 100644 --- a/packages/vite-plugin-svelte/package.json +++ b/packages/vite-plugin-svelte/package.json @@ -68,7 +68,7 @@ "diff-match-patch": "^1.0.5", "esbuild": "^0.13.8", "rollup": "^2.58.0", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "tsup": "^5.4.0", "vite": "^2.6.7" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a2176afc..705c1dd42 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ importers: rimraf: ^3.0.2 semver: ^7.3.5 sirv: ^1.0.18 - svelte: ^3.43.2 + svelte: ^3.44.0 ts-jest: ^27.0.7 typescript: ^4.4.4 vite: ^2.6.7 @@ -71,7 +71,7 @@ importers: eslint-plugin-markdown: 2.2.1_eslint@8.0.1 eslint-plugin-node: 11.1.0_eslint@8.0.1 eslint-plugin-prettier: 4.0.0_15313026b01cdd263118061498e273ac - eslint-plugin-svelte3: 3.2.1_eslint@8.0.1+svelte@3.43.2 + eslint-plugin-svelte3: 3.2.1_eslint@8.0.1+svelte@3.44.0 execa: 5.1.1 fs-extra: 10.0.0 husky: 7.0.2 @@ -84,11 +84,11 @@ importers: npm-run-all: 4.1.5 playwright-core: 1.15.2 prettier: 2.4.1 - prettier-plugin-svelte: 2.4.0_prettier@2.4.1+svelte@3.43.2 + prettier-plugin-svelte: 2.4.0_prettier@2.4.1+svelte@3.44.0 rimraf: 3.0.2 semver: 7.3.5 sirv: 1.0.18 - svelte: 3.43.2 + svelte: 3.44.0 ts-jest: 27.0.7_fe15ac987db2e7d4ad38346689ae2fc5 typescript: 4.4.4 vite: 2.6.7 @@ -142,7 +142,7 @@ importers: e2e-test-dep-svelte-simple: workspace:* postcss: ^8.3.9 postcss-load-config: ^3.1.0 - svelte: ^3.43.2 + svelte: ^3.44.0 svelte-preprocess: ^4.9.8 vite: ^2.6.7 dependencies: @@ -152,46 +152,46 @@ importers: autoprefixer: 10.3.7_postcss@8.3.9 postcss: 8.3.9 postcss-load-config: 3.1.0 - svelte: 3.43.2 - svelte-preprocess: 4.9.8_736a8007488abd5b2de7d5067793036e + svelte: 3.44.0 + svelte-preprocess: 4.9.8_1873fd0c9ca6af10fb1aa8c5ab59f9db vite: 2.6.7 packages/e2e-tests/configfile-custom: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* e2e-test-dep-svelte-simple: workspace:* - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 dependencies: e2e-test-dep-svelte-simple: link:../_test_dependencies/svelte-simple devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 packages/e2e-tests/configfile-esm: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* e2e-test-dep-svelte-simple: workspace:* - svelte: ^3.43.2 + svelte: ^3.44.0 svelte-preprocess: ^4.9.8 vite: ^2.6.7 dependencies: e2e-test-dep-svelte-simple: link:../_test_dependencies/svelte-simple devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte - svelte: 3.43.2 - svelte-preprocess: 4.9.8_svelte@3.43.2+typescript@4.4.4 + svelte: 3.44.0 + svelte-preprocess: 4.9.8_svelte@3.44.0+typescript@4.4.4 vite: 2.6.7 packages/e2e-tests/custom-extensions: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 packages/e2e-tests/hmr: @@ -199,14 +199,14 @@ importers: '@sveltejs/vite-plugin-svelte': workspace:* e2e-test-dep-svelte-simple: workspace:* node-fetch: ^2.6.5 - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 dependencies: e2e-test-dep-svelte-simple: link:../_test_dependencies/svelte-simple devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte node-fetch: 2.6.5 - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 packages/e2e-tests/kit-node: @@ -214,28 +214,28 @@ importers: '@sveltejs/adapter-node': ^1.0.0-next.55 '@sveltejs/kit': ^1.0.0-next.184 e2e-test-dep-svelte-api-only: workspace:* - svelte: ^3.43.2 + svelte: ^3.44.0 svelte-i18n: ^3.3.13 devDependencies: '@sveltejs/adapter-node': 1.0.0-next.55 - '@sveltejs/kit': 1.0.0-next.184_svelte@3.43.2 + '@sveltejs/kit': 1.0.0-next.184_svelte@3.44.0 e2e-test-dep-svelte-api-only: link:../_test_dependencies/svelte-api-only - svelte: 3.43.2 - svelte-i18n: 3.3.13_svelte@3.43.2 + svelte: 3.44.0 + svelte-i18n: 3.3.13_svelte@3.44.0 packages/e2e-tests/package-json-svelte-field: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* e2e-test-dep-svelte-hybrid: workspace:* e2e-test-dep-svelte-nested: workspace:* - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 dependencies: e2e-test-dep-svelte-hybrid: link:../_test_dependencies/svelte-hybrid e2e-test-dep-svelte-nested: link:../_test_dependencies/svelte-nested devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 packages/e2e-tests/preprocess-with-vite: @@ -243,26 +243,26 @@ importers: '@sveltejs/vite-plugin-svelte': workspace:* sass: ^1.43.2 stylus: ^0.55.0 - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte sass: 1.43.2 stylus: 0.55.0 - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7_sass@1.43.2+stylus@0.55.0 packages/e2e-tests/svelte-preprocess: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* - svelte: ^3.43.2 + svelte: ^3.44.0 svelte-preprocess: ^4.9.8 typescript: ^4.4.4 vite: ^2.6.7 devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte - svelte: 3.43.2 - svelte-preprocess: 4.9.8_svelte@3.43.2+typescript@4.4.4 + svelte: 3.44.0 + svelte-preprocess: 4.9.8_svelte@3.44.0+typescript@4.4.4 typescript: 4.4.4 vite: 2.6.7 @@ -277,7 +277,7 @@ importers: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte '@tsconfig/svelte': 2.0.1 '@types/node': 16.11.1 - svelte-preprocess: 4.9.8_svelte@3.43.2+typescript@4.4.4 + svelte-preprocess: 4.9.8_svelte@3.44.0+typescript@4.4.4 vite: 2.6.7 packages/e2e-tests/vite-ssr: @@ -288,7 +288,7 @@ importers: e2e-test-dep-esm-only: workspace:* express: ^4.17.1 serve-static: ^1.14.1 - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte @@ -297,7 +297,7 @@ importers: e2e-test-dep-esm-only: link:../_test_dependencies/esm-only express: 4.17.1 serve-static: 1.14.1 - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 packages/e2e-tests/vite-ssr-esm: @@ -309,7 +309,7 @@ importers: express: ^4.17.1 npm-run-all: ^4.1.5 serve-static: ^1.14.1 - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte @@ -319,7 +319,7 @@ importers: express: 4.17.1 npm-run-all: 4.1.5 serve-static: 1.14.1 - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 packages/playground: @@ -328,11 +328,11 @@ importers: packages/playground/big: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 packages/playground/kit-demo-app: @@ -342,25 +342,25 @@ importers: '@sveltejs/adapter-node': ^1.0.0-next.55 '@sveltejs/kit': ^1.0.0-next.184 cookie: ^0.4.1 - svelte: ^3.43.2 + svelte: ^3.44.0 dependencies: '@fontsource/fira-mono': 4.5.0 '@lukeed/uuid': 2.0.0 cookie: 0.4.1 devDependencies: '@sveltejs/adapter-node': 1.0.0-next.55 - '@sveltejs/kit': 1.0.0-next.184_svelte@3.43.2 - svelte: 3.43.2 + '@sveltejs/kit': 1.0.0-next.184_svelte@3.44.0 + svelte: 3.44.0 packages/playground/optimizedeps-include: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* - svelte: ^3.43.2 + svelte: ^3.44.0 tinro: ^0.6.7 vite: ^2.6.7 devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte - svelte: 3.43.2 + svelte: 3.44.0 tinro: 0.6.7 vite: 2.6.7 @@ -368,7 +368,7 @@ importers: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* diff-match-patch: ^1.0.5 - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 vite-plugin-windicss: ^1.4.11 windicss: ^3.1.9 @@ -377,7 +377,7 @@ importers: devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte diff-match-patch: 1.0.5 - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 vite-plugin-windicss: 1.4.11_vite@2.6.7 @@ -393,7 +393,7 @@ importers: magic-string: ^0.25.7 require-relative: ^0.8.7 rollup: ^2.58.0 - svelte: ^3.43.2 + svelte: ^3.44.0 svelte-hmr: ^0.14.7 tsup: ^5.4.0 vite: ^2.6.7 @@ -403,14 +403,14 @@ importers: kleur: 4.1.4 magic-string: 0.25.7 require-relative: 0.8.7 - svelte-hmr: 0.14.7_svelte@3.43.2 + svelte-hmr: 0.14.7_svelte@3.44.0 devDependencies: '@types/debug': 4.1.7 '@types/diff-match-patch': 1.0.32 diff-match-patch: 1.0.5 esbuild: 0.13.8 rollup: 2.58.0 - svelte: 3.43.2 + svelte: 3.44.0 tsup: 5.4.0_typescript@4.4.4 vite: 2.6.7 @@ -1307,7 +1307,7 @@ packages: tiny-glob: 0.2.9 dev: true - /@sveltejs/kit/1.0.0-next.184_svelte@3.43.2: + /@sveltejs/kit/1.0.0-next.184_svelte@3.44.0: resolution: {integrity: sha512-bQNka3td/OMmnbDEzUTmb3czPgt/y93WOyYiT14ORq/qPewoMhEtgPikfboejdZMTJESSq06s43YXmF2MzqSSA==} engines: {node: '>=14.13'} hasBin: true @@ -1317,7 +1317,7 @@ packages: '@sveltejs/vite-plugin-svelte': link:packages/vite-plugin-svelte cheap-watch: 1.0.4 sade: 1.7.4 - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 transitivePeerDependencies: - less @@ -2921,7 +2921,7 @@ packages: prettier-linter-helpers: 1.0.0 dev: true - /eslint-plugin-svelte3/3.2.1_eslint@8.0.1+svelte@3.43.2: + /eslint-plugin-svelte3/3.2.1_eslint@8.0.1+svelte@3.44.0: resolution: {integrity: sha512-YoBR9mLoKCjGghJ/gvpnFZKaMEu/VRcuxpSRS8KuozuEo7CdBH7bmBHa6FmMm0i4kJnOyx+PVsaptz96K6H/4Q==} engines: {node: '>=10'} peerDependencies: @@ -2929,7 +2929,7 @@ packages: svelte: ^3.2.0 dependencies: eslint: 8.0.1 - svelte: 3.43.2 + svelte: 3.44.0 dev: true /eslint-scope/5.1.1: @@ -5380,14 +5380,14 @@ packages: fast-diff: 1.2.0 dev: true - /prettier-plugin-svelte/2.4.0_prettier@2.4.1+svelte@3.43.2: + /prettier-plugin-svelte/2.4.0_prettier@2.4.1+svelte@3.44.0: resolution: {integrity: sha512-JwJ9bOz4XHLQtiLnX4mTSSDUdhu12WH8sTwy/XTDCSyPlah6IcV7NWeYBZscPEcceu2YnW8Y9sJCP40Z2UH9GA==} peerDependencies: prettier: ^1.16.4 || ^2.0.0 svelte: ^3.2.0 dependencies: prettier: 2.4.1 - svelte: 3.43.2 + svelte: 3.44.0 dev: true /prettier/1.19.1: @@ -6102,15 +6102,15 @@ packages: supports-color: 7.2.0 dev: true - /svelte-hmr/0.14.7_svelte@3.43.2: + /svelte-hmr/0.14.7_svelte@3.44.0: resolution: {integrity: sha512-pDrzgcWSoMaK6AJkBWkmgIsecW0GChxYZSZieIYfCP0v2oPyx2CYU/zm7TBIcjLVUPP714WxmViE9Thht4etog==} peerDependencies: svelte: '>=3.19.0' dependencies: - svelte: 3.43.2 + svelte: 3.44.0 dev: false - /svelte-i18n/3.3.13_svelte@3.43.2: + /svelte-i18n/3.3.13_svelte@3.44.0: resolution: {integrity: sha512-RQM+ys4+Y9ztH//tX22H1UL2cniLNmIR+N4xmYygV6QpQ6EyQvloZiENRew8XrVzfvJ8HaE8NU6/yurLkl7z3g==} engines: {node: '>= 11.15.0'} hasBin: true @@ -6121,11 +6121,11 @@ packages: estree-walker: 2.0.2 intl-messageformat: 9.9.3 sade: 1.7.4 - svelte: 3.43.2 + svelte: 3.44.0 tiny-glob: 0.2.9 dev: true - /svelte-preprocess/4.9.8_736a8007488abd5b2de7d5067793036e: + /svelte-preprocess/4.9.8_1873fd0c9ca6af10fb1aa8c5ab59f9db: resolution: {integrity: sha512-EQS/oRZzMtYdAprppZxY3HcysKh11w54MgA63ybtL+TAZ4hVqYOnhw41JVJjWN9dhPnNjjLzvbZ2tMhTsla1Og==} engines: {node: '>= 9.11.2'} requiresBuild: true @@ -6174,11 +6174,11 @@ packages: postcss-load-config: 3.1.0 sorcery: 0.10.0 strip-indent: 3.0.0 - svelte: 3.43.2 + svelte: 3.44.0 typescript: 4.4.4 dev: true - /svelte-preprocess/4.9.8_svelte@3.43.2+typescript@4.4.4: + /svelte-preprocess/4.9.8_svelte@3.44.0+typescript@4.4.4: resolution: {integrity: sha512-EQS/oRZzMtYdAprppZxY3HcysKh11w54MgA63ybtL+TAZ4hVqYOnhw41JVJjWN9dhPnNjjLzvbZ2tMhTsla1Og==} engines: {node: '>= 9.11.2'} requiresBuild: true @@ -6225,12 +6225,12 @@ packages: magic-string: 0.25.7 sorcery: 0.10.0 strip-indent: 3.0.0 - svelte: 3.43.2 + svelte: 3.44.0 typescript: 4.4.4 dev: true - /svelte/3.43.2: - resolution: {integrity: sha512-Lj+TJfSeod8UGnoG2opysdlCy4MCck/hHQsZwtNPXdYTwLTz+WC37QwewPhZtd+h3dpfps4h9QzFxWGVI4tzQw==} + /svelte/3.44.0: + resolution: {integrity: sha512-zWACSJBSncGiDvFfYOMFGNV5zDLOlyhftmO5yOZ0lEtQMptpElaRtl39MWz1+lYCpwUq4F3Q2lTzI9TrTL+eMA==} engines: {node: '>= 8'} dev: true From 2d7b30c591782e04df5cb86d64b6a6352919161d Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 11:40:37 +0800 Subject: [PATCH 3/9] fix: disable css sourcemap in ssr --- packages/vite-plugin-svelte/src/utils/compile.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/vite-plugin-svelte/src/utils/compile.ts b/packages/vite-plugin-svelte/src/utils/compile.ts index 5cb2876e2..f1398e01f 100644 --- a/packages/vite-plugin-svelte/src/utils/compile.ts +++ b/packages/vite-plugin-svelte/src/utils/compile.ts @@ -26,6 +26,13 @@ const _createCompileSvelte = (makeHot: Function) => log.debug(`setting cssHash ${hash} for ${normalizedFilename}`); compileOptions.cssHash = () => hash; } + if (ssr) { + if (compileOptions.enableSourcemap === undefined || compileOptions.enableSourcemap === true) { + compileOptions.enableSourcemap = { js: true, css: false }; + } else if (typeof compileOptions.enableSourcemap === 'object') { + compileOptions.enableSourcemap.css = false; + } + } let preprocessed; From 944da9aab18040201c2d026da0e9ef6ae082308e Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 11:48:48 +0800 Subject: [PATCH 4/9] chore: add changeset --- .changeset/plenty-wasps-explode.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/plenty-wasps-explode.md diff --git a/.changeset/plenty-wasps-explode.md b/.changeset/plenty-wasps-explode.md new file mode 100644 index 000000000..7bcb60720 --- /dev/null +++ b/.changeset/plenty-wasps-explode.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/vite-plugin-svelte': patch +--- + +Disable CSS sourcemap in SSR From e238b7333cfcba10e7f124ab7abf506185134c63 Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 12:10:39 +0800 Subject: [PATCH 5/9] fix: merge --- packages/playground/big-component-library/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/playground/big-component-library/package.json b/packages/playground/big-component-library/package.json index 5b8fbdfef..373f93e7a 100644 --- a/packages/playground/big-component-library/package.json +++ b/packages/playground/big-component-library/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "workspace:*", "carbon-components-svelte": "^0.45.1", - "svelte": "^3.43.2", + "svelte": "^3.44.0", "vite": "^2.6.7" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fab722efb..667b1e3f2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -339,12 +339,12 @@ importers: specifiers: '@sveltejs/vite-plugin-svelte': workspace:* carbon-components-svelte: ^0.45.1 - svelte: ^3.43.2 + svelte: ^3.44.0 vite: ^2.6.7 devDependencies: '@sveltejs/vite-plugin-svelte': link:../../vite-plugin-svelte carbon-components-svelte: 0.45.1 - svelte: 3.43.2 + svelte: 3.44.0 vite: 2.6.7 packages/playground/kit-demo-app: From 15c585b930d5c86f99477ce9ff317c36855509be Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 12:31:49 +0800 Subject: [PATCH 6/9] chore: add debug log --- packages/vite-plugin-svelte/src/utils/compile.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/vite-plugin-svelte/src/utils/compile.ts b/packages/vite-plugin-svelte/src/utils/compile.ts index f1398e01f..30fd8c899 100644 --- a/packages/vite-plugin-svelte/src/utils/compile.ts +++ b/packages/vite-plugin-svelte/src/utils/compile.ts @@ -26,12 +26,13 @@ const _createCompileSvelte = (makeHot: Function) => log.debug(`setting cssHash ${hash} for ${normalizedFilename}`); compileOptions.cssHash = () => hash; } - if (ssr) { - if (compileOptions.enableSourcemap === undefined || compileOptions.enableSourcemap === true) { - compileOptions.enableSourcemap = { js: true, css: false }; - } else if (typeof compileOptions.enableSourcemap === 'object') { + if (ssr && compileOptions.enableSourcemap !== false) { + if (typeof compileOptions.enableSourcemap === 'object') { compileOptions.enableSourcemap.css = false; + } else { + compileOptions.enableSourcemap = { js: true, css: false }; } + log.debug(`force css sourcemap false for ${normalizedFilename}`); } let preprocessed; From c8cfa71fc0b57b5a8640c5673f53b9da88c1aa5d Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 13:20:28 +0800 Subject: [PATCH 7/9] chore: remove debug log --- packages/vite-plugin-svelte/src/utils/compile.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vite-plugin-svelte/src/utils/compile.ts b/packages/vite-plugin-svelte/src/utils/compile.ts index 30fd8c899..166d31b2e 100644 --- a/packages/vite-plugin-svelte/src/utils/compile.ts +++ b/packages/vite-plugin-svelte/src/utils/compile.ts @@ -32,7 +32,6 @@ const _createCompileSvelte = (makeHot: Function) => } else { compileOptions.enableSourcemap = { js: true, css: false }; } - log.debug(`force css sourcemap false for ${normalizedFilename}`); } let preprocessed; From 8ff74a9d4ef163daf66b25e14c12b8f83e672c7c Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 13:25:44 +0800 Subject: [PATCH 8/9] chore: add debug log again --- packages/vite-plugin-svelte/src/utils/compile.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/vite-plugin-svelte/src/utils/compile.ts b/packages/vite-plugin-svelte/src/utils/compile.ts index 166d31b2e..e53b7989e 100644 --- a/packages/vite-plugin-svelte/src/utils/compile.ts +++ b/packages/vite-plugin-svelte/src/utils/compile.ts @@ -28,9 +28,13 @@ const _createCompileSvelte = (makeHot: Function) => } if (ssr && compileOptions.enableSourcemap !== false) { if (typeof compileOptions.enableSourcemap === 'object') { - compileOptions.enableSourcemap.css = false; + if (compileOptions.enableSourcemap.css) { + compileOptions.enableSourcemap.css = false; + log.debug('forcing css sourcemap to false'); + } } else { compileOptions.enableSourcemap = { js: true, css: false }; + log.debug('forcing css sourcemap to false'); } } From bd71c8fc059532c55ffd98ce3b0d71dd89457a33 Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 18 Oct 2021 14:19:12 +0800 Subject: [PATCH 9/9] chore: remove debug log again --- packages/vite-plugin-svelte/src/utils/compile.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/vite-plugin-svelte/src/utils/compile.ts b/packages/vite-plugin-svelte/src/utils/compile.ts index e53b7989e..166d31b2e 100644 --- a/packages/vite-plugin-svelte/src/utils/compile.ts +++ b/packages/vite-plugin-svelte/src/utils/compile.ts @@ -28,13 +28,9 @@ const _createCompileSvelte = (makeHot: Function) => } if (ssr && compileOptions.enableSourcemap !== false) { if (typeof compileOptions.enableSourcemap === 'object') { - if (compileOptions.enableSourcemap.css) { - compileOptions.enableSourcemap.css = false; - log.debug('forcing css sourcemap to false'); - } + compileOptions.enableSourcemap.css = false; } else { compileOptions.enableSourcemap = { js: true, css: false }; - log.debug('forcing css sourcemap to false'); } }