Skip to content

Commit 7a107f8

Browse files
committed
chore: migrate to Nx v21
1 parent d337acf commit 7a107f8

File tree

18 files changed

+42
-66
lines changed

18 files changed

+42
-66
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See http://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
4+
dist
55
tmp
66
/out-tsc
77
/bin

.husky/commit-msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bunx commitlint --edit $1
1+
commitlint --edit $1

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
bun sync-preset-schemas
2-
bunx lint-staged --concurrent false --relative
2+
lint-staged --concurrent false --relative
33
bun affected:test

.nx/workflows/agents.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
launch-templates:
22
linux-medium-js-java-flutter:
33
resource-class: 'docker_linux_amd64/medium+'
4-
image: 'ubuntu22.04-node20.11-v10'
4+
image: 'ubuntu22.04-node20.19-v2'
55
init-steps:
66
- name: Checkout
77
uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/checkout/main.yaml'
@@ -90,28 +90,35 @@ launch-templates:
9090
echo "⏭️ SDKMan! already installed. Skipping it"
9191
fi
9292
93-
source $HOME/.sdkman/bin/sdkman-init.sh
93+
source "$HOME/.sdkman/bin/sdkman-init.sh"
9494
sdk version
9595
9696
jdkVersion="${JDK_VERSION:-21.0.6}"
9797
jdkDistro="${JDK_DISTRO:-ms}"
9898
javaVersion="${jdkVersion}-${jdkDistro}"
9999
JAVA_HOME="$HOME/.sdkman/candidates/java/$javaVersion"
100100
101-
if [ ! -d $JAVA_HOME ]; then
102-
echo "⌛️ Installing Java v$javaVersion.."
101+
if [ ! -d "$JAVA_HOME" ]; then
102+
echo "⌛️ Installing Java v$javaVersion.."
103103
yes | sdk install java $javaVersion
104+
if [ $? -eq 0 ]; then
105+
echo "SDK install succeeded"
106+
else
107+
echo "SDK install failed with code $?"
108+
fi
104109
sdk use java $javaVersion
110+
if [ $? -eq 0 ]; then
111+
echo "SDK use java succeeded"
112+
else
113+
echo "SDK use java failed with code $?"
114+
fi
105115
else
106116
echo "⏭️ Java v$javaVersion already installed. Making sure it is used"
107117
sdk use java $javaVersion
108118
109119
fi
110120
111-
echo "JAVA_HOME=$JAVA_HOME" >> $NX_CLOUD_ENV
112121
echo "PATH=$JAVA_HOME/bin:$PATH" >> $NX_CLOUD_ENV
113-
echo 'export JAVA_HOME="$JAVA_HOME"' >> $HOME/.profile
114-
source $HOME/.profile
115122
116123
echo "⌛️ Checking Java Installation and Version..."
117124
java -version

bun.lockb

-2.05 KB
Binary file not shown.

package.json

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"dependencies": {
3636
"@clack/prompts": "^0.10.0",
3737
"@swc/helpers": "0.5.11",
38-
"@nx/devkit": "20.6.2",
39-
"create-nx-workspace": "20.6.2",
38+
"@nx/devkit": "21.0.3",
39+
"create-nx-workspace": "21.0.3",
4040
"enquirer": "^2.4.1",
4141
"hpagent": "^1.2.0",
4242
"js-yaml": "^4.1.0",
@@ -54,12 +54,12 @@
5454
"@commitlint/cli": "^19.3.0",
5555
"@commitlint/config-angular": "^19.3.0",
5656
"@jest/globals": "29.7.0",
57-
"@nx/eslint-plugin": "20.6.2",
58-
"@nx/jest": "20.6.2",
59-
"@nx/js": "20.6.2",
60-
"@nx/node": "20.6.2",
61-
"@nx/plugin": "20.6.2",
62-
"@nx/workspace": "20.6.2",
57+
"@nx/eslint-plugin": "21.0.3",
58+
"@nx/jest": "21.0.3",
59+
"@nx/js": "21.0.3",
60+
"@nx/node": "21.0.3",
61+
"@nx/plugin": "21.0.3",
62+
"@nx/workspace": "21.0.3",
6363
"@swc-node/register": "1.9.1",
6464
"@swc/cli": "0.3.12",
6565
"@swc/core": "1.5.7",
@@ -76,29 +76,26 @@
7676
"eslint": "^9.8.0",
7777
"eslint-config-prettier": "^9.0.0",
7878
"fs-extra": "^10.1.0",
79-
"husky": "^9.0.11",
79+
"husky": "^9.1.7",
8080
"jest": "29.7.0",
8181
"jest-environment-jsdom": "29.7.0",
8282
"jest-environment-node": "^29.7.0",
8383
"jsonc-eslint-parser": "^2.1.0",
8484
"jest-mock": "29.7.0",
85-
"lint-staged": "^15.2.7",
86-
"nx": "20.6.2",
85+
"lint-staged": "^16.0.0",
86+
"nx": "21.0.3",
8787
"prettier": "2.6.2",
8888
"ts-jest": "29.1.0",
8989
"ts-node": "10.9.1",
9090
"typescript": "5.7.3",
9191
"typescript-eslint": "^8.19.0",
92-
"verdaccio": "6.0.5"
92+
"verdaccio": "6.1.2"
9393
},
9494
"repository": {
9595
"type": "git",
9696
"url": "https://github.com/tinesoft/nxrocks.git"
9797
},
9898
"nx": {
9999
"includedScripts": []
100-
},
101-
"patchedDependencies": {
102-
"@nx/js@20.6.2": "patches/@nx%2Fjs@20.6.2.patch"
103100
}
104101
}

packages/common-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@clack/prompts": "^0.10.0",
3131
"yargs": "^17.7.2",
3232
"tslib": "^2.6.1",
33-
"@nx/devkit": ">=20.0.0",
33+
"@nx/devkit": ">=21.0.0",
3434
"fs-extra": "^10.1.0",
3535
"terminal-link": "^2.1.1"
3636
},

packages/common-jvm/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
],
2727
"dependencies": {
2828
"@nxrocks/common": "file:../common",
29-
"@nx/workspace": ">=20.0.0",
30-
"@nx/devkit": ">=20.0.0",
29+
"@nx/workspace": ">=21.0.0",
30+
"@nx/devkit": ">=21.0.0",
3131
"tslib": "^2.6.1",
3232
"xmlbuilder2": "^3.1.1",
3333
"xpath": "^0.0.34"

packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"hpagent": "^1.2.0",
3131
"unzipper": "^0.12.3",
3232
"fs-extra": "^10.1.0",
33-
"@nx/devkit": ">=20.0.0",
33+
"@nx/devkit": ">=21.0.0",
3434
"tslib": "^2.6.1",
3535
"minimatch": "^9.0.3",
3636
"semver": "^7.6.0"

packages/common/src/lib/workspace/project-graph.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
CreateNodesContextV2,
66
createNodesFromFiles,
77
CreateNodesResult,
8-
CreateNodesResultV2,
98
CreateNodesV2,
109
DependencyType,
1110
joinPathFragments,

0 commit comments

Comments
 (0)