fix: add optional chaining back to finalise hook (#8846)

braebo · Rich-Harris · web-flow · commit 7cdb7a658193 · 2023-02-02T11:11:37.000-05:00
* fix: add optional chaining back to `finalise` hook

* add a test

* remove check task

* Update .changeset/grumpy-islands-collect.md

---------

Co-authored-by: Rich Harris &lt;hello@rich-harris.dev&gt;
diff --git a/.changeset/grumpy-islands-collect.md b/.changeset/grumpy-islands-collect.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: preserve build error messages
diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js
@@ -725,7 +725,7 @@ function kit({ svelte_config }) {
 			sequential: true,
 			async handler() {
 				if (!vite_config.build.ssr) return;
-				await finalise();
+				await finalise?.();
 			}
 		}
 	};
diff --git a/packages/kit/test/build-errors/apps/syntax-error/.gitignore b/packages/kit/test/build-errors/apps/syntax-error/.gitignore
@@ -0,0 +1,7 @@
+.DS_Store
+node_modules
+/build
+/.svelte-kit
+/package
+.env.*
+!.env.example
diff --git a/packages/kit/test/build-errors/apps/syntax-error/.npmrc b/packages/kit/test/build-errors/apps/syntax-error/.npmrc
@@ -0,0 +1 @@
+engine-strict=true
diff --git a/packages/kit/test/build-errors/apps/syntax-error/package.json b/packages/kit/test/build-errors/apps/syntax-error/package.json
@@ -0,0 +1,18 @@
+{
+	"name": "syntax-error",
+	"version": "0.0.1",
+	"private": true,
+	"scripts": {
+		"dev": "vite dev",
+		"build": "vite build",
+		"preview": "vite preview"
+	},
+	"devDependencies": {
+		"@sveltejs/kit": "workspace:^",
+		"svelte": "^3.55.1",
+		"svelte-check": "^3.0.2",
+		"typescript": "^4.9.4",
+		"vite": "^4.0.4"
+	},
+	"type": "module"
+}
diff --git a/packages/kit/test/build-errors/apps/syntax-error/src/app.html b/packages/kit/test/build-errors/apps/syntax-error/src/app.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
+		<meta name="viewport" content="width=device-width" />
+		%sveltekit.head%
+	</head>
+	<body>
+		<div>%sveltekit.body%</div>
+	</body>
+</html>
diff --git a/packages/kit/test/build-errors/apps/syntax-error/src/lib/test.server.js b/packages/kit/test/build-errors/apps/syntax-error/src/lib/test.server.js
@@ -0,0 +1 @@
+export const should_explode = 'boom';
diff --git a/packages/kit/test/build-errors/apps/syntax-error/src/routes/+page.svelte b/packages/kit/test/build-errors/apps/syntax-error/src/routes/+page.svelte
@@ -0,0 +1 @@
+<div
diff --git a/packages/kit/test/build-errors/apps/syntax-error/static/favicon.png b/packages/kit/test/build-errors/apps/syntax-error/static/favicon.png
diff --git a/packages/kit/test/build-errors/apps/syntax-error/svelte.config.js b/packages/kit/test/build-errors/apps/syntax-error/svelte.config.js
@@ -0,0 +1,4 @@
+/** @type {import('@sveltejs/kit').Config} */
+const config = {};
+
+export default config;
diff --git a/packages/kit/test/build-errors/apps/syntax-error/tsconfig.json b/packages/kit/test/build-errors/apps/syntax-error/tsconfig.json
@@ -0,0 +1,19 @@
+{
+	"extends": "./.svelte-kit/tsconfig.json",
+	"compilerOptions": {
+		"allowJs": true,
+		"checkJs": true,
+		"esModuleInterop": true,
+		"forceConsistentCasingInFileNames": true,
+		"resolveJsonModule": true,
+		"skipLibCheck": true,
+		"sourceMap": true,
+		"strict": true,
+		"noEmit": true,
+		"paths": {
+			"types": ["../../../../types/internal"],
+			"$lib": ["./src/lib"],
+			"$lib/*": ["./src/lib/*"]
+		}
+	}
+}
diff --git a/packages/kit/test/build-errors/apps/syntax-error/vite.config.js b/packages/kit/test/build-errors/apps/syntax-error/vite.config.js
@@ -0,0 +1,14 @@
+import { sveltekit } from '@sveltejs/kit/vite';
+import path from 'path';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	plugins: [sveltekit()],
+	server: {
+		fs: {
+			allow: [path.resolve('../../../../src')]
+		}
+	}
+};
+
+export default config;
diff --git a/packages/kit/test/build-errors/syntax-error.js b/packages/kit/test/build-errors/syntax-error.js
@@ -0,0 +1,23 @@
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+import { execSync } from 'node:child_process';
+import path from 'node:path';
+
+test('$lib/*.server.* is not statically importable from the client', () => {
+	try {
+		execSync('pnpm build', {
+			cwd: path.join(process.cwd(), 'apps/syntax-error'),
+			stdio: 'pipe',
+			timeout: 60000
+		});
+	} catch (err) {
+		assert.ok(
+			err.message.includes('Unexpected end of input'),
+			`received unexpected exception message ${err.message}`
+		);
+		return;
+	}
+	assert.unreachable();
+});
+
+test.run();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@sveltejs/kit': patch
 +---
++
 +fix: preserve build error messages
Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ function kit({ svelte_config }) {`
`725`	`725`	`sequential: true,`
`726`	`726`	`async handler() {`
`727`	`727`	`if (!vite_config.build.ssr) return;`
`728`		`- await finalise();`
	`728`	`+ await finalise?.();`
`729`	`729`	`}`
`730`	`730`	`}`
`731`	`731`	`};`