cabloy 5.1.201 → 5.1.203

package/repo-e2e/scripts/runE2e.ts

@@ -34,16 +34,7 @@ async function assertPortAvailable(): Promise<void> {
 }
 
 const parsed = parseE2eArgs(process.argv.slice(2), E2E_SPECS_DIR);
-if (parsed.mode === 'clean' && process.env.E2E_BASE_URL) {
-  throw new Error(
-    'The clean E2E run manages the local target and cannot be used with E2E_BASE_URL. Use test:e2e:fast for an external target.',
-  );
-}
-
-if (parsed.mode === 'clean') {
-  await assertPortAvailable();
-  run('npm', ['run', 'db:reset']);
-}
+await assertPortAvailable();
 
 const playwrightCommand = resolve(
   E2E_ROOT_DIR,
@@ -55,8 +46,5 @@ const specPaths = parsed.specNames.map(name => resolve(E2E_SPECS_DIR, `${name}.s
 const playwrightArgs = combineGreps(parsed.playwrightArgs, parsed.tags);
 run(playwrightCommand, ['test', '--config', E2E_CONFIG_FILE, ...specPaths, ...playwrightArgs]);
 
-// Keep this value referenced in the runner's startup output and make the local target explicit.
-if (!process.env.E2E_BASE_URL) {
-  // eslint-disable-next-line no-console
-  console.log(`E2E target: ${E2E_LOCAL_BASE_URL}`);
-}
+// eslint-disable-next-line no-console
+console.log(`E2E target: ${E2E_LOCAL_BASE_URL}`);

package/repo-e2e/scripts/runE2eArgs.test.ts

@@ -20,15 +20,11 @@ function withSpecs(callback: (specsDir: string) => void): void {
   }
 }
 
-test('parses mode, multiple specs, and repeatable tags', () => {
+test('parses multiple specs and repeatable tags', () => {
   withSpecs(specsDir => {
     assert.deepEqual(
-      parseE2eArgs(
-        ['--clean', 'cabloy-basic', 'account', '--tag', '@web', '--tag=@smoke'],
-        specsDir,
-      ),
+      parseE2eArgs(['cabloy-basic', 'account', '--tag', '@web', '--tag=@smoke'], specsDir),
       {
-        mode: 'clean',
         specNames: ['cabloy-basic', 'account'],
         playwrightArgs: [],
         tags: ['@web', '@smoke'],
@@ -39,8 +35,7 @@ test('parses mode, multiple specs, and repeatable tags', () => {
 
 test('allows no spec names and forwards Playwright filters', () => {
   withSpecs(specsDir => {
-    assert.deepEqual(parseE2eArgs(['--fast', '--grep', '@flow'], specsDir), {
-      mode: 'fast',
+    assert.deepEqual(parseE2eArgs(['--grep', '@flow'], specsDir), {
       specNames: [],
       playwrightArgs: ['--grep', '@flow'],
       tags: [],
@@ -50,19 +45,28 @@ test('allows no spec names and forwards Playwright filters', () => {
 
 test('rejects invalid or unknown specs and managed config overrides', () => {
   withSpecs(specsDir => {
-    assert.throws(() => parseE2eArgs(['--fast', '../account'], specsDir), /Invalid E2E spec name/);
-    assert.throws(() => parseE2eArgs(['--fast', 'missing'], specsDir), /Unknown E2E spec/);
-    assert.throws(
-      () => parseE2eArgs(['--fast', '--config', 'other.ts'], specsDir),
-      /manages --config/,
-    );
+    assert.throws(() => parseE2eArgs(['../account'], specsDir), /Invalid E2E spec name/);
+    assert.throws(() => parseE2eArgs(['missing'], specsDir), /Unknown E2E spec/);
+    for (const args of [
+      ['--config', 'other.ts'],
+      ['--config=other.ts'],
+      ['-c', 'other.ts'],
+      ['-c=other.ts'],
+      ['-cother.ts'],
+    ]) {
+      assert.throws(() => parseE2eArgs(args, specsDir), /manages --config/);
+    }
+    for (const args of [['--workers', '2'], ['--workers=2'], ['-j', '2'], ['-j=2'], ['-j2']]) {
+      assert.throws(() => parseE2eArgs(args, specsDir), /manages --workers/);
+    }
   });
 });
 
-test('requires exactly one run mode', () => {
+test('rejects removed clean and fast options', () => {
   withSpecs(specsDir => {
-    assert.throws(() => parseE2eArgs(['account'], specsDir), /Missing E2E mode/);
-    assert.throws(() => parseE2eArgs(['--clean', '--fast'], specsDir), /exactly one/);
+    for (const option of ['--clean', '--fast', '--clean=true', '--fast=false']) {
+      assert.throws(() => parseE2eArgs(['account', option], specsDir), /Unsupported E2E option/);
+    }
   });
 });
 

package/repo-e2e/scripts/runE2eArgs.ts

@@ -1,10 +1,7 @@
 import { existsSync } from 'node:fs';
 import { resolve } from 'node:path';
 
-export type E2eRunMode = 'clean' | 'fast';
-
 export type ParsedE2eArgs = {
-  mode: E2eRunMode;
   specNames: string[];
   playwrightArgs: string[];
   tags: string[];
@@ -28,7 +25,6 @@ const VALUE_OPTIONS = new Set([
   '--shard',
   '--timeout',
   '--trace',
-  '--workers',
 ]);
 
 function optionName(arg: string): string {
@@ -46,35 +42,23 @@ export function buildTagGrep(tags: string[]): string | undefined {
 }
 
 export function parseE2eArgs(args: string[], specsDir: string): ParsedE2eArgs {
-  let mode: E2eRunMode | undefined;
-  const remainingArgs: string[] = [];
-
-  for (const arg of args) {
-    if (arg === '--clean' || arg === '--fast') {
-      if (mode && mode !== arg.slice(2)) {
-        throw new Error('Choose exactly one E2E mode: --clean or --fast.');
-      }
-      if (mode === arg.slice(2)) {
-        throw new Error(`E2E mode ${arg} was provided more than once.`);
-      }
-      mode = arg.slice(2) as E2eRunMode;
-    } else {
-      remainingArgs.push(arg);
-    }
-  }
-
-  if (!mode) {
-    throw new Error('Missing E2E mode. Use --clean or --fast.');
-  }
-
   const specNames: string[] = [];
   const playwrightArgs: string[] = [];
   const tags: string[] = [];
   let optionStarted = false;
   let pendingValueFor: string | undefined;
 
-  for (let index = 0; index < remainingArgs.length; index++) {
-    const arg = remainingArgs[index];
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index];
+
+    if (
+      arg === '--clean' ||
+      arg.startsWith('--clean=') ||
+      arg === '--fast' ||
+      arg.startsWith('--fast=')
+    ) {
+      throw new Error(`Unsupported E2E option: ${arg}. Use the single managed test:e2e command.`);
+    }
 
     if (pendingValueFor) {
       if (!arg || arg.startsWith('--')) {
@@ -100,9 +84,12 @@ export function parseE2eArgs(args: string[], specsDir: string): ParsedE2eArgs {
       continue;
     }
 
-    if (arg === '--config' || arg.startsWith('--config=')) {
+    if (arg === '--config' || arg.startsWith('--config=') || arg.startsWith('-c')) {
       throw new Error('The E2E runner manages --config; do not provide it.');
     }
+    if (arg === '--workers' || arg.startsWith('--workers=') || arg.startsWith('-j')) {
+      throw new Error('The E2E runner manages --workers; do not provide it.');
+    }
 
     if (!optionStarted && !arg.startsWith('-')) {
       if (!SPEC_NAME_PATTERN.test(arg)) {
@@ -133,7 +120,7 @@ export function parseE2eArgs(args: string[], specsDir: string): ParsedE2eArgs {
     throw new Error(`Missing value for ${pendingValueFor}.`);
   }
 
-  return { mode, specNames, playwrightArgs, tags };
+  return { specNames, playwrightArgs, tags };
 }
 
 export function combineGreps(args: string[], tags: string[]): string[] {

package/repo-e2e/scripts/startE2eVona.ts

@@ -1,19 +1,30 @@
 import type { ChildProcess } from 'node:child_process';
 
 import { spawn } from 'node:child_process';
+import { resolve } from 'node:path';
 
 import { E2E_LOCAL_BASE_URL, E2E_ROOT_DIR } from './e2e.ts';
 
-const child: ChildProcess = spawn('npm', ['run', 'dev:one'], {
-  cwd: E2E_ROOT_DIR,
-  detached: process.platform !== 'win32',
-  stdio: 'inherit',
-  env: {
-    ...process.env,
-    SERVER_SERVE_PROTOCOL: 'http',
-    SERVER_SERVE_HOST: E2E_LOCAL_BASE_URL.replace(/^https?:\/\//, ''),
+const child: ChildProcess = spawn(
+  process.execPath,
+  [
+    './packages-cli/cli/src/bin/vona.ts',
+    ':bin:dev',
+    '--workers=1',
+    '--flavor=normal',
+    '--mode=test',
+  ],
+  {
+    cwd: resolve(E2E_ROOT_DIR, 'vona'),
+    detached: process.platform !== 'win32',
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      SERVER_SERVE_PROTOCOL: 'http',
+      SERVER_SERVE_HOST: E2E_LOCAL_BASE_URL.replace(/^https?:\/\//, ''),
+    },
   },
-});
+);
 
 const gracefulShutdownTimeout = 7000;