Merge pull request #614 from qwikifiers:pr-revert-pw

reverted nx upgrade and playwright

Author: shairez

.env

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

apps/website-e2e/project.json

@@ -1,6 +1,5 @@
 {
   "extends": [
-    "plugin:playwright/recommended",
     "../../.eslintrc.json",
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
@@ -29,10 +28,6 @@
     {
       "files": ["*.js", "*.jsx"],
       "rules": {}
-    },
-    {
-      "files": ["e2e/**/*.{ts,js,tsx,jsx}"],
-      "rules": {}
     }
   ]
 }

apps/website/.eslintrc.json

@@ -10,14 +10,6 @@ export default defineConfig(async () => {
   const { visit } = await import('unist-util-visit');
 
   return {
-    root: __dirname,
-    build: {
-      outDir: '../../dist/apps/website',
-      reportCompressedSize: true,
-      commonjsOptions: {
-        transformMixedEsModules: true,
-      },
-    },
     plugins: [
       qwikNxVite(),
       qwikCity({

apps/website/e2e/example.spec.ts

@@ -2,41 +2,55 @@
   "migrations": [
     {
       "cli": "nx",
-      "version": "17.3.0-beta.6",
-      "description": "Updates the nx wrapper.",
-      "implementation": "./src/migrations/update-17-3-0/update-nxw",
+      "version": "17.0.0-beta.1",
+      "description": "Updates the default cache directory to .nx/cache",
+      "implementation": "./src/migrations/update-17-0-0/move-cache-directory",
       "package": "nx",
-      "name": "17.3.0-update-nx-wrapper"
+      "name": "17.0.0-move-cache-directory"
     },
     {
       "cli": "nx",
-      "version": "18.0.0-beta.2",
-      "description": "Updates .env to disabled adding plugins when generating projects in an existing Nx workspace",
-      "implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
-      "x-repair-skip": true,
+      "version": "17.0.0-beta.3",
+      "description": "Use minimal config for tasksRunnerOptions",
+      "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options",
       "package": "nx",
-      "name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
+      "name": "17.0.0-use-minimal-config-for-tasks-runner-options"
     },
     {
-      "version": "17.2.0-beta.10",
-      "description": "Update vite config.",
-      "implementation": "./src/migrations/update-17-2-0/update-vite-config",
+      "version": "17.0.0-rc.1",
+      "description": "Migration for v17.0.0-rc.1",
+      "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope",
+      "package": "nx",
+      "name": "rm-default-collection-npm-scope"
+    },
+    {
+      "version": "17.1.0-beta.2",
+      "description": "Move target defaults",
+      "implementation": "./src/migrations/update-17-1-0/move-target-defaults",
       "package": "@nx/vite",
-      "name": "update-vite-config"
+      "name": "move-target-defaults"
+    },
+    {
+      "cli": "nx",
+      "version": "17.0.2",
+      "description": "Remove deprecated build options",
+      "implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
+      "package": "@nx/js",
+      "name": "update-17-0-0-remove-deprecated-build-options"
     },
     {
-      "version": "17.2.0-beta.0",
-      "description": "Simplify eslintFilePatterns",
-      "implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
+      "version": "17.0.0-beta.7",
+      "description": "update-17-0-0-rename-to-eslint",
+      "implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
       "package": "@nx/eslint",
-      "name": "simplify-eslint-patterns"
+      "name": "update-17-0-0-rename-to-eslint"
     },
     {
-      "version": "17.2.9",
-      "description": "Move executor options to target defaults",
-      "implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
+      "version": "17.1.0-beta.1",
+      "description": "Updates for @typescript-utils/utils v6.9.1+",
+      "implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
       "package": "@nx/eslint",
-      "name": "move-options-to-target-defaults"
+      "name": "update-typescript-eslint"
     }
   ]
 }

apps/website/playwright.config.ts

@@ -14,16 +14,12 @@
       }
     }
   },
-  "plugins": [
-    {
-      "plugin": "@nx/playwright/plugin",
-      "options": {
-        "ciTargetName": "e2e-ci",
-        "targetName": "e2e"
-      }
-    }
-  ],
+
   "targetDefaults": {
+    "lint": {
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+      "cache": true
+    },
     "build-bin": {
       "cache": true
     },

apps/website/vite.config.ts

@@ -49,19 +49,17 @@
     "@img/sharp-linux-x64": "^0.33.0",
     "@jscutlery/semver": "^4.2.0",
     "@k11r/nx-cloudflare-wrangler": "2.7.1",
-    "@nx/cypress": "18.0.4",
-    "@nx/devkit": "18.0.4",
-    "@nx/eslint": "18.0.4",
-    "@nx/eslint-plugin": "18.0.4",
-    "@nx/jest": "18.0.4",
-    "@nx/js": "18.0.4",
-    "@nx/playwright": "18.0.4",
-    "@nx/plugin": "18.0.4",
-    "@nx/storybook": "18.0.4",
-    "@nx/vite": "18.0.4",
-    "@nx/workspace": "18.0.4",
+    "@nx/cypress": "17.1.3",
+    "@nx/devkit": "17.1.3",
+    "@nx/eslint": "17.1.3",
+    "@nx/eslint-plugin": "17.1.3",
+    "@nx/jest": "17.1.3",
+    "@nx/js": "17.1.3",
+    "@nx/plugin": "17.2.3",
+    "@nx/storybook": "17.1.3",
+    "@nx/vite": "17.1.3",
+    "@nx/workspace": "17.1.3",
     "@oddbird/popover-polyfill": "0.3.7",
-    "@playwright/test": "^1.36.0",
     "@storybook/addon-a11y": "7.6.0",
     "@storybook/addon-coverage": "^0.0.9",
     "@storybook/addon-essentials": "7.6.0",
@@ -78,11 +76,11 @@
     "@types/eslint": "^8.44.2",
     "@types/estree-jsx": "^1.0.3",
     "@types/jest": "^29.4.0",
-    "@types/node": "18.19.17",
-    "@typescript-eslint/eslint-plugin": "6.21.0",
-    "@typescript-eslint/parser": "6.21.0",
-    "@vitest/coverage-v8": "0.34.6",
-    "@vitest/ui": "0.34.7",
+    "@types/node": "^20.5.7",
+    "@typescript-eslint/eslint-plugin": "6.13.1",
+    "@typescript-eslint/parser": "6.13.1",
+    "@vitest/coverage-v8": "^0.34.3",
+    "@vitest/ui": "^0.34.3",
     "all-contributors-cli": "^6.26.1",
     "autoprefixer": "^10.4.15",
     "axe-core": "^4.7.2",
@@ -101,10 +99,9 @@
     "cz-conventional-changelog": "^3.3.0",
     "danger": "^11.2.8",
     "dotenv": "16.3.1",
-    "eslint": "8.48.0",
+    "eslint": "^8.48.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-cypress": "^2.14.0",
-    "eslint-plugin-playwright": "^0.15.3",
     "eslint-plugin-qwik": "^1.4.0",
     "eslint-plugin-storybook": "^0.6.13",
     "focus-trap": "7.5.3",
@@ -117,7 +114,7 @@
     "ngx-deploy-npm": "^7.0.1",
     "node-fetch": "^3.3.2",
     "np": "^8.0.4",
-    "nx": "18.0.4",
+    "nx": "17.1.3",
     "postcss": "^8.4.29",
     "prettier": "^2.8.8",
     "prettier-plugin-tailwindcss": "0.4.1",
@@ -140,13 +137,13 @@
     "unified": "^11.0.4",
     "unist-util-visit": "^5.0.0",
     "verdaccio": "^5.0.4",
-    "vite": "5.0.4",
+    "vite": "^5.0.4",
     "vite-plugin-dts": "^3.5.3",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-inspect": "0.7.38",
     "vite-plugin-static-copy": "0.17.0",
     "vite-tsconfig-paths": "4.2.0",
-    "vitest": "0.34.6",
+    "vitest": "^0.34.3",
     "wrangler": "^3.11.0",
     "yargs": "17.7.2"
   },
@@ -162,6 +159,5 @@
   ],
   "nx": {
     "includedScripts": []
-  },
-  "dependencies": {}
+  }
 }

migrations.json

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