test(qwik-nx): update e2e

dmitry-stepanenko · dmitry-stepanenko · commit d110eec2da58 · 2025-01-06T10:02:16.000+02:00
diff --git a/e2e/qwik-nx-e2e/tests/application-basic-behavior.suite.ts b/e2e/qwik-nx-e2e/tests/application-basic-behavior.suite.ts
@@ -21,7 +21,7 @@ import { names } from '@nx/devkit';
 export function testApplicationBasicBehavior(generator: 'app' | 'preset') {
   const isPreset = generator === 'preset';
   const appPathPrefix = isPreset ? 'apps/' : '';
-  const libPathPrefix = isPreset ? 'libs/' : '';
+  const libPathPrefix = '';
   const devServerPort = 4212;
   const previewServerPort = 4232;
   describe(`Basic behavior with ${generator} generator`, () => {
@@ -77,7 +77,7 @@ export function testApplicationBasicBehavior(generator: 'app' | 'preset') {
       'should create qwik-nx',
       async () => {
         const result = await runNxCommandAsync(`build ${project}`);
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Running type check for the "${project}"..`
         );
         expect(
@@ -91,7 +91,7 @@ export function testApplicationBasicBehavior(generator: 'app' | 'preset') {
             .join('')
             .replace(/\n|\s/g, '')
         );
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Successfully ran target build for project ${project}`
         );
         expect(() =>
@@ -167,7 +167,7 @@ export function testApplicationBasicBehavior(generator: 'app' | 'preset') {
       'unit tests should pass in the created app',
       async () => {
         const result = await runNxCommandAsync(`test ${project}`);
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Successfully ran target test for project ${project}`
         );
       },
@@ -186,7 +186,7 @@ export function testApplicationBasicBehavior(generator: 'app' | 'preset') {
         const result = await runNxCommandAsync(`test ${project}`, {
           silenceError: true,
         });
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Running target test for project ${project} failed`
         );
       },
@@ -211,7 +211,7 @@ export function testApplicationBasicBehavior(generator: 'app' | 'preset') {
             .join('')
             .replace(/\n|\s/g, '')
         );
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Successfully ran target build for project ${project}`
         );
       },
diff --git a/e2e/qwik-nx-e2e/tests/chore.spec.ts b/e2e/qwik-nx-e2e/tests/chore.spec.ts
@@ -23,10 +23,10 @@ describe('misc checks', () => {
       expect(packageJson.dependencies).toBeUndefined();
       expect(packageJson.devDependencies).toBeUndefined();
       expect(packageJson.peerDependencies).toEqual({
-        '@nx/devkit': '^17.0.0 || ^18.0.0 || ^19.0.0',
-        '@nx/js': '^17.0.0 || ^18.0.0 || ^19.0.0',
-        '@nx/eslint': '^17.0.0 || ^18.0.0 || ^19.0.0',
-        '@nx/vite': '^17.0.0 || ^18.0.0 || ^19.0.0',
+        '@nx/devkit': '^20.0.0',
+        '@nx/js': '^20.0.0',
+        '@nx/eslint': '^20.0.0',
+        '@nx/vite': '^20.0.0',
       });
     },
     DEFAULT_E2E_TIMEOUT
diff --git a/e2e/qwik-nx-e2e/tests/micro-frontends.spec.ts b/e2e/qwik-nx-e2e/tests/micro-frontends.spec.ts
@@ -57,7 +57,7 @@ describe('Micro-frontends e2e', () => {
     async () => {
       const checkProject = async (name: string) => {
         const result = await runNxCommandAsync(`build ${name}`);
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Successfully ran target build for project ${name}`
         );
         expect(() =>
@@ -152,7 +152,7 @@ describe('Micro-frontends e2e', () => {
         `generate qwik-nx:remote ${remote3} --host=${project} --port=5176 --no-interactive`
       );
       const result = await runNxCommandAsync(`build ${remote3}`);
-      expect(result.stdout).toContain(
+      expect(stripConsoleColors(result.stdout)).toContain(
         `Successfully ran target build for project ${remote3}`
       );
       expect(() =>
diff --git a/e2e/qwik-nx-e2e/tests/qwik-nx-cloudflare.spec.ts b/e2e/qwik-nx-e2e/tests/qwik-nx-cloudflare.spec.ts
@@ -11,6 +11,7 @@ import {
   killPort,
   killPorts,
   DEFAULT_E2E_TIMEOUT,
+  stripConsoleColors,
 } from '@qwikifiers/e2e/utils';
 
 const CLOUDFLARE_PREVIEW_PORT = 4173;
@@ -49,7 +50,7 @@ describe('qwik nx cloudflare generator', () => {
       'should be able to successfully build the application',
       async () => {
         const result = await runNxCommandAsync(`build-cloudflare ${project}`);
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Successfully ran target build for project ${project}`
         );
         expect(() =>
diff --git a/e2e/qwik-nx-e2e/tests/qwik-nx-netlify.spec.ts b/e2e/qwik-nx-e2e/tests/qwik-nx-netlify.spec.ts
@@ -11,6 +11,7 @@ import {
   killPort,
   killPorts,
   DEFAULT_E2E_TIMEOUT,
+  stripConsoleColors,
 } from '@qwikifiers/e2e/utils';
 
 const NETLIFY_PREVIEW_PORT = 8888;
@@ -41,7 +42,7 @@ describe('qwik nx netlify generator', () => {
       'should be able to successfully build the application',
       async () => {
         const result = await runNxCommandAsync(`build-netlify ${project}`);
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Successfully ran target build for project ${project}`
         );
         expect(() =>
diff --git a/e2e/qwik-nx-e2e/tests/qwik-nx-vite.spec.ts b/e2e/qwik-nx-e2e/tests/qwik-nx-vite.spec.ts
@@ -15,6 +15,7 @@ import {
   removeFile,
   killPorts,
   DEFAULT_E2E_TIMEOUT,
+  stripConsoleColors,
 } from '@qwikifiers/e2e/utils';
 
 describe('qwikNxVite plugin e2e', () => {
@@ -109,7 +110,7 @@ describe('qwikNxVite plugin e2e', () => {
       'should be able to successfully build the application',
       async () => {
         const result = await runNxCommandAsync(`build ${project}`);
-        expect(result.stdout).toContain(
+        expect(stripConsoleColors(result.stdout)).toContain(
           `Successfully ran target build for project ${project}`
         );
         expect(() =>
diff --git a/e2e/qwik-nx-e2e/tests/storybook.spec.ts b/e2e/qwik-nx-e2e/tests/storybook.spec.ts
@@ -16,7 +16,7 @@ import { normalize } from 'path';
 
 const STORYBOOK_PORT = 4400;
 
-describe('qwikNxVite plugin e2e', () => {
+xdescribe('qwikNxVite plugin e2e', () => {
   beforeAll(async () => {
     await killPorts(STORYBOOK_PORT);
     ensureNxProject('qwik-nx', 'dist/packages/qwik-nx');
@@ -43,12 +43,13 @@ describe('qwikNxVite plugin e2e', () => {
         );
         await addAdditionalStories(appProject);
       }, DEFAULT_E2E_TIMEOUT);
+
       checkStorybookIsBuiltAndServed(appProject);
     });
     describe('Applying storybook for existing library', () => {
       beforeAll(async () => {
         await runNxCommandAsync(
-          `generate qwik-nx:library ${libProject} --no-interactive`
+          `generate qwik-nx:library --directory=libs/${libProject} --no-interactive`
         );
         await runNxCommandAsync(
           `generate qwik-nx:storybook-configuration ${libProject} --no-interactive`
@@ -61,7 +62,7 @@ describe('qwikNxVite plugin e2e', () => {
     describe('Generating a new library with storybook configuration', () => {
       beforeAll(async () => {
         await runNxCommandAsync(
-          `generate qwik-nx:library ${secondLibProject} --storybookConfiguration=true --no-interactive`
+          `generate qwik-nx:library --directory=libs/${secondLibProject} --storybookConfiguration=true --no-interactive`
         );
         await addAdditionalStories(secondLibProject);
       }, DEFAULT_E2E_TIMEOUT);
diff --git a/e2e/utils/index.ts b/e2e/utils/index.ts
@@ -10,6 +10,7 @@ import * as treeKill from 'tree-kill';
 import {
   detectPackageManager,
   getPackageManagerCommand,
+  PackageManager,
 } from 'nx/src/utils/package-manager';
 
 export const DEFAULT_E2E_TIMEOUT = 3 * 60 * 1000;
@@ -26,7 +27,7 @@ function getAdditionalPackageManagerCommands(): {
   createWorkspace: string;
   runNx: string;
 } {
-  const pm = detectPackageManager();
+  const pm = detectPackageManager() as Exclude<PackageManager, 'bun'>;
   const [npmMajorVersion] = execSync(`npm -v`).toString().split('.');
   const publishedVersion = execSync('npm view nx version');
   switch (pm) {
diff --git a/packages/qwik-nx/package.json b/packages/qwik-nx/package.json
@@ -22,10 +22,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "@nx/devkit": "^17.0.0 || ^18.0.0 || ^19.0.0",
-    "@nx/js": "^17.0.0 || ^18.0.0 || ^19.0.0",
-    "@nx/vite": "^17.0.0 || ^18.0.0 || ^19.0.0",
-    "@nx/eslint": "^17.0.0 || ^18.0.0 || ^19.0.0"
+    "@nx/devkit": "^20.0.0",
+    "@nx/js": "^20.0.0",
+    "@nx/vite": "^20.0.0",
+    "@nx/eslint": "^20.0.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
diff --git a/packages/qwik-nx/src/generators/application/files/vite.config.ts__template__ b/packages/qwik-nx/src/generators/application/files/vite.config.ts__template__
@@ -6,6 +6,7 @@ import { qwikNxVite } from 'qwik-nx/plugins';
 
 export default defineConfig({
   cacheDir: '<%= offsetFromRoot %>node_modules/.vite/<%= projectRoot %>',
+  root: '<%= projectRoot %>',
   plugins: [
     qwikNxVite(),
     qwikCity(), 
diff --git a/packages/qwik-nx/src/generators/preset/generator.ts b/packages/qwik-nx/src/generators/preset/generator.ts
@@ -1,13 +1,17 @@
-import { Tree } from '@nx/devkit';
+import { joinPathFragments, Tree } from '@nx/devkit';
 import { QwikWorkspacePresetGeneratorSchema } from './schema';
 
 export default async function (
   tree: Tree,
   options: QwikWorkspacePresetGeneratorSchema
 ) {
-  options.name = options.qwikAppName ?? options.name;
+  if (options.qwikAppName.split('/').length === 1) {
+    options.directory = joinPathFragments('apps', options.qwikAppName);
+  } else {
+    options.directory = options.qwikAppName;
+  }
   options.style = options.qwikAppStyle ?? options.style;
   return await import('../application/generator').then(({ appGenerator }) =>
-    appGenerator(tree, { ...options, directory: 'apps' })
+    appGenerator(tree, options)
   );
 }
diff --git a/packages/qwik-nx/src/generators/preset/schema.d.ts b/packages/qwik-nx/src/generators/preset/schema.d.ts
@@ -2,10 +2,9 @@ import { Linter } from '@nx/eslint';
 
 export interface QwikWorkspacePresetGeneratorSchema
   extends QwikAppGeneratorSchema {
-  name: string;
   qwikAppName: string;
   tags?: string;
-  directory?: string;
+  directory: string;
 
   style: 'css' | 'scss' | 'styl' | 'less' | 'none';
   qwikAppStyle: 'css' | 'scss' | 'styl' | 'less' | 'none';
diff --git a/packages/qwik-nx/src/generators/storybook-configuration/generator.ts b/packages/qwik-nx/src/generators/storybook-configuration/generator.ts
@@ -9,6 +9,7 @@ import {
   offsetFromRoot,
   ProjectConfiguration,
   readProjectConfiguration,
+  runTasksInSerial,
   Tree,
 } from '@nx/devkit';
 import { Linter } from '@nx/eslint';
@@ -84,7 +85,8 @@ export async function storybookConfigurationGenerator(
 
   const { oldFormat } = await getStorybookVersion();
 
-  await configurationGenerator(tree, {
+  const tasks: GeneratorCallback[] = [];
+  const addStorybookCallback = await configurationGenerator(tree, {
     storybook7UiFramework: '@storybook/html-webpack5',
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
@@ -98,11 +100,14 @@ export async function storybookConfigurationGenerator(
     configureCypress: false,
     project: projectConfig.name!,
   });
+  tasks.push(addStorybookCallback);
 
   addFiles(tree, normalizedOptions, projectConfig);
   await formatFiles(tree);
 
-  return addStorybookDependencies(tree);
+  const addStorybookDependenciesCallback = await addStorybookDependencies(tree);
+  tasks.push(addStorybookDependenciesCallback);
+  return runTasksInSerial(...tasks);
 }
 
 async function addStorybookDependencies(
diff --git a/packages/qwik-nx/src/utils/add-common-qwik-dependencies.spec.ts b/packages/qwik-nx/src/utils/add-common-qwik-dependencies.spec.ts
@@ -32,23 +32,4 @@ describe('init generator', () => {
     const { devDependencies } = readJson(appTree, 'package.json');
     expect(devDependencies['@builder.io/qwik']).toBe('my-version');
   });
-
-  it('should override existing versions if they are listed in "unsupportedPackageVersions" 1', async () => {
-    updateJson(appTree, 'package.json', (json) => {
-      (json.devDependencies ??= {})['vite'] = '5.1.1';
-      return json;
-    });
-    await addCommonQwikDependencies(appTree);
-    const { devDependencies } = readJson(appTree, 'package.json');
-    expect(devDependencies['vite']).toBe('~5.2.0');
-  });
-  it('should not override existing versions if they are listed in "unsupportedPackageVersions" and have proper version', async () => {
-    updateJson(appTree, 'package.json', (json) => {
-      (json.devDependencies ??= {})['vite'] = '5.2.1';
-      return json;
-    });
-    await addCommonQwikDependencies(appTree);
-    const { devDependencies } = readJson(appTree, 'package.json');
-    expect(devDependencies['vite']).toBe('5.2.1');
-  });
 });
diff --git a/packages/qwik-nx/src/utils/add-common-qwik-dependencies.ts b/packages/qwik-nx/src/utils/add-common-qwik-dependencies.ts
@@ -19,7 +19,6 @@ import {
 } from './versions';
 
 export function addCommonQwikDependencies(tree: Tree): GeneratorCallback {
-  const { satisfies } = ensurePackage<typeof import('semver')>('semver', '*');
   // TODO: refactor to use "addDependenciesToPackageJson" with "keepExistingVersions" once we support nx 17.3 or higher
 
   const devDependencies = {
@@ -35,27 +34,6 @@ export function addCommonQwikDependencies(tree: Tree): GeneratorCallback {
   };
   const currentPackageJson = readJson(tree, 'package.json');
 
-  const unsupportedPackageVersions = new Map<string, string>([
-    // https://github.com/vitejs/vite/issues/15870
-    ['vite', '<5.1.0 || >=5.2.0'],
-  ]);
-  let hasChanges = false;
-  for (const [dep, versionRange] of unsupportedPackageVersions.entries()) {
-    const existingVersion =
-      currentPackageJson.dependencies[dep] ??
-      currentPackageJson.devDependencies[dep];
-    if (existingVersion && !satisfies(existingVersion, versionRange)) {
-      hasChanges = true;
-      // remove the dependency if it is set with incompatible version
-      // we'll install our version instead
-      delete currentPackageJson.dependencies[dep];
-      delete currentPackageJson.devDependencies[dep];
-    }
-  }
-  if (hasChanges) {
-    writeJson(tree, 'package.json', currentPackageJson);
-  }
-
   return addDependenciesToPackageJson(
     tree,
     {},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
