Add back shortcut for test:unit for husky

Author: Spencer-Smith

.github/workflows/changeset-publish.yml

@@ -247,7 +247,7 @@ jobs:
             exit 0
           fi
           EXT_VERSION=$(node -p "require('./packages/reactor-extension/package.json').version")
-          pnpm --filter reactor-extension run build
+          pnpm --filter reactor-extension-alloy run build
           node scripts/deployExtensionToReactor.mjs "${EXT_VERSION}"
 
       - name: Restore extension workspace protocol for @adobe/alloy

.github/workflows/deployExtensionRelease.yml

@@ -42,7 +42,7 @@ jobs:
         run: pnpm version ${{ github.event.inputs.version }} --no-commit-hooks
         working-directory: packages/reactor-extension
       - name: Build extension (refresh extension.json)
-        run: pnpm --filter reactor-extension run build
+        run: pnpm --filter reactor-extension-alloy run build
       - name: Commit and push
         run: |
           git config user.name "$GITHUB_ACTOR"
@@ -89,7 +89,7 @@ jobs:
         run: pnpm version ${{ github.event.inputs.version }} --no-commit-hooks
         working-directory: packages/reactor-extension
       - name: Build extension (refresh extension.json)
-        run: pnpm --filter reactor-extension run build
+        run: pnpm --filter reactor-extension-alloy run build
       - name: Commit and push
         run: |
           git config user.name "$GITHUB_ACTOR"

.github/workflows/extension-quality.yml

@@ -32,11 +32,11 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build all packages
-        run: pnpm -r run build
+        run: pnpm run build:all
       - name: Run ${{ matrix.check }}
         run: |
           if [ "${{ matrix.check }}" = "build" ]; then
-            pnpm --filter reactor-extension run build
+            pnpm run build:all
           else
             pnpm run ${{ matrix.check }}
           fi
@@ -64,6 +64,6 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Build all packages
-        run: pnpm -r run build
+        run: pnpm run build:all
       - name: Run test:${{ matrix.test }}
-        run: pnpm --filter reactor-extension run test:${{ matrix.test }}
+        run: pnpm --filter reactor-extension-alloy run test:${{ matrix.test }}

package.json

@@ -23,24 +23,20 @@
   },
   "scripts": {
     "clean": "rimraf dist distTest libEs5 libEs6 types",
-    "lint": "eslint --cache --fix \"*.{js,cjs,mjs,jsx}\" \"{sandboxes/*/src,packages/*/src,packages/*/scripts,test,scripts}/**/*.{js,cjs,mjs,jsx}\"",
+    "lint": "eslint --cache --fix \"*.{js,cjs,mjs,jsx}\" \"{sandboxes/*/src,packages/*/src,packages/*/scripts,test,scripts}/**/*.{js,cjs,mjs,jsx}\" && pnpm --filter reactor-extension-alloy run lint",
     "format": "prettier --write \"*.{html,js,cjs,mjs,jsx}\" \"{sandboxes/*/src,packages/*/src,packages/*/scripts,packages/*/test,test,scripts}/**/*.{html,js,cjs,mjs,jsx}\"",
-    "format:check": "prettier --check \"*.{html,js,cjs,mjs,jsx}\" \"{sandboxes/*/src,packages/*/src,packages/*/scripts,test,scripts}/**/*.{html,js,cjs,mjs,jsx}\"",
+    "format:check": "prettier --check \"*.{html,js,cjs,mjs,jsx}\" \"{sandboxes/*/src,packages/*/src,packages/*/scripts,packages/*/test,test,scripts}/**/*.{html,js,cjs,mjs,jsx}\"",
     "types": "tsc",
-    "test": "pnpm exec playwright install chromium && vitest run && pnpm run test:scripts",
-    "test:coverage": "rimraf coverage && pnpm exec playwright install chromium && vitest run --coverage",
-    "test:unit": "pnpm exec playwright install chromium && vitest run --config ./vitest.config.js --project=unit --project=reactor-extension/unit",
-    "test:unit:core": "pnpm exec playwright install chromium && vitest run --config ./vitest.config.js --project=unit",
-    "test:unit:extension": "pnpm exec playwright install chromium && vitest run --config ./vitest.config.js --project=reactor-extension/unit",
-    "test:unit:debug": "pnpm exec playwright install chromium && vitest --config ./vitest.config.js --project=unit --project=reactor-extension/unit --no-file-parallelism --browser=chromium --browser.provider=playwright --browser.headless=false",
-    "test:unit:watch": "pnpm exec playwright install chromium && vitest --config ./vitest.config.js --project=unit --project=reactor-extension/unit",
-    "test:unit:coverage": "pnpm exec playwright install chromium && vitest run --config ./vitest.config.js --project=unit --project=reactor-extension/unit --coverage",
-    "test:integration": "pnpm exec playwright install chromium && vitest run --config ./vitest.config.js --project=integration --project=reactor-extension/integration",
-    "test:integration:core": "pnpm exec playwright install chromium && vitest run --config ./vitest.config.js --project=integration",
-    "test:integration:extension": "pnpm exec playwright install chromium && vitest run --config ./vitest.config.js --project=reactor-extension/integration",
-    "test:integration:debug": "pnpm exec playwright install chromium && vitest --config ./vitest.config.js --project=integration --project=reactor-extension/integration --no-file-parallelism --browser=chromium --browser.provider=playwright --browser.headless=false",
-    "test:integration:watch": "pnpm exec playwright install chromium && vitest --config ./vitest.config.js --project=integration --project=reactor-extension/integration",
-    "test:integration:coverage": "pnpm exec playwright install chromium && vitest run --config ./vitest.config.js --project=integration --project=reactor-extension/integration --coverage",
+    "test": "node scripts/runTests.js",
+    "test:coverage": "node scripts/runTests.js --coverage",
+    "test:unit": "node scripts/runTests.js --mode=unit",
+    "test:unit:core": "node scripts/runTests.js --mode=unit --package=core",
+    "test:unit:extension": "node scripts/runTests.js --mode=unit --package=extension",
+    "test:unit:watch:extension": "node scripts/runTests.js --watch --mode=unit --package=extension",
+    "test:integration:core": "node scripts/runTests.js --mode=integration --package=core",
+    "test:integration:extension": "node scripts/runTests.js --mode=integration --package=extension",
+    "test:integration:watch:extension": "node scripts/runTests.js --watch --mode=integration --package=extension",
+    "test:integration:debug": "node scripts/runTests.js --debug --mode=integration",
     "test:functional": "pnpm exec playwright install chromium && EDGE_BASE_PATH=\"ee-pre-prd\" ALLOY_ENV=\"int\" testcafe chromium",
     "test:functional:custom": "node scripts/helpers/runFunctionalTests.js",
     "test:functional:watch": "pnpm exec playwright install chromium && EDGE_BASE_PATH=\"ee-pre-prd\" ALLOY_ENV=\"int\" ./scripts/watchFunctionalTests.js --browsers chromium",
@@ -50,13 +46,14 @@
     "test:scripts": "vitest run --config=./scripts/specs/vitest.config.js",
     "dev": "concurrently --names build,sandbox \"rollup -c -w --environment SANDBOX_SERVICE_WORKER\" \"REACT_APP_NONCE=123 pnpm run --filter @adobe/alloy-sandbox-browser start\"",
     "build": "pnpm run clean && rollup -c --environment BASE_CODE_MIN,STANDALONE,STANDALONE_MIN,SERVICE_WORKER,SERVICE_WORKER_MIN && echo \"Base Code:\" && cat distTest/baseCode.min.js",
+    "build:all": "pnpm run build && pnpm --filter reactor-extension-alloy run build",
     "build:watch": "pnpm run clean && rollup -c --watch --environment BASE_CODE_MIN,STANDALONE",
     "build:custom": "node scripts/alloyBuilder.js",
-    "build:extension": "pnpm run build && pnpm --filter reactor-extension run build",
-    "test:extension": "pnpm --filter reactor-extension run test",
-    "package:extension": "pnpm --filter reactor-extension run package",
-    "sandbox:extension": "pnpm --filter reactor-extension run sandbox",
-    "dev:extension": "pnpm --filter reactor-extension run dev",
+    "build:extension": "pnpm run build:all",
+    "test:extension": "pnpm --filter reactor-extension-alloy run test",
+    "package:extension": "pnpm --filter reactor-extension-alloy run package",
+    "sandbox:extension": "pnpm --filter reactor-extension-alloy run sandbox",
+    "dev:extension": "pnpm --filter reactor-extension-alloy run dev",
     "prepare": "husky",
     "build:lib": "babel packages/core/src -d libEs5 --env-name npmEs5 && babel packages/core/src -d libEs6 --env-name npmEs6 && echo '{\"type\":\"commonjs\"}' > libEs5/package.json && echo '{\"type\":\"module\"}' > libEs6/package.json",
     "prepack": "pnpm run clean && pnpm run build:lib && pnpm run types",

packages/reactor-extension/package.json

@@ -30,13 +30,13 @@
     "prepare": "husky",
     "prepush-msg": "echo 'Running pre-push scripts...' && exit 0",
     "sandbox": "./scripts/buildExtensionManifest.mjs && reactor-sandbox",
-    "test": "pnpm exec playwright install chromium && vitest run && pnpm run test:functional",
+    "test": "pnpm -C ../.. run build:lib && pnpm run build:alloy:preinstalled && pnpm -C ../.. run test:unit:extension && pnpm -C ../.. run test:integration:extension && pnpm run test:functional",
     "test:coverage": "pnpm run clean && rimraf coverage && pnpm run build:alloy:preinstalled && pnpm exec playwright install chromium && vitest run --coverage",
-    "test:unit": "pnpm -C ../.. --filter @adobe/alloy run build:lib && pnpm run build:alloy:preinstalled && pnpm exec playwright install chromium && vitest run --project=unit",
-    "test:unit:watch": "pnpm -C ../.. --filter @adobe/alloy run build:lib && pnpm run build:alloy:preinstalled && pnpm exec playwright install chromium && vitest --project=unit",
-    "test:integration": "pnpm exec playwright install chromium && vitest run --project=integration",
-    "test:integration:watch": "pnpm exec playwright install chromium && vitest --project=integration",
-    "test:integration:debug": "pnpm exec playwright install chromium && vitest --project=integration --browser=chromium --browser.provider=playwright --browser.headless=false",
+    "test:unit": "pnpm -C ../.. run build:lib && pnpm run build:alloy:preinstalled && pnpm exec playwright install chromium && pnpm -C ../.. run test:unit:extension",
+    "test:unit:watch": "pnpm -C ../.. run build:lib && pnpm run build:alloy:preinstalled && pnpm exec playwright install chromium && pnpm -C ../.. run test:unit:watch:extension",
+    "test:integration": "pnpm -C ../.. run test:integration:extension",
+    "test:integration:watch": "pnpm -C ../.. run test:integration:watch:extension",
+    "test:integration:debug": "pnpm -C ../.. run test:integration:debug",
     "test:integration:debug:file": "pnpm exec playwright install chromium && vitest --browser=chromium --browser.provider=playwright --browser.headless=false --testTimeout=7000",
     "test:serve": "serve --cors --no-clipboard --no-port-switching -p \"$WEB_SERVER_PORT\" dist/view",
     "test:functional": "pnpm run build && WEB_SERVER_PORT=4000 conc --pad-prefix --kill-others --hide serve --names \"serve,test\" \"pnpm run test:serve\" \"testcafe playwright:chromium --esm test/functional/specs\"",

scripts/runTests.js

@@ -0,0 +1,115 @@
+#!/usr/bin/env node
+
+/*
+Copyright 2025 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+/**
+ * Unified vitest runner. Usage:
+ *   pnpm run test                    # all unit + integration (core + extension), then test:scripts
+ *   pnpm run test -- --coverage      # all with coverage
+ *   pnpm run test -- --watch --mode=unit --package=extension
+ *   pnpm run test -- --debug --mode=integration --package=core
+ * Flags: --coverage, --watch, --debug, --mode=unit|integration, --package=core|extension|all
+ * Extra args are passed to vitest (e.g. path to a test file).
+ */
+
+import { spawnSync } from "child_process";
+
+const argv = process.argv.slice(2);
+
+const has = (flag) => argv.includes(flag);
+const get = (prefix) => {
+  const arg = argv.find((a) => a.startsWith(`${prefix}=`));
+  return arg ? arg.slice(prefix.length + 1) : null;
+};
+
+const coverage = has("--coverage");
+const watch = has("--watch");
+const debug = has("--debug");
+const mode = get("--mode"); // unit | integration
+const pkg = get("--package"); // core | extension | all
+
+// Any remaining args (e.g. file path) pass through to vitest
+const passthrough = argv.filter(
+  (a) =>
+    !a.startsWith("--mode=") &&
+    !a.startsWith("--package=") &&
+    a !== "--coverage" &&
+    a !== "--watch" &&
+    a !== "--debug",
+);
+
+const PROJECTS = {
+  unit: ["unit", "reactor-extension/unit"],
+  integration: ["integration", "reactor-extension/integration"],
+};
+
+const getProjects = () => {
+  if (!mode) {
+    return [
+      "unit",
+      "integration",
+      "reactor-extension/unit",
+      "reactor-extension/integration",
+    ];
+  }
+  const both = PROJECTS[mode];
+  if (!both) {
+    console.error(`Invalid --mode=${mode}; use unit or integration`);
+    process.exit(1);
+  }
+  if (pkg === "core") return [both[0]];
+  if (pkg === "extension") return [both[1]];
+  return both;
+};
+
+const run = (cmd, args, opts = {}) => {
+  const result = spawnSync(cmd, args, {
+    stdio: "inherit",
+    shell: true,
+    ...opts,
+  });
+  if (result.status !== 0) process.exit(result.status ?? 1);
+  return result;
+};
+
+// Playwright install (needed for browser projects)
+run("pnpm", ["exec", "playwright", "install", "chromium"]);
+
+if (coverage) {
+  run("pnpm", ["exec", "rimraf", "coverage"]);
+}
+
+const projects = getProjects();
+const vitestArgs = [
+  ...(watch ? [] : ["run"]),
+  "--config",
+  "./vitest.config.js",
+  ...projects.flatMap((p) => ["--project", p]),
+  ...(coverage ? ["--coverage"] : []),
+  ...(debug
+    ? [
+        "--no-file-parallelism",
+        "--browser=chromium",
+        "--browser.provider=playwright",
+        "--browser.headless=false",
+      ]
+    : []),
+  ...passthrough,
+];
+
+run("pnpm", ["exec", "vitest", ...vitestArgs]);
+
+// Default (no mode): also run script specs
+if (!mode) {
+  run("pnpm", ["run", "test:scripts"]);
+}