[patch] fix tests on windows

.github/workflows/tests.yml

@@ -10,26 +10,29 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-    build:
+    tests:
         runs-on: ${{ matrix.os }}
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest, macos-latest]
+                os: [macos-latest, ubuntu-latest, windows-latest]
         steps:
             - uses: actions/[email protected]
             - name: Use Node.js ${{ matrix.node-version }}
               uses: actions/[email protected]
               with:
                   node-version-file: '.nvmrc'
             # handle NPM / Node.js repeatedly bricking their npm setup on Windows
+            # Note that this won't work if it uses --no-save
             - if: runner.os == 'Windows'
               shell: bash
               run: |
-                  npm install npm
+                  npm i npm
+            # format package.json is to account for the above `npm i npm` command
             - name: run test
               shell: bash
               run: |
                   npm ci
                   npx playwright install --with-deps
+                  npm run format package.json
                   npm run test:all

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/mono-repo-root",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "private": true,
     "type": "module",
     "workspaces": [
@@ -58,6 +58,7 @@
         "node": ">=22"
     },
     "overrides": {
+        "playwright": "1.46.1",
         "virmator": "*"
     }
 }

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/compile",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Default TS compile plugin for virmator.",
     "keywords": [
         "virmator",
@@ -33,12 +33,12 @@
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
         "@augment-vir/node-js": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "run-time-assertions": "^1.5.2"
     },
     "devDependencies": {
         "@types/node": "^22.5.4",
-        "@virmator/plugin-testing": "^13.3.10",
+        "@virmator/plugin-testing": "^13.3.11",
         "c8": "^10.1.2",
         "chalk": "^5.3.0",
         "concurrently": "^9.0.0",

packages/compile/src/compile.test.ts

@@ -18,7 +18,7 @@ describe(virmatorCompilePlugin.name, () => {
                  * are stable.
                  */
                 if (logType === LogOutputType.standard) {
-                    return arg.replace(/ Version.+/, '');
+                    return arg;
                 }
                 return arg;
             },

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/core",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Shared core functionality for all virmator plugins and the virmator CLI.",
     "keywords": [
         "automation",

packages/deps/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/deps",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Default TS deps plugin for virmator.",
     "keywords": [
         "virmator",
@@ -35,7 +35,7 @@
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
         "@augment-vir/node-js": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "mri": "^1.2.0"
     },
     "devDependencies": {

packages/docs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/docs",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Default TS docs plugin for virmator.",
     "keywords": [
         "virmator",
@@ -34,7 +34,7 @@
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
         "@augment-vir/node-js": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "chalk": "^5.3.0",
         "mri": "^1.2.0",
         "run-time-assertions": "^1.5.2"

packages/docs/src/docs.ts

@@ -12,6 +12,7 @@ import {
 import {ChalkInstance} from 'chalk';
 import mri from 'mri';
 import {basename, join} from 'node:path';
+import {pathToFileURL} from 'node:url';
 import type * as Typedoc from 'typedoc';
 
 /** A virmator plugin for checking and generating documentation. */
@@ -160,9 +161,14 @@ export const virmatorDocsPlugin = defineVirmatorPlugin(
             }
 
             // dynamic imports are not branches
-            /* node:coverage ignore next 2 */
-            const config = (await import(join(packageDir, configs.docs.configs.typedoc.copyToPath)))
-                .typeDocConfig as Typedoc.TypeDocOptions;
+            /* node:coverage ignore next 7 */
+            const config = (
+                await import(
+                    pathToFileURL(
+                        join(packageDir, configs.docs.configs.typedoc.copyToPath),
+                    ).toString()
+                )
+            ).typeDocConfig as Typedoc.TypeDocOptions;
 
             await runTypedoc({
                 checkOnly,

packages/format/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/format",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Default format plugin for virmator.",
     "keywords": [
         "virmator",
@@ -32,7 +32,7 @@
     },
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "mri": "^1.2.0"
     },
     "devDependencies": {

packages/frontend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/frontend",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Default frontend plugin for virmator.",
     "keywords": [
         "virmator",
@@ -36,7 +36,7 @@
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
         "@augment-vir/node-js": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "mri": "^1.2.0"
     },
     "devDependencies": {

packages/frontend/src/frontend.test.ts

@@ -22,7 +22,7 @@ describe(virmatorFrontendPlugin.name, () => {
             dir,
             {
                 logTransform(logType, log) {
-                    return log.replace(/built in [\dm]+s/, 'built');
+                    return log.replace(/built in [\d.m]+s/g, 'built');
                 },
             },
         );

packages/frontend/src/frontend.ts

@@ -4,6 +4,7 @@ import {defineVirmatorPlugin, NpmDepType, PackageType, VirmatorEnv} from '@virma
 import mri from 'mri';
 import {cp, rm} from 'node:fs/promises';
 import {join, relative, resolve} from 'node:path';
+import {pathToFileURL} from 'node:url';
 import type {UserConfig} from 'vite';
 
 /** A virmator plugin for running and building frontend packages. */
@@ -109,7 +110,9 @@ export const virmatorFrontendPlugin = defineVirmatorPlugin(
             usedCommands.frontend?.subCommands.build || usedCommands.frontend?.subCommands.preview;
         const configPath = args.config || configs.frontend.configs.vite.fullCopyToPath;
 
-        const viteConfig = await ((await import(configPath)).default as MaybePromise<UserConfig>);
+        const viteConfig = await ((
+            await import(pathToFileURL(configPath).toString())
+        ).default as MaybePromise<UserConfig>);
 
         const rootDir: string = viteConfig.root ? resolve(cwd, viteConfig.root) : cwd;
         const outDir: string = resolve(rootDir, viteConfig.build?.outDir || 'dist');

packages/help/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/help",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Default help plugin for virmator.",
     "keywords": [
         "virmator",
@@ -33,7 +33,7 @@
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
         "@augment-vir/node-js": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "run-time-assertions": "^1.5.2"
     },
     "devDependencies": {

packages/init/configs/github/workflows/tests-node.yml

@@ -15,20 +15,23 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest, windows-latest, macos-latest]
+                os: [macos-latest, ubuntu-latest, windows-latest]
         steps:
             - uses: actions/[email protected]
             - name: Use Node.js ${{ matrix.node-version }}
               uses: actions/[email protected]
               with:
                   node-version-file: '.nvmrc'
             # handle NPM / Node.js repeatedly bricking their npm setup on Windows
+            # Note that this won't work if it uses --no-save
             - if: runner.os == 'Windows'
               shell: bash
               run: |
-                  npm install npm
+                  npm i npm
+            # format package.json is to account for the above `npm i npm` command
             - name: run test
               shell: bash
               run: |
                   npm ci
+                  npm run format package.json
                   npm run test:all

packages/init/configs/github/workflows/tests-web.yml

@@ -15,21 +15,24 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest, windows-latest, macos-latest]
+                os: [macos-latest, ubuntu-latest, windows-latest]
         steps:
             - uses: actions/[email protected]
             - name: Use Node.js ${{ matrix.node-version }}
               uses: actions/[email protected]
               with:
                   node-version-file: '.nvmrc'
             # handle NPM / Node.js repeatedly bricking their npm setup on Windows
+            # Note that this won't work if it uses --no-save
             - if: runner.os == 'Windows'
               shell: bash
               run: |
-                  npm install npm
+                  npm i npm
+            # format package.json is to account for the above `npm i npm` command
             - name: run test
               shell: bash
               run: |
                   npm ci
                   npx playwright install --with-deps
+                  npm run format package.json
                   npm run test:all

packages/init/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/init",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Default init plugin for virmator.",
     "keywords": [
         "virmator",
@@ -32,7 +32,7 @@
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
         "@augment-vir/node-js": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "simple-git": "^3.26.0"
     },
     "devDependencies": {

packages/lint/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/lint",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Default ESLint linting plugin for virmator.",
     "keywords": [
         "virmator",
@@ -32,7 +32,7 @@
     },
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "mri": "^1.2.0"
     },
     "devDependencies": {

packages/lint/src/lint.test.ts

@@ -1,5 +1,6 @@
+import {safeMatch} from '@augment-vir/common';
 import {testPlugin} from '@virmator/plugin-testing';
-import {join, resolve} from 'node:path';
+import {basename, join, resolve} from 'node:path';
 import {describe, it, TestContext} from 'node:test';
 import {virmatorLintPlugin} from './lint.js';
 
@@ -12,7 +13,19 @@ describe(virmatorLintPlugin.name, () => {
         cwd: string,
         extraCommand = '',
     ) {
-        await testPlugin(shouldPass, context, virmatorLintPlugin, `lint ${extraCommand}`, cwd);
+        await testPlugin(shouldPass, context, virmatorLintPlugin, `lint ${extraCommand}`, cwd, {
+            logTransform(logType, arg) {
+                const [
+                    ,
+                    fileName,
+                ] = safeMatch(arg, /\s(\S*packages[/\\].+?\.ts)\s/);
+
+                if (fileName) {
+                    return arg.replace(fileName, basename(fileName));
+                }
+                return arg;
+            },
+        });
     }
 
     it('lints a valid project', async (context) => {

packages/lint/src/lint.test.ts.snapshot

@@ -1,7 +1,7 @@
 exports[`Lint > fixes an invalid project 1`] = `
 {
   "logs": {
-    "stdout": "Copied eslint.config.mjs\\nInstalling [email protected] [email protected] [email protected] @eslint/[email protected] @eslint/[email protected] @stylistic/[email protected] [email protected] @stylistic/[email protected] @typescript-eslint/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]...\\n> npx eslint --fix .\\n\\npackages/lint/test-files/bad-repo/src/a.ts\\n  3:8   error  Async function 'doThing' has no 'await' expression  @typescript-eslint/require-await\\n  4:12  error  Forbidden non-null assertion                        @typescript-eslint/no-non-null-assertion\\n\\n✖ 2 problems (2 errors, 0 warnings)\\n",
+    "stdout": "Copied eslint.config.mjs\\nInstalling [email protected] [email protected] [email protected] @eslint/[email protected] @eslint/[email protected] @stylistic/[email protected] [email protected] @stylistic/[email protected] @typescript-eslint/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]...\\n> npx eslint --fix .\\n\\na.ts\\n  3:8   error  Async function 'doThing' has no 'await' expression  @typescript-eslint/require-await\\n  4:12  error  Forbidden non-null assertion                        @typescript-eslint/no-non-null-assertion\\n\\n✖ 2 problems (2 errors, 0 warnings)\\n",
     "stderr": "lint failed."
   },
   "cwd": "packages/lint/test-files/bad-repo",
@@ -34,7 +34,7 @@ exports[`Lint > lints a valid project 1`] = `
 exports[`Lint > lints an invalid project 1`] = `
 {
   "logs": {
-    "stdout": "Copied eslint.config.mjs\\nInstalling [email protected] [email protected] [email protected] @eslint/[email protected] @eslint/[email protected] @stylistic/[email protected] [email protected] @stylistic/[email protected] @typescript-eslint/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]...\\n> npx eslint .\\n\\npackages/lint/test-files/bad-repo/src/a.ts\\n  3:8   error  Async function 'doThing' has no 'await' expression                                 @typescript-eslint/require-await\\n  4:12  error  Forbidden non-null assertion                                                       @typescript-eslint/no-non-null-assertion\\n  4:12  error  This assertion is unnecessary since it does not change the type of the expression  @typescript-eslint/no-unnecessary-type-assertion\\n  4:12  error  Forbidden non-null assertion                                                       @typescript-eslint/no-non-null-assertion\\n  4:12  error  This assertion is unnecessary since it does not change the type of the expression  @typescript-eslint/no-unnecessary-type-assertion\\n  4:12  error  Forbidden extra non-null assertion                                                 @typescript-eslint/no-extra-non-null-assertion\\n  4:12  error  Forbidden non-null assertion                                                       @typescript-eslint/no-non-null-assertion\\n  4:12  error  Forbidden extra non-null assertion                                                 @typescript-eslint/no-extra-non-null-assertion\\n\\n✖ 8 problems (8 errors, 0 warnings)\\n  4 errors and 0 warnings potentially fixable with the \`--fix\` option.\\n",
+    "stdout": "Copied eslint.config.mjs\\nInstalling [email protected] [email protected] [email protected] @eslint/[email protected] @eslint/[email protected] @stylistic/[email protected] [email protected] @stylistic/[email protected] @typescript-eslint/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]...\\n> npx eslint .\\n\\na.ts\\n  3:8   error  Async function 'doThing' has no 'await' expression                                 @typescript-eslint/require-await\\n  4:12  error  Forbidden non-null assertion                                                       @typescript-eslint/no-non-null-assertion\\n  4:12  error  This assertion is unnecessary since it does not change the type of the expression  @typescript-eslint/no-unnecessary-type-assertion\\n  4:12  error  Forbidden non-null assertion                                                       @typescript-eslint/no-non-null-assertion\\n  4:12  error  This assertion is unnecessary since it does not change the type of the expression  @typescript-eslint/no-unnecessary-type-assertion\\n  4:12  error  Forbidden extra non-null assertion                                                 @typescript-eslint/no-extra-non-null-assertion\\n  4:12  error  Forbidden non-null assertion                                                       @typescript-eslint/no-non-null-assertion\\n  4:12  error  Forbidden extra non-null assertion                                                 @typescript-eslint/no-extra-non-null-assertion\\n\\n✖ 8 problems (8 errors, 0 warnings)\\n  4 errors and 0 warnings potentially fixable with the \`--fix\` option.\\n",
     "stderr": "lint failed."
   },
   "cwd": "packages/lint/test-files/bad-repo",

packages/plugin-testing/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@virmator/plugin-testing",
-    "version": "13.3.10",
+    "version": "13.3.11",
     "description": "Testing for virmator plugins.",
     "keywords": [
         "virmator",
@@ -32,7 +32,7 @@
     "dependencies": {
         "@augment-vir/common": "^29.3.0",
         "@augment-vir/node-js": "^29.3.0",
-        "@virmator/core": "^13.3.10",
+        "@virmator/core": "^13.3.11",
         "cli-args-vir": "^0.0.3",
         "run-time-assertions": "^1.5.2",
         "type-fest": "^4.26.1"

packages/plugin-testing/src/augments/fs/dir-contents.ts

@@ -20,7 +20,7 @@ export async function readAllDirContents(
         excludeList?: ReadonlyArray<string | RegExp> | undefined;
     },
 ): Promise<DirContents> {
-    const fileNames = await readdir(dir);
+    const fileNames = (await readdir(dir)).sort();
 
     const allFileContents = await Promise.all(
         fileNames.map(async (fileName) => {

packages/plugin-testing/src/test-plugin.ts

@@ -160,7 +160,7 @@ export async function testPlugin(
 
         const result: TestPluginResult = {
             logs: mapObjectValues(logs, (logType, logs) => {
-                return toPosixPath(logTransform(logType, logs.join('\n')));
+                return toPosixPath(logTransform(logType, logs.join('\n'))).replaceAll('\r', '');
             }),
             cwd: toPosixPath(relative(monoRepoDir, cwd)),
             contentsDiff,