refactor(qwik-nx): params cleanup

dmitry-stepanenko · dmitry-stepanenko · commit c71b058ae986 · 2025-01-11T10:59:43.000+02:00
diff --git a/e2e/qwik-nx-e2e/tests/storybook.spec.ts b/e2e/qwik-nx-e2e/tests/storybook.spec.ts
@@ -11,12 +11,13 @@ import {
   killPort,
   killPorts,
   DEFAULT_E2E_TIMEOUT,
+  stripConsoleColors,
 } from '@qwikifiers/e2e/utils';
 import { normalize } from 'path';
 
 const STORYBOOK_PORT = 4400;
 
-xdescribe('qwikNxVite plugin e2e', () => {
+describe('qwikNxVite plugin e2e', () => {
   beforeAll(async () => {
     await killPorts(STORYBOOK_PORT);
     ensureNxProject('qwik-nx', 'dist/packages/qwik-nx');
@@ -49,7 +50,7 @@ xdescribe('qwikNxVite plugin e2e', () => {
     describe('Applying storybook for existing library', () => {
       beforeAll(async () => {
         await runNxCommandAsync(
-          `generate qwik-nx:library --directory=libs/${libProject} --no-interactive`
+          `generate qwik-nx:library --directory=${libProject} --no-interactive`
         );
         await runNxCommandAsync(
           `generate qwik-nx:storybook-configuration ${libProject} --no-interactive`
@@ -62,7 +63,7 @@ xdescribe('qwikNxVite plugin e2e', () => {
     describe('Generating a new library with storybook configuration', () => {
       beforeAll(async () => {
         await runNxCommandAsync(
-          `generate qwik-nx:library --directory=libs/${secondLibProject} --storybookConfiguration=true --no-interactive`
+          `generate qwik-nx:library --directory=${secondLibProject} --storybookConfiguration=true --no-interactive`
         );
         await addAdditionalStories(secondLibProject);
       }, DEFAULT_E2E_TIMEOUT);
@@ -85,7 +86,7 @@ function checkStorybookIsBuiltAndServed(projectName: string) {
     `should be able to build storybook for the "${projectName}"`,
     async () => {
       const result = await runNxCommandAsync(`build-storybook ${projectName}`);
-      expect(result.stdout).toContain(
+      expect(stripConsoleColors(result.stdout)).toContain(
         `Successfully ran target build-storybook for project ${projectName}`
       );
       expect(() =>
@@ -106,7 +107,7 @@ function checkStorybookIsBuiltAndServed(projectName: string) {
             output.includes('Local:') &&
             output.includes(`:${STORYBOOK_PORT}`)
           ) {
-            resultOutput = output;
+            resultOutput = stripConsoleColors(output);
             return true;
           }
           return false;
diff --git a/packages/qwik-nx/src/generators/application/__snapshots__/generator.spec.ts.snap b/packages/qwik-nx/src/generators/application/__snapshots__/generator.spec.ts.snap
@@ -209,12 +209,11 @@ exports[`qwik-nx generator should run successfully 1`] = `
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/myapp',
+  root: 'apps/myapp',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
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__
@@ -2,13 +2,11 @@ import { qwikVite } from '@builder.io/qwik/optimizer';
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 
 export default defineConfig({
   cacheDir: '<%= offsetFromRoot %>node_modules/.vite/<%= projectRoot %>',
   root: '<%= projectRoot %>',
   plugins: [
-    qwikNxVite(),
     qwikCity(), 
     qwikVite({
 			client: {
diff --git a/packages/qwik-nx/src/generators/host/__snapshots__/generator.spec.ts.snap b/packages/qwik-nx/src/generators/host/__snapshots__/generator.spec.ts.snap
@@ -317,12 +317,11 @@ exports[`host generator should run successfully 1`] = `
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/myhostapp',
+  root: 'apps/myhostapp',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
@@ -817,12 +816,11 @@ exports[`host generator should run successfully 5`] = `
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/remote1',
+  root: 'apps/remote1',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
@@ -982,12 +980,11 @@ exports[`host generator should run successfully 8`] = `
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/remote2',
+  root: 'apps/remote2',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
diff --git a/packages/qwik-nx/src/generators/integrations/react-in-app/__snapshots__/generator.spec.ts.snap b/packages/qwik-nx/src/generators/integrations/react-in-app/__snapshots__/generator.spec.ts.snap
@@ -5,12 +5,11 @@ exports[`integrations/react-in-app generator should generate demo component with
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 import { qwikReact } from '@builder.io/qwik-react/vite';
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/myapp',
+  root: 'apps/myapp',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
@@ -201,12 +200,11 @@ exports[`integrations/react-in-app generator should run successfully 1`] = `
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 import { qwikReact } from '@builder.io/qwik-react/vite';
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/myapp',
+  root: 'apps/myapp',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
diff --git a/packages/qwik-nx/src/generators/integrations/react-library/__snapshots__/generator.spec.ts.snap b/packages/qwik-nx/src/generators/integrations/react-library/__snapshots__/generator.spec.ts.snap
@@ -97,16 +97,10 @@ exports[`integrations/react-library generator should generate demo component wit
 "import { qwikVite } from '@builder.io/qwik/optimizer';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vite';
-import { qwikNxVite } from 'qwik-nx/plugins';
 import { qwikReact } from '@builder.io/qwik-react/vite';
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/libs/mylib',
-  plugins: [
-    qwikNxVite(),
-    qwikVite(),
-    tsconfigPaths({ root: '../../' }),
-    qwikReact(),
-  ],
+  plugins: [qwikVite(), tsconfigPaths({ root: '../../' }), qwikReact()],
   test: {
     globals: true,
     cache: {
@@ -242,16 +236,10 @@ exports[`integrations/react-library generator should run successfully 2`] = `
 "import { qwikVite } from '@builder.io/qwik/optimizer';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vite';
-import { qwikNxVite } from 'qwik-nx/plugins';
 import { qwikReact } from '@builder.io/qwik-react/vite';
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/libs/mylib',
-  plugins: [
-    qwikNxVite(),
-    qwikVite(),
-    tsconfigPaths({ root: '../../' }),
-    qwikReact(),
-  ],
+  plugins: [qwikVite(), tsconfigPaths({ root: '../../' }), qwikReact()],
   test: {
     globals: true,
     cache: {
@@ -357,12 +345,11 @@ exports[`integrations/react-library generator should update app config if provid
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 import { qwikReact } from '@builder.io/qwik-react/vite';
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/myapp1',
+  root: 'apps/myapp1',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
@@ -404,12 +391,11 @@ exports[`integrations/react-library generator should update app config if provid
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 import { qwikReact } from '@builder.io/qwik-react/vite';
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/myapp2',
+  root: 'apps/myapp2',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
diff --git a/packages/qwik-nx/src/generators/library/__snapshots__/generator.spec.ts.snap b/packages/qwik-nx/src/generators/library/__snapshots__/generator.spec.ts.snap
@@ -112,12 +112,9 @@ import { defineConfig } from 'vite';
 import dts from 'vite-plugin-dts';
 import { join } from 'path';
 
-import { qwikNxVite } from 'qwik-nx/plugins';
-
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/libs/mylib',
   plugins: [
-    qwikNxVite(),
     qwikVite(),
     tsconfigPaths({ root: '../../' }),
     dts({
@@ -394,11 +391,9 @@ exports[`library generator should run successfully 2`] = `
 import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vite';
 
-import { qwikNxVite } from 'qwik-nx/plugins';
-
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/libs/mylib',
-  plugins: [qwikNxVite(), qwikVite(), tsconfigPaths({ root: '../../' })],
+  plugins: [qwikVite(), tsconfigPaths({ root: '../../' })],
 
   test: {
     globals: true,
diff --git a/packages/qwik-nx/src/generators/library/files/vite.config.ts.template b/packages/qwik-nx/src/generators/library/files/vite.config.ts.template
@@ -4,12 +4,10 @@ import { defineConfig } from 'vite';
 <% if(buildable) { %>import dts from 'vite-plugin-dts';
 import { join } from 'path';
 <% } %>
-import { qwikNxVite } from 'qwik-nx/plugins';
 
 export default defineConfig({
   cacheDir: '<%= offsetFromRoot %>node_modules/.vite/<%= projectRoot %>',
   plugins: [
-    qwikNxVite(),
     qwikVite(), 
     tsconfigPaths({ root: '<%= offsetFromRoot %>' }),
     <% if(buildable) { %>  dts({
diff --git a/packages/qwik-nx/src/generators/preset/generator.spec.ts b/packages/qwik-nx/src/generators/preset/generator.spec.ts
@@ -8,15 +8,11 @@ import { Linter } from '@nx/eslint';
 describe('preset generator', () => {
   let appTree: Tree;
   const options: QwikWorkspacePresetGeneratorSchema = {
-    name: 'test',
     qwikAppName: 'test',
     qwikAppStyle: 'css',
-    style: 'css',
     linter: Linter.None,
-    skipFormat: true,
     e2eTestRunner: 'none',
     unitTestRunner: 'none',
-    strict: false,
   };
 
   beforeEach(() => {
diff --git a/packages/qwik-nx/src/generators/preset/generator.ts b/packages/qwik-nx/src/generators/preset/generator.ts
@@ -5,13 +5,20 @@ export default async function (
   tree: Tree,
   options: QwikWorkspacePresetGeneratorSchema
 ) {
+  const appGeneratorOptions = {
+    directory: options.qwikAppName,
+    style: options.qwikAppStyle,
+    linter: options.linter,
+    unitTestRunner: options.unitTestRunner,
+    e2eTestRunner: options.e2eTestRunner,
+  };
   if (options.qwikAppName.split('/').length === 1) {
-    options.directory = joinPathFragments('apps', options.qwikAppName);
-  } else {
-    options.directory = options.qwikAppName;
+    appGeneratorOptions.directory = joinPathFragments(
+      'apps',
+      options.qwikAppName
+    );
   }
-  options.style = options.qwikAppStyle ?? options.style;
   return await import('../application/generator').then(({ appGenerator }) =>
-    appGenerator(tree, options)
+    appGenerator(tree, appGeneratorOptions)
   );
 }
diff --git a/packages/qwik-nx/src/generators/preset/schema.d.ts b/packages/qwik-nx/src/generators/preset/schema.d.ts
@@ -1,19 +1,9 @@
 import { Linter } from '@nx/eslint';
 
-export interface QwikWorkspacePresetGeneratorSchema
-  extends QwikAppGeneratorSchema {
+export interface QwikWorkspacePresetGeneratorSchema {
   qwikAppName: string;
-  tags?: string;
-  directory: string;
-
-  style: 'css' | 'scss' | 'styl' | 'less' | 'none';
-  qwikAppStyle: 'css' | 'scss' | 'styl' | 'less' | 'none';
-  linter: Linter;
-  skipFormat: boolean;
-  tailwind?: boolean;
-  unitTestRunner: 'vitest' | 'none';
-  strict: boolean;
-  e2eTestRunner: 'playwright' | 'cypress' | 'none';
-  devServerPort?: number;
-  previewServerPort?: number;
+  qwikAppStyle?: 'css' | 'scss' | 'styl' | 'less' | 'none';
+  linter?: Linter;
+  unitTestRunner?: 'vitest' | 'none';
+  e2eTestRunner?: 'playwright' | 'cypress' | 'none';
 }
diff --git a/packages/qwik-nx/src/generators/preset/schema.json b/packages/qwik-nx/src/generators/preset/schema.json
@@ -9,11 +9,6 @@
       "description": "",
       "x-prompt": "App Name"
     },
-    "tags": {
-      "type": "string",
-      "description": "Add tags to the project (used for linting)",
-      "alias": "t"
-    },
     "qwikAppStyle": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -55,31 +50,11 @@
       "description": "Test runner to use for unit tests.",
       "default": "vitest"
     },
-    "strict": {
-      "type": "boolean",
-      "description": "Creates an application with strict mode and strict type checking.",
-      "default": true
-    },
-    "tailwind": {
-      "description": "Setup Tailwind",
-      "type": "boolean",
-      "default": false
-    },
     "e2eTestRunner": {
       "type": "string",
       "enum": ["playwright", "cypress", "none"],
       "description": "Test runner to use for end to end (E2E) tests.",
       "default": "none"
-    },
-    "devServerPort": {
-      "type": "number",
-      "description": "The port for the dev server of the app.",
-      "default": 5173
-    },
-    "previewServerPort": {
-      "type": "number",
-      "description": "The port for the preview server of the app.",
-      "default": 4173
     }
   },
   "required": ["qwikAppName"]
diff --git a/packages/qwik-nx/src/generators/remote/__snapshots__/generator.spec.ts.snap b/packages/qwik-nx/src/generators/remote/__snapshots__/generator.spec.ts.snap
@@ -161,12 +161,11 @@ exports[`remote generator should run successfully 1`] = `
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { qwikNxVite } from 'qwik-nx/plugins';
 
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/apps/myremote',
+  root: 'apps/myremote',
   plugins: [
-    qwikNxVite(),
     qwikCity(),
     qwikVite({
       client: {
diff --git a/packages/qwik-nx/src/generators/storybook-configuration/__snapshots__/generator.spec.ts.snap b/packages/qwik-nx/src/generators/storybook-configuration/__snapshots__/generator.spec.ts.snap
@@ -2,14 +2,13 @@
 
 exports[`storybook-configuration generator should add required targets 1`] = `
 "import { UserConfig } from 'vite';
-import { withNx } from 'qwik-nx/storybook';
 
 const config = {
   stories: ['../**/*.stories.mdx', '../**/*.stories.@(js|jsx|ts|tsx)'],
   addons: ['@storybook/addon-essentials'],
   framework: { name: 'storybook-framework-qwik' },
   async viteFinal(config: UserConfig) {
-    return withNx(config);
+    return config;
   },
 };
 
diff --git a/packages/qwik-nx/src/generators/storybook-configuration/files/.storybook/main.__configExtension__.template b/packages/qwik-nx/src/generators/storybook-configuration/files/.storybook/main.__configExtension__.template
diff --git a/packages/qwik-nx/src/utils/exportable/storybook.ts b/packages/qwik-nx/src/utils/exportable/storybook.ts
