merge master

sveltejs · Dec 6, 2022 · dbfd266 · dbfd266
2 parents c070f5a + a999fce
commit dbfd266
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 29 deletions.
diff --git a/.changeset/six-ravens-attack.md b/.changeset/six-ravens-attack.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[fix] continuous optionals should not throw conflict error
diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json
@@ -31,7 +31,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"typescript": "^4.9.3"
 	},
 	"dependencies": {

diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -35,7 +35,7 @@
 	},
 	"devDependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0",
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"typescript": "^4.9.3"
 	}
 }
diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json
@@ -37,7 +37,7 @@
 		"worktop": "0.8.0-next.14"
 	},
 	"devDependencies": {
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"@types/ws": "^8.5.3",
 		"typescript": "^4.9.3"
 	},

diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json
@@ -42,7 +42,7 @@
 		"@rollup/plugin-json": "^5.0.2",
 		"@rollup/plugin-node-resolve": "^15.0.1",
 		"@sveltejs/kit": "workspace:*",
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"@types/set-cookie-parser": "^2.4.2",
 		"rimraf": "^3.0.2",
 		"rollup": "^2.79.1",

diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json
@@ -33,7 +33,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"c8": "^7.12.0",
 		"polka": "^1.0.0-next.22",
 		"rimraf": "^3.0.2",

diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
@@ -26,7 +26,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"sirv": "^2.0.2",
 		"svelte": "^3.53.1",
 		"typescript": "^4.9.3",

diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
@@ -33,7 +33,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"typescript": "^4.9.3"
 	}
 }
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -28,7 +28,7 @@
 		"@types/connect": "^3.4.35",
 		"@types/marked": "^4.0.7",
 		"@types/mime": "^3.0.1",
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"@types/sade": "^1.7.4",
 		"@types/set-cookie-parser": "^2.4.2",
 		"marked": "^4.2.3",

diff --git a/packages/kit/src/core/sync/create_manifest_data/index.js b/packages/kit/src/core/sync/create_manifest_data/index.js
@@ -486,10 +486,11 @@ function prevent_conflicts(routes) {
 			const matcher = split[i];
 			const next = split[i + 1];
 
-			permutations = [
-				...permutations.map((x) => x + next),
-				...permutations.map((x) => x + `<${matcher}>${next}`)
-			];
+			permutations = permutations.reduce((a, b) => {
+				a.push(b + next);
+				if (!(matcher === '*' && b.endsWith('//'))) a.push(b + `<${matcher}>${next}`);
+				return a;
+			}, /** @type {string[]} */ ([]));
 		}
 
 		for (const permutation of permutations) {

diff --git a/packages/kit/src/core/sync/create_manifest_data/index.spec.js b/packages/kit/src/core/sync/create_manifest_data/index.spec.js
@@ -386,6 +386,35 @@ test('optional parameters', () => {
 	]);
 });
 
+test('nested optionals', () => {
+	const { nodes, routes } = create('samples/nested-optionals');
+	assert.equal(nodes.map(simplify_node), [
+		default_layout,
+		default_error,
+		{ component: 'samples/nested-optionals/[[a]]/[[b]]/+page.svelte' }
+	]);
+
+	assert.equal(routes.map(simplify_route), [
+		{
+			id: '/',
+			pattern: '/^/$/'
+		},
+		{
+			id: '/[[a]]/[[b]]',
+			pattern: '/^(?:/([^/]+))?(?:/([^/]+))?/?$/',
+			page: {
+				layouts: [0],
+				errors: [1],
+				leaf: nodes.findIndex((node) => node.component?.includes('/[[a]]/[[b]]'))
+			}
+		},
+		{
+			id: '/[[a]]',
+			pattern: '/^(?:/([^/]+))?/?$/'
+		}
+	]);
+});
+
 test('ignores files and directories with leading underscores', () => {
 	const { routes } = create('samples/hidden-underscore');
 

diff --git a/...src/core/sync/create_manifest_data/test/samples/nested-optionals/[[a]]/[[b]]/+page.svelte b/...src/core/sync/create_manifest_data/test/samples/nested-optionals/[[a]]/[[b]]/+page.svelte
diff --git a/packages/package/package.json b/packages/package/package.json
@@ -16,7 +16,7 @@
 		"svelte2tsx": "~0.5.20"
 	},
 	"devDependencies": {
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"svelte": "^3.53.1",
 		"svelte-preprocess": "^4.10.7",
 		"typescript": "^4.9.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
@@ -15,7 +15,7 @@
 		"@sveltejs/amp": "workspace:*",
 		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/site-kit": "^2.1.4",
-		"@types/node": "^16.18.3",
+		"@types/node": "^16.18.6",
 		"d3": "^7.7.0",
 		"d3-dsv": "^3.0.1",
 		"flexsearch": "^0.7.31",

diff --git a/sites/kit.svelte.dev/src/routes/+layout.svelte b/sites/kit.svelte.dev/src/routes/+layout.svelte
@@ -60,8 +60,7 @@
 		position: relative;
 		margin: 0 auto;
 		padding-top: var(--sk-nav-height);
-		overflow: auto;
-		overflow-x: hidden;
+		overflow: hidden;
 	}
 
 	.small {