Skip to content

fix: disable css sourcemap in ssr #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 18, 2021
Merged

fix: disable css sourcemap in ssr #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cd60be3
chore: add test
bluwy Oct 18, 2021
6a75765
chore: update svelte
bluwy Oct 18, 2021
2d7b30c
fix: disable css sourcemap in ssr
bluwy Oct 18, 2021
944da9a
chore: add changeset
bluwy Oct 18, 2021
6aaca96
Merge branch 'main' into fix-import-meta-env
bluwy Oct 18, 2021
e238b73
fix: merge
bluwy Oct 18, 2021
15c585b
chore: add debug log
bluwy Oct 18, 2021
c8cfa71
chore: remove debug log
bluwy Oct 18, 2021
8ff74a9
chore: add debug log again
bluwy Oct 18, 2021
bd71c8f
chore: remove debug log again
bluwy Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/plenty-wasps-explode.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': patch
---

Disable CSS sourcemap in SSR
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-tests/autoprefixer-browerslist/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-tests/configfile-custom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.43.2",
"svelte": "^3.44.0",
"vite": "^2.6.7"
}
}
2 changes: 1 addition & 1 deletion packages/e2e-tests/configfile-esm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-tests/custom-extensions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.43.2",
"svelte": "^3.44.0",
"vite": "^2.6.7"
}
}
2 changes: 1 addition & 1 deletion packages/e2e-tests/hmr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
1 change: 1 addition & 0 deletions packages/e2e-tests/kit-node/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_FOO=FOOBARENV
1 change: 1 addition & 0 deletions packages/e2e-tests/kit-node/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!.env
4 changes: 4 additions & 0 deletions packages/e2e-tests/kit-node/__tests__/kit.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-tests/kit-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions packages/e2e-tests/kit-node/src/routes/index.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
mount_status = 'AFTER_MOUNT';
});
setSomeContext();
addMessages('en', { welcome: 'hello' });
addMessages('en', { welcome: 'WELCOME' });
init({
fallbackLocale: 'en',
initialLocale: 'en'
Expand All @@ -50,7 +50,8 @@
<div id="after-child">after-child</div>
<div id="load">{load_status}</div>
<div id="mount">{mount_status}</div>
<div>{$_('welcome')}</div>
<div id="i18n">{$_('welcome')}</div>
<div id="env">{import.meta.env.VITE_FOO}</div>
</main>

<!-- HMR-TEMPLATE-INJECT -->
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-tests/package-json-svelte-field/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.43.2",
"svelte": "^3.44.0",
"vite": "^2.6.7"
}
}
2 changes: 1 addition & 1 deletion packages/e2e-tests/preprocess-with-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/e2e-tests/svelte-preprocess/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-tests/vite-ssr-esm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/e2e-tests/vite-ssr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/playground/big-component-library/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/playground/big/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:*",
"svelte": "^3.43.2",
"svelte": "^3.44.0",
"vite": "^2.6.7"
}
}
2 changes: 1 addition & 1 deletion packages/playground/kit-demo-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/optimizedeps-include/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/windicss/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-plugin-svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
7 changes: 7 additions & 0 deletions packages/vite-plugin-svelte/src/utils/compile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ const _createCompileSvelte = (makeHot: Function) =>
log.debug(`setting cssHash ${hash} for ${normalizedFilename}`);
compileOptions.cssHash = () => hash;
}
if (ssr && compileOptions.enableSourcemap !== false) {
if (typeof compileOptions.enableSourcemap === 'object') {
compileOptions.enableSourcemap.css = false;
} else {
compileOptions.enableSourcemap = { js: true, css: false };
}
}

let preprocessed;

Expand Down
Loading