Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Drop Embedded Swift with 6.1 and earlier and removeJAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM#406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Draft
kateinoigakukun wants to merge1 commit intomain
base:main
Choose a base branch
Loading
fromyt/remove-JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM
Draft
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletionExamples/Embedded/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
#!/bin/bash
set -euxo pipefail
package_dir="$(cd "$(dirname "$0")" && pwd)"
JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM=true \
swift package --package-path "$package_dir" \
-c release --triple wasm32-unknown-none-wasm js
24 changes: 2 additions & 22 deletionsPackage.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import CompilerPluginSupport
import PackageDescription

// NOTE: needed for embedded customizations, ideally this will not be necessary at all in the future, or can be replaced with traits
let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"].flatMap(Bool.init) ?? false
let useLegacyResourceBundling =
Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false

Expand DownExpand Up@@ -36,18 +35,9 @@ let package = Package(
dependencies: ["_CJavaScriptKit"],
exclude: useLegacyResourceBundling ? [] : ["Runtime"],
resources: useLegacyResourceBundling ? [.copy("Runtime")] : [],
cSettings: shouldBuildForEmbedded
? [
.unsafeFlags(["-fdeclspec"])
] : nil,
swiftSettings: [
.enableExperimentalFeature("Extern")
]
+ (shouldBuildForEmbedded
? [
.enableExperimentalFeature("Embedded"),
.unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
] : [])
),
.target(name: "_CJavaScriptKit"),
.testTarget(
Expand All@@ -60,12 +50,7 @@ let package = Package(

.target(
name: "JavaScriptBigIntSupport",
dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"],
swiftSettings: shouldBuildForEmbedded
? [
.enableExperimentalFeature("Embedded"),
.unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
] : []
dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"]
),
.target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]),
.testTarget(
Expand All@@ -75,12 +60,7 @@ let package = Package(

.target(
name: "JavaScriptEventLoop",
dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"],
swiftSettings: shouldBuildForEmbedded
? [
.enableExperimentalFeature("Embedded"),
.unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
] : []
dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"]
),
.target(name: "_CJavaScriptEventLoop"),
.testTarget(
Expand Down
5 changes: 0 additions & 5 deletionsPlugins/PackageToJS/Sources/PackageToJSPlugin.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,11 +376,6 @@ struct PackageToJSPlugin: CommandPlugin {

/// Check if the build is for embedded WebAssembly
private func isBuildingForEmbedded(selfPackage: Package) -> Bool {
if let rawValue = ProcessInfo.processInfo.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"],
let value = Bool(rawValue), value
{
return true
}
let coreTarget = selfPackage.targets.first { $0.name == "JavaScriptKit" }
guard let swiftTarget = coreTarget as? SwiftSourceModuleTarget else {
return false
Expand Down
12 changes: 6 additions & 6 deletionsPlugins/PackageToJS/Tests/ExampleTests.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,30 +323,30 @@ extension Trait where Self == ConditionTrait {
}
}

#if compiler(>=6.2)
@Test(.requireEmbeddedSwiftInToolchain(triple: "wasm32-unknown-none-wasm"))
func embeddedWasmUnknownNone() throws {
try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
try runSwift(
["package", "--triple", "wasm32-unknown-none-wasm", "js", "-c", "release"],
[
"JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true"
]
[:]
)
}
}
#endif

#if compiler(>=6.2)
@Test(.requireEmbeddedSwiftInSwiftSDK())
func embeddedWasmUnknownWasi() throws {
let swiftSDKID = try #require(Self.getEmbeddedSwiftSDKID())
try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
try runSwift(
["package", "--swift-sdk", swiftSDKID, "js", "-c", "release"],
[
"JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true"
]
[:]
)
}
}
#endif

@Test(.requireSwiftSDK)
func continuationLeakInTest_XCTest() throws {
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp