fix: update to Nx workspace to v20.6.0

Closes #247

Author: tinesoft

.github/actions/install-dependencies/action.yml

@@ -26,7 +26,7 @@ runs:
       with:
         lookup-only: true
         path: '**/node_modules'
-        key: bun-${{ hashFiles('bun.lockb') }}
+        key: bun-${{ hashFiles('bun.lockb','bun.lock') }}
 
     - name: Install packages
       run: bun install --frozen-lockfile

.github/actions/setup/action.yml

@@ -45,7 +45,7 @@ runs:
       with:
         lookup-only: true
         path: '**/node_modules'
-        key: bun-${{ hashFiles('bun.lockb') }}
+        key: bun-${{ hashFiles('bun.lockb','bun.lock') }}
 
     - name: Install packages
       run: bun install --frozen-lockfile

.nx/workflows/agents.yaml

@@ -9,7 +9,7 @@ launch-templates:
       - name: Restore Node Modules Cache
         uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/cache/main.yaml'
         inputs:
-          key: 'package-lock.json|yarn.lock|pnpm-lock.yaml|bun.lock|bun.lockb'
+          key: 'package-lock.json|yarn.lock|pnpm-lock.yaml|bun.lockb|bun.lock'
           paths: 'node_modules'
           base-branch: 'develop'
 
@@ -54,7 +54,6 @@ launch-templates:
       - name: Check bun
         script: |
           bun --version
-          echo "bunx=`which bunx`"
 
       - name: Install Node Modules (with Bun)
         script: bun install --frozen-lockfile --ignore-scripts

bun.lockb

@@ -0,0 +1,2 @@
+[install]
+saveTextLockfile = false

bunfig.toml

@@ -1,9 +1,4 @@
 {
-  "pluginsConfig": {
-    "@nx/js": {
-      "analyzeSourceFiles": true
-    }
-  },
   "release": {
     "projects": ["packages/*"],
     "projectsRelationship": "independent",
@@ -17,7 +12,7 @@
       }
     },
     "version": {
-      "preVersionCommand": "bunx nx run-many -t build --skipNxCache --parallel 4",
+      "preVersionCommand": "bunx nx run-many -t build",
       "conventionalCommits": true,
       "generatorOptions": {
         "packageRoot": "dist/packages/{projectName}",
@@ -101,7 +96,7 @@
     {
       "plugin": "@nx/eslint/plugin",
       "options": {
-        "targetName": "eslint:lint",
+        "targetName": "lint",
         "extensions": ["ts", "tsx", "js", "jsx", "html", "vue"]
       }
     },

nx.json

@@ -35,7 +35,8 @@
   "dependencies": {
     "@clack/prompts": "^0.10.0",
     "@swc/helpers": "0.5.11",
-    "create-nx-workspace": "20.4.0",
+    "@nx/devkit": "20.6.2",
+    "create-nx-workspace": "20.6.2",
     "enquirer": "^2.4.1",
     "hpagent": "^1.2.0",
     "js-yaml": "^4.1.0",
@@ -52,13 +53,12 @@
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-angular": "^19.3.0",
     "@jest/globals": "29.7.0",
-    "@nx/devkit": "20.4.0",
-    "@nx/eslint-plugin": "20.4.0",
-    "@nx/jest": "20.4.0",
-    "@nx/js": "20.4.0",
-    "@nx/node": "20.4.0",
-    "@nx/plugin": "20.4.0",
-    "@nx/workspace": "20.4.0",
+    "@nx/eslint-plugin": "20.6.2",
+    "@nx/jest": "20.6.2",
+    "@nx/js": "20.6.2",
+    "@nx/node": "20.6.2",
+    "@nx/plugin": "20.6.2",
+    "@nx/workspace": "20.6.2",
     "@swc-node/register": "1.9.1",
     "@swc/cli": "0.3.12",
     "@swc/core": "1.5.7",
@@ -67,28 +67,27 @@
     "@types/node": "18.16.9",
     "@types/node-fetch": "^2.6.9",
     "@types/semver": "^7.5.8",
-    "@types/tmp": "^0.2.3",
     "@types/unzipper": "^0.10.5",
     "@types/xmldoc": "^1.1.6",
     "@types/yargs": "^17.0.26",
     "@typescript-eslint/eslint-plugin": "^7.3.0",
     "@typescript-eslint/parser": "^7.3.0",
-    "dotenv": "10.0.0",
     "eslint": "~8.57.0",
     "eslint-config-prettier": "^9.0.0",
     "fs-extra": "^10.1.0",
     "husky": "^9.0.11",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
-    "jest-environment-node": "^29.4.1",
-    "jest-mock": "28.1.3",
+    "jest-environment-node": "^29.7.0",
+    "jsonc-eslint-parser": "^2.1.0",
+    "jest-mock": "29.7.0",
     "lint-staged": "^15.2.7",
-    "nx": "20.4.0",
+    "nx": "20.6.2",
     "prettier": "2.6.2",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
     "typescript": "5.7.3",
-    "verdaccio": "^5.0.4"
+    "verdaccio": "6.0.5"
   },
   "repository": {
     "type": "git",

package.json

@@ -2,19 +2,15 @@ import { Tree } from '@nx/devkit';
 import { ProjectGeneratorOptions, NormalizedSchema } from '../schema';
 import {
   determineProjectNameAndRootOptions,
-  ensureProjectName,
+  ensureRootProjectName,
 } from '@nx/devkit/src/generators/project-name-and-root-utils';
 
 export async function normalizeOptions(
   tree: Tree,
   options: ProjectGeneratorOptions
 ): Promise<NormalizedSchema> {
   const projectType = options.template === 'app' ? 'application' : 'library';
-  await ensureProjectName(
-    tree,
-    options as ProjectGeneratorOptions,
-    projectType
-  );
+  await ensureRootProjectName(options as ProjectGeneratorOptions, projectType);
   const { projectName, projectRoot } = await determineProjectNameAndRootOptions(
     tree,
     {
@@ -24,6 +20,7 @@ export async function normalizeOptions(
       //rootProject: options.rootProject,
     }
   );
+  options.name = projectName;
   const parsedTags = options.tags
     ? options.tags.split(',').map((s) => s.trim())
     : [];

packages/nx-flutter/src/generators/project/lib/normalize-options.ts

@@ -2,15 +2,14 @@ import { Tree } from '@nx/devkit';
 import { ProjectGeneratorOptions, NormalizedSchema } from '../schema';
 import {
   determineProjectNameAndRootOptions,
-  ensureProjectName,
+  ensureRootProjectName,
 } from '@nx/devkit/src/generators/project-name-and-root-utils';
 
 export async function normalizeOptions(
   tree: Tree,
   options: ProjectGeneratorOptions
 ): Promise<NormalizedSchema> {
-  await ensureProjectName(
-    tree,
+  await ensureRootProjectName(
     options as ProjectGeneratorOptions,
     'application'
   );
@@ -23,6 +22,7 @@ export async function normalizeOptions(
       //rootProject: options.rootProject,
     }
   );
+  options.name = projectName;
   const parsedTags = options.tags
     ? options.tags.split(',').map((s) => s.trim())
     : [];

packages/nx-ktor/src/generators/project/lib/normalize-options.ts

@@ -2,15 +2,14 @@ import { Tree } from '@nx/devkit';
 import { ProjectGeneratorOptions, NormalizedSchema } from '../schema';
 import {
   determineProjectNameAndRootOptions,
-  ensureProjectName,
+  ensureRootProjectName,
 } from '@nx/devkit/src/generators/project-name-and-root-utils';
 
 export async function normalizeOptions(
   tree: Tree,
   options: ProjectGeneratorOptions
 ): Promise<NormalizedSchema> {
-  await ensureProjectName(
-    tree,
+  await ensureRootProjectName(
     options as ProjectGeneratorOptions,
     'application'
   );
@@ -23,6 +22,7 @@ export async function normalizeOptions(
       //rootProject: options.rootProject,
     }
   );
+  options.name = projectName;
   const parsedTags = options.tags
     ? options.tags.split(',').map((s) => s.trim())
     : [];