@nx/rollup 23.0.0-rc.3 → 23.0.0-rc.4

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.
@@ -119,7 +119,9 @@ function updatePackageJson(tree, options, outputConfig, isTsSolutionSetup) {
119
119
  // target must exist if we don't receive an outputConfig
120
120
  const projectTarget = project.targets[options.buildTarget];
121
121
  const nxJson = (0, devkit_1.readNxJson)(tree);
122
- const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(options.buildTarget, nxJson.targetDefaults, projectTarget.executor));
122
+ const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (projectTarget.executor
123
+ ? nxJson.targetDefaults?.[projectTarget.executor]
124
+ : undefined) ?? nxJson.targetDefaults?.[options.buildTarget]);
123
125
  ({ main, outputPath } = mergedTarget.options);
124
126
  }
125
127
  packageJson = (0, js_1.getUpdatedPackageJsonContent)(packageJson, {
@@ -20,13 +20,9 @@ async function convertToInferred(tree, options) {
20
20
  return;
21
21
  // Since targetDefaults for '@nx/rollup:rollup' will no longer apply, we want to copy them to the target options.
22
22
  const nxJson = (0, devkit_1.readNxJson)(tree);
23
- const defaults = (0, internal_1.normalizeTargetDefaults)(nxJson?.targetDefaults).find((e) => e.executor === '@nx/rollup:rollup' &&
24
- e.target === undefined &&
25
- e.projects === undefined &&
26
- e.plugin === undefined);
23
+ const defaults = nxJson.targetDefaults['@nx/rollup:rollup'];
27
24
  if (defaults) {
28
- const { target: _t, executor: _e, projects: _p, plugin: _pl, ...rest } = defaults;
29
- for (const [key, value] of Object.entries(rest)) {
25
+ for (const [key, value] of Object.entries(defaults)) {
30
26
  target[key] ??= value;
31
27
  }
32
28
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/rollup",
3
- "version": "23.0.0-rc.3",
3
+ "version": "23.0.0-rc.4",
4
4
  "private": false,
5
5
  "type": "commonjs",
6
6
  "files": [
@@ -91,8 +91,8 @@
91
91
  "postcss": "^8.4.38",
92
92
  "postcss-modules": "^6.0.1",
93
93
  "tslib": "^2.3.0",
94
- "@nx/devkit": "23.0.0-rc.3",
95
- "@nx/js": "23.0.0-rc.3"
94
+ "@nx/devkit": "23.0.0-rc.4",
95
+ "@nx/js": "23.0.0-rc.4"
96
96
  },
97
97
  "peerDependencies": {
98
98
  "rollup": "^3.0.0 || ^4.0.0"
@@ -104,7 +104,7 @@
104
104
  },
105
105
  "devDependencies": {
106
106
  "source-map-js": "^1.2.0",
107
- "nx": "23.0.0-rc.3"
107
+ "nx": "23.0.0-rc.4"
108
108
  },
109
109
  "publishConfig": {
110
110
  "access": "public"