Merge branch 'main' into kit-links

Author: dummdidumm

apps/svelte.dev/src/hooks.server.js

@@ -4,19 +4,15 @@ const mappings = new Map([
 	['/docs/accessibility-warnings', '/docs/svelte/compiler-warnings'],
 	['/docs/basic-markup', '/docs/svelte/basic-markup'],
 	['/docs/client-side-component-api', '/docs/svelte/legacy-component-api'],
-	// no good mapping for this one
-	['/docs/component-directives', '/docs/svelte/svelte-files'],
+	['/docs/component-directives', '/docs/svelte/svelte-files'], // no good mapping for this one
 	['/docs/custom-elements-api', '/docs/svelte/custom-elements'],
-	// no good mapping for this one
-	['/docs/element-directives', '/docs/svelte/basic-markup'],
+	['/docs/element-directives', '/docs/svelte/basic-markup'], // no good mapping for this one
 	['/docs/introduction', '/docs/svelte/overview'],
-	// no good mapping for this one
-	['/docs/logic-blocks', '/docs/svelte/basic-markup'],
+	['/docs/logic-blocks', '/docs/svelte/basic-markup'], // no good mapping for this one
 	['/docs/server-side-component-api', '/docs/svelte/legacy-component-api'],
-	// no good mapping for this one
-	['/docs/special-elements', '/docs/svelte/svelte-window'],
+	['/docs/special-elements', '/docs/svelte/svelte-window'], // no good mapping for this one
 	['/docs/special-tags', '/docs/svelte/basic-markup'],
-	['/docs/svelte', '/docs/svelte/svelte'],
+	// can't map this, as this is now a redirect to the overview page: ['/docs/svelte', '/docs/svelte/svelte'],
 	['/docs/svelte-action', '/docs/svelte/svelte-action'],
 	['/docs/svelte-animate', '/docs/svelte/svelte-animate'],
 	['/docs/svelte-compiler', '/docs/svelte/svelte-compiler'],

packages/repl/src/lib/workers/bundler/index.ts

@@ -287,13 +287,14 @@ async function get_bundle(
 				// fetch from unpkg
 				self.postMessage({ type: 'status', uid, message: `resolving ${importee}` });
 
-				const match = /^((?:@[^/]+\/)?[^/]+)(\/.+)?$/.exec(importee);
+				const match = /^((?:@[^/]+\/)?[^/@]+)(?:@([^/]+))?(\/.+)?$/.exec(importee);
 				if (!match) {
 					return console.error(`Invalid import "${importee}"`);
 				}
 
 				const pkg_name = match[1];
-				const subpath = `.${match[2] ?? ''}`;
+				const version = pkg_name === 'svelte' ? svelte.VERSION : match[2] ?? 'latest';
+				const subpath = `.${match[3] ?? ''}`;
 
 				// if this was imported by one of our files, add it to the `imports` set
 				if (importer && local_files_lookup.has(importer)) {
@@ -302,7 +303,6 @@ async function get_bundle(
 
 				const fetch_package_info = async () => {
 					try {
-						const version = pkg_name === 'svelte' ? svelte.VERSION : 'latest';
 						const pkg_url = await follow_redirects(
 							`${packages_url}/${pkg_name}@${version}/package.json`,
 							uid