Check extensions for param matcher files (#5085)

* Check file extensions in create_manifest_data

* fix break to continue

* use endpointExtensions instead `['.js', '.ts']`

* rename endpointExtensions to moduleExtensions

* fix doc

* changeset

* error on encountering endpointExtensions

* add TODO comment

* oops, update tests

Co-authored-by: Rich Harris <hello@rich-harris.dev>

.changeset/many-suns-push.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[breaking] change endpointExtensions to moduleExtensions, and use to filter param matchers

documentation/docs/14-configuration.md

@@ -29,7 +29,7 @@ const config = {
 				// ...
 			}
 		},
-		endpointExtensions: ['.js', '.ts'],
+		moduleExtensions: ['.js', '.ts'],
 		files: {
 			assets: 'static',
 			hooks: 'src/hooks',
@@ -155,9 +155,9 @@ When pages are prerendered, the CSP header is added via a `<meta http-equiv>` ta
 
 > When `mode` is `'auto'`, SvelteKit will use nonces for dynamically rendered pages and hashes for prerendered pages. Using nonces with prerendered pages is insecure and therefore forbidden.
 
-### endpointExtensions
+### moduleExtensions
 
-An array of file extensions that SvelteKit will treat as endpoints. Files with extensions that match neither `config.extensions` nor `config.kit.endpointExtensions` will be ignored by the router.
+An array of file extensions that SvelteKit will treat as modules. Files with extensions that match neither `config.extensions` nor `config.kit.moduleExtensions` will be ignored by the router.
 
 ### files
 

packages/kit/src/core/config/index.spec.js

@@ -69,7 +69,7 @@ const get_defaults = (prefix = '') => ({
 				referrer: undefined
 			}
 		},
-		endpointExtensions: ['.js', '.ts'],
+		endpointExtensions: undefined,
 		files: {
 			assets: join(prefix, 'static'),
 			hooks: join(prefix, 'src/hooks'),
@@ -88,6 +88,7 @@ const get_defaults = (prefix = '') => ({
 			parameter: '_method',
 			allowed: []
 		},
+		moduleExtensions: ['.js', '.ts'],
 		outDir: join(prefix, '.svelte-kit'),
 		package: {
 			dir: 'package',

packages/kit/src/core/config/options.js

@@ -115,7 +115,10 @@ const options = object(
 				})
 			}),
 
-			endpointExtensions: string_array(['.js', '.ts']),
+			// TODO: remove this for the 1.0 release
+			endpointExtensions: error(
+				(keypath) => `${keypath} has been renamed to config.kit.moduleExtensions`
+			),
 
 			files: object({
 				assets: string('static'),
@@ -161,6 +164,8 @@ const options = object(
 				})
 			}),
 
+			moduleExtensions: string_array(['.js', '.ts']),
+
 			outDir: string('.svelte-kit'),
 
 			package: object({

packages/kit/src/core/sync/create_manifest_data/index.js

@@ -82,7 +82,7 @@ export default function create_manifest_data({
 	});
 
 	const routes_base = posixify(path.relative(cwd, config.kit.files.routes));
-	const valid_extensions = [...config.extensions, ...config.kit.endpointExtensions];
+	const valid_extensions = [...config.extensions, ...config.kit.moduleExtensions];
 
 	if (fs.existsSync(config.kit.files.routes)) {
 		list_files(config.kit.files.routes).forEach((file) => {
@@ -267,6 +267,7 @@ export default function create_manifest_data({
 	if (fs.existsSync(config.kit.files.params)) {
 		for (const file of fs.readdirSync(config.kit.files.params)) {
 			const ext = path.extname(file);
+			if (!config.kit.moduleExtensions.includes(ext)) continue;
 			const type = file.slice(0, -ext.length);
 
 			if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(type)) {

packages/kit/src/core/sync/write_types.js

@@ -33,7 +33,7 @@ export function write_types(config, manifest_data) {
 
 		if (file) {
 			const ext = /** @type {string} */ (
-				config.kit.endpointExtensions.find((ext) => file.endsWith(ext))
+				config.kit.moduleExtensions.find((ext) => file.endsWith(ext))
 			);
 			const key = file.slice(0, -ext.length);
 			shadow_types.set(key, {

packages/kit/types/index.d.ts

@@ -107,7 +107,7 @@ export interface KitConfig {
 		mode?: 'hash' | 'nonce' | 'auto';
 		directives?: CspDirectives;
 	};
-	endpointExtensions?: string[];
+	moduleExtensions?: string[];
 	files?: {
 		assets?: string;
 		hooks?: string;