update to componentizeJS 0.17 (#347)

karthik2804 · web-flow · commit 512175d60712 · 2025-02-24T14:43:47.000+01:00
* update to componentizeJS 0.17

Signed-off-by: karthik2804 &lt;karthik.ganeshram@fermyon.com&gt;

* fix webpack externals

Signed-off-by: karthik2804 &lt;karthik.ganeshram@fermyon.com&gt;

---------

Signed-off-by: karthik2804 &lt;karthik.ganeshram@fermyon.com&gt;
diff --git a/bin/j2w.mjs b/bin/j2w.mjs
@@ -37,10 +37,20 @@ const args = yargs(hideBin(process.argv))
         describe: "Spin trigger to target",
         demandOption: true
     })
+    .option('debug-build', {
+        describe: "Use debug build of the runtime",
+        type: 'boolean',
+    })
     .option('aot', {
         describe: "Enable Ahead of Time compilation",
         type: 'boolean',
     })
+    .check((argv) => {
+        if (argv['debug-build'] && argv['runtime-path']) {
+            throw new Error("The --runtime-path option cannot be used when --debug-build is enabled.");
+        }
+        return true;
+    })
     .argv;
 
 const src = args.input;
@@ -123,6 +133,7 @@ async function saveBuildData(buildDataPath, checksum, version) {
             worldName: args.triggerType,
             disableFeatures: [],
             enableFeatures: ["http"],
+            debugBuild: args.debugBuild ?? false,
             enableAot: args.aot
         });
 
diff --git a/bin/wit/deps/spin@2.0.0/spin.wit b/bin/wit/deps/spin@2.0.0/spin.wit
@@ -1,6 +1,7 @@
 package fermyon:spin@2.0.0;
 
 world spin-imports {
+  import wasi:cli/environment@0.2.3;
   import wasi:http/outgoing-handler@0.2.3;
   import llm;
   import redis;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fermyon/spin-sdk",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,7 +26,7 @@
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@bytecodealliance/componentize-js": "^0.16.0",
+    "@bytecodealliance/componentize-js": "^0.17.0",
     "@fermyon/knitwit": "^0.3.0",
     "acorn-walk": "^8.3.4",
     "acron": "^1.0.5",
@@ -45,4 +45,4 @@
       "world": "spin-imports"
     }
   }
-}
+}
diff --git a/plugins/webpack/index.js b/plugins/webpack/index.js
@@ -1,28 +1,26 @@
 class SpinSdkPlugin {
     constructor() {
-        this.externals = {
-            "wasi:http/types@0.2.0": "wasi:http/types@0.2.0",
-            "wasi:cli/environment@0.2.0": "wasi:cli/environment@0.2.0",
-            "wasi:filesystem/preopens@0.2.0": "wasi:filesystem/preopens@0.2.0",
-            "fermyon:spin/llm@2.0.0": "fermyon:spin/llm@2.0.0",
-            "fermyon:spin/variables@2.0.0": "fermyon:spin/variables@2.0.0",
-            "fermyon:spin/redis@2.0.0": "fermyon:spin/redis@2.0.0",
-            "fermyon:spin/key-value@2.0.0": "fermyon:spin/key-value@2.0.0",
-            "fermyon:spin/sqlite@2.0.0": "fermyon:spin/sqlite@2.0.0",
-            "fermyon:spin/postgres@2.0.0": "fermyon:spin/postgres@2.0.0",
-            "fermyon:spin/mysql@2.0.0": "fermyon:spin/mysql@2.0.0",
-            "fermyon:spin/mqtt@2.0.0": "fermyon:spin/mqtt@2.0.0",
-            "wasi:config/store@0.2.0-draft-2024-09-27": "wasi:config/store@0.2.0-draft-2024-09-27",
-            "spin:postgres/postgres@3.0.0": "spin:postgres/postgres@3.0.0",
-        };
+        this.externals = [
+            /^wasi:.*/,
+            /^fermyon:.*/,
+            /^spin:.*/,
+        ];
     }
 
     apply(compiler) {
         // If externals are already defined, merge them with new externals
-        if (compiler.options.externals && typeof compiler.options.externals === 'object') {
-            this.externals = Object.assign({}, compiler.options.externals, this.externals);
+        const userExternals = compiler.options.externals;
+
+        if (Array.isArray(userExternals)) {
+            // Append to the existing array
+            compiler.options.externals = [...userExternals, ...this.externals];
+        } else if (typeof userExternals === 'object') {
+            // Wrap in an array and add the object as-is
+            compiler.options.externals = [userExternals, ...this.externals];
+        } else {
+            // Default: Just use our externals
+            compiler.options.externals = [...this.externals];
         }
-        compiler.options.externals = this.externals;
     }
 }
 
diff --git a/test/test-app/package-lock.json b/test/test-app/package-lock.json
diff --git a/test/test-app/package.json b/test/test-app/package.json
@@ -4,9 +4,8 @@
     "description": "",
     "main": "index.js",
     "scripts": {
-        "build": "npx webpack --mode=production && npx mkdirp dist && npx j2w -i build/bundle.js -d build/wit/knitwit -n combined -o dist/test-app.wasm --aot",
-        "test": "echo \"Error: no test specified\" && exit 1",
-        "postinstall": "knitwit --out-dir build/wit/knitwit"
+        "build": "knitwit --out-dir build/wit/knitwit && npx webpack --mode=production && npx mkdirp dist && npx j2w --debug-build -i build/bundle.js -d build/wit/knitwit -n combined -o dist/test-app.wasm --aot",
+        "test": "echo \"Error: no test specified\" && exit 1"
     },
     "keywords": [],
     "author": "",
@@ -22,4 +21,4 @@
         "@fermyon/spin-sdk": "file:../../",
         "itty-router": "^5.0.18"
     }
-}
+}
