Update examples

kateinoigakukun · kateinoigakukun · commit 1003cc2eee73 · 2025-03-07T06:51:20.000+09:00
diff --git a/Examples/Basic/Package.swift b/Examples/Basic/Package.swift
@@ -17,5 +17,5 @@ let package = Package(
             ]
         )
     ],
-    swiftLanguageVersions: [.v5]
+    swiftLanguageModes: [.v5]
 )
diff --git a/Examples/Basic/build.sh b/Examples/Basic/build.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-swift build --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasi}" -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor -Xlinker --export=__main_argc_argv
+set -ex
+swift package --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasi}" -c "${1:-debug}" js
diff --git a/Examples/Basic/index.html b/Examples/Basic/index.html
@@ -3,10 +3,20 @@
 
 <head>
   <title>Getting Started</title>
+  <script type="importmap">
+    {
+      "imports": {
+        "@bjorn3/browser_wasi_shim": "https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.4.1/+esm"
+      }
+    }
+  </script>
 </head>
 
 <body>
-  <script src="./index.js" type="module"></script>
+  <script type="module">
+    import { instantiate } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
+    await instantiate(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+  </script>
 </body>
 
 </html>
diff --git a/Examples/Basic/index.js b/Examples/Basic/index.js
diff --git a/Examples/Embedded/build.sh b/Examples/Embedded/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 package_dir="$(cd "$(dirname "$0")" && pwd)"
 JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM=true \
-  swift build --package-path "$package_dir" --product EmbeddedApp \
-  -c release --triple wasm32-unknown-none-wasm
+  swift package --package-path "$package_dir" \
+  -c release --triple wasm32-unknown-none-wasm js
diff --git a/Examples/Embedded/index.html b/Examples/Embedded/index.html
@@ -3,10 +3,20 @@
 
 <head>
   <title>Getting Started</title>
+  <script type="importmap">
+    {
+      "imports": {
+        "@bjorn3/browser_wasi_shim": "https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.4.1/+esm"
+      }
+    }
+  </script>
 </head>
 
 <body>
-  <script src="./index.js" type="module"></script>
+  <script type="module">
+    import { instantiate } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
+    await instantiate(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+  </script>
 </body>
 
 </html>
diff --git a/Examples/Embedded/index.js b/Examples/Embedded/index.js

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ let package = Package(`
`17`	`17`	`]`
`18`	`18`	`)`
`19`	`19`	`],`
`20`		`- swiftLanguageVersions: [.v5]`
	`20`	`+ swiftLanguageModes: [.v5]`
`21`	`21`	`)`