Merge pull request #531 from shairez/pr-new-release

Author: shairez

.gitignore

@@ -72,4 +72,5 @@ Thumbs.db
 **/cypress/videos
 
 # Verdaccio
-tmp
+tmp
+.nx/cache

.prettierignore

@@ -8,3 +8,5 @@ node_modules
 coverage
 discussion
 pnpm-lock.yaml
+
+/.nx/cache

apps/website-e2e/project.json

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

migrations.json

@@ -2,34 +2,55 @@
   "migrations": [
     {
       "cli": "nx",
-      "version": "16.8.0-beta.3",
-      "description": "Escape $ in env variables",
-      "implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables",
+      "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": "16.8.0-escape-dollar-sign-env"
+      "name": "17.0.0-move-cache-directory"
     },
     {
       "cli": "nx",
-      "version": "16.8.2-beta.0",
-      "description": "Remove invalid options (strict, noInterop) for ES6 type modules.",
-      "factory": "./src/migrations/update-16-8-2/update-swcrc",
-      "package": "@nx/js",
-      "name": "16-8-2-update-swcrc"
+      "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": "17.0.0-use-minimal-config-for-tasks-runner-options"
+    },
+    {
+      "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": "16.8.0",
-      "description": "update-16-8-0-add-ignored-files",
-      "implementation": "./src/migrations/update-16-8-0-add-ignored-files/update-16-8-0-add-ignored-files",
-      "package": "@nx/linter",
-      "name": "update-16-8-0-add-ignored-files"
+      "version": "17.1.0-beta.2",
+      "description": "Move target defaults",
+      "implementation": "./src/migrations/update-17-1-0/move-target-defaults",
+      "package": "@nx/vite",
+      "name": "move-target-defaults"
     },
     {
       "cli": "nx",
-      "version": "16.8.0-beta.4",
-      "description": "Update to Cypress v13. Most noteable change is video recording is off by default. This migration will only update if the workspace is already on Cypress v12. https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-130",
-      "implementation": "./src/migrations/update-16-8-0/cypress-13",
-      "package": "@nx/cypress",
-      "name": "update-16-8-0-cypress-13"
+      "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.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": "update-17-0-0-rename-to-eslint"
+    },
+    {
+      "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": "update-typescript-eslint"
     }
   ]
 }

nx.json

@@ -1,22 +1,5 @@
 {
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx-cloud",
-      "options": {
-        "cacheableOperations": [
-          "build",
-          "lint",
-          "test",
-          "e2e",
-          "build-storybook",
-          "component-test"
-        ],
-        "accessToken": "MzViMzc1MGQtMDQyNi00N2E3LTliMmYtYWI4ZGIxYWJjYzE3fHJlYWQtd3JpdGU="
-      }
-    }
-  },
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
-  "npmScope": "qwik-ui",
   "affected": {
     "defaultBase": "main"
   },
@@ -26,10 +9,25 @@
   },
   "targetDefaults": {
     "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+      "cache": true
+    },
+    "build": {
+      "cache": true
+    },
+    "e2e": {
+      "cache": true
     },
-    "test": {
-      "inputs": ["default", "^default"]
+    "build-storybook": {
+      "cache": true
+    },
+    "component-test": {
+      "cache": true
+    },
+    "@nx/vite:test": {
+      "inputs": ["default", "^default"],
+      "cache": true
     }
-  }
+  },
+  "nxCloudAccessToken": "MzViMzc1MGQtMDQyNi00N2E3LTliMmYtYWI4ZGIxYWJjYzE3fHJlYWQtd3JpdGU="
 }

package.json

@@ -18,6 +18,7 @@
     "story.headless": "nx storybook headless",
     "test.headless": "nx component-test headless",
     "test.headless.ci": "nx component-test-ci headless",
+    "update.version": "tsm ./scripts/update-versions.ts",
     "build": "nx build website",
     "build.cloudflare": "nx build-cloudflare website",
     "build.headless": "nx build headless",
@@ -41,32 +42,32 @@
     "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10",
     "@jscutlery/semver": "^3.1.0",
     "@k11r/nx-cloudflare-wrangler": "2.7.1",
-    "@nx/cypress": "16.9.1",
-    "@nx/eslint-plugin": "16.9.1",
-    "@nx/js": "16.9.1",
-    "@nx/linter": "16.9.1",
-    "@nx/storybook": "16.9.1",
-    "@nx/vite": "16.9.1",
-    "@nx/workspace": "16.9.1",
-    "@storybook/addon-a11y": "^7.4.0",
+    "@nx/cypress": "17.1.3",
+    "@nx/eslint": "17.1.3",
+    "@nx/eslint-plugin": "17.1.3",
+    "@nx/js": "17.1.3",
+    "@nx/storybook": "17.1.3",
+    "@nx/vite": "17.1.3",
+    "@nx/workspace": "17.1.3",
+    "@storybook/addon-a11y": "7.6.0",
     "@storybook/addon-coverage": "^0.0.9",
-    "@storybook/addon-essentials": "^7.4.0",
-    "@storybook/addon-interactions": "^7.4.0",
-    "@storybook/addon-links": "^7.4.0",
+    "@storybook/addon-essentials": "7.6.0",
+    "@storybook/addon-interactions": "7.6.0",
+    "@storybook/addon-links": "7.6.0",
     "@storybook/blocks": "^7.4.0",
     "@storybook/builder-vite": "^7.4.0",
     "@storybook/html": "^7.4.0",
     "@storybook/html-vite": "^7.4.0",
-    "@storybook/jest": "^0.2.2",
-    "@storybook/test-runner": "^0.13.0",
-    "@storybook/testing-library": "^0.2.0",
+    "@storybook/jest": "0.2.3",
+    "@storybook/test-runner": "0.13.0",
+    "@storybook/testing-library": "0.2.2",
     "@testing-library/cypress": "9.0.0",
     "@types/body-scroll-lock": "3.1.1",
     "@types/eslint": "^8.44.2",
     "@types/estree-jsx": "^1.0.3",
     "@types/node": "^20.5.7",
-    "@typescript-eslint/eslint-plugin": "^5",
-    "@typescript-eslint/parser": "^6.7.0",
+    "@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",
@@ -86,7 +87,7 @@
     "daisyui": "^3.6.4",
     "danger": "^11.2.8",
     "eslint": "^8.48.0",
-    "eslint-config-prettier": "^8",
+    "eslint-config-prettier": "9.0.0",
     "eslint-plugin-cypress": "^2.14.0",
     "eslint-plugin-qwik": "^1.2.19",
     "eslint-plugin-storybook": "^0.6.13",
@@ -97,8 +98,7 @@
     "ngx-deploy-npm": "^7.0.1",
     "node-fetch": "^3.3.2",
     "np": "^8.0.4",
-    "nx": "16.9.1",
-    "nx-cloud": "16.4.0",
+    "nx": "17.1.3",
     "postcss": "^8.4.29",
     "prettier": "^2.8.8",
     "prettier-plugin-tailwindcss": "0.4.1",
@@ -114,6 +114,7 @@
     "tailwind-merge": "^1.14.0",
     "tailwindcss": "^3.3.3",
     "ts-node": "10.9.1",
+    "tsm": "2.3.0",
     "typescript": "^5.2.2",
     "undici": "^5.23.0",
     "unified": "^10.1.2",

packages/kit-fluffy/project.json

@@ -26,13 +26,12 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/kit-fluffy/**/*.{ts,tsx,js,jsx}"]
       }
     },
-
     "storybook": {
       "executor": "@nx/storybook:storybook",
       "options": {

packages/kit-headless/project.json

@@ -26,7 +26,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/kit-headless/**/*.{ts,tsx,js,jsx}"]
@@ -51,7 +51,17 @@
         "noVerify": true,
         "push": true,
         "releaseAs": "patch",
-        "postTargets": ["headless:publish", "headless:push-to-github"]
+        "postTargets": [
+          "headless:update-utils-version",
+          "headless:publish",
+          "headless:push-to-github"
+        ]
+      }
+    },
+    "update-utils-version": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "pnpm update.version"
       }
     },
     "publish": {
@@ -65,7 +75,7 @@
       "options": {
         "tag": "${tag}",
         "notes": "${notes}",
-        "title": "@qwik-ui/kit-headless@${version}"
+        "title": "@qwik-ui/headless@${version}"
       }
     },
     "storybook": {
@@ -86,7 +96,7 @@
       "options": {
         "uiFramework": "@storybook/html",
         "configDir": "packages/kit-headless/.storybook",
-        "outputDir": "dist/storybook/headless"
+        "outputDir": "dist/storybook/kit-headless"
       },
       "configurations": {
         "ci": {

packages/kit-material/project.json

@@ -25,7 +25,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/kit-material/**/*.{ts,tsx,js,jsx}"]

packages/kit-tailwind/project.json

@@ -26,7 +26,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/kit-tailwind/**/*.{ts,tsx,js,jsx}"]