Skip to content

Commit 8704225

Browse files
committed
Merge remote-tracking branch 'upstream/main' into asyncify
2 parents a3dcfa7 + d583439 commit 8704225

File tree

20 files changed

+6691
-297
lines changed

20 files changed

+6691
-297
lines changed

.github/FUNDING.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: [swiftwasm] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: swiftwasm # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
export PATH="$SWIFTENV_ROOT/bin:$PATH"
2121
eval "$(swiftenv init -)"
2222
make bootstrap
23-
cd Example
23+
cd Example/JavaScriptKitExample
2424
swift build --triple wasm32-unknown-wasi

Example/JavaScriptKitExample/Sources/JavaScriptKitExample/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ buttonElement.innerText = "Click me!"
1212
let listener = JSClosure { _ in
1313
alert("Swift is running on browser!")
1414
}
15-
buttonElement.onclick = .function(listener)
15+
buttonElement.onclick = .object(listener)
1616

1717
_ = document.body.appendChild(buttonElement)

Example/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dist/JavaScriptKitExample.wasm: JavaScriptKitExample
1010
cp ./JavaScriptKitExample/.build/debug/JavaScriptKitExample $@
1111

1212
node_modules:
13-
npm install
13+
npm ci
1414
build: node_modules dist/JavaScriptKitExample.wasm
1515
cd ../Runtime && npm run build
1616
npm run build

0 commit comments

Comments
 (0)