Merge branch 'main' into feat-622

Author: 7nik

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

@@ -234,9 +234,12 @@ async function get_bundle(
 			}
 
 			// importing a file from the same package via pkg.imports
-			if (importee[0] === '#' && current) {
-				const subpath = resolve_subpath(current, importee);
-				return normalize_path(current, subpath.slice(2));
+			if (importee[0] === '#') {
+				if (current) {
+					const subpath = resolve_subpath(current, importee);
+					return normalize_path(current, subpath.slice(2));
+				}
+				return await resolve_local(importee);
 			}
 
 			// importing an external package -> `npm://$/<name>@<version>/<path>`

packages/repl/src/lib/workers/npm.ts

@@ -223,9 +223,14 @@ let local_svelte_pkg: Promise<any>;
 export async function resolve_local(specifier: string) {
 	const pkg = await (local_svelte_pkg ??= fetch(LOCAL_PKG_URL).then((r) => r.json()));
 
-	const subpath = resolve.exports(pkg, specifier.replace('svelte', '.'), {
-		browser: true
-	})![0] as string;
+	const subpath =
+		specifier[0] === '#'
+			? (resolve.imports(pkg, specifier, {
+					browser: true
+				})![0] as string)
+			: (resolve.exports(pkg, specifier.replace('svelte', '.'), {
+					browser: true
+				})![0] as string);
 
 	return new URL(subpath, LOCAL_PKG_URL).href;
 }