fix: fix importfn and remove ts snip

MercuryWorkshop · Jan 11, 2025 · 6b43c90 · 6b43c90
1 parent f71e9c1
commit 6b43c90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/rewriter/wasm/build.sh b/rewriter/wasm/build.sh
@@ -40,7 +40,6 @@ cd ../../
 wasm-snip rewriter/wasm/out/wasm_bg.wasm -o rewriter/wasm/out/wasm_snipped.wasm \
 	-p 'oxc_regular_expression::.*' \
 	'oxc_parser::ts::types::<impl oxc_parser::ParserImpl>::parse_non_array_type' \
-	'oxc_parser::ts::statement::<impl oxc_parser::ParserImpl>::parse_declaration' \
 	'oxc_parser::ts::types::<impl oxc_parser::ParserImpl>::parse_ts_import_type' \
 	'oxc_parser::ts::types::<impl oxc_parser::ParserImpl>::parse_type_operator_or_higher' \
 	'oxc_parser::ts::statement::<impl oxc_parser::ParserImpl>::parse_ts_interface_declaration' \

diff --git a/src/client/shared/import.ts b/src/client/shared/import.ts
@@ -5,14 +5,10 @@ import { rewriteUrl } from "../../shared/rewriters/url";
 export default function (client: ScramjetClient, self: Self) {
 	const Function = client.natives.store["Function"];
 
-	self[config.globals.importfn] = function (base: string) {
-		return function (url: string) {
-			const resolved = new URL(url, base).href;
+	self[config.globals.importfn] = function (base: string, url: string) {
+		const resolved = new URL(url, base).href;
 
-			return Function(
-				`return import("${rewriteUrl(resolved, client.meta)}")`
-			)();
-		};
+		return Function(`return import("${rewriteUrl(resolved, client.meta)}")`)();
 	};
 
 	self[config.globals.metafn] = function (base: string) {