fix: unit tests on Windows

Author: Varixo

packages/qwik/src/cli/add/update-files.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import { extname, join } from 'node:path';
+import { extname, join, normalize } from 'node:path';
 import type { FsUpdates, UpdateAppOptions } from '../types';
 import { getPackageManager } from '../utils/utils';
 
@@ -22,12 +22,18 @@ export async function mergeIntegrationDir(
       const s = await fs.promises.stat(srcChildPath);
 
       if (s.isDirectory()) {
-        await mergeIntegrationDir(fileUpdates, opts, srcChildPath, destRootPath, alwaysInRoot);
+        await mergeIntegrationDir(
+          fileUpdates,
+          opts,
+          srcChildPath,
+          normalize(destRootPath).replace(/\\/g, '/'),
+          alwaysInRoot
+        );
       } else if (s.isFile()) {
         const finalDestPath = getFinalDestPath(opts, destRootPath, destDir, destName, alwaysInRoot);
 
         if (destName === 'package.json') {
-          await mergePackageJsons(fileUpdates, srcChildPath, destRootPath);
+          await mergePackageJsons(fileUpdates, srcChildPath, finalDestPath);
         } else if (destName === 'settings.json') {
           await mergeJsons(fileUpdates, srcChildPath, finalDestPath);
         } else if (destName === 'README.md') {
@@ -37,7 +43,7 @@ export async function mergeIntegrationDir(
           destName === '.prettierignore' ||
           destName === '.eslintignore'
         ) {
-          await mergeIgnoresFile(fileUpdates, srcChildPath, destRootPath);
+          await mergeIgnoresFile(fileUpdates, srcChildPath, finalDestPath);
         } else if (ext === '.css') {
           await mergeCss(fileUpdates, srcChildPath, finalDestPath, opts);
         } else if (fs.existsSync(finalDestPath)) {
@@ -75,11 +81,17 @@ function getFinalDestPath(
 
   const finalDestPath =
     alwaysInRoot &&
-    alwaysInRoot.some((rootItem) => destName.includes(rootItem) || destDir.includes(rootItem))
+    (destName === 'package.json' ||
+      alwaysInRoot.some(
+        (rootItem) =>
+          normalize(destName).replace(/\\/g, '/').includes(rootItem) ||
+          normalize(destDir).replace(/\\/g, '/').includes(rootItem)
+      ))
       ? destRootPath
       : destChildPath;
 
-  return finalDestPath;
+  // Normalize path separators to forward slashes for cross-platform compatibility
+  return normalize(finalDestPath).replace(/\\/g, '/');
 }
 
 async function mergePackageJsons(fileUpdates: FsUpdates, srcPath: string, destPath: string) {

packages/qwik/src/optimizer/src/plugins/plugin.unit.ts

@@ -1,9 +1,10 @@
 import path, { resolve } from 'node:path';
 import { assert, describe, expect, test } from 'vitest';
+import { normalizePath } from '../../../testing/util';
 import type { QwikManifest } from '../types';
 import { ExperimentalFeatures, createQwikPlugin } from './plugin';
-import { normalizePath } from '../../../testing/util';
 import { qwikVite } from './vite';
+import type { ResolvedId } from 'rollup';
 
 const cwd = process.cwd();
 
@@ -244,18 +245,22 @@ describe('resolveId', () => {
     ).toHaveProperty('id', '/root/src/routes/layout.tsx_s_7xk04rim0vu.js');
     expect(await plugin.resolveId(null!, './foo', '/root/src/routes/layout.tsx')).toBeFalsy();
     expect(
-      await plugin.resolveId(
-        ctx,
-        './layout.tsx_layout_component_usetask_1_7xk04rim0vu.js',
-        '/root/src/routes/layout.tsx'
-      )
-    ).toHaveProperty('id', '/root/src/routes/layout.tsx_layout_component_usetask_1_7xk04rim0vu.js');
+      (
+        (await plugin.resolveId(
+          ctx,
+          './layout.tsx_layout_component_usetask_1_7xk04rim0vu.js',
+          '/root/src/routes/layout.tsx'
+        )) as ResolvedId
+      ).id
+    ).toContain('/root/src/routes/layout.tsx_layout_component_usetask_1_7xk04rim0vu.js');
     // this uses the already populated id we created above
     expect(
       await plugin.resolveId(
         {
           resolve: (id: string, importer: string) => {
-            expect(id).toBe('/root/src/routes/foo');
+            expect(id).toContain(
+              process.platform === 'win32' ? '\\root\\src\\routes\\foo' : '/root/src/routes/foo'
+            );
             expect(importer).toBe('Yey');
             return { id: 'hi' };
           },

packages/qwik/src/optimizer/src/plugins/rollup.ts

@@ -190,7 +190,7 @@ export function normalizeRollupOutputOptionsObject(
         const sanitized = relativePath
           .replace(/^(\.\.\/)+/, '')
           .replace(/^\/+/, '')
-          .replace(/\//g, '-');
+          .replace(/[\\/]/g, '-');
         return `build/${sanitized}.js`;
       };
     }