Use vite as dev server instead of built-in one

`carton-dev` is now just a combination of `carton-bundle --debug` +
`vite`

Package.swift

@@ -23,7 +23,6 @@ let package = Package(
       url: "https://github.com/apple/swift-argument-parser.git",
       .upToNextMinor(from: "1.3.0")
     ),
-    .package(url: "https://github.com/apple/swift-nio.git", from: "2.34.0"),
     .package(
       url: "https://github.com/swiftwasm/WasmTransformer",
       .upToNextMinor(from: "0.5.0")
@@ -44,12 +43,6 @@ let package = Package(
     ),
     .executableTarget(
       name: "carton-frontend",
-      dependencies: [
-        "CartonFrontend"
-      ]
-    ),
-    .executableTarget(
-      name: "carton-frontend-slim",
       dependencies: [
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         "CartonHelpers",
@@ -64,7 +57,7 @@ let package = Package(
           description: "Produces an optimized app bundle for distribution."
         )
       ),
-      dependencies: ["carton-frontend-slim"],
+      dependencies: ["carton-frontend"],
       exclude: [
         "CartonCore/README.md",
         "CartonPluginShared/README.md",
@@ -78,7 +71,7 @@ let package = Package(
           description: "Run the tests in a WASI environment."
         )
       ),
-      dependencies: ["carton-frontend-slim"],
+      dependencies: ["carton-frontend"],
       exclude: [
         "CartonCore/README.md",
         "CartonPluginShared/README.md",
@@ -99,27 +92,6 @@ let package = Package(
       ]
     ),
     .executableTarget(name: "carton-plugin-helper"),
-    .target(
-      name: "CartonFrontend",
-      dependencies: [
-        "CartonKit"
-      ]
-    ),
-    .target(
-      name: "CartonKit",
-      dependencies: [
-        .product(name: "NIOWebSocket", package: "swift-nio"),
-        .product(name: "NIOHTTP1", package: "swift-nio"),
-        .product(name: "NIO", package: "swift-nio"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "CartonHelpers",
-        "WasmTransformer",
-      ],
-      exclude: ["Utilities/README.md"],
-      swiftSettings: [
-        .enableUpcomingFeature("BareSlashRegexLiterals")
-      ]
-    ),
     .target(
       name: "SwiftToolchain",
       dependencies: [
@@ -151,13 +123,6 @@ let package = Package(
       name: "CartonCore",
       exclude: ["README.md"]
     ),
-    .target(
-      name: "WebDriver",
-      dependencies: [
-        .product(name: "NIO", package: "swift-nio"),
-        "CartonHelpers",
-      ]
-    ),
     // This target is used only for release automation tasks and
     // should not be installed by `carton` users.
     .executableTarget(
@@ -171,20 +136,18 @@ let package = Package(
     .testTarget(
       name: "CartonTests",
       dependencies: [
-        "CartonFrontend",
+        "carton",
         "CartonHelpers",
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
       ]
     ),
     .testTarget(
       name: "CartonCommandTests",
       dependencies: [
-        "CartonFrontend",
         "SwiftToolchain",
-        "WebDriver",
+        "CartonHelpers",
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
       ]
     ),
-    .testTarget(name: "WebDriverTests", dependencies: ["WebDriver"]),
   ]
 )

Plugins/CartonBundlePlugin/CartonBundlePluginCommand.swift

@@ -33,7 +33,7 @@ struct CartonBundlePluginCommand: CommandPlugin {
 
   func performCommand(context: PluginContext, arguments: [String]) async throws {
     try checkSwiftVersion()
-    try checkHelpFlag(arguments, frontend: "carton-frontend-slim", subcommand: "bundle", context: context)
+    try checkHelpFlag(arguments, subcommand: "bundle", context: context)
 
     var extractor = ArgumentExtractor(arguments)
     let options = Options.parse(from: &extractor)
@@ -86,7 +86,6 @@ struct CartonBundlePluginCommand: CommandPlugin {
       } + extractor.remainingArguments
     let frontend = try makeCartonFrontendProcess(
         context: context,
-        frontend: "carton-frontend-slim",
         arguments: frontendArguments
       )
     try frontend.checkRun(printsLoadingMessage: false, forwardExit: true)

Plugins/CartonDevPlugin/CartonDevPluginCommand.swift

@@ -90,6 +90,7 @@ struct CartonDevPluginCommand: CommandPlugin {
     var args: [String] = [
       "dev",
       "--main-wasm-path", productArtifact.path.string,
+      "--plugin-work-directory", context.pluginWorkDirectory.string,
       "--build-request", buildRequestPipe,
       "--build-response", buildResponsePipe
     ]
@@ -100,7 +101,11 @@ struct CartonDevPluginCommand: CommandPlugin {
     args += extractor.remainingArguments
 
     let frontend = try makeCartonFrontendProcess(context: context, arguments: args)
-    frontend.forwardTerminationSignals()
+    let signalSources = frontend.forwardTerminationSignals()
+    defer { signalSources.forEach { $0.cancel() } }
+    frontend.terminationHandler = { _ in
+      frontend.forwardExit()
+    }
 
     try frontend.run()
 

Plugins/CartonTestPlugin/CartonTestPluginCommand.swift

@@ -38,7 +38,7 @@ struct CartonTestPluginCommand: CommandPlugin {
   func performCommand(context: PluginContext, arguments: [String]) async throws {
     try checkSwiftVersion()
     try checkHelpFlag(
-      arguments, frontend: "carton-frontend-slim", subcommand: "test", context: context)
+      arguments, subcommand: "test", context: context)
 
     let productName = "\(context.package.displayName)PackageTests"
 
@@ -116,7 +116,7 @@ struct CartonTestPluginCommand: CommandPlugin {
     }
     args += extractor.remainingArguments
     let frontend = try makeCartonFrontendProcess(
-      context: context, frontend: "carton-frontend-slim", arguments: args)
+      context: context, arguments: args)
     try frontend.checkRun(printsLoadingMessage: false, forwardExit: true)
   }
 

Sources/CartonCore/FoundationProcessEx.swift

@@ -2,19 +2,22 @@ import Foundation
 
 extension Foundation.Process {
   // Monitor termination/interrruption signals to forward them to child process
-  public func setSignalForwarding(_ signalNo: Int32) {
+  public func setSignalForwarding(_ signalNo: Int32) -> DispatchSourceSignal {
     signal(signalNo, SIG_IGN)
     let signalSource = DispatchSource.makeSignalSource(signal: signalNo)
     signalSource.setEventHandler { [self] in
       signalSource.cancel()
       kill(processIdentifier, signalNo)
     }
     signalSource.resume()
+    return signalSource
   }
 
-  public func forwardTerminationSignals() {
-    setSignalForwarding(SIGINT)
-    setSignalForwarding(SIGTERM)
+  public func forwardTerminationSignals() -> [DispatchSourceSignal] {
+    return [
+      setSignalForwarding(SIGINT),
+      setSignalForwarding(SIGTERM),
+    ]
   }
 
   public var commandLine: String {
@@ -44,8 +47,14 @@ extension Foundation.Process {
       print("Running \(try commandLine)")
     }
 
+    let signalSources = forwardTerminationSignals()
+    defer {
+      for signalSource in signalSources {
+        signalSource.cancel()
+      }
+    }
+
     try run()
-    forwardTerminationSignals()
     waitUntilExit()
 
     if forwardExit {

Sources/CartonKit/Utilities/FSWatch.swift → Sources/CartonHelpers/Basics/FSWatch.swift

@@ -8,7 +8,6 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import CartonHelpers
 import Dispatch
 import Foundation