[patch] try fixing tests on windows

electrovir · Sep 11, 2024 · bbc08e0 · bbc08e0
1 parent 6898db7
commit bbc08e0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
         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 }}
@@ -26,7 +26,7 @@ jobs:
             - if: runner.os == 'Windows'
               shell: bash
               run: |
-                  npm install npm
+                  npm i npm --no-save
             - name: run test
               shell: bash
               run: |

diff --git a/packages/docs/src/docs.ts b/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,

diff --git a/packages/frontend/src/frontend.ts b/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');

diff --git a/packages/init/configs/github/workflows/tests-node.yml b/packages/init/configs/github/workflows/tests-node.yml
@@ -15,7 +15,7 @@ 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 }}
@@ -26,7 +26,7 @@ jobs:
             - if: runner.os == 'Windows'
               shell: bash
               run: |
-                  npm install npm
+                  npm i npm --no-save
             - name: run test
               shell: bash
               run: |

diff --git a/packages/init/configs/github/workflows/tests-web.yml b/packages/init/configs/github/workflows/tests-web.yml
@@ -15,7 +15,7 @@ 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 }}
@@ -26,7 +26,7 @@ jobs:
             - if: runner.os == 'Windows'
               shell: bash
               run: |
-                  npm install npm
+                  npm i npm --no-save
             - name: run test
               shell: bash
               run: |

diff --git a/packages/test/src/test.ts b/packages/test/src/test.ts
@@ -12,6 +12,7 @@ import {glob} from 'glob';
 import mri from 'mri';
 import {rm, writeFile} from 'node:fs/promises';
 import {join, relative} from 'node:path';
+import {pathToFileURL} from 'node:url';
 
 /** A virmator plugin for running tests. */
 export const virmatorTestPlugin = defineVirmatorPlugin(
@@ -282,7 +283,7 @@ export const virmatorTestPlugin = defineVirmatorPlugin(
                           configPath,
                       ];
 
-                const webTestRunnerConfig = (await import(configPath))
+                const webTestRunnerConfig = (await import(pathToFileURL(configPath).toString()))
                     .default as Partial<TestRunnerConfig>;
 
                 const includeCoverage = usedCommands.test.subCommands.web.subCommands.coverage;