Skip to content

Commit b5d0d1a

Browse files
committed
Merge branch 'main' of github.com:swiftwasm/DOMKit into maxd/webcodecs
# Conflicts: # Sources/DOMKit/WebIDL/Strings.swift # Sources/DOMKit/WebIDL/Typedefs.swift # parse-idl/parse-all.js
2 parents 6781702 + 271ef41 commit b5d0d1a

File tree

464 files changed

+18560
-20287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

464 files changed

+18560
-20287
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
2020
brew install swiftwasm/tap/carton
2121
22+
carton bundle --product DOMKitDemo
2223
carton test --environment defaultBrowser
2324
env:
2425
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Package.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ let package = Package(
2626
dependencies: ["DOMKit"]),
2727
.target(
2828
name: "DOMKit",
29-
dependencies: ["JavaScriptKit", .product(name: "JavaScriptEventLoop", package: "JavaScriptKit")]),
29+
dependencies: ["ECMAScript", "JavaScriptKit", .product(name: "JavaScriptEventLoop", package: "JavaScriptKit")]),
30+
// This support library should be moved to JavaScriptKit
31+
.target(name: "ECMAScript", dependencies: [
32+
"JavaScriptKit",
33+
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit")]),
3034
.target(name: "WebIDL"),
3135
.target(
3236
name: "WebIDLToSwift",

0 commit comments

Comments
 (0)