Skip to content

Commit a3dcfa7

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

File tree

9 files changed

+55
-12
lines changed

9 files changed

+55
-12
lines changed

.github/workflows/perf.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ jobs:
1616
export SWIFTENV_ROOT="$HOME/.swiftenv"
1717
export PATH="$SWIFTENV_ROOT/bin:$PATH"
1818
eval "$(swiftenv init -)"
19-
swiftenv install $TOOLCHAIN_DOWNLOAD
19+
make bootstrap
2020
make perf-tester
2121
node ci/perf-tester
2222
env:
23-
TOOLCHAIN_DOWNLOAD: https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.3-SNAPSHOT-2020-08-10-a/swift-wasm-5.3-SNAPSHOT-2020-08-10-a-linux.tar.gz
2423
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
wasm-5.3-SNAPSHOT-2020-10-20-a
1+
wasm-5.3.0-RELEASE

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# 0.9.0 (27 November 2020)
2+
3+
This release introduces support for catching `JSError` instances in Swift from throwing JavaScript
4+
functions. This is possible thanks to the new `JSThrowingFunction` and `JSThrowingObject` classes.
5+
The former can only be called with `try`, while the latter will expose all of its member functions
6+
as throwing. Use the new `throws` property on `JSFunction` to convert it to `JSThrowingFunction`,
7+
and the new `throwing` property on `JSObject` to convert it to `JSThrowingObject`.
8+
9+
**Closed issues:**
10+
11+
- Support JS errors ([#37](https://github.com/swiftwasm/JavaScriptKit/issues/37))
12+
13+
**Merged pull requests:**
14+
15+
- Update toolchain version swift-wasm-5.3.0-RELEASE ([#108](https://github.com/swiftwasm/JavaScriptKit/pull/108)) via [@kateinoigakukun](https://github.com/kateinoigakukun)
16+
- Update ci trigger condition ([#104](https://github.com/swiftwasm/JavaScriptKit/pull/104)) via [@kateinoigakukun](https://github.com/kateinoigakukun)
17+
- Fix branch and triple in `compatibility.yml` ([#105](https://github.com/swiftwasm/JavaScriptKit/pull/105)) via [@MaxDesiatov](https://github.com/MaxDesiatov)
18+
- Check source code compatibility ([#103](https://github.com/swiftwasm/JavaScriptKit/pull/103)) via [@kateinoigakukun](https://github.com/kateinoigakukun)
19+
- JS Exception Support ([#102](https://github.com/swiftwasm/JavaScriptKit/pull/102)) via [@kateinoigakukun](https://github.com/kateinoigakukun)
20+
- Mention `carton` Docker image and refine wording in `README.md` ([#101](https://github.com/swiftwasm/JavaScriptKit/pull/101)) via [@MaxDesiatov](https://github.com/MaxDesiatov)
21+
122
# 0.8.0 (21 October 2020)
223

324
This release introduces a few enhancements and deprecations. Namely, `JSValueConstructible`

IntegrationTests/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
CONFIGURATION ?= debug
22

33
FORCE:
4-
TestSuites/.build/$(CONFIGURATION)/%: FORCE
4+
TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE
55
swift build --package-path TestSuites \
6-
--product $(notdir $@) \
6+
--product $(basename $(notdir $@)) \
77
--triple wasm32-unknown-wasi \
88
--configuration $(CONFIGURATION)
99

10-
dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%
10+
dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%.wasm
1111
mkdir -p dist
1212
cp $< $@
1313

IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ try test("Exception") {
562562
try expectEqual(error4 is JSValue, true)
563563
let errorObject2 = JSError(from: error4 as! JSValue)
564564
try expectNotNil(errorObject2)
565-
565+
566566
// MARK: Throwing constructor call
567567
let Animal = JSObject.global.Animal.function!
568568
_ = try Animal.throws.new("Tama", 3, true)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Just pass a toolchain archive URL for [the latest SwiftWasm 5.3
119119
snapshot](https://github.com/swiftwasm/swift/releases) appropriate for your platform:
120120

121121
```sh
122-
$ swiftenv install https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.3-SNAPSHOT-2020-10-20-a/swift-wasm-5.3-SNAPSHOT-2020-10-20-a-macos_x86_64.pkg
122+
$ swiftenv install https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.3.0-RELEASE/swift-wasm-5.3.0-RELEASE-macos_x86_64.pkg
123123
```
124124

125125
You can also use the `install-toolchain.sh` helper script that uses a hardcoded toolchain snapshot:

Sources/JavaScriptKit/FundamentalObjects/JSObject.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class JSObject: Equatable {
7676
get { getJSValue(this: self, index: Int32(index)) }
7777
set { setJSValue(this: self, index: Int32(index), value: newValue) }
7878
}
79-
79+
8080
/// A modifier to call methods as throwing methods capturing `this`
8181
///
8282
///

package-lock.json

Lines changed: 25 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "javascript-kit-swift",
3-
"version": "0.8.0",
3+
"version": "0.9.0",
44
"description": "A runtime library of JavaScriptKit which is Swift framework to interact with JavaScript through WebAssembly.",
55
"main": "Runtime/lib/index.js",
66
"files": [

0 commit comments

Comments
 (0)