@tokamakdev/tok 0.1.0-beta.34 → 0.1.1-beta.38

package/README.md

@@ -4,12 +4,21 @@ The tokamak CLI, published from the tokamak workspace. The version is the
 workspace Cargo version, with a `-beta.N` suffix for automated pre-releases.
 
 ```sh
-npm install -g @tokamakdev/tok@beta
-tok targets
+npm install --save-dev @tokamakdev/tok@beta
+npx tok targets
 ```
 
-The package installs the `tok` binary for the current platform through an
+The package installs the `tok` binary for the current machine through an
 optional dependency (`@tokamakdev/tok-darwin-arm64`, `-darwin-x64`,
-`-linux-x64`, or `-win32-x64`). Building apps also needs the target packs,
-which the tokamak installer places under `~/.local/share/tokamak`; `tok`
-finds them there, or wherever `TOKAMAK_TARGET_PACK_DIR` points.
+`-linux-x64`, or `-win32-x64`), and the platform packs the machine can build
+as `@tokamakdev/platform-<target>` optional dependencies:
+
+| Machine | Platform packs |
+| --- | --- |
+| macOS, Apple silicon | `android-arm64`, `ios-arm64`, `ios-simulator-arm64`, `macos-arm64` |
+| macOS, Intel | `android-arm64`, `ios-arm64`, `ios-simulator-x64`, `macos-x64` |
+| Windows x64 | `android-arm64`, `windows-x64` |
+| Linux x64 | `android-arm64` |
+
+The launcher passes the installed platform packs to `tok` in
+`TOKAMAK_PLATFORM_PACK_PATH`, unless that variable is already set.

package/bin/tok.js

@@ -2,7 +2,8 @@
 "use strict";
 
 const { spawnSync } = require("node:child_process");
-const { binaryPath } = require("../platform.js");
+const path = require("node:path");
+const { binaryPath, platformPackRoots } = require("../platform.js");
 
 let binary;
 try {
@@ -16,7 +17,13 @@ try {
 // so the launcher only waits for it.
 for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) process.on(signal, () => {});
 
-const result = spawnSync(binary, process.argv.slice(2), { stdio: "inherit" });
+const env = { ...process.env };
+if (!env.TOKAMAK_PLATFORM_PACK_PATH) {
+  const roots = platformPackRoots(require.resolve);
+  if (roots.length > 0) env.TOKAMAK_PLATFORM_PACK_PATH = roots.join(path.delimiter);
+}
+
+const result = spawnSync(binary, process.argv.slice(2), { stdio: "inherit", env });
 if (result.error) {
   console.error(`could not run ${binary}: ${result.error.message}`);
   process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/tok",
-  "version": "0.1.0-beta.34",
+  "version": "0.1.1-beta.38",
   "description": "The tokamak CLI: build native apps from a Cloudflare Workers codebase",
   "repository": {
     "type": "git",
@@ -19,10 +19,17 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@tokamakdev/tok-darwin-arm64": "0.1.0-beta.34",
-    "@tokamakdev/tok-darwin-x64": "0.1.0-beta.34",
-    "@tokamakdev/tok-linux-x64": "0.1.0-beta.34",
-    "@tokamakdev/tok-win32-x64": "0.1.0-beta.34"
+    "@tokamakdev/platform-android-arm64": "0.1.1-beta.38",
+    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.38",
+    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.38",
+    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.38",
+    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.38",
+    "@tokamakdev/platform-macos-x64": "0.1.1-beta.38",
+    "@tokamakdev/platform-windows-x64": "0.1.1-beta.38",
+    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.38",
+    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.38",
+    "@tokamakdev/tok-linux-x64": "0.1.1-beta.38",
+    "@tokamakdev/tok-win32-x64": "0.1.1-beta.38"
   },
   "publishConfig": {
     "access": "public"

package/platform.js

@@ -1,5 +1,8 @@
 "use strict";
 
+const path = require("node:path");
+const { optionalDependencies } = require("./package.json");
+
 const PACKAGES = {
   "darwin-arm64": "@tokamakdev/tok-darwin-arm64",
   "darwin-x64": "@tokamakdev/tok-darwin-x64",
@@ -7,6 +10,8 @@ const PACKAGES = {
   "win32-x64": "@tokamakdev/tok-win32-x64",
 };
 
+const PLATFORM_PACKS = Object.keys(optionalDependencies).filter((name) => name.startsWith("@tokamakdev/platform-"));
+
 function packageFor(platform, arch) {
   const name = PACKAGES[`${platform}-${arch}`];
   if (!name) throw new Error(`tokamak does not publish a CLI for ${platform} ${arch}`);
@@ -23,4 +28,15 @@ function binaryPath(platform, arch, resolve) {
   }
 }
 
-module.exports = { packageFor, binaryPath };
+// npm installs only the platform packs whose os and cpu match this host.
+function platformPackRoots(resolve) {
+  return PLATFORM_PACKS.flatMap((name) => {
+    try {
+      return [path.dirname(resolve(`${name}/package.json`))];
+    } catch {
+      return [];
+    }
+  });
+}
+
+module.exports = { PLATFORM_PACKS, packageFor, binaryPath, platformPackRoots };