@nrwl/workspace 14.2.0-rc.1 → 14.2.0-rc.2

Sign up to get free protection for your applications and to get access to all the features.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- # [14.2.0-rc.1](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-rc.1) (2022-06-03)
6
+ # [14.2.0-rc.2](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-rc.2) (2022-06-03)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/workspace
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "14.2.0-rc.1",
3
+ "version": "14.2.0-rc.2",
4
4
  "description": "Smart, Fast and Extensible Build System.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,27 +32,27 @@
32
32
  "requirements": {},
33
33
  "migrations": "./migrations.json",
34
34
  "packageGroup": {
35
- "@nrwl/angular": "14.2.0-rc.1",
36
- "@nrwl/cypress": "14.2.0-rc.1",
37
- "@nrwl/devkit": "14.2.0-rc.1",
38
- "@nrwl/eslint-plugin-nx": "14.2.0-rc.1",
39
- "@nrwl/express": "14.2.0-rc.1",
40
- "@nrwl/jest": "14.2.0-rc.1",
41
- "@nrwl/linter": "14.2.0-rc.1",
42
- "@nrwl/nest": "14.2.0-rc.1",
43
- "@nrwl/next": "14.2.0-rc.1",
44
- "@nrwl/node": "14.2.0-rc.1",
45
- "@nrwl/nx-plugin": "14.2.0-rc.1",
46
- "@nrwl/react": "14.2.0-rc.1",
47
- "@nrwl/storybook": "14.2.0-rc.1",
48
- "@nrwl/web": "14.2.0-rc.1",
49
- "@nrwl/js": "14.2.0-rc.1",
50
- "@nrwl/cli": "14.2.0-rc.1",
51
- "@nrwl/tao": "14.2.0-rc.1",
35
+ "@nrwl/angular": "14.2.0-rc.2",
36
+ "@nrwl/cypress": "14.2.0-rc.2",
37
+ "@nrwl/devkit": "14.2.0-rc.2",
38
+ "@nrwl/eslint-plugin-nx": "14.2.0-rc.2",
39
+ "@nrwl/express": "14.2.0-rc.2",
40
+ "@nrwl/jest": "14.2.0-rc.2",
41
+ "@nrwl/linter": "14.2.0-rc.2",
42
+ "@nrwl/nest": "14.2.0-rc.2",
43
+ "@nrwl/next": "14.2.0-rc.2",
44
+ "@nrwl/node": "14.2.0-rc.2",
45
+ "@nrwl/nx-plugin": "14.2.0-rc.2",
46
+ "@nrwl/react": "14.2.0-rc.2",
47
+ "@nrwl/storybook": "14.2.0-rc.2",
48
+ "@nrwl/web": "14.2.0-rc.2",
49
+ "@nrwl/js": "14.2.0-rc.2",
50
+ "@nrwl/cli": "14.2.0-rc.2",
51
+ "@nrwl/tao": "14.2.0-rc.2",
52
52
  "@nrwl/nx-cloud": "latest",
53
- "@nrwl/react-native": "14.2.0-rc.1",
54
- "@nrwl/detox": "14.2.0-rc.1",
55
- "nx": "14.2.0-rc.1"
53
+ "@nrwl/react-native": "14.2.0-rc.2",
54
+ "@nrwl/detox": "14.2.0-rc.2",
55
+ "nx": "14.2.0-rc.2"
56
56
  }
57
57
  },
58
58
  "peerDependencies": {
@@ -64,9 +64,9 @@
64
64
  }
65
65
  },
66
66
  "dependencies": {
67
- "@nrwl/devkit": "14.2.0-rc.1",
68
- "@nrwl/jest": "14.2.0-rc.1",
69
- "@nrwl/linter": "14.2.0-rc.1",
67
+ "@nrwl/devkit": "14.2.0-rc.2",
68
+ "@nrwl/jest": "14.2.0-rc.2",
69
+ "@nrwl/linter": "14.2.0-rc.2",
70
70
  "@parcel/watcher": "2.0.4",
71
71
  "chalk": "4.1.0",
72
72
  "chokidar": "^3.5.1",
@@ -81,7 +81,7 @@
81
81
  "ignore": "^5.0.4",
82
82
  "minimatch": "3.0.5",
83
83
  "npm-run-path": "^4.0.1",
84
- "nx": "14.2.0-rc.1",
84
+ "nx": "14.2.0-rc.2",
85
85
  "open": "^8.4.0",
86
86
  "rxjs": "^6.5.4",
87
87
  "semver": "7.3.4",
@@ -90,5 +90,5 @@
90
90
  "yargs": "^17.4.0",
91
91
  "yargs-parser": "21.0.1"
92
92
  },
93
- "gitHead": "2fb10593d18f88fb9c1da855bdbc1025d01071fe"
93
+ "gitHead": "26177d15af643cb85d6c94530b02c7b3c29bbf98"
94
94
  }
@@ -6,6 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
6
6
  const output_1 = require("../output");
7
7
  const plugin_capabilities_1 = require("./plugin-capabilities");
8
8
  const shared_1 = require("./shared");
9
+ const package_json_1 = require("nx/src/utils/package-json");
9
10
  function getInstalledPluginsFromPackageJson(workspaceRoot, corePlugins, communityPlugins = []) {
10
11
  const packageJson = (0, devkit_1.readJsonFile)(`${workspaceRoot}/package.json`);
11
12
  const plugins = new Set([
@@ -19,7 +20,7 @@ function getInstalledPluginsFromPackageJson(workspaceRoot, corePlugins, communit
19
20
  try {
20
21
  // Check for `package.json` existence instead of requiring the module itself
21
22
  // because malformed entries like `main`, may throw false exceptions.
22
- require.resolve(`${name}/package.json`, { paths: [workspaceRoot] });
23
+ (0, package_json_1.readModulePackageJson)(name);
23
24
  return true;
24
25
  }
25
26
  catch (_a) {
@@ -1 +1 @@
1
- {"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/installed-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yCAA4C;AAC5C,sCAAmC;AAEnC,+DAA8D;AAC9D,qCAAuC;AAEvC,SAAgB,kCAAkC,CAChD,aAAqB,EACrB,WAAyB,EACzB,mBAAsC,EAAE;IAExC,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,GAAG,aAAa,eAAe,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;QACtB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9C,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,CACZ,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SAChB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,IAAI;YACF,4EAA4E;YAC5E,qEAAqE;YACrE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;SACb;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC;SACD,IAAI,EAAE;SACN,GAAG,CAA+B,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,IAAI;QACJ,IAAA,2CAAqB,EAAC,aAAa,EAAE,IAAI,CAAC;KAC3C,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAC3D,CAAC;AACJ,CAAC;AAjCD,gFAiCC;AAED,SAAgB,oBAAoB,CAClC,gBAAiD;IAEjD,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,gBAAgB,EAAE;QACpC,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,SAAS,CAAC,EAAE;YAC5B,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,UAAU,CAAC,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACjC;QACD,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAClE;IAED,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,SAAS;KACrB,CAAC,CAAC;AACL,CAAC;AApBD,oDAoBC"}
1
+ {"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/installed-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yCAA4C;AAC5C,sCAAmC;AAEnC,+DAA8D;AAC9D,qCAAuC;AACvC,4DAAkE;AAElE,SAAgB,kCAAkC,CAChD,aAAqB,EACrB,WAAyB,EACzB,mBAAsC,EAAE;IAExC,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,GAAG,aAAa,eAAe,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;QACtB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9C,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,CACZ,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SAChB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,IAAI;YACF,4EAA4E;YAC5E,qEAAqE;YACrE,IAAA,oCAAqB,EAAC,IAAI,CAAC,CAAC;YAC5B,OAAO,IAAI,CAAC;SACb;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC;SACD,IAAI,EAAE;SACN,GAAG,CAA+B,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,IAAI;QACJ,IAAA,2CAAqB,EAAC,aAAa,EAAE,IAAI,CAAC;KAC3C,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAC3D,CAAC;AACJ,CAAC;AAjCD,gFAiCC;AAED,SAAgB,oBAAoB,CAClC,gBAAiD;IAEjD,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,gBAAgB,EAAE;QACpC,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,SAAS,CAAC,EAAE;YAC5B,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,UAAU,CAAC,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACjC;QACD,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAClE;IAED,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,SAAS;KACrB,CAAC,CAAC;AACL,CAAC;AApBD,oDAoBC"}
@@ -4,6 +4,7 @@ exports.listPluginCapabilities = exports.getPluginCapabilities = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const devkit_2 = require("@nrwl/devkit");
6
6
  const chalk = require("chalk");
7
+ const package_json_1 = require("nx/src/utils/package-json");
7
8
  const path_1 = require("path");
8
9
  const output_1 = require("../output");
9
10
  const shared_1 = require("./shared");
@@ -21,10 +22,7 @@ function tryGetCollection(packageJsonPath, collectionFile, propName) {
21
22
  }
22
23
  function getPluginCapabilities(workspaceRoot, pluginName) {
23
24
  try {
24
- const packageJsonPath = require.resolve(`${pluginName}/package.json`, {
25
- paths: [workspaceRoot],
26
- });
27
- const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
25
+ const { path: packageJsonPath, packageJson } = (0, package_json_1.readModulePackageJson)(pluginName);
28
26
  return {
29
27
  name: pluginName,
30
28
  generators: tryGetCollection(packageJsonPath, packageJson.generators, 'generators') ||
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":"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"}