Skip to content

Commit 631d447

Browse files
benmccannbenmccann
committed
Remove svelte/ssr resolving
1 parent f112d8b commit 631d447

File tree

20 files changed

+120
-90
lines changed

20 files changed

+120
-90
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"rimraf": "^3.0.2",
6363
"semver": "^7.3.5",
6464
"sirv": "^1.0.17",
65-
"svelte": "^3.42.6",
65+
"svelte": "^3.43.0",
6666
"ts-jest": "^27.0.5",
6767
"typescript": "^4.4.3",
6868
"vite": "^2.5.10"

‎packages/e2e-tests/autoprefixer-browerslist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"autoprefixer": "^10.3.4",
1616
"postcss": "^8.3.6",
1717
"postcss-load-config": "^3.1.0",
18-
"svelte": "^3.42.6",
18+
"svelte": "^3.43.0",
1919
"svelte-preprocess": "^4.9.5",
2020
"vite": "^2.5.10"
2121
}

‎packages/e2e-tests/configfile-custom/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:*",
15-
"svelte": "^3.42.6",
15+
"svelte": "^3.43.0",
1616
"vite": "^2.5.10"
1717
}
1818
}

‎packages/e2e-tests/configfile-esm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:*",
15-
"svelte": "^3.42.6",
15+
"svelte": "^3.43.0",
1616
"svelte-preprocess": "^4.9.5",
1717
"vite": "^2.5.10"
1818
},

‎packages/e2e-tests/custom-extensions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
12-
"svelte": "^3.42.6",
12+
"svelte": "^3.43.0",
1313
"vite": "^2.5.10"
1414
}
1515
}

‎packages/e2e-tests/hmr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:*",
1515
"node-fetch": "^2.6.2",
16-
"svelte": "^3.42.6",
16+
"svelte": "^3.43.0",
1717
"vite": "^2.5.10"
1818
}
1919
}

‎packages/e2e-tests/kit-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@sveltejs/adapter-node": "^1.0.0-next.49",
1212
"@sveltejs/kit": "^1.0.0-next.169",
1313
"e2e-test-dep-svelte-api-only": "workspace:*",
14-
"svelte": "^3.42.6",
14+
"svelte": "^3.43.0",
1515
"svelte-i18n": "^3.3.10"
1616
},
1717
"type": "module",

‎packages/e2e-tests/package-json-svelte-field/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@sveltejs/vite-plugin-svelte": "workspace:*",
16-
"svelte": "^3.42.6",
16+
"svelte": "^3.43.0",
1717
"vite": "^2.5.10"
1818
}
1919
}

‎packages/e2e-tests/svelte-preprocess/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
12-
"svelte": "^3.42.6",
12+
"svelte": "^3.43.0",
1313
"svelte-preprocess": "^4.9.5",
1414
"typescript": "^4.4.3",
1515
"vite": "^2.5.10"

‎packages/e2e-tests/vite-ssr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"cross-env": "^7.0.3",
1717
"express": "^4.17.1",
1818
"serve-static": "^1.14.1",
19-
"svelte": "^3.42.6",
19+
"svelte": "^3.43.0",
2020
"vite": "^2.5.10"
2121
}
2222
}

‎packages/playground/big/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
12-
"svelte": "^3.42.6",
12+
"svelte": "^3.43.0",
1313
"vite": "^2.5.10"
1414
}
1515
}

‎packages/playground/kit-demo-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"devDependencies": {
1111
"@sveltejs/adapter-node": "^1.0.0-next.49",
1212
"@sveltejs/kit": "^1.0.0-next.169",
13-
"svelte": "^3.42.6"
13+
"svelte": "^3.43.0"
1414
},
1515
"type": "module",
1616
"dependencies": {

‎packages/playground/optimizedeps-include/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@sveltejs/vite-plugin-svelte": "workspace:*",
13-
"svelte": "^3.42.6",
13+
"svelte": "^3.43.0",
1414
"tinro": "^0.6.7",
1515
"vite": "^2.5.10"
1616
}

‎packages/playground/preprocess-with-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@sveltejs/vite-plugin-svelte": "workspace:*",
1212
"sass": "^1.41.1",
1313
"stylus": "^0.55.0",
14-
"svelte": "^3.42.6",
14+
"svelte": "^3.43.0",
1515
"vite": "^2.5.10"
1616
}
1717
}

‎packages/playground/windicss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:*",
1515
"diff-match-patch": "^1.0.5",
16-
"svelte": "^3.42.6",
16+
"svelte": "^3.43.0",
1717
"vite": "^2.5.10",
1818
"vite-plugin-windicss": "^1.4.3"
1919
}

‎packages/vite-plugin-svelte/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
},
5555
"peerDependencies": {
5656
"diff-match-patch": "^1.0.5",
57-
"svelte": "^3.34.0",
57+
"svelte": "^3.43.0",
5858
"vite": "^2.5.3"
5959
},
6060
"peerDependenciesMeta": {
@@ -68,7 +68,7 @@
6868
"diff-match-patch": "^1.0.5",
6969
"esbuild": "^0.12.28",
7070
"rollup": "^2.56.3",
71-
"svelte": "^3.42.6",
71+
"svelte": "^3.43.0",
7272
"tsup": "^5.1.0",
7373
"vite": "^2.5.10"
7474
}

‎packages/vite-plugin-svelte/src/index.ts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { VitePluginSvelteCache } from './utils/vite-plugin-svelte-cache';
1616
import { ensureWatchedFile, setupWatchers } from './utils/watch';
1717
import { resolveViaPackageJsonSvelte } from './utils/resolve';
1818
import { addExtraPreprocessors } from './utils/preprocess';
19-
import { PartialResolvedId } from 'rollup';
2019

2120
export function svelte(inlineOptions?: Partial<Options>): Plugin {
2221
if (process.env.DEBUG != null) {
@@ -37,8 +36,6 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
3736
) => Promise<CompileData>;
3837
/* eslint-enable no-unused-vars */
3938

40-
let resolvedSvelteSSR: Promise<PartialResolvedId | null>;
41-
4239
return {
4340
name: 'vite-plugin-svelte',
4441
// make sure our resolver runs before vite internal resolver to resolve svelte field correctly
@@ -104,25 +101,6 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
104101
return importee; // query with svelte tag, an id we generated, no need for further analysis
105102
}
106103

107-
if (ssr && importee === 'svelte') {
108-
if (!resolvedSvelteSSR) {
109-
resolvedSvelteSSR = this.resolve('svelte/ssr', undefined, { skipSelf: true }).then(
110-
(svelteSSR) => {
111-
log.debug('resolved svelte to svelte/ssr');
112-
return svelteSSR;
113-
},
114-
(err) => {
115-
log.debug(
116-
'failed to resolve svelte to svelte/ssr. Update svelte to a version that exports it',
117-
err
118-
);
119-
return null; // returning null here leads to svelte getting resolved regularly
120-
}
121-
);
122-
}
123-
return resolvedSvelteSSR;
124-
}
125-
126104
try {
127105
const resolved = resolveViaPackageJsonSvelte(importee, importer);
128106
if (resolved) {

‎packages/vite-plugin-svelte/src/utils/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export const SVELTE_IMPORTS = [
77
'svelte/easing',
88
'svelte/internal',
99
'svelte/motion',
10-
'svelte/ssr',
1110
'svelte/store',
1211
'svelte/transition',
1312
'svelte'

‎packages/vite-plugin-svelte/src/utils/options.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,8 @@ function buildOptimizeDepsForSvelte(
242242
);
243243
};
244244
if (!isExcluded('svelte')) {
245-
const svelteImportsToInclude = SVELTE_IMPORTS.filter((x) => x !== 'svelte/ssr'); // not used on clientside
246-
log.debug(
247-
`adding bare svelte packages to optimizeDeps.include: ${svelteImportsToInclude.join(', ')} `
248-
);
249-
include.push(...svelteImportsToInclude.filter((x) => !isIncluded(x)));
245+
log.debug(`adding bare svelte packages to optimizeDeps.include: ${SVELTE_IMPORTS.join(', ')} `);
246+
include.push(...SVELTE_IMPORTS.filter((x) => !isIncluded(x)));
250247
} else {
251248
log.debug('"svelte" is excluded in optimizeDeps.exclude, skipped adding it to include.');
252249
}

0 commit comments

Comments
 (0)