fully revert changes to create_manifest_data. add more docs and tests

benmccann · benmccann · commit ce76e032dd15 · 2021-09-15T16:40:46.000-07:00
diff --git a/packages/kit/src/core/create_manifest_data/index.js b/packages/kit/src/core/create_manifest_data/index.js
@@ -393,18 +393,21 @@ function get_pattern(segments, add_trailing_slash) {
 								return part.dynamic
 									? '([^/]+?)'
 									: // allow users to specify characters on the file system in an encoded manner
-									  // we use [ and ] to denote parameters, so users must encode these on the file
-									  // system to match against them
-									  decodeURI(
-											part.content
-												// # / ? can only appear in URLs in an encoded manner
-												// they will not be decoded by decodeURI
-												// we skip / since you can't create a file with it on any OS
-												.normalize()
-												.replace(/#/g, '%23')
-												.replace(/\?/g, '%3F')
+									  part.content
+											.normalize()
+											// We use [ and ] to denote parameters, so users must encode these on the file
+											// system to match against them. We don't decode all characters since others
+											// can already be epressed and so that '%' can be easily used directly in filenames
+											.replace(/%5[Bb]/g, '[')
+											.replace(/%5[Dd]/g, ']')
+											// '#', '/', and '?' can only appear in URL path segments in an encoded manner.
+											// They will not be touched by decodeURI so need to be encoded here, so
+											// that we can match against them.
+											// We skip '/' since you can't create a file with it on any OS
+											.replace(/#/g, '%23')
+											.replace(/\?/g, '%3F')
 											// escape characters that have special meaning in regex
-									  ).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+											.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 							})
 							.join('');
 		})
diff --git a/packages/kit/test/apps/basics/src/routes/encoded/_tests.js b/packages/kit/test/apps/basics/src/routes/encoded/_tests.js
@@ -19,6 +19,16 @@ export default function (test) {
 		assert.equal(await page.innerHTML('h3'), '/encoded/AC%2fDC: AC/DC');
 	});
 
+	test('visits a route with an encoded bracket', '/encoded/%5b', async ({ page }) => {
+		assert.equal(await page.innerHTML('h2'), '/encoded/%5b: [');
+		assert.equal(await page.innerHTML('h3'), '/encoded/%5b: [');
+	});
+
+	test('visits a route with an encoded question mark', '/encoded/%3f', async ({ page }) => {
+		assert.equal(await page.innerHTML('h2'), '/encoded/%3f: ?');
+		assert.equal(await page.innerHTML('h3'), '/encoded/%3f: ?');
+	});
+
 	test(
 		'visits a dynamic route with non-ASCII character',
 		'/encoded',
