From 397e57c3103141de68c08f59c6510eb2f51a367a Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 27 Mar 2025 15:44:41 +0000 Subject: [PATCH 1/2] Place the runtime JS files beside the template files So that we can remove @ts-ignore hacks in the template files. --- Makefile | 4 +++- .../index.d.ts => Plugins/PackageToJS/Templates/runtime.d.ts | 0 .../index.js => Plugins/PackageToJS/Templates/runtime.js | 0 .../index.mjs => Plugins/PackageToJS/Templates/runtime.mjs | 0 4 files changed, 3 insertions(+), 1 deletion(-) rename Sources/JavaScriptKit/Runtime/index.d.ts => Plugins/PackageToJS/Templates/runtime.d.ts (100%) rename Sources/JavaScriptKit/Runtime/index.js => Plugins/PackageToJS/Templates/runtime.js (100%) rename Sources/JavaScriptKit/Runtime/index.mjs => Plugins/PackageToJS/Templates/runtime.mjs (100%) diff --git a/Makefile b/Makefile index f43ca4f5..93d7400e 100644 --- a/Makefile +++ b/Makefile @@ -39,4 +39,6 @@ perf-tester: .PHONY: regenerate_swiftpm_resources regenerate_swiftpm_resources: npm run build - cp Runtime/lib/index.js Runtime/lib/index.mjs Runtime/lib/index.d.ts Sources/JavaScriptKit/Runtime + cp Runtime/lib/index.js Plugins/PackageToJS/Templates/runtime.js + cp Runtime/lib/index.mjs Plugins/PackageToJS/Templates/runtime.mjs + cp Runtime/lib/index.d.ts Plugins/PackageToJS/Templates/runtime.d.ts diff --git a/Sources/JavaScriptKit/Runtime/index.d.ts b/Plugins/PackageToJS/Templates/runtime.d.ts similarity index 100% rename from Sources/JavaScriptKit/Runtime/index.d.ts rename to Plugins/PackageToJS/Templates/runtime.d.ts diff --git a/Sources/JavaScriptKit/Runtime/index.js b/Plugins/PackageToJS/Templates/runtime.js similarity index 100% rename from Sources/JavaScriptKit/Runtime/index.js rename to Plugins/PackageToJS/Templates/runtime.js diff --git a/Sources/JavaScriptKit/Runtime/index.mjs b/Plugins/PackageToJS/Templates/runtime.mjs similarity index 100% rename from Sources/JavaScriptKit/Runtime/index.mjs rename to Plugins/PackageToJS/Templates/runtime.mjs From 5d69e8117926e1f4b3637f55e1a09181f7bef1f3 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 27 Mar 2025 15:45:55 +0000 Subject: [PATCH 2/2] Put the runtime file symlinks to keep compatibility with the legacy mode --- Sources/JavaScriptKit/Runtime/index.d.ts | 1 + Sources/JavaScriptKit/Runtime/index.js | 1 + Sources/JavaScriptKit/Runtime/index.mjs | 1 + 3 files changed, 3 insertions(+) create mode 120000 Sources/JavaScriptKit/Runtime/index.d.ts create mode 120000 Sources/JavaScriptKit/Runtime/index.js create mode 120000 Sources/JavaScriptKit/Runtime/index.mjs diff --git a/Sources/JavaScriptKit/Runtime/index.d.ts b/Sources/JavaScriptKit/Runtime/index.d.ts new file mode 120000 index 00000000..0d94264b --- /dev/null +++ b/Sources/JavaScriptKit/Runtime/index.d.ts @@ -0,0 +1 @@ +../../../Plugins/PackageToJS/Templates/runtime.d.ts \ No newline at end of file diff --git a/Sources/JavaScriptKit/Runtime/index.js b/Sources/JavaScriptKit/Runtime/index.js new file mode 120000 index 00000000..c60afde5 --- /dev/null +++ b/Sources/JavaScriptKit/Runtime/index.js @@ -0,0 +1 @@ +../../../Plugins/PackageToJS/Templates/runtime.js \ No newline at end of file diff --git a/Sources/JavaScriptKit/Runtime/index.mjs b/Sources/JavaScriptKit/Runtime/index.mjs new file mode 120000 index 00000000..59613101 --- /dev/null +++ b/Sources/JavaScriptKit/Runtime/index.mjs @@ -0,0 +1 @@ +../../../Plugins/PackageToJS/Templates/runtime.mjs \ No newline at end of file