@nx/js 17.0.0-beta.1 → 17.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +4 -4
  2. package/src/utils/buildable-libs-utils.js +13 -22
  3. package/src/utils/package-json/update-package-json.js +4 -7
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/js",
3
- "version": "17.0.0-beta.1",
3
+ "version": "17.0.0-beta.2",
4
4
  "private": false,
5
5
  "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
6
6
  "repository": {
@@ -59,9 +59,9 @@
59
59
  "semver": "7.5.3",
60
60
  "source-map-support": "0.5.19",
61
61
  "tslib": "^2.3.0",
62
- "@nx/devkit": "17.0.0-beta.1",
63
- "@nx/workspace": "17.0.0-beta.1",
64
- "@nrwl/js": "17.0.0-beta.1"
62
+ "@nx/devkit": "17.0.0-beta.2",
63
+ "@nx/workspace": "17.0.0-beta.2",
64
+ "@nrwl/js": "17.0.0-beta.2"
65
65
  },
66
66
  "peerDependencies": {
67
67
  "verdaccio": "^5.0.4"
package/src/utils/buildable-libs-utils.js CHANGED
@@ -49,13 +49,10 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
49
49
  ? (0, devkit_1.readJsonFile)(libPackageJsonPath).name // i.e. @workspace/mylib
50
50
  : dep,
51
51
  outputs: (0, devkit_1.getOutputsForTargetAndConfiguration)({
52
- overrides: {},
53
- target: {
54
- project: projectName,
55
- target: targetName,
56
- configuration: configurationName,
57
- },
58
- }, depNode),
52
+ project: projectName,
53
+ target: targetName,
54
+ configuration: configurationName,
55
+ }, {}, depNode),
59
56
  node: depNode,
60
57
  };
61
58
  }
@@ -128,7 +125,7 @@ function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, proje
128
125
  if (depProjectNode?.type !== 'lib') {
129
126
  return null;
130
127
  }
131
- let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask, depProjectNode);
128
+ let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask.target, depTask.overrides, depProjectNode);
132
129
  if (outputs.length === 0) {
133
130
  nonBuildableDependencies.push(depTask.target.project);
134
131
  continue;
@@ -305,13 +302,10 @@ exports.updatePaths = updatePaths;
305
302
  */
306
303
  function updateBuildableProjectPackageJsonDependencies(root, projectName, targetName, configurationName, node, dependencies, typeOfDependency = 'dependencies') {
307
304
  const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
308
- overrides: {},
309
- target: {
310
- project: projectName,
311
- target: targetName,
312
- configuration: configurationName,
313
- },
314
- }, node);
305
+ project: projectName,
306
+ target: targetName,
307
+ configuration: configurationName,
308
+ }, {}, node);
315
309
  const packageJsonPath = `${outputs[0]}/package.json`;
316
310
  let packageJson;
317
311
  let workspacePackageJson;
@@ -337,13 +331,10 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
337
331
  let depVersion;
338
332
  if (entry.node.type === 'lib') {
339
333
  const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
340
- overrides: {},
341
- target: {
342
- project: projectName,
343
- target: targetName,
344
- configuration: configurationName,
345
- },
346
- }, entry.node);
334
+ project: projectName,
335
+ target: targetName,
336
+ configuration: configurationName,
337
+ }, {}, entry.node);
347
338
  const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
348
339
  depVersion = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
349
340
  packageJson[typeOfDependency][packageName] = depVersion;
package/src/utils/package-json/update-package-json.js CHANGED
@@ -79,13 +79,10 @@ function addMissingDependencies(packageJson, { projectName, targetName, configur
79
79
  !packageJson.devDependencies?.[packageName] &&
80
80
  !packageJson.peerDependencies?.[packageName]) {
81
81
  const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
82
- overrides: {},
83
- target: {
84
- project: projectName,
85
- target: targetName,
86
- configuration: configurationName,
87
- },
88
- }, entry.node);
82
+ project: projectName,
83
+ target: targetName,
84
+ configuration: configurationName,
85
+ }, {}, entry.node);
89
86
  const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
90
87
  if ((0, fs_1.existsSync)(depPackageJsonPath)) {
91
88
  const version = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;