@nx/rollup 23.1.0-beta.3 → 23.1.0-beta.5
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,9 +119,7 @@ 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, (projectTarget.executor
|
|
123
|
-
? nxJson.targetDefaults?.[projectTarget.executor]
|
|
124
|
-
: undefined) ?? nxJson.targetDefaults?.[options.buildTarget]);
|
|
122
|
+
const mergedTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(options.buildTarget, nxJson.targetDefaults, projectTarget.executor));
|
|
125
123
|
({ main, outputPath } = mergedTarget.options);
|
|
126
124
|
}
|
|
127
125
|
packageJson = (0, js_1.getUpdatedPackageJsonContent)(packageJson, {
|
|
@@ -20,9 +20,12 @@ 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 = nxJson
|
|
23
|
+
const defaults = (0, internal_1.findTargetDefault)(nxJson?.targetDefaults, {
|
|
24
|
+
executor: '@nx/rollup:rollup',
|
|
25
|
+
});
|
|
24
26
|
if (defaults) {
|
|
25
|
-
|
|
27
|
+
const { target: _t, executor: _e, projects: _p, plugin: _pl, ...rest } = defaults;
|
|
28
|
+
for (const [key, value] of Object.entries(rest)) {
|
|
26
29
|
target[key] ??= value;
|
|
27
30
|
}
|
|
28
31
|
}
|
|
@@ -59,6 +59,11 @@ async function default_1(tree) {
|
|
|
59
59
|
const ROLLUP_EXECUTORS = ['@nx/rollup:rollup', '@nrwl/rollup:rollup'];
|
|
60
60
|
let nxJsonChanged = false;
|
|
61
61
|
for (const [targetOrExecutor, targetDefault] of Object.entries(nxJson.targetDefaults)) {
|
|
62
|
+
// This migration predates the filtered array value form, so values are
|
|
63
|
+
// always plain objects here; skip arrays defensively to stay type-safe.
|
|
64
|
+
if (Array.isArray(targetDefault)) {
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
62
67
|
if (!ROLLUP_EXECUTORS.includes(targetOrExecutor) &&
|
|
63
68
|
!ROLLUP_EXECUTORS.includes(targetDefault.executor)) {
|
|
64
69
|
continue;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/rollup",
|
|
3
|
-
"version": "23.1.0-beta.
|
|
3
|
+
"version": "23.1.0-beta.5",
|
|
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.1.0-beta.
|
|
95
|
-
"@nx/js": "23.1.0-beta.
|
|
94
|
+
"@nx/devkit": "23.1.0-beta.5",
|
|
95
|
+
"@nx/js": "23.1.0-beta.5"
|
|
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.1.0-beta.
|
|
107
|
+
"nx": "23.1.0-beta.5"
|
|
108
108
|
},
|
|
109
109
|
"publishConfig": {
|
|
110
110
|
"access": "public"
|