fixed some nx stuff

Author: shairez

apps/website-e2e/project.json

@@ -20,7 +20,9 @@
     "lint": {
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
-      "options": { "lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"] }
+      "options": {
+        "lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"]
+      }
     }
   },
   "tags": [],

apps/website/project.json

@@ -23,7 +23,7 @@
     },
     "test": {
       "executor": "@nx/vite:test",
-      "outputs": ["../../coverage/apps/website"],
+      "outputs": ["coverage/apps/website"],
       "options": {
         "passWithNoTests": true,
         "reportsDirectory": "../../coverage/apps/website"

apps/website/vite.config.ts

@@ -1,10 +1,10 @@
 import { qwikCity } from '@builder.io/qwik-city/vite';
+import { qwikReact } from '@builder.io/qwik-react/vite';
 import { qwikVite } from '@builder.io/qwik/optimizer';
 import { qwikNxVite } from 'qwik-nx/plugins';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import { recmaProvideComponents } from './recma-provide-components';
-import { qwikReact } from '@builder.io/qwik-react/vite';
 
 export default defineConfig(async () => {
   const { default: rehypePrettyCode } = await import('rehype-pretty-code');
@@ -92,6 +92,7 @@ export default defineConfig(async () => {
       qwikReact(),
       tsconfigPaths({ root: '../../' }),
     ],
+
     server: {
       fs: {
         // Allow serving files from the project root

nx.json

@@ -14,7 +14,6 @@
       }
     }
   },
-
   "targetDefaults": {
     "lint": {
       "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
@@ -25,7 +24,8 @@
     },
     "build": {
       "cache": true,
-      "dependsOn": ["^build"]
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"]
     },
     "e2e": {
       "cache": true
@@ -45,5 +45,10 @@
       "cache": true
     }
   },
-  "nxCloudAccessToken": "MzViMzc1MGQtMDQyNi00N2E3LTliMmYtYWI4ZGIxYWJjYzE3fHJlYWQtd3JpdGU="
+  "nxCloudAccessToken": "MzViMzc1MGQtMDQyNi00N2E3LTliMmYtYWI4ZGIxYWJjYzE3fHJlYWQtd3JpdGU=",
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
+    "sharedGlobals": [],
+    "production": ["default"]
+  }
 }

package.json

@@ -29,6 +29,7 @@
     "release.resetroot": "cp dist/pnpm-workspace.yaml pnpm-workspace.yaml",
     "story.build.headless": "nx build-storybook headless",
     "story.headless": "nx storybook headless",
+    "test.cli": "nx test cli",
     "test.headless": "nx component-test headless",
     "test.headless.ci": "nx component-test-ci headless"
   },
@@ -77,6 +78,8 @@
     "@storybook/jest": "0.2.3",
     "@storybook/test-runner": "0.13.0",
     "@storybook/testing-library": "0.2.2",
+    "@swc-node/register": "~1.6.7",
+    "@swc/core": "~1.3.85",
     "@testing-library/cypress": "9.0.0",
     "@types/eslint": "^8.44.2",
     "@types/estree-jsx": "^1.0.3",
@@ -86,9 +89,10 @@
     "@types/react-dom": "18.0.11",
     "@typescript-eslint/eslint-plugin": "6.13.1",
     "@typescript-eslint/parser": "6.13.1",
-    "@vitest/coverage-v8": "^0.34.3",
+    "@vitest/coverage-v8": "~0.34.6",
     "@vitest/ui": "^0.34.3",
     "all-contributors-cli": "^6.26.1",
+    "ansis": "2.3.0",
     "autoprefixer": "^10.4.15",
     "axe-core": "^4.7.2",
     "body-scroll-lock-upgrade": "1.1.0",
@@ -170,5 +174,6 @@
   ],
   "nx": {
     "includedScripts": []
-  }
+  },
+  "dependencies": {}
 }

packages/cli-e2e/project.json

@@ -16,7 +16,9 @@
     "lint": {
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
-      "options": { "lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"] }
+      "options": {
+        "lintFilePatterns": ["packages/cli-e2e/**/*.{js,ts}"]
+      }
     }
   },
   "implicitDependencies": ["cli"]

packages/cli/project.json

@@ -47,7 +47,7 @@
         ]
       }
     },
-    "test-generators": {
+    "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
@@ -57,7 +57,9 @@
     "lint": {
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
-      "options": { "lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"] }
+      "options": {
+        "lintFilePatterns": ["packages/cli/**/*.{js,ts}"]
+      }
     }
   },
   "tags": [],

packages/kit-headless/project.json

@@ -28,7 +28,9 @@
     "lint": {
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
-      "options": { "lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"] }
+      "options": {
+        "lintFilePatterns": ["packages/headless/**/*.{js,ts}"]
+      }
     },
     "storybook": {
       "executor": "@nx/storybook:storybook",

packages/kit-styled/project.json

@@ -57,13 +57,6 @@
         "passWithNoTests": true
       }
     },
-    "test-generators": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "packages/kit-styled/jest.config.ts"
-      }
-    },
     "lint": {
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],

packages/kit-styled/tsconfig.spec.json

@@ -1,9 +1,19 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node", "vitest"]
   },
-  "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
+  "include": [
+    "vite.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
 }