From 3079eb8d7425ff21f076b434c8d81f9ffa82dacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?= Date: Thu, 25 Apr 2024 09:57:34 +0200 Subject: [PATCH 1/4] chore: update nx --- apps/nxls-e2e/project.json | 3 + apps/nxls/project.json | 3 +- apps/vscode/project.json | 6 +- .../watcher/src/lib/native-watcher.ts | 20 +- package.json | 30 +- yarn.lock | 471 +++++++++--------- 6 files changed, 277 insertions(+), 256 deletions(-) diff --git a/apps/nxls-e2e/project.json b/apps/nxls-e2e/project.json index ea2ea150ef..b81bfb828e 100644 --- a/apps/nxls-e2e/project.json +++ b/apps/nxls-e2e/project.json @@ -6,6 +6,9 @@ "targets": { "test": { "command": "jest --detectOpenHandles --runInBand --verbose", + "options": { + "cwd": "apps/nxls-e2e" + }, "dependsOn": [ { "projects": "nxls", diff --git a/apps/nxls/project.json b/apps/nxls/project.json index 12d7990ba1..ae4d0969b9 100644 --- a/apps/nxls/project.json +++ b/apps/nxls/project.json @@ -66,7 +66,8 @@ "@parcel/watcher", "@nx/nx*", "webpack", - "fsevents" + "fsevents", + "nx" ], "target": "es2020", "outputFileName": "main.js", diff --git a/apps/vscode/project.json b/apps/vscode/project.json index 637af4de5f..48702cfc71 100644 --- a/apps/vscode/project.json +++ b/apps/vscode/project.json @@ -46,7 +46,8 @@ "fsevents", "ts-node", "pnpapi", - "@angular-devkit/*" + "@angular-devkit/*", + "nx" ], "bundle": true, "thirdParty": true, @@ -106,7 +107,8 @@ "pnpapi", "webpack", "@angular-devkit/*", - "@nx/nx*" + "@nx/nx*", + "nx" ], "thirdParty": true, "minify": true, diff --git a/libs/language-server/watcher/src/lib/native-watcher.ts b/libs/language-server/watcher/src/lib/native-watcher.ts index d085bd7cd5..25b0dcd05e 100644 --- a/libs/language-server/watcher/src/lib/native-watcher.ts +++ b/libs/language-server/watcher/src/lib/native-watcher.ts @@ -1,6 +1,7 @@ import { WatchEvent, Watcher } from 'nx/src/native'; import { lspLogger } from '@nx-console/language-server/utils'; -import { normalize } from 'path'; +import { workspaceDependencyPath } from '@nx-console/shared/npm'; +import { join, normalize } from 'path'; import { match as minimatch } from 'minimatch'; const NX_PLUGIN_PATTERNS_TO_WATCH = [ @@ -35,10 +36,23 @@ export class NativeWatcher { } private async initWatcher() { - const native = await import('nx/src/native'); + const nxWorkspaceDepPath = await workspaceDependencyPath( + this.workspacePath, + 'nx' + ); + if (!nxWorkspaceDepPath) { + lspLogger.log( + 'Could not find the "nx" package. Native watcher will not be used. Make sure to install the workspace dependencies.' + ); + return; + } + + const native = await import( + join(nxWorkspaceDepPath, 'src/native/index.js') + ); this.watcher = new native.Watcher(this.workspacePath); - this.watcher.watch((err: string | null, events: WatchEvent[]) => { + this.watcher!.watch((err: string | null, events: WatchEvent[]) => { if (err) { lspLogger.log('Error watching files: ' + err); } else if ( diff --git a/package.json b/package.json index 2eec33dc4d..c630eadd96 100644 --- a/package.json +++ b/package.json @@ -65,20 +65,20 @@ "@angular/platform-browser": "17.3.1", "@angular/platform-browser-dynamic": "17.3.1", "@babel/core": "7.21.0", - "@nx/angular": "18.2.1", - "@nx/cypress": "18.2.1", - "@nx/devkit": "18.2.1", - "@nx/esbuild": "18.2.1", - "@nx/eslint": "18.2.1", - "@nx/eslint-plugin": "18.2.1", - "@nx/gradle": "18.2.1", - "@nx/jest": "18.2.1", - "@nx/js": "18.2.1", - "@nx/node": "18.2.1", - "@nx/storybook": "18.2.1", - "@nx/web": "18.2.1", - "@nx/webpack": "18.2.1", - "@nx/workspace": "18.2.1", + "@nx/angular": "19.0.0-beta.5", + "@nx/cypress": "19.0.0-beta.5", + "@nx/devkit": "19.0.0-beta.5", + "@nx/esbuild": "19.0.0-beta.5", + "@nx/eslint": "19.0.0-beta.5", + "@nx/eslint-plugin": "19.0.0-beta.5", + "@nx/gradle": "19.0.0-beta.5", + "@nx/jest": "19.0.0-beta.5", + "@nx/js": "19.0.0-beta.5", + "@nx/node": "19.0.0-beta.5", + "@nx/storybook": "19.0.0-beta.5", + "@nx/web": "19.0.0-beta.5", + "@nx/webpack": "19.0.0-beta.5", + "@nx/workspace": "19.0.0-beta.5", "@schematics/angular": "17.3.1", "@storybook/addon-essentials": "7.5.3", "@storybook/addon-knobs": "~7.0.2", @@ -125,7 +125,7 @@ "jest-preset-angular": "14.0.3", "memfs": "^3.4.7", "mocha": "^10.0.0", - "nx": "18.2.1", + "nx": "19.0.0-beta.5", "ovsx": "^0.7.1", "prettier": "2.7.1", "prettier-plugin-tailwindcss": "^0.3.0", diff --git a/yarn.lock b/yarn.lock index d3ec38fef2..6013a1043c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5250,22 +5250,22 @@ __metadata: languageName: node linkType: hard -"@nrwl/angular@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/angular@npm:18.2.1" +"@nrwl/angular@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/angular@npm:19.0.0-beta.5" dependencies: - "@nx/angular": 18.2.1 + "@nx/angular": 19.0.0-beta.5 tslib: ^2.3.0 - checksum: d863165eef3a236a5f02509e5eb56c0f99a7b2e51b94313e420b885fd684a57f0477aafb4335ad452bc3525a13079af970ec1bd78c83e817fe5544330198eaba + checksum: 17e86c7ed9a9597ab1f5a812cf3899069bea010e78519c01fb3957e770038dca8febfd37d20720a47dbf7fcc1112101898ad9827bdcf8e1c3890a47d8bdd3e87 languageName: node linkType: hard -"@nrwl/cypress@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/cypress@npm:18.2.1" +"@nrwl/cypress@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/cypress@npm:19.0.0-beta.5" dependencies: - "@nx/cypress": 18.2.1 - checksum: 63eda2c1569f1f8188bca34d5ac4693a5f70d31d2ed7a3cb8ef79bd967ba6187013d9a3065dca6e35c9994798f9472f11319ceff3ee0430269b670bb1b1563a3 + "@nx/cypress": 19.0.0-beta.5 + checksum: 75bd18f835fae61d89f4ce8c16bde8f3e636ab5b7b2cf40a93e3928ad0df13f64fd43b424fd292e92af6093f2e6aeade55d7ed3c1cc92f2e7ae440e6f8fbc61d languageName: node linkType: hard @@ -5278,119 +5278,119 @@ __metadata: languageName: node linkType: hard -"@nrwl/devkit@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/devkit@npm:18.2.1" +"@nrwl/devkit@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/devkit@npm:19.0.0-beta.5" dependencies: - "@nx/devkit": 18.2.1 - checksum: 050e519c06b1398fb9113dfb85ac60eed215da851a26af9c115c503de87ae548b6c401f183dc245dbeb5eafadebc32fc6d3db2abc218fd95c9f79f9ae0987b93 + "@nx/devkit": 19.0.0-beta.5 + checksum: fd1e210551d7a2b20a15ba567d948c49270cae5e39989db791409588a6d88b49ffaf15efcceca0c99aeda51e671a30591966dff59b2ffa04ed8cf3e7cfbc7f60 languageName: node linkType: hard -"@nrwl/esbuild@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/esbuild@npm:18.2.1" +"@nrwl/esbuild@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/esbuild@npm:19.0.0-beta.5" dependencies: - "@nx/esbuild": 18.2.1 - checksum: a292fbc6cbd4153e49f310c6d13d7f8068fb041ce7e36cf0a06958233f85294cb8eb23055ed90cae90c53163df18b3d147034ce9fcc7b45dacf10dbe7a61bfb7 + "@nx/esbuild": 19.0.0-beta.5 + checksum: c7b1d80679b5acf1785c7cf1665c0fb5fdb195a4d18a9219aab39e036d015eb25dd406523494090d26bc601e66e6169a3da59fcea1b36070b91a29da2e2559fb languageName: node linkType: hard -"@nrwl/eslint-plugin-nx@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/eslint-plugin-nx@npm:18.2.1" +"@nrwl/eslint-plugin-nx@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/eslint-plugin-nx@npm:19.0.0-beta.5" dependencies: - "@nx/eslint-plugin": 18.2.1 - checksum: 03b2838ace6437ad7d718ec168b02c20067b874fcb8a3392665e634df8d3a6330e74a642184c80d34d5d0f209e01481346b20c8d1a9cdfdc33221646185d3be5 + "@nx/eslint-plugin": 19.0.0-beta.5 + checksum: ea29268cbe6cab947fea4cad74a030bdb0d55a5df856894d6ee2d4858c3977ed64258122bc35bf370b4e58c76cabe739116e679c3636bbde08ad02cf95e431e1 languageName: node linkType: hard -"@nrwl/jest@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/jest@npm:18.2.1" +"@nrwl/jest@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/jest@npm:19.0.0-beta.5" dependencies: - "@nx/jest": 18.2.1 - checksum: a455cb6fb8489c19b6c26d1d0e43f4f72d5e15389ab8efada81cecdac81066018ace1613fd90c1a8f605be3d3823a95abc4ea23d9998c666b24207a4d1026273 + "@nx/jest": 19.0.0-beta.5 + checksum: 4d67ed303585241220ed1e8e486cb18af441b18034d8fe521237ac5015a0cc5af5862e32e371ac9ba1cdc49153c1a562ea34d25ec65d027085d20bc4c7ca0497 languageName: node linkType: hard -"@nrwl/js@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/js@npm:18.2.1" +"@nrwl/js@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/js@npm:19.0.0-beta.5" dependencies: - "@nx/js": 18.2.1 - checksum: 60bc1ddb9276d5c8c89f6d962f9a58229f2bcad729a7ca0f0df899bda78276ed0b4f40eae9b5c66ba5d6c21d873e7ec8119a3ece8acf606f261a4826c609d33d + "@nx/js": 19.0.0-beta.5 + checksum: 5b2bd5b48ef8593bc655c3c7c52481e0d62cfc537ad1548b0e832d5cdd8385a26f3cb07516c402dc15239a13969742facc38864ad4fb8bc7c2984c271a6f3aaa languageName: node linkType: hard -"@nrwl/node@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/node@npm:18.2.1" +"@nrwl/node@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/node@npm:19.0.0-beta.5" dependencies: - "@nx/node": 18.2.1 - checksum: a570ce13d0bb75b682fe724ce2c8e58f99196508599423460afca1530dea83310ea362c5002c4322e1cc1cff6e3316c351048cc9b531a4aaf2073b6fc0790ca5 + "@nx/node": 19.0.0-beta.5 + checksum: e0520c9aed4cf3ae96163b2f8e86084de8bf3f19be830447294724b2bc0acbe8bb6125e6f9a863dc409aabe94dbb68453d2e86ff1dda041203404d2d5b324d1d languageName: node linkType: hard -"@nrwl/storybook@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/storybook@npm:18.2.1" +"@nrwl/storybook@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/storybook@npm:19.0.0-beta.5" dependencies: - "@nx/storybook": 18.2.1 - checksum: e139425cbd503ba1d454720293449a7504f686cbd6141dbcc929f08d94e360125e936c9226b187b3bcd3a9dc92030462c82683f46788be88b4e015232c4e2d5d + "@nx/storybook": 19.0.0-beta.5 + checksum: 152f4072dca98de6b87f6b00f10c5aef114ff0eec1ee2cfc82beaf335e3fda33483d30edafde13decb962825ea228369fc3601071dad48f7f1d965923f46d7b8 languageName: node linkType: hard -"@nrwl/tao@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/tao@npm:18.2.1" +"@nrwl/tao@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/tao@npm:19.0.0-beta.5" dependencies: - nx: 18.2.1 + nx: 19.0.0-beta.5 tslib: ^2.3.0 bin: tao: index.js - checksum: 728b3d61850649d1480dbe02b427f917d769a29168e9dc8b22f4792a0b371c604cb6019692ca30699be000f650c33e9ed64a57efe1baf374fa0faf285c7a5cad + checksum: 3b0eaacb24c9e8797db0d4ff40858637b739aee9811917edc577fbe2a2303375047927db0dbcefd2993db40454d8efd52ec585dba84ecdbbc336ad3deabbc9bc languageName: node linkType: hard -"@nrwl/web@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/web@npm:18.2.1" +"@nrwl/web@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/web@npm:19.0.0-beta.5" dependencies: - "@nx/web": 18.2.1 - checksum: 8d583696cef4f409cba3e176fa91edd70deb1793236039dd8414f021bacfd1865cf2c4353be0bc57cc7b44cb19b84c39b50b89c0ce1d2387d74b3b0f1d3def59 + "@nx/web": 19.0.0-beta.5 + checksum: 69d12dd93ba290ff5337f7dd094fede19474628031afcc258fa59a68055896456b3afe8845791713af6fdd486f4143ae380cd9661fb88ac90036568eee337b13 languageName: node linkType: hard -"@nrwl/webpack@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/webpack@npm:18.2.1" +"@nrwl/webpack@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/webpack@npm:19.0.0-beta.5" dependencies: - "@nx/webpack": 18.2.1 - checksum: 7f0288f62197377a1bb6fa6bbe40687334bfaa500df9d16eeb38b756791adb961cf4aa58b9574220dcc0c8b656471553be2d00d8a88f0586351794212fb79499 + "@nx/webpack": 19.0.0-beta.5 + checksum: 567899bf053d84b13b73a1ab28c3457156d76938cc003ce66f39113b4018df081ced03ba00dd6b58d7426462d873f381b9b0e252a11529631b5a3c0e4c3368db languageName: node linkType: hard -"@nrwl/workspace@npm:18.2.1": - version: 18.2.1 - resolution: "@nrwl/workspace@npm:18.2.1" +"@nrwl/workspace@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nrwl/workspace@npm:19.0.0-beta.5" dependencies: - "@nx/workspace": 18.2.1 - checksum: 93115f8fb0a4782c44db9fd0017f075d6456814d958cce2c86dc3fb090f5aaef46dc7e973b4684b24d8f477912c801f0248281c9c66d48fb5c969cee56f27a53 + "@nx/workspace": 19.0.0-beta.5 + checksum: 6d124d34cb1db2ab1c851c141a1d1d1be2d975da9a7d3d8d33c5a9990c03ab87df9c1082ddff373ad07476a88e48df8b193b06c6461c91350e2397fafbfbfd4c languageName: node linkType: hard -"@nx/angular@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/angular@npm:18.2.1" +"@nx/angular@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/angular@npm:19.0.0-beta.5" dependencies: - "@nrwl/angular": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/eslint": 18.2.1 - "@nx/js": 18.2.1 - "@nx/web": 18.2.1 - "@nx/webpack": 18.2.1 - "@nx/workspace": 18.2.1 + "@nrwl/angular": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/eslint": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 + "@nx/web": 19.0.0-beta.5 + "@nx/webpack": 19.0.0-beta.5 + "@nx/workspace": 19.0.0-beta.5 "@phenomnomnominal/tsquery": ~5.0.1 "@typescript-eslint/type-utils": ^7.3.0 chalk: ^4.1.0 @@ -5413,18 +5413,18 @@ __metadata: peerDependenciesMeta: esbuild: optional: true - checksum: b777a57944ad712003594ca60e33bd0f2f71d8bdede89d57de898cd98a375f90fceb520592ad430e422f5d458a82391aee39a98b23fdf2d8e6556a21d6a68a90 + checksum: b4c1aed0e8dab641c4b2c5f988ff39e12020f0b15d59cabf942c01b97d387e2c40abcc8e7b5d5d6d441d170baa086abd732b2ead0ae17c17c7f6df359ec8ac84 languageName: node linkType: hard -"@nx/cypress@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/cypress@npm:18.2.1" +"@nx/cypress@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/cypress@npm:19.0.0-beta.5" dependencies: - "@nrwl/cypress": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/eslint": 18.2.1 - "@nx/js": 18.2.1 + "@nrwl/cypress": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/eslint": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 "@phenomnomnominal/tsquery": ~5.0.1 detect-port: ^1.5.1 semver: ^7.5.3 @@ -5434,7 +5434,7 @@ __metadata: peerDependenciesMeta: cypress: optional: true - checksum: bef26fe6cb30ff1fdafaa42b3eb61761fdad451db924f9e01b3146ed61e4799c9ad6a093d420c26aa7fcdd242e6cc4f9627d08b21439644c85c8464e3f14d09b + checksum: cfb8a1bf4c32ed3c0b2c7deb835a56d7ed0659abd6c0674eef25f05333687db8b004a1d103c3f6cd0afb06d6af7e1a41fedf5e3d3ce9355e4fba794130509fbe languageName: node linkType: hard @@ -5454,31 +5454,32 @@ __metadata: languageName: node linkType: hard -"@nx/devkit@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/devkit@npm:18.2.1" +"@nx/devkit@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/devkit@npm:19.0.0-beta.5" dependencies: - "@nrwl/devkit": 18.2.1 + "@nrwl/devkit": 19.0.0-beta.5 ejs: ^3.1.7 enquirer: ~2.3.6 ignore: ^5.0.4 + minimatch: 9.0.3 semver: ^7.5.3 tmp: ~0.2.1 tslib: ^2.3.0 yargs-parser: 21.1.1 peerDependencies: - nx: ">= 16 <= 18" - checksum: d1b1772d98b7ff34a39a18cd7df1aee63cbd0a6127c692b4f3bd9bfb637cda5f159b03e18e13801dcd4280aab0c4cf306c5484bbe11a873d8145c0da3aec0b71 + nx: ">= 16 <= 19" + checksum: db72fc6e70d385a3d4374f13366345986d2d72732d5beee625cd378c8500165a018a1b8d165af03c47e017373905fed2db20ce91d46f70c0414a70106ffb9d7d languageName: node linkType: hard -"@nx/esbuild@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/esbuild@npm:18.2.1" +"@nx/esbuild@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/esbuild@npm:19.0.0-beta.5" dependencies: - "@nrwl/esbuild": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/js": 18.2.1 + "@nrwl/esbuild": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 chalk: ^4.1.0 fast-glob: 3.2.7 fs-extra: ^11.1.0 @@ -5489,17 +5490,17 @@ __metadata: peerDependenciesMeta: esbuild: optional: true - checksum: 3113aab8c4bd31bd92d2955c23096e92eb3fec2c4d5a9a385294bc861f2ab7505ab97d4927a2291e188d9af0ea035e1b839bce1ffbcb055303346966797d4551 + checksum: 1d3e42855ea242c128d7b317ff26dbaa317bac83e7024eff312737c58fdb77a7b2259e22192a8fab9a3f9bf1b0fe38002e43c3dd909cdc34cfa6c48a93adfe2b languageName: node linkType: hard -"@nx/eslint-plugin@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/eslint-plugin@npm:18.2.1" +"@nx/eslint-plugin@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/eslint-plugin@npm:19.0.0-beta.5" dependencies: - "@nrwl/eslint-plugin-nx": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/js": 18.2.1 + "@nrwl/eslint-plugin-nx": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 "@typescript-eslint/type-utils": ^7.3.0 "@typescript-eslint/utils": ^7.3.0 chalk: ^4.1.0 @@ -5513,17 +5514,17 @@ __metadata: peerDependenciesMeta: eslint-config-prettier: optional: true - checksum: 3dee2d9ab5964e20bedb8705cc6c6df8f24c5af50bb826fed45006ae9b2cb0e0fc6fd2d550944d94e8d9f41cab038845c6ece918e745da35b4f052da240945f8 + checksum: 6e86d866372f8c613ed706faa95636ba8ffad47e8a50df32e405cc4c297e54fbccc11a8eb9dbda7bbfb5256a1424bad47ac296599a36d969948ad15dc1642815 languageName: node linkType: hard -"@nx/eslint@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/eslint@npm:18.2.1" +"@nx/eslint@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/eslint@npm:19.0.0-beta.5" dependencies: - "@nx/devkit": 18.2.1 - "@nx/js": 18.2.1 - "@nx/linter": 18.2.1 + "@nx/devkit": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 + "@nx/linter": 19.0.0-beta.5 eslint: ^8.0.0 tslib: ^2.3.0 typescript: ~5.4.2 @@ -5532,28 +5533,28 @@ __metadata: peerDependenciesMeta: js-yaml: optional: true - checksum: ddf7f5ef3388bade1fc3bbac33072be7fc5ae7611ef89f14cbb8ff0cce3efd2439ab112f079e283eb688366b8d190f1964bb59adf3745c89d92ff82808173ae0 + checksum: 1020fc0d033f1f678e93947dae8d6a50f78e5a9996fd92ec10f045e2c897a37a7c4ce54d1833ea56e38e690061459d2ac5c1c23d4f1029b70f90bb82ce67ab3a languageName: node linkType: hard -"@nx/gradle@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/gradle@npm:18.2.1" +"@nx/gradle@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/gradle@npm:19.0.0-beta.5" dependencies: - "@nx/devkit": 18.2.1 - checksum: 34b430a7f6b4744295d133eb6a6121b7a8641755ede3fc3c5f0c019b89db5e7c77877442cd2d73489a2346befcef639524516c130a705d1f328befe88bccca7b + "@nx/devkit": 19.0.0-beta.5 + checksum: 9447ed7c1f622d5f63a377912cdf0377a8bd8587832152fa8a87abd8b22134a1dca23d2431093eb4b2ab7c4a21206884b9300d0bafe0aa84ce878123bf166dd9 languageName: node linkType: hard -"@nx/jest@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/jest@npm:18.2.1" +"@nx/jest@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/jest@npm:19.0.0-beta.5" dependencies: "@jest/reporters": ^29.4.1 "@jest/test-result": ^29.4.1 - "@nrwl/jest": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/js": 18.2.1 + "@nrwl/jest": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 "@phenomnomnominal/tsquery": ~5.0.1 chalk: ^4.1.0 identity-obj-proxy: 3.0.0 @@ -5564,13 +5565,13 @@ __metadata: resolve.exports: 1.1.0 tslib: ^2.3.0 yargs-parser: 21.1.1 - checksum: b3c623c38d5c3865f4afdf00515615778f77048683211b9c336e249d83fab52eef6a1208cea821cc5ff674d310f65fff444e5e9e867480cfefeb362050de1775 + checksum: 889c8819ce7b132dbcb4b3aab203d39a358c6ae935b6d11aec8d2abaeeaa20dbc14ac5024ed5ae0d851f1660e2a18ca2bc967d77eff863550f7d720bb18c7c25 languageName: node linkType: hard -"@nx/js@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/js@npm:18.2.1" +"@nx/js@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/js@npm:19.0.0-beta.5" dependencies: "@babel/core": ^7.23.2 "@babel/plugin-proposal-decorators": ^7.22.7 @@ -5579,9 +5580,9 @@ __metadata: "@babel/preset-env": ^7.23.2 "@babel/preset-typescript": ^7.22.5 "@babel/runtime": ^7.22.6 - "@nrwl/js": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/workspace": 18.2.1 + "@nrwl/js": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/workspace": 19.0.0-beta.5 "@phenomnomnominal/tsquery": ~5.0.1 babel-plugin-const-enum: ^1.0.1 babel-plugin-macros: ^2.8.0 @@ -5607,142 +5608,142 @@ __metadata: peerDependenciesMeta: verdaccio: optional: true - checksum: 814a213ce118938326ea23e5aa1d1827609125dd26b6e08a58a9de0c248bba7b54ca979e1d4c646807fcda2e86131a1d9fc6a551c97fa345789cf8425393a93f + checksum: 820f463335c91dd401fa84d30f88d42d1693f593f767b71ec85cf5aeb5a4a0a171ad8081b82c2005852938828c4913e5eba526eea927f80483e4e55119fda7a8 languageName: node linkType: hard -"@nx/linter@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/linter@npm:18.2.1" +"@nx/linter@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/linter@npm:19.0.0-beta.5" dependencies: - "@nx/eslint": 18.2.1 - checksum: 995eb02a7bca2210bb8805b7a0a8debf05acc709260b8a6d507f841f089bb44f5436c2482ac8ce3a8495597b140196f9c9fb7557c4ec34e899bf91b98f381ca9 + "@nx/eslint": 19.0.0-beta.5 + checksum: 296b8fab6a260755ec36dede1ba435cc548bc70719c54cde09e646c01e25124fd20054b86f86fed1e71a7b0db2bfa87763f08008c464fd94d1fad5e8ab1de5f5 languageName: node linkType: hard -"@nx/node@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/node@npm:18.2.1" +"@nx/node@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/node@npm:19.0.0-beta.5" dependencies: - "@nrwl/node": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/eslint": 18.2.1 - "@nx/jest": 18.2.1 - "@nx/js": 18.2.1 + "@nrwl/node": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/eslint": 19.0.0-beta.5 + "@nx/jest": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 tslib: ^2.3.0 - checksum: d4d3e281710a18f88522a1c070e07f16b60665bc25a395eb89a4fda435f52687df3f9b541599c1397a76fa324a7dddf8e1fc4f37024c16c2e767cc7b4047ec93 + checksum: 1f13919a2bf32bd2c81e7cf7b14aa7659919c4d3f727c82a66f7fb96d5a917bfc8569750989ad325e9d270af6e93198727cbd6c07f1ed3bae582272df601076d languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-darwin-arm64@npm:18.2.1" +"@nx/nx-darwin-arm64@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-darwin-arm64@npm:19.0.0-beta.5" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-darwin-x64@npm:18.2.1" +"@nx/nx-darwin-x64@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-darwin-x64@npm:19.0.0-beta.5" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-freebsd-x64@npm:18.2.1" +"@nx/nx-freebsd-x64@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-freebsd-x64@npm:19.0.0-beta.5" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.2.1" +"@nx/nx-linux-arm-gnueabihf@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.0.0-beta.5" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-linux-arm64-gnu@npm:18.2.1" +"@nx/nx-linux-arm64-gnu@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-linux-arm64-gnu@npm:19.0.0-beta.5" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-linux-arm64-musl@npm:18.2.1" +"@nx/nx-linux-arm64-musl@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-linux-arm64-musl@npm:19.0.0-beta.5" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-linux-x64-gnu@npm:18.2.1" +"@nx/nx-linux-x64-gnu@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-linux-x64-gnu@npm:19.0.0-beta.5" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-linux-x64-musl@npm:18.2.1" +"@nx/nx-linux-x64-musl@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-linux-x64-musl@npm:19.0.0-beta.5" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-win32-arm64-msvc@npm:18.2.1" +"@nx/nx-win32-arm64-msvc@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-win32-arm64-msvc@npm:19.0.0-beta.5" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/nx-win32-x64-msvc@npm:18.2.1" +"@nx/nx-win32-x64-msvc@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/nx-win32-x64-msvc@npm:19.0.0-beta.5" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@nx/storybook@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/storybook@npm:18.2.1" +"@nx/storybook@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/storybook@npm:19.0.0-beta.5" dependencies: - "@nrwl/storybook": 18.2.1 - "@nx/cypress": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/eslint": 18.2.1 - "@nx/js": 18.2.1 + "@nrwl/storybook": 19.0.0-beta.5 + "@nx/cypress": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/eslint": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 "@phenomnomnominal/tsquery": ~5.0.1 semver: ^7.5.3 tslib: ^2.3.0 - checksum: 57d9e63dd94baf1b9f5245202707f1a26594af28228c60ce59d29feb364a3464036b7400a63ac5d4e24918428e42d36db743afc4c7e0489fdf0c18e8b541e4f6 + checksum: b5364d1eb4ed57f87e7080106930370c09873d0e62004e4d7f4a22b1e180afbca297976cb2b045db6ef1115eb1145919e922f903358a05238fbb2dfe1b1c92fc languageName: node linkType: hard -"@nx/web@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/web@npm:18.2.1" +"@nx/web@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/web@npm:19.0.0-beta.5" dependencies: - "@nrwl/web": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/js": 18.2.1 + "@nrwl/web": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 chalk: ^4.1.0 detect-port: ^1.5.1 http-server: ^14.1.0 tslib: ^2.3.0 - checksum: 8348bddbf16b72f4cc905c03fd3adacbc477daf9a53045d9ea2c13f6fb213b7e0556c4b59bc68039dbb2fa2bf4c2da18adf76ed507a5f6a8cb16c5e4180eda87 + checksum: 46e43ee4c954eb80d10efc56925fa97a261b73e136099f44e9468e03fe07e9b401b62592cc1f2852b9ce8069c20c2f7aafb336bef79e2b94bcc4dfc6d6b42213 languageName: node linkType: hard -"@nx/webpack@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/webpack@npm:18.2.1" +"@nx/webpack@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/webpack@npm:19.0.0-beta.5" dependencies: "@babel/core": ^7.23.2 - "@nrwl/webpack": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/js": 18.2.1 + "@nrwl/webpack": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 ajv: ^8.12.0 autoprefixer: ^10.4.9 babel-loader: ^9.1.2 @@ -5776,22 +5777,22 @@ __metadata: webpack-dev-server: ^4.9.3 webpack-node-externals: ^3.0.0 webpack-subresource-integrity: ^5.1.0 - checksum: 1e77e40188729fd9951962ac390fb363c05e8c70ef39caf9460ba0ea3fe25feb5389a9641c97155c218a4ac72a44bcb0c81ab49e64b45963aa1ec88a36eeb9e8 + checksum: 09e4ffd3a7b1957ef501d4202e087b494b9911c271ea204f43c5ea944548ab1684ff808270f718b4564232b95ab2e266d0e28b45bd9aabadcd32ac09e6ae3ec0 languageName: node linkType: hard -"@nx/workspace@npm:18.2.1": - version: 18.2.1 - resolution: "@nx/workspace@npm:18.2.1" +"@nx/workspace@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "@nx/workspace@npm:19.0.0-beta.5" dependencies: - "@nrwl/workspace": 18.2.1 - "@nx/devkit": 18.2.1 + "@nrwl/workspace": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 chalk: ^4.1.0 enquirer: ~2.3.6 - nx: 18.2.1 + nx: 19.0.0-beta.5 tslib: ^2.3.0 yargs-parser: 21.1.1 - checksum: b051a1140a94a999f5ac3fb79112a66a25be5116e54e77a3e6890d2eff7b765605d1030b43748e2e1de54fe31931ee35c95da1ce0ea668700600d1985f9dc924 + checksum: 2289811e322507415c575e407da40825e08180634448184dcd81ac9f3e2f8d8b785076eea91b3fb5b81f3227d8d1f54b8e35f183eda0fa281ea55de541d4a657 languageName: node linkType: hard @@ -22737,20 +22738,20 @@ __metadata: "@microsoft/fast-element": ^1.12.0 "@microsoft/fast-foundation": ^2.49.0 "@monodon/typescript-nx-imports-plugin": 0.2.0 - "@nx/angular": 18.2.1 - "@nx/cypress": 18.2.1 - "@nx/devkit": 18.2.1 - "@nx/esbuild": 18.2.1 - "@nx/eslint": 18.2.1 - "@nx/eslint-plugin": 18.2.1 - "@nx/gradle": 18.2.1 - "@nx/jest": 18.2.1 - "@nx/js": 18.2.1 - "@nx/node": 18.2.1 - "@nx/storybook": 18.2.1 - "@nx/web": 18.2.1 - "@nx/webpack": 18.2.1 - "@nx/workspace": 18.2.1 + "@nx/angular": 19.0.0-beta.5 + "@nx/cypress": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.5 + "@nx/esbuild": 19.0.0-beta.5 + "@nx/eslint": 19.0.0-beta.5 + "@nx/eslint-plugin": 19.0.0-beta.5 + "@nx/gradle": 19.0.0-beta.5 + "@nx/jest": 19.0.0-beta.5 + "@nx/js": 19.0.0-beta.5 + "@nx/node": 19.0.0-beta.5 + "@nx/storybook": 19.0.0-beta.5 + "@nx/web": 19.0.0-beta.5 + "@nx/webpack": 19.0.0-beta.5 + "@nx/workspace": 19.0.0-beta.5 "@open-wc/lit-helpers": ^0.6.0 "@parcel/watcher": ^2.4.1 "@schematics/angular": 17.3.1 @@ -22811,7 +22812,7 @@ __metadata: memfs: ^3.4.7 minimatch: ^9.0.3 mocha: ^10.0.0 - nx: 18.2.1 + nx: 19.0.0-beta.5 ovsx: ^0.7.1 prettier: 2.7.1 prettier-plugin-tailwindcss: ^0.3.0 @@ -22844,21 +22845,21 @@ __metadata: languageName: unknown linkType: soft -"nx@npm:18.2.1": - version: 18.2.1 - resolution: "nx@npm:18.2.1" - dependencies: - "@nrwl/tao": 18.2.1 - "@nx/nx-darwin-arm64": 18.2.1 - "@nx/nx-darwin-x64": 18.2.1 - "@nx/nx-freebsd-x64": 18.2.1 - "@nx/nx-linux-arm-gnueabihf": 18.2.1 - "@nx/nx-linux-arm64-gnu": 18.2.1 - "@nx/nx-linux-arm64-musl": 18.2.1 - "@nx/nx-linux-x64-gnu": 18.2.1 - "@nx/nx-linux-x64-musl": 18.2.1 - "@nx/nx-win32-arm64-msvc": 18.2.1 - "@nx/nx-win32-x64-msvc": 18.2.1 +"nx@npm:19.0.0-beta.5": + version: 19.0.0-beta.5 + resolution: "nx@npm:19.0.0-beta.5" + dependencies: + "@nrwl/tao": 19.0.0-beta.5 + "@nx/nx-darwin-arm64": 19.0.0-beta.5 + "@nx/nx-darwin-x64": 19.0.0-beta.5 + "@nx/nx-freebsd-x64": 19.0.0-beta.5 + "@nx/nx-linux-arm-gnueabihf": 19.0.0-beta.5 + "@nx/nx-linux-arm64-gnu": 19.0.0-beta.5 + "@nx/nx-linux-arm64-musl": 19.0.0-beta.5 + "@nx/nx-linux-x64-gnu": 19.0.0-beta.5 + "@nx/nx-linux-x64-musl": 19.0.0-beta.5 + "@nx/nx-win32-arm64-msvc": 19.0.0-beta.5 + "@nx/nx-win32-x64-msvc": 19.0.0-beta.5 "@yarnpkg/lockfile": ^1.1.0 "@yarnpkg/parsers": 3.0.0-rc.46 "@zkochan/js-yaml": 0.0.6 @@ -22924,7 +22925,7 @@ __metadata: bin: nx: bin/nx.js nx-cloud: bin/nx-cloud.js - checksum: a654735a5570f2568dbaeaf35ec080af330f97e8b707033c6919c70ecca7ccb432ec93768a2d1a69cdd724519aaddc374298dbb290322ba059d0aba84282ba2d + checksum: 0634f00320980024e8785bc46c43a1a2582c257985903ed9b51ec33cbed865963132227bb33c0153fe6bfab74ba2de9f9177a967a74a7121c48e50762d9e3945 languageName: node linkType: hard From 755a6edf2cff6e0cc80d0fffef2682ae1eaa96fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?= Date: Thu, 25 Apr 2024 15:54:08 +0200 Subject: [PATCH 2/4] feat: update nx package imports to be made from the workspace deps --- .../definition/src/lib/get-definition.ts | 10 +++- .../document-links/src/lib/target-link.ts | 13 ++++- .../language-server/utils/src/lib/nx-reset.ts | 11 +++-- .../watcher/src/lib/native-watcher.ts | 23 +++------ .../watcher/src/lib/watcher.ts | 11 +++-- .../workspace/src/lib/create-project-graph.ts | 20 ++++---- .../src/lib/get-nx-workspace-package.ts | 41 ++++------------ .../src/lib/get-project-graph-output.ts | 12 +++-- .../workspace/src/lib/get-source-map.ts | 3 +- .../src/lib/has-affected-projects.ts | 2 +- .../src/lib/project-json-schema.ts | 4 +- .../npm/src/lib/workspace-dependencies.ts | 49 ++++++++++++++++++- .../types/src/lib/project-folder-tree.ts | 2 +- .../utils/src/lib/get-nx-execution-command.ts | 14 +++--- .../src/lib/vscode-add-dependency.ts | 30 +++++++----- .../graph-base/src/lib/nx-graph-server.ts | 7 ++- .../src/lib/nx-commands-provider.ts | 7 ++- .../src/lib/views/nx-project-base-view.ts | 2 +- .../src/lib/get-project-by-path.ts | 2 +- .../nx-workspace/src/lib/get-source-map.ts | 2 +- .../nx-workspace/src/lib/stop-daemon.ts | 9 +++- .../lib/project-details-codelens-provider.ts | 5 +- .../src/lib/init-vscode-project-graph.ts | 3 +- .../legacy-implementation/project-graph.ts | 2 +- libs/vscode/tasks/src/lib/cli-task.ts | 16 +++--- libs/vscode/tasks/src/lib/nx-task.ts | 4 +- libs/vscode/utils/src/lib/read-projects.ts | 3 +- libs/vscode/utils/src/lib/shell-execution.ts | 16 +++--- 28 files changed, 192 insertions(+), 131 deletions(-) diff --git a/libs/language-server/capabilities/definition/src/lib/get-definition.ts b/libs/language-server/capabilities/definition/src/lib/get-definition.ts index 330b8358b3..ed70dddd7b 100644 --- a/libs/language-server/capabilities/definition/src/lib/get-definition.ts +++ b/libs/language-server/capabilities/definition/src/lib/get-definition.ts @@ -1,6 +1,9 @@ -import { isExecutorStringNode } from '@nx-console/language-server/utils'; +import { + isExecutorStringNode, + lspLogger, +} from '@nx-console/language-server/utils'; import { getExecutors } from '@nx-console/language-server/workspace'; -import { resolveImplementation } from 'nx/src/config/schema-utils'; +import { importNxPackagePath } from '@nx-console/shared/npm'; import { dirname } from 'path'; import { JSONDocument } from 'vscode-json-languageservice'; import { DefinitionParams, LocationLink } from 'vscode-languageserver'; @@ -28,6 +31,9 @@ export async function getDefinition( return undefined; } + const { resolveImplementation } = await importNxPackagePath< + typeof import('nx/src/config/schema-utils') + >(workingPath, 'src/config/schema-utils', lspLogger); const executorFile = resolveImplementation( executor.implementationPath, dirname(executor.configPath) diff --git a/libs/language-server/capabilities/document-links/src/lib/target-link.ts b/libs/language-server/capabilities/document-links/src/lib/target-link.ts index 719610098b..c5032d1349 100644 --- a/libs/language-server/capabilities/document-links/src/lib/target-link.ts +++ b/libs/language-server/capabilities/document-links/src/lib/target-link.ts @@ -1,4 +1,3 @@ -import { parseTargetString } from '@nx/devkit/src/executors/parse-target-string'; import { fileExists, readFile } from '@nx-console/shared/file-system'; import { findProperty, @@ -16,6 +15,10 @@ import { } from 'vscode-json-languageservice'; import { URI } from 'vscode-uri'; import { createRange } from './create-range'; +import { + importWorkspaceDependency, + workspaceDependencyPath, +} from '@nx-console/shared/npm'; const tempDocumentCounter = new Map(); @@ -30,6 +33,14 @@ export async function targetLink( const targetString = node.value; let project, target, configuration; try { + let importPath: string | undefined; + const devkitPath = await workspaceDependencyPath(workingPath, '@nx/devkit'); + if (devkitPath) { + importPath = join(devkitPath, 'src/executors/parse-target-string'); + } + const { parseTargetString } = await importWorkspaceDependency< + typeof import('@nx/devkit/src/executors/parse-target-string') + >(importPath, lspLogger); const parsedTargets = parseTargetString(targetString); project = parsedTargets.project; target = parsedTargets.target; diff --git a/libs/language-server/utils/src/lib/nx-reset.ts b/libs/language-server/utils/src/lib/nx-reset.ts index fdca464d9a..3e57feb36f 100644 --- a/libs/language-server/utils/src/lib/nx-reset.ts +++ b/libs/language-server/utils/src/lib/nx-reset.ts @@ -1,12 +1,15 @@ +import { importNxPackagePath } from '@nx-console/shared/npm'; import { Logger } from '@nx-console/shared/schema'; import { exec } from 'node:child_process'; -import { - detectPackageManager, - getPackageManagerCommand, -} from 'nx/src/utils/package-manager'; export async function nxReset(workspacePath: string, logger: Logger) { logger.log('Resetting workspace with `nx reset`'); + const { detectPackageManager, getPackageManagerCommand } = + await importNxPackagePath( + workspacePath, + 'src/utils/package-manager', + logger + ); const packageManagerCommands = getPackageManagerCommand( detectPackageManager(workspacePath) ); diff --git a/libs/language-server/watcher/src/lib/native-watcher.ts b/libs/language-server/watcher/src/lib/native-watcher.ts index 25b0dcd05e..e2d5b27188 100644 --- a/libs/language-server/watcher/src/lib/native-watcher.ts +++ b/libs/language-server/watcher/src/lib/native-watcher.ts @@ -1,7 +1,7 @@ -import { WatchEvent, Watcher } from 'nx/src/native'; +import type { WatchEvent, Watcher } from 'nx/src/native'; import { lspLogger } from '@nx-console/language-server/utils'; -import { workspaceDependencyPath } from '@nx-console/shared/npm'; -import { join, normalize } from 'path'; +import { importNxPackagePath } from '@nx-console/shared/npm'; +import { normalize } from 'path'; import { match as minimatch } from 'minimatch'; const NX_PLUGIN_PATTERNS_TO_WATCH = [ @@ -36,23 +36,14 @@ export class NativeWatcher { } private async initWatcher() { - const nxWorkspaceDepPath = await workspaceDependencyPath( + const native = await importNxPackagePath( this.workspacePath, - 'nx' - ); - if (!nxWorkspaceDepPath) { - lspLogger.log( - 'Could not find the "nx" package. Native watcher will not be used. Make sure to install the workspace dependencies.' - ); - return; - } - - const native = await import( - join(nxWorkspaceDepPath, 'src/native/index.js') + 'src/native/index.js', + lspLogger ); this.watcher = new native.Watcher(this.workspacePath); - this.watcher!.watch((err: string | null, events: WatchEvent[]) => { + this.watcher.watch((err: string | null, events: WatchEvent[]) => { if (err) { lspLogger.log('Error watching files: ' + err); } else if ( diff --git a/libs/language-server/watcher/src/lib/watcher.ts b/libs/language-server/watcher/src/lib/watcher.ts index 38e13b3d9a..51396d1472 100644 --- a/libs/language-server/watcher/src/lib/watcher.ts +++ b/libs/language-server/watcher/src/lib/watcher.ts @@ -2,11 +2,11 @@ import { lspLogger } from '@nx-console/language-server/utils'; import { getNxVersion } from '@nx-console/language-server/workspace'; import { debounce } from '@nx-console/shared/utils'; import * as watcher from '@parcel/watcher'; -import { getIgnoredGlobs } from 'nx/src/utils/ignore'; import { platform } from 'os'; import { gte } from 'semver'; import { DaemonWatcher } from './daemon-watcher'; import { NativeWatcher } from './native-watcher'; +import { importNxPackagePath } from '@nx-console/shared/npm'; let _daemonWatcher: DaemonWatcher | undefined; let _nativeWatcher: NativeWatcher | undefined; @@ -64,7 +64,7 @@ export async function languageServerWatcher( debouncedCallback(); } }, - watcherOptions(workspacePath) + await watcherOptions(workspacePath) ); return () => { @@ -74,7 +74,12 @@ export async function languageServerWatcher( } } -function watcherOptions(workspacePath: string): watcher.Options | undefined { +async function watcherOptions( + workspacePath: string +): Promise { + const { getIgnoredGlobs } = await importNxPackagePath< + typeof import('nx/src/utils/ignore') + >(workspacePath, 'src/utils/ignore', lspLogger); const options: watcher.Options = { ignore: getIgnoredGlobs(workspacePath), }; diff --git a/libs/language-server/workspace/src/lib/create-project-graph.ts b/libs/language-server/workspace/src/lib/create-project-graph.ts index 6c7a3903e0..4bf2074f44 100644 --- a/libs/language-server/workspace/src/lib/create-project-graph.ts +++ b/libs/language-server/workspace/src/lib/create-project-graph.ts @@ -17,15 +17,13 @@ export async function createProjectGraph( const { isEncapsulatedNx } = await nxWorkspace(workspacePath); const projectGraphOutput = await getProjectGraphOutput(workspacePath); - return new Promise((res, rej) => { - const command = getNxExecutionCommand({ - cwd: workspacePath, - displayCommand: - `nx graph ${showAffected ? '--affected' : ''} --file ` + - projectGraphOutput.relativePath, - encapsulatedNx: isEncapsulatedNx, - }); - + return getNxExecutionCommand({ + cwd: workspacePath, + displayCommand: + `nx graph ${showAffected ? '--affected' : ''} --file ` + + projectGraphOutput.relativePath, + encapsulatedNx: isEncapsulatedNx, + }).then((command) => { logger.log(`Generating graph with command: \`${command}\``); try { execSync(command, { @@ -37,10 +35,10 @@ export async function createProjectGraph( stdio: 'ignore', }); - res(undefined); + return undefined; } catch (e) { const errorMessage = `${e.output[1] || e}`; - rej('Unable to create project graph: ' + errorMessage); + throw 'Unable to create project graph: ' + errorMessage; } }); } diff --git a/libs/language-server/workspace/src/lib/get-nx-workspace-package.ts b/libs/language-server/workspace/src/lib/get-nx-workspace-package.ts index 0f49ce59a3..9145686497 100644 --- a/libs/language-server/workspace/src/lib/get-nx-workspace-package.ts +++ b/libs/language-server/workspace/src/lib/get-nx-workspace-package.ts @@ -5,9 +5,11 @@ import type * as NxProjectGraphFileUtils from 'nx/src/project-graph/file-map-uti import type * as NxDaemonClient from 'nx/src/daemon/client/client'; import type * as NxDaemonCache from 'nx/src/daemon/cache'; import type * as NxOutput from 'nx/src/utils/output'; -import { platform } from 'os'; import { join } from 'path'; -import { findNxPackagePath } from '@nx-console/shared/npm'; +import { + findNxPackagePath, + importWorkspaceDependency, +} from '@nx-console/shared/npm'; import { Logger } from '@nx-console/shared/schema'; export async function getNxDaemonClient( @@ -21,7 +23,7 @@ export async function getNxDaemonClient( if (!importPath) { return; } - return getNxPackage(importPath, logger); + return importWorkspaceDependency(importPath, logger); } export async function getNxDaemonCache( @@ -32,7 +34,7 @@ export async function getNxDaemonCache( workspacePath, join('src', 'daemon', 'cache.js') ); - return getNxPackage(importPath, logger); + return importWorkspaceDependency(importPath, logger); } export async function getNxOutput( @@ -48,7 +50,7 @@ export async function getNxOutput( return; } - return getNxPackage(importPath, logger); + return importWorkspaceDependency(importPath, logger); } export async function getNxProjectGraphUtils( @@ -64,7 +66,7 @@ export async function getNxProjectGraphUtils( return; } - return getNxPackage(importPath, logger); + return importWorkspaceDependency(importPath, logger); } export async function getNxProjectGraph( @@ -83,7 +85,7 @@ export async function getNxProjectGraph( ); } - return getNxPackage(importPath, logger); + return importWorkspaceDependency(importPath, logger); } /** @@ -105,28 +107,5 @@ export async function getNxWorkspacePackageFileUtils( ); } - return getNxPackage(importPath, logger); -} - -export async function getNxPackage( - importPath: string | undefined, - logger: Logger -): Promise { - if (!importPath) { - logger?.log( - `Unable to load the ${importPath} dependency from the workspace. Please ensure that the proper dependencies are installed locally.` - ); - throw 'local Nx dependency not found'; - } - - if (platform() === 'win32') { - importPath = importPath.replace(/\\/g, '/'); - } - - // eslint-disable-next-line @typescript-eslint/no-var-requires - const imported = require(importPath); - - logger?.log(`Using local Nx package at ${importPath}`); - - return imported; + return importWorkspaceDependency(importPath, logger); } diff --git a/libs/language-server/workspace/src/lib/get-project-graph-output.ts b/libs/language-server/workspace/src/lib/get-project-graph-output.ts index 86fa2d81f3..7250279d2a 100644 --- a/libs/language-server/workspace/src/lib/get-project-graph-output.ts +++ b/libs/language-server/workspace/src/lib/get-project-graph-output.ts @@ -1,7 +1,9 @@ import { lspLogger } from '@nx-console/language-server/utils'; -import { findNxPackagePath } from '@nx-console/shared/npm'; +import { + findNxPackagePath, + importWorkspaceDependency, +} from '@nx-console/shared/npm'; import { join, relative, normalize } from 'path'; -import { getNxPackage } from './get-nx-workspace-package'; export async function getProjectGraphOutput(workspacePath: string) { const cacheDir = await getCacheDir(workspacePath); @@ -21,5 +23,9 @@ async function getCacheDir(workspacePath: string): Promise { join('src', 'utils', 'cache-directory.js') ); - return ((await getNxPackage(importPath, lspLogger)) as any).cacheDir; + return ( + await importWorkspaceDependency< + typeof import('nx/src/utils/cache-directory') + >(importPath, lspLogger) + ).cacheDir; } diff --git a/libs/language-server/workspace/src/lib/get-source-map.ts b/libs/language-server/workspace/src/lib/get-source-map.ts index bffa6eb38d..9458ebc6a6 100644 --- a/libs/language-server/workspace/src/lib/get-source-map.ts +++ b/libs/language-server/workspace/src/lib/get-source-map.ts @@ -1,7 +1,6 @@ -import { TargetConfiguration } from 'nx/src/devkit-exports'; +import type { TargetConfiguration } from 'nx/src/devkit-exports'; import { nxWorkspace } from './workspace'; import { normalize, relative } from 'path'; -import { lspLogger } from '@nx-console/language-server/utils'; let _sourceMapFilesToProjectMap: Record | undefined = undefined; diff --git a/libs/language-server/workspace/src/lib/has-affected-projects.ts b/libs/language-server/workspace/src/lib/has-affected-projects.ts index 91f0320877..16e241168c 100644 --- a/libs/language-server/workspace/src/lib/has-affected-projects.ts +++ b/libs/language-server/workspace/src/lib/has-affected-projects.ts @@ -9,7 +9,7 @@ export async function hasAffectedProjects( ): Promise { const { isEncapsulatedNx } = await nxWorkspace(workspacePath); - const command = getNxExecutionCommand({ + const command = await getNxExecutionCommand({ cwd: workspacePath, displayCommand: `nx show projects --affected`, encapsulatedNx: isEncapsulatedNx, diff --git a/libs/shared/json-schema/src/lib/project-json-schema.ts b/libs/shared/json-schema/src/lib/project-json-schema.ts index 665896649c..cac2b6d734 100644 --- a/libs/shared/json-schema/src/lib/project-json-schema.ts +++ b/libs/shared/json-schema/src/lib/project-json-schema.ts @@ -1,6 +1,6 @@ -import { TargetConfiguration } from 'nx/src/devkit-exports'; +import type { TargetConfiguration } from 'nx/src/devkit-exports'; import { CollectionInfo } from '@nx-console/shared/schema'; -import { TargetDefaults } from 'nx/src/config/nx-json'; +import type { TargetDefaults } from 'nx/src/config/nx-json'; import type { JSONSchema } from 'vscode-json-languageservice'; import { implicitDependencies, diff --git a/libs/shared/npm/src/lib/workspace-dependencies.ts b/libs/shared/npm/src/lib/workspace-dependencies.ts index 65e9914ea6..c80ab658e2 100644 --- a/libs/shared/npm/src/lib/workspace-dependencies.ts +++ b/libs/shared/npm/src/lib/workspace-dependencies.ts @@ -1,5 +1,5 @@ -import { directoryExists } from '@nx-console/shared/file-system'; -import { WorkspaceProjects } from '@nx-console/shared/schema'; +import { directoryExists, fileExists } from '@nx-console/shared/file-system'; +import type { Logger, WorkspaceProjects } from '@nx-console/shared/schema'; import { NxVersion } from '@nx-console/shared/types'; import { stat } from 'fs/promises'; import { join } from 'path'; @@ -10,6 +10,7 @@ import { pnpDependencies, pnpDependencyPath, } from './pnp-dependencies'; +import { platform } from 'os'; /** * Get dependencies for the current workspace. @@ -75,6 +76,50 @@ export async function workspaceDependencyPath( } } +export function importWorkspaceDependency( + importPath: string | undefined, + logger: Logger = { + log(message) { + console.log(message); + }, + } +): Promise { + if (!importPath) { + logger?.log( + `Unable to load the ${importPath} dependency from the workspace. Please ensure that the proper dependencies are installed locally.` + ); + throw 'local Nx dependency not found'; + } + + if (platform() === 'win32') { + importPath = importPath.replace(/\\/g, '/'); + } + + // eslint-disable-next-line @typescript-eslint/no-var-requires + const imported = require(importPath); + + logger?.log(`Using local Nx package at ${importPath}`); + + return imported; +} + +export async function importNxPackagePath( + workspacePath: string, + nestedPath: string, + logger: Logger = { + log(message) { + console.log(message); + }, + } +): Promise { + const nxWorkspaceDepPath = await workspaceDependencyPath(workspacePath, 'nx'); + const importPath = nxWorkspaceDepPath + ? join(nxWorkspaceDepPath, nestedPath) + : undefined; + + return importWorkspaceDependency(importPath, logger); +} + export async function localDependencyPath( workspacePath: string, workspaceDependencyName: string, diff --git a/libs/shared/types/src/lib/project-folder-tree.ts b/libs/shared/types/src/lib/project-folder-tree.ts index 7b28d39dfd..a93778c95d 100644 --- a/libs/shared/types/src/lib/project-folder-tree.ts +++ b/libs/shared/types/src/lib/project-folder-tree.ts @@ -1,4 +1,4 @@ -import { ProjectConfiguration } from 'nx/src/devkit-exports'; +import type { ProjectConfiguration } from 'nx/src/devkit-exports'; export type TreeNode = { dir: string; diff --git a/libs/shared/utils/src/lib/get-nx-execution-command.ts b/libs/shared/utils/src/lib/get-nx-execution-command.ts index 444ee94916..983ee94aa1 100644 --- a/libs/shared/utils/src/lib/get-nx-execution-command.ts +++ b/libs/shared/utils/src/lib/get-nx-execution-command.ts @@ -1,17 +1,14 @@ -import { - detectPackageManager, - getPackageManagerCommand, -} from 'nx/src/devkit-exports'; +import { importNxPackagePath } from '@nx-console/shared/npm'; import { platform } from 'os'; /** * see `getShellExecutionForConfig` for a vscode-specific implementation of this */ -export function getNxExecutionCommand(config: { +export async function getNxExecutionCommand(config: { cwd: string; displayCommand: string; encapsulatedNx: boolean; -}): string { +}): Promise { let command = config.displayCommand; if (config.encapsulatedNx) { if (platform() == 'win32') { @@ -20,6 +17,11 @@ export function getNxExecutionCommand(config: { command = command.replace(/^nx/, './nx'); } } else { + const { detectPackageManager, getPackageManagerCommand } = + await importNxPackagePath( + config.cwd, + 'src/devkit-exports' + ); const packageManager = detectPackageManager(config.cwd); const packageManagerCommand = getPackageManagerCommand(packageManager); command = `${packageManagerCommand.exec} ${command}`; diff --git a/libs/vscode/add-dependency/src/lib/vscode-add-dependency.ts b/libs/vscode/add-dependency/src/lib/vscode-add-dependency.ts index c6e4465995..6e854787c3 100644 --- a/libs/vscode/add-dependency/src/lib/vscode-add-dependency.ts +++ b/libs/vscode/add-dependency/src/lib/vscode-add-dependency.ts @@ -1,15 +1,9 @@ -import { - readJsonFile, - detectPackageManager, - getPackageManagerCommand, - PackageManager, -} from 'nx/src/devkit-exports'; +import type { PackageManager } from 'nx/src/devkit-exports'; import { getGeneratorOptions, getGenerators, getNxVersion, } from '@nx-console/vscode/nx-workspace'; -import { getNxWorkspace } from '@nx-console/vscode/nx-workspace'; import { getShellExecutionForConfig, getTelemetry, @@ -33,6 +27,7 @@ import { selectFlags } from '@nx-console/vscode/nx-cli-quickpicks'; import { execSync } from 'child_process'; import { major } from 'semver'; import { getNxWorkspacePath } from '@nx-console/vscode/configuration'; +import { importNxPackagePath } from '@nx-console/shared/npm'; export const ADD_DEPENDENCY_COMMAND = 'nxConsole.addDependency'; export const ADD_DEV_DEPENDENCY_COMMAND = 'nxConsole.addDevDependency'; @@ -55,6 +50,9 @@ let pkgManager: PackageManager; function vscodeAddDependencyCommand(installAsDevDependency: boolean) { return async () => { const workspacePath = getNxWorkspacePath(); + const { detectPackageManager } = await importNxPackagePath< + typeof import('nx/src/devkit-exports') + >(workspacePath, 'src/devkit-exports'); pkgManager = detectPackageManager(workspacePath); const depInput = await promptForDependencyInput(); @@ -73,7 +71,7 @@ function vscodeAddDependencyCommand(installAsDevDependency: boolean) { if (dep) { const quickInput = showLoadingQuickInput(dep); getTelemetry().featureUsed('add-dependency'); - addDependency(dep, version, installAsDevDependency, workspacePath); + await addDependency(dep, version, installAsDevDependency, workspacePath); const disposable = tasks.onDidEndTaskProcess((taskEndEvent) => { if ( taskEndEvent.execution.task.definition.type === 'nxconsole-add-dep' @@ -133,15 +131,18 @@ function showLoadingQuickInput(dependency: string): QuickInput { return quickInput; } -function addDependency( +async function addDependency( dependency: string, version: string, installAsDevDependency: boolean, workspacePath: string ) { try { + const { getPackageManagerCommand } = await importNxPackagePath< + typeof import('nx/src/devkit-exports') + >(workspacePath, 'src/devkit-exports'); const pkgManagerCommands = getPackageManagerCommand(pkgManager); - const pkgManagerWorkspaceFlag = getWorkspaceAddFlag( + const pkgManagerWorkspaceFlag = await getWorkspaceAddFlag( pkgManager, workspacePath ); @@ -205,7 +206,7 @@ async function executeInitGenerator(dependency: string, workspacePath: string) { TaskScope.Workspace, command, pkgManager, - getShellExecutionForConfig({ + await getShellExecutionForConfig({ cwd: workspacePath, displayCommand: command, encapsulatedNx: false, @@ -263,10 +264,13 @@ async function getDependencySuggestions(): Promise< ); } -function getWorkspaceAddFlag( +async function getWorkspaceAddFlag( pkgManager: string, workspacePath: string -): string { +): Promise { + const { readJsonFile } = await importNxPackagePath< + typeof import('nx/src/devkit-exports') + >(workspacePath, 'src/devkit-exports'); const pkgJson = readJsonFile<{ workspaces?: string[]; private?: boolean; diff --git a/libs/vscode/graph-base/src/lib/nx-graph-server.ts b/libs/vscode/graph-base/src/lib/nx-graph-server.ts index 61be1fd75b..bf10a486e3 100644 --- a/libs/vscode/graph-base/src/lib/nx-graph-server.ts +++ b/libs/vscode/graph-base/src/lib/nx-graph-server.ts @@ -1,7 +1,7 @@ +import { importNxPackagePath } from '@nx-console/shared/npm'; import { getNxWorkspacePath } from '@nx-console/vscode/configuration'; import { ChildProcess, spawn } from 'child_process'; import { createServer } from 'net'; -import { getPackageManagerCommand } from 'nx/src/devkit-exports'; import { xhr } from 'request-light'; import { Disposable, EventEmitter, ExtensionContext } from 'vscode'; @@ -139,7 +139,10 @@ export class NxGraphServer implements Disposable { } private async spawnProcess(port: number): Promise { - const workspacePath = await getNxWorkspacePath(); + const workspacePath = getNxWorkspacePath(); + const { getPackageManagerCommand } = await importNxPackagePath< + typeof import('nx/src/devkit-exports') + >(workspacePath, 'src/devkit-exports'); return new Promise((resolve, reject) => { const nxGraphProcess = spawn( diff --git a/libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts b/libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts index c25369fe68..b7c31de755 100644 --- a/libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts +++ b/libs/vscode/nx-commands-view/src/lib/nx-commands-provider.ts @@ -1,4 +1,3 @@ -import { detectPackageManager } from 'nx/src/devkit-exports'; import { getNxWorkspacePath, GlobalConfigurationStore, @@ -12,6 +11,7 @@ import { import { commands, ExtensionContext, Task, tasks, TaskScope } from 'vscode'; import { NxCommandConfig, NxCommandsTreeItem } from './nx-commands-tree-item'; import { onWorkspaceRefreshed } from '@nx-console/vscode/lsp-client'; +import { importNxPackagePath } from '@nx-console/shared/npm'; export const EXECUTE_ARBITRARY_COMMAND = 'nxConsole.executeArbitraryCommand'; @@ -83,6 +83,9 @@ export class NxCommandsTreeProvider extends AbstractTreeProvider(workspacePath, 'src/devkit-exports'); const pkgManager = detectPackageManager(workspacePath); try { @@ -91,7 +94,7 @@ export class NxCommandsTreeProvider extends AbstractTreeProvider | undefined diff --git a/libs/vscode/nx-workspace/src/lib/stop-daemon.ts b/libs/vscode/nx-workspace/src/lib/stop-daemon.ts index b054e9967b..adfd81cab3 100644 --- a/libs/vscode/nx-workspace/src/lib/stop-daemon.ts +++ b/libs/vscode/nx-workspace/src/lib/stop-daemon.ts @@ -1,13 +1,18 @@ -import { getPackageManagerCommand } from 'nx/src/devkit-exports'; +import { importNxPackagePath } from '@nx-console/shared/npm'; import { getWorkspacePath } from '@nx-console/vscode/utils'; import { exec } from 'child_process'; import { promisify } from 'util'; export async function stopDaemon() { + const workspacePath = getWorkspacePath(); + const { getPackageManagerCommand } = await importNxPackagePath< + typeof import('nx/src/devkit-exports') + >(workspacePath, 'src/devkit-exports'); + return promisify(exec)( `${getPackageManagerCommand().exec} nx daemon --stop`, { - cwd: getWorkspacePath(), + cwd: workspacePath, } ).catch((e) => { console.log(e); diff --git a/libs/vscode/project-details/src/lib/project-details-codelens-provider.ts b/libs/vscode/project-details/src/lib/project-details-codelens-provider.ts index 00dcc33ac5..eda2d6865b 100644 --- a/libs/vscode/project-details/src/lib/project-details-codelens-provider.ts +++ b/libs/vscode/project-details/src/lib/project-details-codelens-provider.ts @@ -14,8 +14,8 @@ import { getTelemetry, registerCodeLensProvider, } from '@nx-console/vscode/utils'; -import { ProjectConfiguration } from 'nx/src/devkit-exports'; -import { JsonSourceFile, parseJsonText } from 'typescript'; +import type { ProjectConfiguration } from 'nx/src/devkit-exports'; +import { parseJsonText } from 'typescript'; import { CancellationToken, CodeLens, @@ -24,7 +24,6 @@ import { Position, ProviderResult, TextDocument, - languages, Range, window, commands, diff --git a/libs/vscode/project-graph/src/lib/init-vscode-project-graph.ts b/libs/vscode/project-graph/src/lib/init-vscode-project-graph.ts index 5a60a6290c..51053d3ad4 100644 --- a/libs/vscode/project-graph/src/lib/init-vscode-project-graph.ts +++ b/libs/vscode/project-graph/src/lib/init-vscode-project-graph.ts @@ -10,12 +10,11 @@ import { getProjectByPath, } from '@nx-console/vscode/nx-workspace'; import { - getNxlsOutputChannel, getTelemetry, showNoNxVersionMessage, showNoProjectAtPathMessage, } from '@nx-console/vscode/utils'; -import { ProjectConfiguration } from 'nx/src/devkit-exports'; +import type { ProjectConfiguration } from 'nx/src/devkit-exports'; import { gte } from 'semver'; import { ExtensionContext, Uri, commands, window } from 'vscode'; import { GraphWebviewManager } from './graph-webview-manager'; diff --git a/libs/vscode/project-graph/src/lib/legacy-implementation/project-graph.ts b/libs/vscode/project-graph/src/lib/legacy-implementation/project-graph.ts index 191b020af1..0a8e7367fb 100644 --- a/libs/vscode/project-graph/src/lib/legacy-implementation/project-graph.ts +++ b/libs/vscode/project-graph/src/lib/legacy-implementation/project-graph.ts @@ -10,7 +10,7 @@ import { getProjectByPath, } from '@nx-console/vscode/nx-workspace'; import { getTelemetry, showNoProjectsMessage } from '@nx-console/vscode/utils'; -import { ProjectConfiguration } from 'nx/src/devkit-exports'; +import type { ProjectConfiguration } from 'nx/src/devkit-exports'; import { Disposable, Uri, commands, window } from 'vscode'; import { MessageType } from './graph-message-type'; import { GraphWebView } from './graph-webview'; diff --git a/libs/vscode/tasks/src/lib/cli-task.ts b/libs/vscode/tasks/src/lib/cli-task.ts index f77f0024ff..5dde22df33 100644 --- a/libs/vscode/tasks/src/lib/cli-task.ts +++ b/libs/vscode/tasks/src/lib/cli-task.ts @@ -1,14 +1,11 @@ import { getShellExecutionForConfig } from '@nx-console/vscode/utils'; -import { Task, TaskGroup, TaskScope } from 'vscode'; +import { Task, TaskScope } from 'vscode'; import { CliTaskDefinition } from './cli-task-definition'; import { getNxWorkspace } from '@nx-console/vscode/nx-workspace'; import { NxWorkspace } from '@nx-console/shared/types'; -import { - detectPackageManager, - getPackageManagerCommand, - PackageManagerCommands, -} from 'nx/src/utils/package-manager'; +import type { PackageManagerCommands } from 'nx/src/utils/package-manager'; import { join } from 'path'; +import { importNxPackagePath } from '@nx-console/shared/npm'; export class CliTask extends Task { /** @@ -38,7 +35,7 @@ export class CliTask extends Task { displayCommand, // name 'nx', // execution - getShellExecutionForConfig( + await getShellExecutionForConfig( { displayCommand, cwd: definition.cwd @@ -63,6 +60,11 @@ export class CliTask extends Task { return []; } + const { detectPackageManager, getPackageManagerCommand } = + await importNxPackagePath( + w.workspacePath, + 'src/utils/package-manager' + ); const packageManagerCommands = getPackageManagerCommand( detectPackageManager(w?.workspacePath) ); diff --git a/libs/vscode/tasks/src/lib/nx-task.ts b/libs/vscode/tasks/src/lib/nx-task.ts index 6fabd0e91b..3af411c3e8 100644 --- a/libs/vscode/tasks/src/lib/nx-task.ts +++ b/libs/vscode/tasks/src/lib/nx-task.ts @@ -4,7 +4,7 @@ import { getShellExecutionForConfig, } from '@nx-console/vscode/utils'; import { join } from 'path'; -import { Task, TaskScope, window } from 'vscode'; +import { Task, TaskScope } from 'vscode'; export interface NxTaskDefinition { positional?: string; @@ -41,7 +41,7 @@ export class NxTask extends Task { displayCommand, // name 'nx', // source // execution - getShellExecutionForConfig({ + await getShellExecutionForConfig({ displayCommand, cwd: cwd ? join(workspacePath, cwd) : workspacePath, encapsulatedNx: isEncapsulatedNx, diff --git a/libs/vscode/utils/src/lib/read-projects.ts b/libs/vscode/utils/src/lib/read-projects.ts index 10becc73e6..83e38658c4 100644 --- a/libs/vscode/utils/src/lib/read-projects.ts +++ b/libs/vscode/utils/src/lib/read-projects.ts @@ -6,9 +6,8 @@ import { WorkspaceProjects, } from '@nx-console/shared/schema'; import * as path from 'path'; -import { TargetConfiguration as NxTargetConfiguration } from 'nx/src/devkit-exports'; +import type { TargetConfiguration as NxTargetConfiguration } from 'nx/src/devkit-exports'; -import { getTelemetry } from './telemetry'; import { getOutputChannel } from './output-channel'; import { localDependencyPath, diff --git a/libs/vscode/utils/src/lib/shell-execution.ts b/libs/vscode/utils/src/lib/shell-execution.ts index 57208f7c8b..da862c269d 100644 --- a/libs/vscode/utils/src/lib/shell-execution.ts +++ b/libs/vscode/utils/src/lib/shell-execution.ts @@ -1,8 +1,5 @@ -import { - detectPackageManager, - getPackageManagerCommand, -} from 'nx/src/devkit-exports'; -import { PackageManagerCommands } from 'nx/src/utils/package-manager'; +import { importNxPackagePath } from '@nx-console/shared/npm'; +import type { PackageManagerCommands } from 'nx/src/utils/package-manager'; import { platform } from 'os'; import { ShellExecution } from 'vscode'; @@ -13,10 +10,10 @@ export interface ShellConfig { encapsulatedNx: boolean; } -export function getShellExecutionForConfig( +export async function getShellExecutionForConfig( config: ShellConfig, packageManagerCommands?: PackageManagerCommands -): ShellExecution { +): Promise { let command = config.displayCommand; if (config.encapsulatedNx) { if (platform() == 'win32') { @@ -25,6 +22,11 @@ export function getShellExecutionForConfig( command = command.replace(/^nx/, './nx'); } } else { + const { detectPackageManager, getPackageManagerCommand } = + await importNxPackagePath( + config.cwd, + 'src/utils/package-manager' + ); const pmc = packageManagerCommands ?? getPackageManagerCommand(detectPackageManager(config.cwd)); From 47b352414dd12a960d80d7b593d83e4e27aaba65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?= Date: Fri, 26 Apr 2024 09:53:00 +0200 Subject: [PATCH 3/4] fix: log missing workspace package correctly --- .../document-links/src/lib/target-link.ts | 10 +++++--- .../src/lib/get-nx-workspace-package.ts | 24 +++++++++++++++---- .../src/lib/get-project-graph-output.ts | 7 ++++++ .../npm/src/lib/workspace-dependencies.ts | 24 +++++++++---------- 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/libs/language-server/capabilities/document-links/src/lib/target-link.ts b/libs/language-server/capabilities/document-links/src/lib/target-link.ts index c5032d1349..17c9bece3d 100644 --- a/libs/language-server/capabilities/document-links/src/lib/target-link.ts +++ b/libs/language-server/capabilities/document-links/src/lib/target-link.ts @@ -33,11 +33,15 @@ export async function targetLink( const targetString = node.value; let project, target, configuration; try { - let importPath: string | undefined; const devkitPath = await workspaceDependencyPath(workingPath, '@nx/devkit'); - if (devkitPath) { - importPath = join(devkitPath, 'src/executors/parse-target-string'); + if (!devkitPath) { + lspLogger.log( + `Unable to load the "@nx/devkit" package from the workspace. Please ensure that the proper dependencies are installed locally.` + ); + throw 'local @nx/devkit dependency not found'; } + + const importPath = join(devkitPath, 'src/executors/parse-target-string'); const { parseTargetString } = await importWorkspaceDependency< typeof import('@nx/devkit/src/executors/parse-target-string') >(importPath, lspLogger); diff --git a/libs/language-server/workspace/src/lib/get-nx-workspace-package.ts b/libs/language-server/workspace/src/lib/get-nx-workspace-package.ts index 9145686497..f472bdec9e 100644 --- a/libs/language-server/workspace/src/lib/get-nx-workspace-package.ts +++ b/libs/language-server/workspace/src/lib/get-nx-workspace-package.ts @@ -23,7 +23,7 @@ export async function getNxDaemonClient( if (!importPath) { return; } - return importWorkspaceDependency(importPath, logger); + return getNxPackage(importPath, logger); } export async function getNxDaemonCache( @@ -34,7 +34,7 @@ export async function getNxDaemonCache( workspacePath, join('src', 'daemon', 'cache.js') ); - return importWorkspaceDependency(importPath, logger); + return getNxPackage(importPath, logger); } export async function getNxOutput( @@ -50,7 +50,7 @@ export async function getNxOutput( return; } - return importWorkspaceDependency(importPath, logger); + return getNxPackage(importPath, logger); } export async function getNxProjectGraphUtils( @@ -66,7 +66,7 @@ export async function getNxProjectGraphUtils( return; } - return importWorkspaceDependency(importPath, logger); + return getNxPackage(importPath, logger); } export async function getNxProjectGraph( @@ -85,7 +85,7 @@ export async function getNxProjectGraph( ); } - return importWorkspaceDependency(importPath, logger); + return getNxPackage(importPath, logger); } /** @@ -107,5 +107,19 @@ export async function getNxWorkspacePackageFileUtils( ); } + return getNxPackage(importPath, logger); +} + +export async function getNxPackage( + importPath: string | undefined, + logger: Logger +): Promise { + if (!importPath) { + logger.log( + `Unable to load the "nx" package from the workspace. Please ensure that the proper dependencies are installed locally.` + ); + throw 'local Nx dependency not found'; + } + return importWorkspaceDependency(importPath, logger); } diff --git a/libs/language-server/workspace/src/lib/get-project-graph-output.ts b/libs/language-server/workspace/src/lib/get-project-graph-output.ts index 7250279d2a..0f3951c963 100644 --- a/libs/language-server/workspace/src/lib/get-project-graph-output.ts +++ b/libs/language-server/workspace/src/lib/get-project-graph-output.ts @@ -23,6 +23,13 @@ async function getCacheDir(workspacePath: string): Promise { join('src', 'utils', 'cache-directory.js') ); + if (!importPath) { + lspLogger.log( + `Unable to load the "nx" package from the workspace. Please ensure that the proper dependencies are installed locally.` + ); + throw 'local Nx dependency not found'; + } + return ( await importWorkspaceDependency< typeof import('nx/src/utils/cache-directory') diff --git a/libs/shared/npm/src/lib/workspace-dependencies.ts b/libs/shared/npm/src/lib/workspace-dependencies.ts index c80ab658e2..9581fb8544 100644 --- a/libs/shared/npm/src/lib/workspace-dependencies.ts +++ b/libs/shared/npm/src/lib/workspace-dependencies.ts @@ -77,20 +77,13 @@ export async function workspaceDependencyPath( } export function importWorkspaceDependency( - importPath: string | undefined, + importPath: string, logger: Logger = { log(message) { console.log(message); }, } ): Promise { - if (!importPath) { - logger?.log( - `Unable to load the ${importPath} dependency from the workspace. Please ensure that the proper dependencies are installed locally.` - ); - throw 'local Nx dependency not found'; - } - if (platform() === 'win32') { importPath = importPath.replace(/\\/g, '/'); } @@ -113,11 +106,18 @@ export async function importNxPackagePath( } ): Promise { const nxWorkspaceDepPath = await workspaceDependencyPath(workspacePath, 'nx'); - const importPath = nxWorkspaceDepPath - ? join(nxWorkspaceDepPath, nestedPath) - : undefined; - return importWorkspaceDependency(importPath, logger); + if (!nxWorkspaceDepPath) { + logger?.log( + `Unable to load the "nx" package from the workspace. Please ensure that the proper dependencies are installed locally.` + ); + throw 'local Nx dependency not found'; + } + + return importWorkspaceDependency( + join(nxWorkspaceDepPath, nestedPath), + logger + ); } export async function localDependencyPath( From b829b37c4c26f380cf8bec5a15cd33d1936b1688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?= Date: Fri, 26 Apr 2024 09:54:40 +0200 Subject: [PATCH 4/4] chore: update nx to 19.0.0-beta.6 --- package.json | 30 ++-- yarn.lock | 468 +++++++++++++++++++++++++-------------------------- 2 files changed, 249 insertions(+), 249 deletions(-) diff --git a/package.json b/package.json index c630eadd96..c50fbe9f41 100644 --- a/package.json +++ b/package.json @@ -65,20 +65,20 @@ "@angular/platform-browser": "17.3.1", "@angular/platform-browser-dynamic": "17.3.1", "@babel/core": "7.21.0", - "@nx/angular": "19.0.0-beta.5", - "@nx/cypress": "19.0.0-beta.5", - "@nx/devkit": "19.0.0-beta.5", - "@nx/esbuild": "19.0.0-beta.5", - "@nx/eslint": "19.0.0-beta.5", - "@nx/eslint-plugin": "19.0.0-beta.5", - "@nx/gradle": "19.0.0-beta.5", - "@nx/jest": "19.0.0-beta.5", - "@nx/js": "19.0.0-beta.5", - "@nx/node": "19.0.0-beta.5", - "@nx/storybook": "19.0.0-beta.5", - "@nx/web": "19.0.0-beta.5", - "@nx/webpack": "19.0.0-beta.5", - "@nx/workspace": "19.0.0-beta.5", + "@nx/angular": "19.0.0-beta.6", + "@nx/cypress": "19.0.0-beta.6", + "@nx/devkit": "19.0.0-beta.6", + "@nx/esbuild": "19.0.0-beta.6", + "@nx/eslint": "19.0.0-beta.6", + "@nx/eslint-plugin": "19.0.0-beta.6", + "@nx/gradle": "19.0.0-beta.6", + "@nx/jest": "19.0.0-beta.6", + "@nx/js": "19.0.0-beta.6", + "@nx/node": "19.0.0-beta.6", + "@nx/storybook": "19.0.0-beta.6", + "@nx/web": "19.0.0-beta.6", + "@nx/webpack": "19.0.0-beta.6", + "@nx/workspace": "19.0.0-beta.6", "@schematics/angular": "17.3.1", "@storybook/addon-essentials": "7.5.3", "@storybook/addon-knobs": "~7.0.2", @@ -125,7 +125,7 @@ "jest-preset-angular": "14.0.3", "memfs": "^3.4.7", "mocha": "^10.0.0", - "nx": "19.0.0-beta.5", + "nx": "19.0.0-beta.6", "ovsx": "^0.7.1", "prettier": "2.7.1", "prettier-plugin-tailwindcss": "^0.3.0", diff --git a/yarn.lock b/yarn.lock index 6013a1043c..37d8c91a2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5250,22 +5250,22 @@ __metadata: languageName: node linkType: hard -"@nrwl/angular@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/angular@npm:19.0.0-beta.5" +"@nrwl/angular@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/angular@npm:19.0.0-beta.6" dependencies: - "@nx/angular": 19.0.0-beta.5 + "@nx/angular": 19.0.0-beta.6 tslib: ^2.3.0 - checksum: 17e86c7ed9a9597ab1f5a812cf3899069bea010e78519c01fb3957e770038dca8febfd37d20720a47dbf7fcc1112101898ad9827bdcf8e1c3890a47d8bdd3e87 + checksum: 1505a558f4363444cc31b87b23679cd0a83568cd244322b1e8a850a55878ae48b1b824745865af4c3b2b235d9f9624d54796e8281dd8194469208c7303ca256e languageName: node linkType: hard -"@nrwl/cypress@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/cypress@npm:19.0.0-beta.5" +"@nrwl/cypress@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/cypress@npm:19.0.0-beta.6" dependencies: - "@nx/cypress": 19.0.0-beta.5 - checksum: 75bd18f835fae61d89f4ce8c16bde8f3e636ab5b7b2cf40a93e3928ad0df13f64fd43b424fd292e92af6093f2e6aeade55d7ed3c1cc92f2e7ae440e6f8fbc61d + "@nx/cypress": 19.0.0-beta.6 + checksum: f9fdc941688f78269e0ab7e48273c80a7286750b0a1f5428a0d5d5deaaa1f94fb262b57bcbb7da0b579379a138a9ba4c0305cd5dad8d0efc28df2f662c63fa58 languageName: node linkType: hard @@ -5278,119 +5278,119 @@ __metadata: languageName: node linkType: hard -"@nrwl/devkit@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/devkit@npm:19.0.0-beta.5" +"@nrwl/devkit@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/devkit@npm:19.0.0-beta.6" dependencies: - "@nx/devkit": 19.0.0-beta.5 - checksum: fd1e210551d7a2b20a15ba567d948c49270cae5e39989db791409588a6d88b49ffaf15efcceca0c99aeda51e671a30591966dff59b2ffa04ed8cf3e7cfbc7f60 + "@nx/devkit": 19.0.0-beta.6 + checksum: fcbfdd2fe0d1247e44e90b9dfb4c4bdce369070b1066ac5ed9e6591e972989c26dfef8fd7d98d376587d8ed97a90865b175a39016e8b32b0b8c0f47e8dc1ede3 languageName: node linkType: hard -"@nrwl/esbuild@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/esbuild@npm:19.0.0-beta.5" +"@nrwl/esbuild@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/esbuild@npm:19.0.0-beta.6" dependencies: - "@nx/esbuild": 19.0.0-beta.5 - checksum: c7b1d80679b5acf1785c7cf1665c0fb5fdb195a4d18a9219aab39e036d015eb25dd406523494090d26bc601e66e6169a3da59fcea1b36070b91a29da2e2559fb + "@nx/esbuild": 19.0.0-beta.6 + checksum: 5f2e4afe60ea81e977a289caebfe95afb8eff48f60ea42d306da4fa06972ed808837704ed2065e4f2d9dd0157655fe786ced22c7bec5e0501045b58d3885d069 languageName: node linkType: hard -"@nrwl/eslint-plugin-nx@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/eslint-plugin-nx@npm:19.0.0-beta.5" +"@nrwl/eslint-plugin-nx@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/eslint-plugin-nx@npm:19.0.0-beta.6" dependencies: - "@nx/eslint-plugin": 19.0.0-beta.5 - checksum: ea29268cbe6cab947fea4cad74a030bdb0d55a5df856894d6ee2d4858c3977ed64258122bc35bf370b4e58c76cabe739116e679c3636bbde08ad02cf95e431e1 + "@nx/eslint-plugin": 19.0.0-beta.6 + checksum: 181db0538feff42b0a36d44cc9717061c16275adaebb0e146a874b387ba796772fb97c92ed1bf7b4e5b48f3796836f6457268a15c2ead89d30e0259d64756cbe languageName: node linkType: hard -"@nrwl/jest@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/jest@npm:19.0.0-beta.5" +"@nrwl/jest@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/jest@npm:19.0.0-beta.6" dependencies: - "@nx/jest": 19.0.0-beta.5 - checksum: 4d67ed303585241220ed1e8e486cb18af441b18034d8fe521237ac5015a0cc5af5862e32e371ac9ba1cdc49153c1a562ea34d25ec65d027085d20bc4c7ca0497 + "@nx/jest": 19.0.0-beta.6 + checksum: 29c9f65abf54cd7ee8117e0a26b8fae48678594470028f6178d34386fe097c2704e99ec23ebf4c4464de60e9b70f1d739e2f56ba7806b73fe0baae935b4d1297 languageName: node linkType: hard -"@nrwl/js@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/js@npm:19.0.0-beta.5" +"@nrwl/js@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/js@npm:19.0.0-beta.6" dependencies: - "@nx/js": 19.0.0-beta.5 - checksum: 5b2bd5b48ef8593bc655c3c7c52481e0d62cfc537ad1548b0e832d5cdd8385a26f3cb07516c402dc15239a13969742facc38864ad4fb8bc7c2984c271a6f3aaa + "@nx/js": 19.0.0-beta.6 + checksum: 0ac11d2f8262f38fa3f2af0af2307e78cb5c2ec915a282559bfd98555fee8527b5e1ee7f78fdc059ad6bdab3b0b7c23793e879b8d5fc043fbb2ce966cffc3561 languageName: node linkType: hard -"@nrwl/node@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/node@npm:19.0.0-beta.5" +"@nrwl/node@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/node@npm:19.0.0-beta.6" dependencies: - "@nx/node": 19.0.0-beta.5 - checksum: e0520c9aed4cf3ae96163b2f8e86084de8bf3f19be830447294724b2bc0acbe8bb6125e6f9a863dc409aabe94dbb68453d2e86ff1dda041203404d2d5b324d1d + "@nx/node": 19.0.0-beta.6 + checksum: 60c4b9a2f2bf2bcc81d205ce6b5e4730e05565493404ccc9658a584f58b91e984f4821d831d968ae651e083004b97de409b6b2edff245b5023daf9b1bf5fc1ed languageName: node linkType: hard -"@nrwl/storybook@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/storybook@npm:19.0.0-beta.5" +"@nrwl/storybook@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/storybook@npm:19.0.0-beta.6" dependencies: - "@nx/storybook": 19.0.0-beta.5 - checksum: 152f4072dca98de6b87f6b00f10c5aef114ff0eec1ee2cfc82beaf335e3fda33483d30edafde13decb962825ea228369fc3601071dad48f7f1d965923f46d7b8 + "@nx/storybook": 19.0.0-beta.6 + checksum: f222db64bfdf4ccccf3447255b21f6e6be5321757080389c23b67123e618ee20afe7a2d39c3894f3a1def0cc416a628023ee2a607b105ab0e6973d674a5081f6 languageName: node linkType: hard -"@nrwl/tao@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/tao@npm:19.0.0-beta.5" +"@nrwl/tao@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/tao@npm:19.0.0-beta.6" dependencies: - nx: 19.0.0-beta.5 + nx: 19.0.0-beta.6 tslib: ^2.3.0 bin: tao: index.js - checksum: 3b0eaacb24c9e8797db0d4ff40858637b739aee9811917edc577fbe2a2303375047927db0dbcefd2993db40454d8efd52ec585dba84ecdbbc336ad3deabbc9bc + checksum: f8423f880c951214d4daa47629d8448caed3dc94a51c5aaa646009a050d4f13c8c0e891c7bd0aa9be27d55a5bf2b02ffce5ad8850a4094f814c2c9b68992dc3b languageName: node linkType: hard -"@nrwl/web@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/web@npm:19.0.0-beta.5" +"@nrwl/web@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/web@npm:19.0.0-beta.6" dependencies: - "@nx/web": 19.0.0-beta.5 - checksum: 69d12dd93ba290ff5337f7dd094fede19474628031afcc258fa59a68055896456b3afe8845791713af6fdd486f4143ae380cd9661fb88ac90036568eee337b13 + "@nx/web": 19.0.0-beta.6 + checksum: 0201d84cbf6a0689d4330df61abc21928a55dee5f72d4bc26e32a27fedf1409d2fcef8e7e051d425dba938d14c02a01a75b72d50cb63bab7c7d0e1439e0a3af6 languageName: node linkType: hard -"@nrwl/webpack@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/webpack@npm:19.0.0-beta.5" +"@nrwl/webpack@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/webpack@npm:19.0.0-beta.6" dependencies: - "@nx/webpack": 19.0.0-beta.5 - checksum: 567899bf053d84b13b73a1ab28c3457156d76938cc003ce66f39113b4018df081ced03ba00dd6b58d7426462d873f381b9b0e252a11529631b5a3c0e4c3368db + "@nx/webpack": 19.0.0-beta.6 + checksum: 762738019b15eec165695ece688238de31ea74157b7574254f05a6f23f95be8fc35d5a197004b522f37bd642a3b48a635763d2b9d9bd549ead87c34068f10457 languageName: node linkType: hard -"@nrwl/workspace@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nrwl/workspace@npm:19.0.0-beta.5" +"@nrwl/workspace@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nrwl/workspace@npm:19.0.0-beta.6" dependencies: - "@nx/workspace": 19.0.0-beta.5 - checksum: 6d124d34cb1db2ab1c851c141a1d1d1be2d975da9a7d3d8d33c5a9990c03ab87df9c1082ddff373ad07476a88e48df8b193b06c6461c91350e2397fafbfbfd4c + "@nx/workspace": 19.0.0-beta.6 + checksum: e33de9e39ddd127238a699e592fe21f74d9e592afb0c878bda957d6b1d8003335f3abd3b386446b9eaf1ada88ec2b29393209acfdc3a311ad9208449f300fbcc languageName: node linkType: hard -"@nx/angular@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/angular@npm:19.0.0-beta.5" +"@nx/angular@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/angular@npm:19.0.0-beta.6" dependencies: - "@nrwl/angular": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/eslint": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 - "@nx/web": 19.0.0-beta.5 - "@nx/webpack": 19.0.0-beta.5 - "@nx/workspace": 19.0.0-beta.5 + "@nrwl/angular": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/eslint": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 + "@nx/web": 19.0.0-beta.6 + "@nx/webpack": 19.0.0-beta.6 + "@nx/workspace": 19.0.0-beta.6 "@phenomnomnominal/tsquery": ~5.0.1 "@typescript-eslint/type-utils": ^7.3.0 chalk: ^4.1.0 @@ -5413,18 +5413,18 @@ __metadata: peerDependenciesMeta: esbuild: optional: true - checksum: b4c1aed0e8dab641c4b2c5f988ff39e12020f0b15d59cabf942c01b97d387e2c40abcc8e7b5d5d6d441d170baa086abd732b2ead0ae17c17c7f6df359ec8ac84 + checksum: 3a39fc849c9cc0b8b6ab8d76317615c2f2a9bb51d87befbd421d71699e527f97401b944bc1d0f978b3d44fa3dea43a54b0f449e2f6e44bff77c1913adde6368b languageName: node linkType: hard -"@nx/cypress@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/cypress@npm:19.0.0-beta.5" +"@nx/cypress@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/cypress@npm:19.0.0-beta.6" dependencies: - "@nrwl/cypress": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/eslint": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 + "@nrwl/cypress": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/eslint": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 "@phenomnomnominal/tsquery": ~5.0.1 detect-port: ^1.5.1 semver: ^7.5.3 @@ -5434,7 +5434,7 @@ __metadata: peerDependenciesMeta: cypress: optional: true - checksum: cfb8a1bf4c32ed3c0b2c7deb835a56d7ed0659abd6c0674eef25f05333687db8b004a1d103c3f6cd0afb06d6af7e1a41fedf5e3d3ce9355e4fba794130509fbe + checksum: bf65efa08c1120376bedecb2060847726fccfb8fdbb68e9515185cdc74cc833b2c258cabdc87baea4f21a970362bb5d12f43a750360a0976c9e81ae529f83fe7 languageName: node linkType: hard @@ -5454,11 +5454,11 @@ __metadata: languageName: node linkType: hard -"@nx/devkit@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/devkit@npm:19.0.0-beta.5" +"@nx/devkit@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/devkit@npm:19.0.0-beta.6" dependencies: - "@nrwl/devkit": 19.0.0-beta.5 + "@nrwl/devkit": 19.0.0-beta.6 ejs: ^3.1.7 enquirer: ~2.3.6 ignore: ^5.0.4 @@ -5469,17 +5469,17 @@ __metadata: yargs-parser: 21.1.1 peerDependencies: nx: ">= 16 <= 19" - checksum: db72fc6e70d385a3d4374f13366345986d2d72732d5beee625cd378c8500165a018a1b8d165af03c47e017373905fed2db20ce91d46f70c0414a70106ffb9d7d + checksum: e61a83a5c8c6029491c42f66773bd21296b0192891efcfde365bb9c5a99f86616babe5a67c594c8dc1d5c6857c3b913b699712c05c14b4103076d453cfc1a7d0 languageName: node linkType: hard -"@nx/esbuild@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/esbuild@npm:19.0.0-beta.5" +"@nx/esbuild@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/esbuild@npm:19.0.0-beta.6" dependencies: - "@nrwl/esbuild": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 + "@nrwl/esbuild": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 chalk: ^4.1.0 fast-glob: 3.2.7 fs-extra: ^11.1.0 @@ -5490,17 +5490,17 @@ __metadata: peerDependenciesMeta: esbuild: optional: true - checksum: 1d3e42855ea242c128d7b317ff26dbaa317bac83e7024eff312737c58fdb77a7b2259e22192a8fab9a3f9bf1b0fe38002e43c3dd909cdc34cfa6c48a93adfe2b + checksum: 1658218d86d0bc99a42fabab39823304f455757d617a411c20171c249b837bb862de83d4fbea9fe59729c058c7a2d698127e857c1d6f078f22cf8dcc98ff3598 languageName: node linkType: hard -"@nx/eslint-plugin@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/eslint-plugin@npm:19.0.0-beta.5" +"@nx/eslint-plugin@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/eslint-plugin@npm:19.0.0-beta.6" dependencies: - "@nrwl/eslint-plugin-nx": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 + "@nrwl/eslint-plugin-nx": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 "@typescript-eslint/type-utils": ^7.3.0 "@typescript-eslint/utils": ^7.3.0 chalk: ^4.1.0 @@ -5514,17 +5514,17 @@ __metadata: peerDependenciesMeta: eslint-config-prettier: optional: true - checksum: 6e86d866372f8c613ed706faa95636ba8ffad47e8a50df32e405cc4c297e54fbccc11a8eb9dbda7bbfb5256a1424bad47ac296599a36d969948ad15dc1642815 + checksum: e30b5c33bc5a66799fdd092c16dd7062052deb6a2f4026a157214b055470d0daabf6db1009263ccc22d09e9d830b55a9444358dce4410c911bc24754be675ff0 languageName: node linkType: hard -"@nx/eslint@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/eslint@npm:19.0.0-beta.5" +"@nx/eslint@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/eslint@npm:19.0.0-beta.6" dependencies: - "@nx/devkit": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 - "@nx/linter": 19.0.0-beta.5 + "@nx/devkit": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 + "@nx/linter": 19.0.0-beta.6 eslint: ^8.0.0 tslib: ^2.3.0 typescript: ~5.4.2 @@ -5533,28 +5533,28 @@ __metadata: peerDependenciesMeta: js-yaml: optional: true - checksum: 1020fc0d033f1f678e93947dae8d6a50f78e5a9996fd92ec10f045e2c897a37a7c4ce54d1833ea56e38e690061459d2ac5c1c23d4f1029b70f90bb82ce67ab3a + checksum: 560fcb23bc3b1c9f6b8e37e6683665f08573094847161d0647b28ce7665f9ea3567aada59d735aa28163ef6a7c70edfbfca61792306fdc6a34be32866487695d languageName: node linkType: hard -"@nx/gradle@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/gradle@npm:19.0.0-beta.5" +"@nx/gradle@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/gradle@npm:19.0.0-beta.6" dependencies: - "@nx/devkit": 19.0.0-beta.5 - checksum: 9447ed7c1f622d5f63a377912cdf0377a8bd8587832152fa8a87abd8b22134a1dca23d2431093eb4b2ab7c4a21206884b9300d0bafe0aa84ce878123bf166dd9 + "@nx/devkit": 19.0.0-beta.6 + checksum: 7d83fbf6e4d1a2ec521e912df92a4fb88ba46c7b6d9fe0de19af1ab1e66df9f65ec064e679d0d1cb09bb69e7df968f5e962f0cd33e69b6d3cad1d399d5496b14 languageName: node linkType: hard -"@nx/jest@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/jest@npm:19.0.0-beta.5" +"@nx/jest@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/jest@npm:19.0.0-beta.6" dependencies: "@jest/reporters": ^29.4.1 "@jest/test-result": ^29.4.1 - "@nrwl/jest": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 + "@nrwl/jest": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 "@phenomnomnominal/tsquery": ~5.0.1 chalk: ^4.1.0 identity-obj-proxy: 3.0.0 @@ -5565,13 +5565,13 @@ __metadata: resolve.exports: 1.1.0 tslib: ^2.3.0 yargs-parser: 21.1.1 - checksum: 889c8819ce7b132dbcb4b3aab203d39a358c6ae935b6d11aec8d2abaeeaa20dbc14ac5024ed5ae0d851f1660e2a18ca2bc967d77eff863550f7d720bb18c7c25 + checksum: 574a12094844501ea6bcf35bdfee1d7da59923360e6ce26486f09d8d497770ae71bbef9411e68d8e7896bf4676f7dc0f68b70bf241fabc06f02d56faae7de72b languageName: node linkType: hard -"@nx/js@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/js@npm:19.0.0-beta.5" +"@nx/js@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/js@npm:19.0.0-beta.6" dependencies: "@babel/core": ^7.23.2 "@babel/plugin-proposal-decorators": ^7.22.7 @@ -5580,9 +5580,9 @@ __metadata: "@babel/preset-env": ^7.23.2 "@babel/preset-typescript": ^7.22.5 "@babel/runtime": ^7.22.6 - "@nrwl/js": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/workspace": 19.0.0-beta.5 + "@nrwl/js": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/workspace": 19.0.0-beta.6 "@phenomnomnominal/tsquery": ~5.0.1 babel-plugin-const-enum: ^1.0.1 babel-plugin-macros: ^2.8.0 @@ -5608,142 +5608,142 @@ __metadata: peerDependenciesMeta: verdaccio: optional: true - checksum: 820f463335c91dd401fa84d30f88d42d1693f593f767b71ec85cf5aeb5a4a0a171ad8081b82c2005852938828c4913e5eba526eea927f80483e4e55119fda7a8 + checksum: 6bac1f7fc2c39981348f652725162270f0111a665a966ded231f5972b6e7586211ad3a6df06d1843f4e116bb9ed1e9f7cd315389024bd71bcbba296c3bb3afd5 languageName: node linkType: hard -"@nx/linter@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/linter@npm:19.0.0-beta.5" +"@nx/linter@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/linter@npm:19.0.0-beta.6" dependencies: - "@nx/eslint": 19.0.0-beta.5 - checksum: 296b8fab6a260755ec36dede1ba435cc548bc70719c54cde09e646c01e25124fd20054b86f86fed1e71a7b0db2bfa87763f08008c464fd94d1fad5e8ab1de5f5 + "@nx/eslint": 19.0.0-beta.6 + checksum: a6f3a7c47b81f91cd6769b61711b16da04b9764004d3ed5af7e62ec8c9d5269f5f5abb8522d1cdb51b255f459086d2faef9d1423fb161123141b375d331e327d languageName: node linkType: hard -"@nx/node@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/node@npm:19.0.0-beta.5" +"@nx/node@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/node@npm:19.0.0-beta.6" dependencies: - "@nrwl/node": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/eslint": 19.0.0-beta.5 - "@nx/jest": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 + "@nrwl/node": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/eslint": 19.0.0-beta.6 + "@nx/jest": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 tslib: ^2.3.0 - checksum: 1f13919a2bf32bd2c81e7cf7b14aa7659919c4d3f727c82a66f7fb96d5a917bfc8569750989ad325e9d270af6e93198727cbd6c07f1ed3bae582272df601076d + checksum: bb585a53643c86dbf44aa1da45a31a719a39d2fd0e2e2823ee347bf116ef7fa00240078e340b736d2d808a5c7b381a8b605af576efec4c8c2d0fa0b25cb32d35 languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-darwin-arm64@npm:19.0.0-beta.5" +"@nx/nx-darwin-arm64@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-darwin-arm64@npm:19.0.0-beta.6" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-darwin-x64@npm:19.0.0-beta.5" +"@nx/nx-darwin-x64@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-darwin-x64@npm:19.0.0-beta.6" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-freebsd-x64@npm:19.0.0-beta.5" +"@nx/nx-freebsd-x64@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-freebsd-x64@npm:19.0.0-beta.6" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.0.0-beta.5" +"@nx/nx-linux-arm-gnueabihf@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.0.0-beta.6" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-linux-arm64-gnu@npm:19.0.0-beta.5" +"@nx/nx-linux-arm64-gnu@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-linux-arm64-gnu@npm:19.0.0-beta.6" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-linux-arm64-musl@npm:19.0.0-beta.5" +"@nx/nx-linux-arm64-musl@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-linux-arm64-musl@npm:19.0.0-beta.6" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-linux-x64-gnu@npm:19.0.0-beta.5" +"@nx/nx-linux-x64-gnu@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-linux-x64-gnu@npm:19.0.0-beta.6" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-linux-x64-musl@npm:19.0.0-beta.5" +"@nx/nx-linux-x64-musl@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-linux-x64-musl@npm:19.0.0-beta.6" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-win32-arm64-msvc@npm:19.0.0-beta.5" +"@nx/nx-win32-arm64-msvc@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-win32-arm64-msvc@npm:19.0.0-beta.6" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/nx-win32-x64-msvc@npm:19.0.0-beta.5" +"@nx/nx-win32-x64-msvc@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/nx-win32-x64-msvc@npm:19.0.0-beta.6" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@nx/storybook@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/storybook@npm:19.0.0-beta.5" +"@nx/storybook@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/storybook@npm:19.0.0-beta.6" dependencies: - "@nrwl/storybook": 19.0.0-beta.5 - "@nx/cypress": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/eslint": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 + "@nrwl/storybook": 19.0.0-beta.6 + "@nx/cypress": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/eslint": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 "@phenomnomnominal/tsquery": ~5.0.1 semver: ^7.5.3 tslib: ^2.3.0 - checksum: b5364d1eb4ed57f87e7080106930370c09873d0e62004e4d7f4a22b1e180afbca297976cb2b045db6ef1115eb1145919e922f903358a05238fbb2dfe1b1c92fc + checksum: abb5d039de6a2b1ac900ba71a84c1c8abc17f30b6b3c023124aef472b6562975e6e88d8202aa3cd20a5ab20b08cdf86702f15162e673ffc08a3332c42dbe494e languageName: node linkType: hard -"@nx/web@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/web@npm:19.0.0-beta.5" +"@nx/web@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/web@npm:19.0.0-beta.6" dependencies: - "@nrwl/web": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 + "@nrwl/web": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 chalk: ^4.1.0 detect-port: ^1.5.1 http-server: ^14.1.0 tslib: ^2.3.0 - checksum: 46e43ee4c954eb80d10efc56925fa97a261b73e136099f44e9468e03fe07e9b401b62592cc1f2852b9ce8069c20c2f7aafb336bef79e2b94bcc4dfc6d6b42213 + checksum: b3cf9f68d4b9f5e10943bf2fa8dff705d243c1f23704635237a581b2e8b7000fa9a9506ebe749982053f28f1923943b67ccf0fc6552e02533a54cb9d758a3154 languageName: node linkType: hard -"@nx/webpack@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/webpack@npm:19.0.0-beta.5" +"@nx/webpack@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/webpack@npm:19.0.0-beta.6" dependencies: "@babel/core": ^7.23.2 - "@nrwl/webpack": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 + "@nrwl/webpack": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 ajv: ^8.12.0 autoprefixer: ^10.4.9 babel-loader: ^9.1.2 @@ -5777,22 +5777,22 @@ __metadata: webpack-dev-server: ^4.9.3 webpack-node-externals: ^3.0.0 webpack-subresource-integrity: ^5.1.0 - checksum: 09e4ffd3a7b1957ef501d4202e087b494b9911c271ea204f43c5ea944548ab1684ff808270f718b4564232b95ab2e266d0e28b45bd9aabadcd32ac09e6ae3ec0 + checksum: 2c666959566c2b07af937a17b0db264c01816678ef7d339d1c35157efeedabedaa721b6170cd7b46ca0f5e4be6f266518892a892754d4fa0f9ce1e330dcf0133 languageName: node linkType: hard -"@nx/workspace@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "@nx/workspace@npm:19.0.0-beta.5" +"@nx/workspace@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "@nx/workspace@npm:19.0.0-beta.6" dependencies: - "@nrwl/workspace": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 + "@nrwl/workspace": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 chalk: ^4.1.0 enquirer: ~2.3.6 - nx: 19.0.0-beta.5 + nx: 19.0.0-beta.6 tslib: ^2.3.0 yargs-parser: 21.1.1 - checksum: 2289811e322507415c575e407da40825e08180634448184dcd81ac9f3e2f8d8b785076eea91b3fb5b81f3227d8d1f54b8e35f183eda0fa281ea55de541d4a657 + checksum: 59d39b5dd320f2897495aefb45c5e0892fbc7d090301b35a93ec157f39900e2c56fcebb87c36bc880cb8f079b876a778591860597ddfe52878359e1115c28bfd languageName: node linkType: hard @@ -22738,20 +22738,20 @@ __metadata: "@microsoft/fast-element": ^1.12.0 "@microsoft/fast-foundation": ^2.49.0 "@monodon/typescript-nx-imports-plugin": 0.2.0 - "@nx/angular": 19.0.0-beta.5 - "@nx/cypress": 19.0.0-beta.5 - "@nx/devkit": 19.0.0-beta.5 - "@nx/esbuild": 19.0.0-beta.5 - "@nx/eslint": 19.0.0-beta.5 - "@nx/eslint-plugin": 19.0.0-beta.5 - "@nx/gradle": 19.0.0-beta.5 - "@nx/jest": 19.0.0-beta.5 - "@nx/js": 19.0.0-beta.5 - "@nx/node": 19.0.0-beta.5 - "@nx/storybook": 19.0.0-beta.5 - "@nx/web": 19.0.0-beta.5 - "@nx/webpack": 19.0.0-beta.5 - "@nx/workspace": 19.0.0-beta.5 + "@nx/angular": 19.0.0-beta.6 + "@nx/cypress": 19.0.0-beta.6 + "@nx/devkit": 19.0.0-beta.6 + "@nx/esbuild": 19.0.0-beta.6 + "@nx/eslint": 19.0.0-beta.6 + "@nx/eslint-plugin": 19.0.0-beta.6 + "@nx/gradle": 19.0.0-beta.6 + "@nx/jest": 19.0.0-beta.6 + "@nx/js": 19.0.0-beta.6 + "@nx/node": 19.0.0-beta.6 + "@nx/storybook": 19.0.0-beta.6 + "@nx/web": 19.0.0-beta.6 + "@nx/webpack": 19.0.0-beta.6 + "@nx/workspace": 19.0.0-beta.6 "@open-wc/lit-helpers": ^0.6.0 "@parcel/watcher": ^2.4.1 "@schematics/angular": 17.3.1 @@ -22812,7 +22812,7 @@ __metadata: memfs: ^3.4.7 minimatch: ^9.0.3 mocha: ^10.0.0 - nx: 19.0.0-beta.5 + nx: 19.0.0-beta.6 ovsx: ^0.7.1 prettier: 2.7.1 prettier-plugin-tailwindcss: ^0.3.0 @@ -22845,21 +22845,21 @@ __metadata: languageName: unknown linkType: soft -"nx@npm:19.0.0-beta.5": - version: 19.0.0-beta.5 - resolution: "nx@npm:19.0.0-beta.5" - dependencies: - "@nrwl/tao": 19.0.0-beta.5 - "@nx/nx-darwin-arm64": 19.0.0-beta.5 - "@nx/nx-darwin-x64": 19.0.0-beta.5 - "@nx/nx-freebsd-x64": 19.0.0-beta.5 - "@nx/nx-linux-arm-gnueabihf": 19.0.0-beta.5 - "@nx/nx-linux-arm64-gnu": 19.0.0-beta.5 - "@nx/nx-linux-arm64-musl": 19.0.0-beta.5 - "@nx/nx-linux-x64-gnu": 19.0.0-beta.5 - "@nx/nx-linux-x64-musl": 19.0.0-beta.5 - "@nx/nx-win32-arm64-msvc": 19.0.0-beta.5 - "@nx/nx-win32-x64-msvc": 19.0.0-beta.5 +"nx@npm:19.0.0-beta.6": + version: 19.0.0-beta.6 + resolution: "nx@npm:19.0.0-beta.6" + dependencies: + "@nrwl/tao": 19.0.0-beta.6 + "@nx/nx-darwin-arm64": 19.0.0-beta.6 + "@nx/nx-darwin-x64": 19.0.0-beta.6 + "@nx/nx-freebsd-x64": 19.0.0-beta.6 + "@nx/nx-linux-arm-gnueabihf": 19.0.0-beta.6 + "@nx/nx-linux-arm64-gnu": 19.0.0-beta.6 + "@nx/nx-linux-arm64-musl": 19.0.0-beta.6 + "@nx/nx-linux-x64-gnu": 19.0.0-beta.6 + "@nx/nx-linux-x64-musl": 19.0.0-beta.6 + "@nx/nx-win32-arm64-msvc": 19.0.0-beta.6 + "@nx/nx-win32-x64-msvc": 19.0.0-beta.6 "@yarnpkg/lockfile": ^1.1.0 "@yarnpkg/parsers": 3.0.0-rc.46 "@zkochan/js-yaml": 0.0.6 @@ -22925,7 +22925,7 @@ __metadata: bin: nx: bin/nx.js nx-cloud: bin/nx-cloud.js - checksum: 0634f00320980024e8785bc46c43a1a2582c257985903ed9b51ec33cbed865963132227bb33c0153fe6bfab74ba2de9f9177a967a74a7121c48e50762d9e3945 + checksum: 3b35daf8bbb4c83ee5afd5e26445821ca21324e6af7ee9e53c2ada0ccfcb7e0a502066c11322db325c223a711e500c64fd3d960b33a86e90a74c2d28dac0db0d languageName: node linkType: hard