Skip to content

Commit

Permalink
chore: update nx to latest, simplify config (#7428)
Browse files Browse the repository at this point in the history
* chore: update nx to latest, simplify config

* chore: simplify config based on new defaults in nx release
  • Loading branch information
JamesHenry committed Jan 17, 2024
1 parent 3a994fc commit 7f36e90
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 123 deletions.
18 changes: 5 additions & 13 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,19 @@
}
},
"release": {
"projects": ["rxjs"],
"releaseTagPattern": "{version}",
"changelog": {
"git": {
"commit": true,
"tag": true
},
"workspaceChangelog": {
"createRelease": "github",
"file": false
},
"projectChangelogs": true
},
"groups": {
"npm": {
"projects": ["rxjs"],
"version": {
"generatorOptions": {
"currentVersionResolver": "git-tag",
"specifierSource": "conventional-commits"
}
}
"version": {
"generatorOptions": {
"currentVersionResolver": "git-tag",
"specifierSource": "conventional-commits"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {},
"devDependencies": {
"@nx/js": "17.2.6",
"nx": "17.2.6"
"@nx/js": "17.3.0-beta.4",
"nx": "17.3.0-beta.4"
}
}
2 changes: 0 additions & 2 deletions scripts/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ const yargs = require('nx/node_modules/yargs');

const { workspaceVersion, projectsVersionData } = await releaseVersion({
specifier: options.version,
// stage package.json updates to be committed later by the changelog command
stageChanges: true,
dryRun: options.dryRun,
verbose: options.verbose,
});
Expand Down
211 changes: 105 additions & 106 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2148,19 +2148,19 @@
semver "7.3.4"
tslib "^2.0.0"

"@nrwl/devkit@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-17.2.6.tgz#ab283bc16fde0b3c4a73ce59c1364b89d9b73468"
integrity sha512-uZVqc2qhi+WdSqLV9aIcE+5ck+IUSQ47Cc5bslWrssQjBncqGavHYDuU4ZLuKK5HxCuZqlQjvo7TsF7LeOjNiA==
"@nrwl/devkit@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nrwl/devkit/-/devkit-17.3.0-beta.4.tgz#5553cd9156245adca8838365326ff078f10b5248"
integrity sha512-Oy/POJa7rfpsMbvstRswvobUFeZG8pHrh74HnKafQ9yyFEBQHcbcUdMK1VGSITtEa/DlFL4JSmI/BzCJMhZMkA==
dependencies:
"@nx/devkit" "17.2.6"
"@nx/devkit" "17.3.0-beta.4"

"@nrwl/js@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-17.2.6.tgz#643f06df639bd31a628651d1a4aa73ee2b75b733"
integrity sha512-oFnyaVOpVG3XrkIXQMs5TM6hrRRBe38jRX79d51S41yLuiOrHgpJlMmii1wafevM1Dpk9UlAvPh7v8OffgDZtg==
"@nrwl/js@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nrwl/js/-/js-17.3.0-beta.4.tgz#3e6a530489ee015f1e20ac247cb38f97a2a01cea"
integrity sha512-J4Z4JYZVoc/aXoL77Thlbj5C9MkGzUDAzFbUQxf7+OK27/isx8eSeDlA1qP7HSFJTq2kneoV26jPEP/6fSpouQ==
dependencies:
"@nx/js" "17.2.6"
"@nx/js" "17.3.0-beta.4"

"@nrwl/nx-darwin-arm64@15.9.3":
version "15.9.3"
Expand Down Expand Up @@ -2231,38 +2231,38 @@
dependencies:
nx "15.9.3"

"@nrwl/tao@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-17.2.6.tgz#eab09ad1c5751e4310bb8c21796e25df1e8310b1"
integrity sha512-cgtUKTRSxDZ94S9IpC27/qYZJ1YttJDET+veKrtRYvwnHFgkq1peyeTTtnM25yJon7PRdm2lYrlIVdPm0vXupw==
"@nrwl/tao@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nrwl/tao/-/tao-17.3.0-beta.4.tgz#c385d12573e03f13d6c35759250d0e1914f73696"
integrity sha512-iar6qS4BA8DkYj5PiMYVUmk85VhoA+I4J2CJYaP/LRKMlaUIZJUMSVEo8Kp3qwkKl2Yr1q0jqVi5n/uXnVLurg==
dependencies:
nx "17.2.6"
nx "17.3.0-beta.4"
tslib "^2.3.0"

"@nrwl/workspace@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-17.2.6.tgz#7656c9f7371d2a476e2bdec8265d0de2e8e1616d"
integrity sha512-ACMnIxblNEAsjFfkpNspENxlm/jMpF9hr3aKioyoFAUmATxO7lJt8VuA43slI1oVgtTfWpOcM0aSRP/07kVW6Q==
"@nrwl/workspace@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nrwl/workspace/-/workspace-17.3.0-beta.4.tgz#72b05ddfe83dbe7222f6424f6faae825ff49b903"
integrity sha512-AYMXg7rPiL0i7tyjzVSNcWtdfz7sLPPBHxSwEb4XO8++ixmsTqoG2Qnyil2aP4b/qnKac3GTr4MZ/FRqqu6RzA==
dependencies:
"@nx/workspace" "17.2.6"
"@nx/workspace" "17.3.0-beta.4"

"@nx/devkit@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-17.2.6.tgz#e65d8386ca7467d49de2193bc963a78561134623"
integrity sha512-a9GPw0KiLhvv2RBLPlWgaVDZRvgww4ANBwv7LuGvk8FNgxF5vkQMM5WyKpvxKJhmh1EZ+T9JsGWAFrK7skW9Bw==
"@nx/devkit@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/devkit/-/devkit-17.3.0-beta.4.tgz#b723780ee9df23f504006b761452d8629118479c"
integrity sha512-/vKr0D3H5wtKESrUhgedEKDS5nLU1kkLJv8SJTvs371w9zMMHA6S0CVO50ZSddKpZyh72f/DK89YA4veXEWuAQ==
dependencies:
"@nrwl/devkit" "17.2.6"
"@nrwl/devkit" "17.3.0-beta.4"
ejs "^3.1.7"
enquirer "~2.3.6"
ignore "^5.0.4"
semver "7.5.3"
tmp "~0.2.1"
tslib "^2.3.0"

"@nx/js@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/js/-/js-17.2.6.tgz#aafe2b27092f805995a2dba3eb005a9b220ad5cc"
integrity sha512-jjWzEg63C7vBu6Lo890N8gIcEji+8/ggf5My2kCmAnJehqIg8/B0Bq0x9shIxAT7qZgyLxHbC3VWg5ictS6aEw==
"@nx/js@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/js/-/js-17.3.0-beta.4.tgz#e797a8c55231c3d15cd59fb1f5a4178791ea2b93"
integrity sha512-xNFrwNvi6mcWsFPJyDRwZLH75fQjjoaxc+h+i+gU9PJ9OT8ov0R6fN6kTSb9U+8Ww/2/Sp3vdJSP/g/iqnlYjQ==
dependencies:
"@babel/core" "^7.22.9"
"@babel/plugin-proposal-decorators" "^7.22.7"
Expand All @@ -2271,9 +2271,9 @@
"@babel/preset-env" "^7.22.9"
"@babel/preset-typescript" "^7.22.5"
"@babel/runtime" "^7.22.6"
"@nrwl/js" "17.2.6"
"@nx/devkit" "17.2.6"
"@nx/workspace" "17.2.6"
"@nrwl/js" "17.3.0-beta.4"
"@nx/devkit" "17.3.0-beta.4"
"@nx/workspace" "17.3.0-beta.4"
"@phenomnomnominal/tsquery" "~5.0.1"
babel-plugin-const-enum "^1.0.1"
babel-plugin-macros "^2.8.0"
Expand All @@ -2295,66 +2295,66 @@
tsconfig-paths "^4.1.2"
tslib "^2.3.0"

"@nx/nx-darwin-arm64@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.2.6.tgz#8f5a4cc579158388ec98e0bf26996d9c0457da00"
integrity sha512-ezU5u7hkEwI2xzsFSjyr53uNURBvga40LQlpEnS/CbqRifHHhTKisCy+r2+kRhiOwTeR+I+/2D3zPyIyN3aEHQ==

"@nx/nx-darwin-x64@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-17.2.6.tgz#4ca7b4fb5ab03b786d8bcdfb9e5780abd1f31faf"
integrity sha512-wUIwbM/7LMxlFkEOlbxR/s2qaRuD69yXc70f2rtxsskwJ4GOF5kfc1jk2YaDs9qswI+FgQVgbeZu8pgF+slY7Q==

"@nx/nx-freebsd-x64@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.2.6.tgz#59e0189d14f9b021644b123c16315ba1e09a808b"
integrity sha512-uBKEGqG4txVCpBirRzt1QwuOLzfA0s9dlUP7n5t4qJuaf9OXuVcDXay8g84WT1jx4PPtipyv/wyIFu3r7v8kZw==

"@nx/nx-linux-arm-gnueabihf@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.2.6.tgz#e1bebfb4bf8e24b7d4f2072bde077de988317461"
integrity sha512-dSDVz2BktaPHMkrJojFCx+V+QFLDF0KzoHorESzZmHZTfumr0xtJ1COWCU+gYmLptc+8OgwCzCPWXHhcDgji/A==

"@nx/nx-linux-arm64-gnu@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.2.6.tgz#b830f581ab5afc2ae30ec2f8bd27a750c1a66753"
integrity sha512-AD99Kk47Yxn3IJ89aCT1oVpNX1XNECAYay97yhqf2tiBsDv9hC43PppOdjI0dNP5VRBTrr6EsWdhvE0uNJ3RJw==

"@nx/nx-linux-arm64-musl@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.2.6.tgz#c3865d4386097190f3c7fd1840999e3cc6fbb8cf"
integrity sha512-MOX/EJyzseEnzbFxY7V6es/xta6WQ0cDDrl6i6qjCRnoRTFFVMsL0Fb4dtVbv7fd75O41P+OBGpG70MYx2SOxw==

"@nx/nx-linux-x64-gnu@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.2.6.tgz#3520364998256a628a861ad1427754504fc585a6"
integrity sha512-16xTSszGPY25INDUr4pzLXWcO3va1764iVFiHRTuJr5siDymY7zSj+DPKFmewzqF2358Y5m8AtMotY0FqKciYg==

"@nx/nx-linux-x64-musl@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.2.6.tgz#f3c89d7d5c5336735bf31eb2ae0dd2e5ab6a9f25"
integrity sha512-F/nIq8bcZd2cNuBiQbyJwur7CpeRBCt0qKDF38HQ2l3HhQv+jwk4T6115LMQqwZb9e6kt6BAFsY+6O7I6t3pCw==

"@nx/nx-win32-arm64-msvc@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.2.6.tgz#1e432cdbf55ba816d04fec776227e7d459dc4cc4"
integrity sha512-1lAKKKiH7eduzqcPDB03iPz38yNXn3Y4Q/3jULjaRc3EFAplfBsYVwJ9kGjXPZSrpt/AY7w5ATY55/r5B3gQnA==

"@nx/nx-win32-x64-msvc@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.6.tgz#07fde42a0fe1f8f103aa7afd1db83cb76a72951f"
integrity sha512-LrJySMWrO5oWMrP4VOWM1hr3c4rtxHGCcRy19VwqvaAPDrnsg0qfPjv4q1C9YyIU8sj+T3oJs1yZdnNntlN8ew==

"@nx/workspace@17.2.6":
version "17.2.6"
resolved "https://registry.yarnpkg.com/@nx/workspace/-/workspace-17.2.6.tgz#bd0ee625f84f517583a1d2f028f23c8bd69c2117"
integrity sha512-mss1RggPBWpggMJ7ok83iHx/PdlevhDqayLvjguRKjPwk0rTBRUuvY78AkKo2RbMOQyywNMt09MNz5FOmfCfqg==
dependencies:
"@nrwl/workspace" "17.2.6"
"@nx/devkit" "17.2.6"
"@nx/nx-darwin-arm64@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.3.0-beta.4.tgz#fbffc0dc1c426e1253eb8d89a0bfc73751897269"
integrity sha512-cRG5RNR/VebrXA4g9VMnFWHx4JWjUNOCQZoA/RIxx6/aj6hSxXqbQBhgYH04T3m3rlgMRBk0GfzLk0oHR+EVVQ==

"@nx/nx-darwin-x64@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-17.3.0-beta.4.tgz#9892f951ade4725b1fd7344faea397de736bc9ae"
integrity sha512-SEvwfjTg+yt7q2JBYTVvgSE0m0lx0Vz2mpCFQneiEpmQlNb7vNicfQW9NkGdCrs+6y6rQr4BeGf4Cu2g/yupCA==

"@nx/nx-freebsd-x64@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.3.0-beta.4.tgz#d38c6012cfbefbd18e988e1e070e973a09e877fa"
integrity sha512-i+nrjUhvYrayQi98CkIW5MF900M+ouOqmljHMX2KesYun8KjOOwV59irnyI6MJewfdav6jbj8r2UwZEOr0a6FA==

"@nx/nx-linux-arm-gnueabihf@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.3.0-beta.4.tgz#0631b89d99f70fca56f99c4d23c4bf14c93cad4a"
integrity sha512-VpvMI3kqjFcZaJuS1NScYyPOYdJRSPgaq77j6k0x5Rsek7cFRYg5vJIJ/6n28GX19URFQgkVrh3m9Lf0TciwFg==

"@nx/nx-linux-arm64-gnu@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.3.0-beta.4.tgz#17e91beaa1962a64340e9bc6954d148f49e88be1"
integrity sha512-dMzsar+yz5ZgDl/Ovw3ux5cnvOpTSBCyr/5hNITjg0QOFpPMORyTdp791oCPrArqlVvXqnFDyvk4ePgnDcotnQ==

"@nx/nx-linux-arm64-musl@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.3.0-beta.4.tgz#5edfcc2f67adb39d668aa554215d2d738827ba6a"
integrity sha512-uE8kC270HvJWSx4LSM3Uchz1Zf5mH5pYDA9jDjfuQQhBwAw4M9M1gU2sTE5KjHHDhRsBubOHbfxBAA8AdeH2ZA==

"@nx/nx-linux-x64-gnu@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.3.0-beta.4.tgz#c7adc94d0e49e202422a5fcb4971d787ae51d3e8"
integrity sha512-p7pTaNNW9bSwPtY9kqw3mC8Oq/N3Mgwgjb1HMHVuAsEHL1480CtfYPdia9QLyJTqhL6BGtcfnPdfPlOIzOjung==

"@nx/nx-linux-x64-musl@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.3.0-beta.4.tgz#9a1085d430ce2f380263bcd3253ce05b687e8ed1"
integrity sha512-mmjPvwANjX88+EOCkiUm9tT6iChL0m9vpfo7A9CNteGoUa7OD+ir9u0yuxQqyEEx6wGq4BghWw4Z0ki9vmL23g==

"@nx/nx-win32-arm64-msvc@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.3.0-beta.4.tgz#888a8e5887d43a7b8f0881b5d6493f2c70867a49"
integrity sha512-OMXjVcsOKv4kP7vmPfQDEN3nakgQA5pQId+xacJ75ByX4dlSx17sAS2h1wwPAvGNxMCGLQv7DdGkSSajcGS0eQ==

"@nx/nx-win32-x64-msvc@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.3.0-beta.4.tgz#500de235bde1d327bfc58c425d7a71052cf97ff3"
integrity sha512-FKrpT/ryMaJyFzhGh8G63UB8KlZ/ude6hbtMdnzUsOEfT/rh8rSbIibpXlQCPSvL84v0EnSexTNs1dWlliUe/w==

"@nx/workspace@17.3.0-beta.4":
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/@nx/workspace/-/workspace-17.3.0-beta.4.tgz#d5c73f6bd855567207b6ffd0ae857e8f261a2e1a"
integrity sha512-3Tj/vHoMygKLXdFdHqx8EunKlqWgbqG0YnEcajYx1SMu6diyHPbxjuvMU9cGQqhy20TTuzsEYsiOv8+zJ9e+RQ==
dependencies:
"@nrwl/workspace" "17.3.0-beta.4"
"@nx/devkit" "17.3.0-beta.4"
chalk "^4.1.0"
enquirer "~2.3.6"
nx "17.2.6"
nx "17.3.0-beta.4"
tslib "^2.3.0"
yargs-parser "21.1.1"

Expand Down Expand Up @@ -11900,12 +11900,12 @@ nx@15.9.3:
"@nrwl/nx-win32-arm64-msvc" "15.9.3"
"@nrwl/nx-win32-x64-msvc" "15.9.3"

nx@17.2.6:
version "17.2.6"
resolved "https://registry.yarnpkg.com/nx/-/nx-17.2.6.tgz#717297e0757237aa010f2e07aa8fdf68e77ea104"
integrity sha512-lBHp0e0AMBwYwpT44a8b0j29szspmYUhY1okqNctz/3ifuonNFG9WGfbzRO4YKOrVkfNsuaomHVAE6gtqo55ng==
nx@17.3.0-beta.4:
version "17.3.0-beta.4"
resolved "https://registry.npmjs.org/nx/-/nx-17.3.0-beta.4.tgz#13d06ba26efc17d541055848543300f2516e3c41"
integrity sha512-QjTsBs3vKHfkUMvbK3YgrPCuSL+6y/Ppbv1/svNX4lwgWmLcNVNsrTIYXnJPA9jnKZJMpYk6sI+MIeoYpcgDFQ==
dependencies:
"@nrwl/tao" "17.2.6"
"@nrwl/tao" "17.3.0-beta.4"
"@yarnpkg/lockfile" "^1.1.0"
"@yarnpkg/parsers" "3.0.0-rc.46"
"@zkochan/js-yaml" "0.0.6"
Expand All @@ -11920,7 +11920,6 @@ nx@17.2.6:
figures "3.2.0"
flat "^5.0.2"
fs-extra "^11.1.0"
glob "7.1.4"
ignore "^5.0.4"
jest-diff "^29.4.1"
js-yaml "4.1.0"
Expand All @@ -11940,16 +11939,16 @@ nx@17.2.6:
yargs "^17.6.2"
yargs-parser "21.1.1"
optionalDependencies:
"@nx/nx-darwin-arm64" "17.2.6"
"@nx/nx-darwin-x64" "17.2.6"
"@nx/nx-freebsd-x64" "17.2.6"
"@nx/nx-linux-arm-gnueabihf" "17.2.6"
"@nx/nx-linux-arm64-gnu" "17.2.6"
"@nx/nx-linux-arm64-musl" "17.2.6"
"@nx/nx-linux-x64-gnu" "17.2.6"
"@nx/nx-linux-x64-musl" "17.2.6"
"@nx/nx-win32-arm64-msvc" "17.2.6"
"@nx/nx-win32-x64-msvc" "17.2.6"
"@nx/nx-darwin-arm64" "17.3.0-beta.4"
"@nx/nx-darwin-x64" "17.3.0-beta.4"
"@nx/nx-freebsd-x64" "17.3.0-beta.4"
"@nx/nx-linux-arm-gnueabihf" "17.3.0-beta.4"
"@nx/nx-linux-arm64-gnu" "17.3.0-beta.4"
"@nx/nx-linux-arm64-musl" "17.3.0-beta.4"
"@nx/nx-linux-x64-gnu" "17.3.0-beta.4"
"@nx/nx-linux-x64-musl" "17.3.0-beta.4"
"@nx/nx-win32-arm64-msvc" "17.3.0-beta.4"
"@nx/nx-win32-x64-msvc" "17.3.0-beta.4"

oauth-sign@~0.9.0:
version "0.9.0"
Expand Down

0 comments on commit 7f36e90

Please sign in to comment.