chore: add vite ssr esm test (#204)

bluwy · dominikg · web-flow · commit d65f17f09cc5 · 2021-12-08T12:05:44.000+08:00
Co-authored-by: dominikg &lt;dominik.goepel@gmx.de&gt;
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "svelte": "^3.44.2",
     "ts-jest": "^27.0.7",
     "typescript": "^4.5.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   },
   "lint-staged": {
     "*.{js,ts,svelte,html,md,svx}": "eslint --fix",
@@ -77,7 +77,7 @@
       "//consistent-versions": "force consistent versions for the following packages",
       "@sveltejs/vite-plugin-svelte": "workspace:*",
       "esbuild": "^0.13.15",
-      "vite": "^2.6.14",
+      "vite": "^2.7.0",
       "//audit-fixes": "force update packages flagged by pnpm audit",
       "ansi-regex@>2.1.1 <5.0.1": "^5.0.1"
     }
diff --git a/packages/e2e-tests/autoprefixer-browerslist/package.json b/packages/e2e-tests/autoprefixer-browerslist/package.json
@@ -17,6 +17,6 @@
     "postcss-load-config": "^3.1.0",
     "svelte": "^3.44.2",
     "svelte-preprocess": "^4.9.8",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/configfile-custom/package.json b/packages/e2e-tests/configfile-custom/package.json
@@ -13,6 +13,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/configfile-esm/package.json b/packages/e2e-tests/configfile-esm/package.json
@@ -14,7 +14,7 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.44.2",
     "svelte-preprocess": "^4.9.8",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   },
   "type": "module"
 }
diff --git a/packages/e2e-tests/custom-extensions/package.json b/packages/e2e-tests/custom-extensions/package.json
@@ -10,6 +10,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/hmr/package.json b/packages/e2e-tests/hmr/package.json
@@ -14,6 +14,6 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "node-fetch": "^2.6.6",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/package-json-svelte-field/package.json b/packages/e2e-tests/package-json-svelte-field/package.json
@@ -14,6 +14,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/preprocess-with-vite/package.json b/packages/e2e-tests/preprocess-with-vite/package.json
@@ -12,6 +12,6 @@
     "sass": "^1.44.0",
     "stylus": "^0.55.0",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/svelte-preprocess/package.json b/packages/e2e-tests/svelte-preprocess/package.json
@@ -12,6 +12,6 @@
     "svelte": "^3.44.2",
     "svelte-preprocess": "^4.9.8",
     "typescript": "^4.5.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/ts-type-import/package.json b/packages/e2e-tests/ts-type-import/package.json
@@ -12,6 +12,6 @@
     "@tsconfig/svelte": "^2.0.1",
     "@types/node": "^16.11.11",
     "svelte-preprocess": "^4.9.8",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/vite-ssr-esm/__tests__/vite-ssr-esm.spec.ts b/packages/e2e-tests/vite-ssr-esm/__tests__/vite-ssr-esm.spec.ts
@@ -35,6 +35,10 @@ test('loaded esm only package', async () => {
 	expect(e2eServer.logs.server.out).toContain('esm\n');
 });
 
+test('loaded external node esm only package', () => {
+	expect(e2eServer.logs.server.out).toContain('hello_world\n');
+});
+
 test('asset', async () => {
 	// should have no 404s
 	browserLogs.forEach((msg) => {
diff --git a/packages/e2e-tests/vite-ssr-esm/package.json b/packages/e2e-tests/vite-ssr-esm/package.json
@@ -15,11 +15,12 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "compression": "^1.7.4",
     "cross-env": "^7.0.3",
+    "decamelize": "^6.0.0",
     "e2e-test-dep-esm-only": "workspace:*",
     "express": "^4.17.1",
     "npm-run-all": "^4.1.5",
     "serve-static": "^1.14.1",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/e2e-tests/vite-ssr-esm/server.js b/packages/e2e-tests/vite-ssr-esm/server.js
@@ -49,12 +49,6 @@ async function createServer(root = process.cwd(), isProd = process.env.NODE_ENV
 				index: false
 			})
 		);
-
-		// workaround, dist/server/entry-server.js will be cjs, add a package.json as hint
-		const serverPkg = resolve('dist/server/package.json');
-		if (!fs.existsSync(serverPkg)) {
-			fs.writeFileSync(serverPkg, JSON.stringify({ type: 'commonjs' }), 'utf-8');
-		}
 	}
 
 	app.use('*', async (req, res) => {
diff --git a/packages/e2e-tests/vite-ssr-esm/src/entry-server.js b/packages/e2e-tests/vite-ssr-esm/src/entry-server.js
@@ -1,7 +1,10 @@
 import App from './App.svelte';
 // eslint-disable-next-line node/no-missing-import
 import { esm } from 'e2e-test-dep-esm-only';
+import decamelize from 'decamelize';
+
 console.log(esm());
+console.log(decamelize('helloWorld'));
 
 export async function render(url, manifest) {
 	return App.render({
diff --git a/packages/e2e-tests/vite-ssr-esm/vite.config.js b/packages/e2e-tests/vite-ssr-esm/vite.config.js
@@ -13,7 +13,12 @@ export default defineConfig(({ command, mode }) => {
 		build: {
 			target: 'esnext',
 			minify: false,
-			assetsInlineLimit: 0
+			assetsInlineLimit: 0,
+			rollupOptions: {
+				output: {
+					format: 'esm'
+				}
+			}
 		},
 		server: {
 			watch: {
@@ -22,6 +27,10 @@ export default defineConfig(({ command, mode }) => {
 				usePolling: true,
 				interval: 100
 			}
+		},
+		// manually externalize until https://github.com/vitejs/vite/pull/5197 released
+		ssr: {
+			external: ['decamelize']
 		}
 	};
 });
diff --git a/packages/e2e-tests/vite-ssr/package.json b/packages/e2e-tests/vite-ssr/package.json
@@ -18,6 +18,6 @@
     "express": "^4.17.1",
     "serve-static": "^1.14.1",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/playground/big-component-library/package.json b/packages/playground/big-component-library/package.json
@@ -12,6 +12,6 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "carbon-components-svelte": "^0.50.2",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/playground/big/package.json b/packages/playground/big/package.json
@@ -10,6 +10,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/playground/optimizedeps-include/package.json b/packages/playground/optimizedeps-include/package.json
@@ -12,6 +12,6 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "svelte": "^3.44.2",
     "tinro": "^0.6.8",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/playground/windicss/package.json b/packages/playground/windicss/package.json
@@ -14,7 +14,7 @@
     "@sveltejs/vite-plugin-svelte": "workspace:*",
     "diff-match-patch": "^1.0.5",
     "svelte": "^3.44.2",
-    "vite": "^2.6.14",
+    "vite": "^2.7.0",
     "vite-plugin-windicss": "^1.5.4"
   }
 }
diff --git a/packages/vite-plugin-svelte/package.json b/packages/vite-plugin-svelte/package.json
@@ -70,6 +70,6 @@
     "rollup": "^2.60.2",
     "svelte": "^3.44.2",
     "tsup": "^5.10.1",
-    "vite": "^2.6.14"
+    "vite": "^2.7.0"
   }
 }
diff --git a/packages/vite-plugin-svelte/src/index.ts b/packages/vite-plugin-svelte/src/index.ts
@@ -95,7 +95,10 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 			}
 		},
 
-		async resolveId(importee, importer, opts, _ssr) {
+		async resolveId(importee, importer, opts, ...args) {
+			// get _ssr this way to suppress typescript warning
+			const _ssr = (args as any)[0] as boolean | undefined;
+
 			// @ts-expect-error anticipate vite deprecating forth parameter and rely on `opts.ssr` instead`
 			// see https://github.com/vitejs/vite/discussions/5109
 			const ssr: boolean = _ssr === true || opts.ssr;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`"postcss-load-config": "^3.1.0",`
`18`	`18`	`"svelte": "^3.44.2",`
`19`	`19`	`"svelte-preprocess": "^4.9.8",`
`20`		`- "vite": "^2.6.14"`
	`20`	`+ "vite": "^2.7.0"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@`
`13`	`13`	`"devDependencies": {`
`14`	`14`	`"@sveltejs/vite-plugin-svelte": "workspace:*",`
`15`	`15`	`"svelte": "^3.44.2",`
`16`		`- "vite": "^2.6.14"`
	`16`	`+ "vite": "^2.7.0"`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"@sveltejs/vite-plugin-svelte": "workspace:*",`
`15`	`15`	`"svelte": "^3.44.2",`
`16`	`16`	`"svelte-preprocess": "^4.9.8",`
`17`		`- "vite": "^2.6.14"`
	`17`	`+ "vite": "^2.7.0"`
`18`	`18`	`},`
`19`	`19`	`"type": "module"`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`	`"devDependencies": {`
`11`	`11`	`"@sveltejs/vite-plugin-svelte": "workspace:*",`
`12`	`12`	`"svelte": "^3.44.2",`
`13`		`- "vite": "^2.6.14"`
	`13`	`+ "vite": "^2.7.0"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@`
`14`	`14`	`"@sveltejs/vite-plugin-svelte": "workspace:*",`
`15`	`15`	`"node-fetch": "^2.6.6",`
`16`	`16`	`"svelte": "^3.44.2",`
`17`		`- "vite": "^2.6.14"`
	`17`	`+ "vite": "^2.7.0"`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`"sass": "^1.44.0",`
`13`	`13`	`"stylus": "^0.55.0",`
`14`	`14`	`"svelte": "^3.44.2",`
`15`		`- "vite": "^2.6.14"`
	`15`	`+ "vite": "^2.7.0"`
`16`	`16`	`}`
`17`	`17`	`}`