@cityholdings/minicube-dev 0.1.1 → 0.1.2

package/README.md

@@ -36,8 +36,12 @@ npm publish
 
 Optional tools, used only by the commands that need them: `adb` (Android preview), Xcode
 command-line tools (`xcrun`, iOS simulator/device preview), `kubectl` (token administration or
-`transport: "kube"`), `@antdigital/cube` in card projects, `cube-pack` (inline card images), and the
-mini program compiler `mini-pkg-builder`.
+`transport: "kube"`), `cube-pack` (inline card images), and the mini program compiler
+`mini-pkg-builder`.
+
+Card projects must install ACT v4 themselves (`npm i -D @antdigital/cube@4`). minicube-dev uses only
+that copy, found from the card directory upwards, and stops if it is missing or older than v4; a
+global `act` (often ACT v2, which the apps cannot load) is never used.
 
 ## Configuration
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityholdings/minicube-dev",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Command-line workflow for mPaaS mini programs, H5 offline packages and Cube cards: build, debug upload, device preview and release",
   "type": "module",
   "bin": {

package/src/act.js

@@ -2,10 +2,10 @@ import { mkdirSync, openSync } from 'node:fs';
 import { createConnection } from 'node:net';
 import os from 'node:os';
 import path from 'node:path';
-import { cardDir, resolveAct } from './build.js';
+import { cardDir, resolveAct, runAct } from './build.js';
 import { adb, androidSerial } from './device.js';
 import { CliError, log } from './log.js';
-import { delay, run, runSync, spawnDetached } from './proc.js';
+import { delay, runSync, spawnDetached } from './proc.js';
 
 const DEFAULT_PORT = 9001;
 const CONNECT_TIMEOUT_MS = 45_000;
@@ -55,8 +55,7 @@ export function advertisedHost(target) {
  * address is restarted.
  */
 export async function ensureActServer(project, port = DEFAULT_PORT, host = null) {
-  const act = resolveAct(project.root);
-  if (!act) throw new CliError('ACT not found', 'Install it in the card project: npm i -D @antdigital/cube');
+  const act = resolveAct(cardDir(project), project.root);
   if (await isListening(port)) {
     const current = (await serverAddress(port)).host;
     if (!host || current === host) {
@@ -64,13 +63,13 @@ export async function ensureActServer(project, port = DEFAULT_PORT, host = null)
       return act;
     }
     log.detail(`Restarting the ACT server: it advertises ${current}, this device needs ${host}`);
-    await run(act, ['prepare'], { cwd: project.root, capture: true });
+    await runAct(act, ['prepare'], { cwd: project.root, capture: true });
     const freed = Date.now() + 10_000;
     while ((await isListening(port)) && Date.now() < freed) await delay(300);
   }
   mkdirSync(path.join(project.root, '.minicube'), { recursive: true });
   const logFile = path.join(project.root, '.minicube', 'act-server.log');
-  spawnDetached(act, ['server'], { cwd: project.root, logFd: openSync(logFile, 'a'), env: host ? { HOST: host } : undefined });
+  spawnDetached(process.execPath, [act.script, 'server'], { cwd: project.root, logFd: openSync(logFile, 'a'), env: host ? { HOST: host } : undefined });
   const deadline = Date.now() + 20_000;
   while (Date.now() < deadline) {
     await delay(500);
@@ -145,6 +144,6 @@ export async function attachDevice(target, env, devices, port = DEFAULT_PORT) {
 }
 
 export async function deliverCard(project, act) {
-  const result = await run(act, ['preview', cardDir(project)], { cwd: project.root });
+  const result = await runAct(act, ['preview', cardDir(project)], { cwd: project.root });
   if (result.code !== 0) throw new CliError(`act preview failed (exit ${result.code})`);
 }

package/src/build.js

@@ -176,10 +176,39 @@ async function buildH5(project, outRoot) {
 // ---------------------------------------------------------------------------------------------
 // Cards: cube-pack (inlines local images) when installed, otherwise the project's own `act build`.
 
-export function resolveAct(projectRoot) {
-  const local = which('act', [path.join(projectRoot, 'node_modules', '.bin')]);
-  if (local && local.startsWith(projectRoot)) return local;
-  return local ?? null;
+export const ACT_MIN_MAJOR = 4;
+const ACT_INSTALL_HINT = 'Install ACT v4 in the card project: npm i -D @antdigital/cube@4';
+
+/**
+ * The card project's own ACT v4 CLI script (`@antdigital/cube`), looked up like Node resolves
+ * packages: from each start directory up through its parents. A global `act` is never used — it is
+ * often ACT v2, whose builds and server the apps' v4 Cube host cannot load.
+ */
+export function resolveAct(...startDirs) {
+  for (const start of startDirs) {
+    for (let dir = path.resolve(start); ; dir = path.dirname(dir)) {
+      const pkgDir = path.join(dir, 'node_modules', '@antdigital', 'cube');
+      const pkgFile = path.join(pkgDir, 'package.json');
+      if (existsSync(pkgFile)) {
+        const pkg = JSON.parse(readFileSync(pkgFile, 'utf8'));
+        const major = Number.parseInt(String(pkg.version), 10);
+        if (!(major >= ACT_MIN_MAJOR)) {
+          throw new CliError(`${pkgDir} is ACT ${pkg.version}; ACT v${ACT_MIN_MAJOR} or newer is required`, ACT_INSTALL_HINT);
+        }
+        const bin = typeof pkg.bin === 'string' ? pkg.bin : pkg.bin?.act;
+        const script = bin && path.join(pkgDir, bin);
+        if (!script || !existsSync(script)) throw new CliError(`${pkgDir} has no act CLI`, ACT_INSTALL_HINT);
+        return { script, version: pkg.version };
+      }
+      if (path.dirname(dir) === dir) break;
+    }
+  }
+  throw new CliError(`ACT v${ACT_MIN_MAJOR} (@antdigital/cube) is not installed in the card project`, ACT_INSTALL_HINT);
+}
+
+/** Run the project's ACT CLI with the current Node (also on Windows, where cli.js is not executable). */
+export function runAct(act, args, options) {
+  return run(process.execPath, [act.script, ...args], options);
 }
 
 export function cardDir(project) {
@@ -189,16 +218,13 @@ export function cardDir(project) {
 async function buildCard(project, outRoot) {
   const dir = cardDir(project);
   if (!existsSync(path.join(dir, 'manifest.json'))) throw new CliError(`${dir} is not a card (no manifest.json)`);
+  // Checked even when cube-pack builds: it runs the project's act, so a missing v4 must stop here.
+  const act = resolveAct(dir, project.root);
   const cubePack = project.data.card?.useCubePack === false ? null : which('cube-pack');
-  log.step(`Building card ${project.data.resourceId}`);
-  let result;
-  if (cubePack) {
-    result = await run(cubePack, ['build'], { cwd: project.root });
-  } else {
-    const act = resolveAct(project.root);
-    if (!act) throw new CliError('ACT not found', 'Install it in the card project: npm i -D @antdigital/cube');
-    result = await run(act, ['build', dir], { cwd: project.root });
-  }
+  log.step(`Building card ${project.data.resourceId} (ACT ${act.version})`);
+  const result = cubePack
+    ? await run(cubePack, ['build'], { cwd: project.root })
+    : await runAct(act, ['build', dir], { cwd: project.root });
   if (result.code !== 0) throw new CliError(`Card build failed (exit ${result.code})`);
   const zip = findCardZip(dir);
   const file = path.join(outRoot, `${project.data.resourceId}.zip`);