Skip to content

Commit 71a439d

Browse files
Remove exclude from Package.swift in ImportTS
1 parent de28db9 commit 71a439d

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Examples/ImportTS/Package.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ let package = Package(
1111
dependencies: [
1212
"JavaScriptKit"
1313
],
14-
exclude: ["bridge.d.ts"],
1514
swiftSettings: [
1615
.enableExperimentalFeature("Extern")
1716
],

Examples/ImportTS/Sources/main.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import JavaScriptKit
22

33
@JS public func run() {
4+
consoleLog("Hello, World!")
5+
46
let document = getDocument()
57
document.title = "Hello, World!"
68
let body = document.body

Plugins/BridgeJS/Sources/BridgeJSBuildPlugin/BridgeJSBuildPlugin.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ struct BridgeJSBuildPlugin: BuildToolPlugin {
1818
{
1919
let outputSwiftPath = context.pluginWorkDirectoryURL.appending(path: "ExportSwift.swift")
2020
let outputSkeletonPath = context.pluginWorkDirectoryURL.appending(path: "ExportSwift.json")
21+
let inputFiles = target.sourceFiles.filter { !$0.url.path.hasPrefix(context.pluginWorkDirectoryURL.path + "/") }.map(\.url)
2122
return .buildCommand(
2223
displayName: "Export Swift API",
2324
executable: try context.tool(named: "BridgeJSTool").url,
@@ -28,7 +29,8 @@ struct BridgeJSBuildPlugin: BuildToolPlugin {
2829
"--output-swift",
2930
outputSwiftPath.path,
3031
"--always-write", "true",
31-
] + target.sourceFiles.filter { !$0.url.path.hasPrefix(context.pluginWorkDirectoryURL.path + "/") }.map(\.url.path),
32+
] + inputFiles.map(\.path),
33+
inputFiles: inputFiles,
3234
outputFiles: [
3335
outputSwiftPath
3436
]
@@ -38,6 +40,9 @@ struct BridgeJSBuildPlugin: BuildToolPlugin {
3840
private func createImportTSCommand(context: PluginContext, target: SwiftSourceModuleTarget) throws -> Command {
3941
let outputSwiftPath = context.pluginWorkDirectoryURL.appending(path: "ImportTS.swift")
4042
let outputSkeletonPath = context.pluginWorkDirectoryURL.appending(path: "ImportTS.json")
43+
let inputFiles = [
44+
target.directoryURL.appending(path: "bridge.d.ts")
45+
]
4146
return .buildCommand(
4247
displayName: "Import TypeScript API",
4348
executable: try context.tool(named: "BridgeJSTool").url,
@@ -52,8 +57,8 @@ struct BridgeJSBuildPlugin: BuildToolPlugin {
5257
"--always-write", "true",
5358
"--project",
5459
context.package.directoryURL.appending(path: "tsconfig.json").path,
55-
target.directoryURL.appending(path: "bridge.d.ts").path,
56-
],
60+
] + inputFiles.map(\.path),
61+
inputFiles: inputFiles,
5762
outputFiles: [
5863
outputSwiftPath
5964
]

0 commit comments

Comments
 (0)