@nrwl/angular 15.6.2 → 15.7.0-beta.0
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.
- package/CHANGELOG.md +1 -1
- package/README.md +1 -1
- package/migrations.json +0 -35
- package/package.json +8 -11
- package/src/builders/module-federation-dev-server/schema.json +2 -1
- package/src/builders/module-federation-dev-ssr/schema.json +2 -1
- package/src/builders/utilities/webpack.d.ts +1 -0
- package/src/builders/utilities/webpack.js +9 -1
- package/src/builders/utilities/webpack.js.map +1 -1
- package/src/builders/webpack-browser/schema.json +7 -1
- package/src/builders/webpack-browser/webpack-browser.impl.d.ts +1 -0
- package/src/builders/webpack-browser/webpack-browser.impl.js +20 -7
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/builders/webpack-dev-server/schema.json +2 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +17 -7
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-server/schema.json +3 -1
- package/src/executors/ng-packagr-lite/schema.json +2 -1
- package/src/executors/package/schema.json +2 -1
- package/src/generators/application/angular-v14/application.js +0 -7
- package/src/generators/application/angular-v14/application.js.map +1 -1
- package/src/generators/application/angular-v14/lib/add-e2e.js +0 -7
- package/src/generators/application/angular-v14/lib/add-e2e.js.map +1 -1
- package/src/generators/application/angular-v14/lib/normalize-options.js +2 -13
- package/src/generators/application/angular-v14/lib/normalize-options.js.map +1 -1
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js +1 -1
- package/src/generators/application/angular-v14/lib/update-config-files.js +1 -2
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-e2e-project.js +0 -1
- package/src/generators/application/angular-v14/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/application.js +0 -7
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/add-e2e.js +1 -8
- package/src/generators/application/lib/add-e2e.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +2 -13
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/nrwl-home-tpl.js +1 -1
- package/src/generators/application/lib/update-config-files.js +1 -2
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/lib/update-e2e-project.js +0 -1
- package/src/generators/application/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/schema.json +2 -1
- package/src/generators/host/schema.json +3 -1
- package/src/generators/library/lib/normalize-options.js +1 -10
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/library.js +0 -8
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +2 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +1 -2
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.d.ts +1 -0
- package/src/generators/ng-add/migrators/projects/app.migrator.js +21 -22
- package/src/generators/ng-add/migrators/projects/app.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/lib.migrator.d.ts +1 -1
- package/src/generators/ng-add/migrators/projects/lib.migrator.js +5 -6
- package/src/generators/ng-add/migrators/projects/lib.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/index.d.ts +1 -1
- package/src/generators/ng-add/utilities/index.js +1 -1
- package/src/generators/ng-add/utilities/index.js.map +1 -1
- package/src/generators/ng-add/utilities/{get-all-projects.d.ts → projects.d.ts} +2 -0
- package/src/generators/ng-add/utilities/projects.js +47 -0
- package/src/generators/ng-add/utilities/projects.js.map +1 -0
- package/src/generators/ng-add/utilities/workspace.js +4 -5
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/remote/schema.json +3 -1
- package/src/generators/utils/testing.js +1 -1
- package/src/generators/utils/testing.js.map +1 -1
- package/src/utils/nx-devkit/testing.js +12 -18
- package/src/utils/nx-devkit/testing.js.map +1 -1
- package/scripts/nx-cli-warning.js +0 -40
- package/src/generators/ng-add/utilities/get-all-projects.js +0 -26
- package/src/generators/ng-add/utilities/get-all-projects.js.map +0 -1
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.d.ts +0 -2
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.js +0 -22
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.js.map +0 -1
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.d.ts +0 -2
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js +0 -104
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js.map +0 -1
- package/src/migrations/update-12-3-0/update-angular-eslint-rules.d.ts +0 -2
- package/src/migrations/update-12-3-0/update-angular-eslint-rules.js +0 -60
- package/src/migrations/update-12-3-0/update-angular-eslint-rules.js.map +0 -1
- package/src/migrations/update-12-3-0/update-storybook.d.ts +0 -2
- package/src/migrations/update-12-3-0/update-storybook.js +0 -64
- package/src/migrations/update-12-3-0/update-storybook.js.map +0 -1
- package/src/migrations/update-12-3-0/update-webpack-browser-config.d.ts +0 -2
- package/src/migrations/update-12-3-0/update-webpack-browser-config.js +0 -67
- package/src/migrations/update-12-3-0/update-webpack-browser-config.js.map +0 -1
- package/src/migrations/update-12-9-0/update-invalid-import-paths.d.ts +0 -10
- package/src/migrations/update-12-9-0/update-invalid-import-paths.js +0 -94
- package/src/migrations/update-12-9-0/update-invalid-import-paths.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,7 +130,9 @@
|
|
|
130
130
|
},
|
|
131
131
|
"standaloneConfig": {
|
|
132
132
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
133
|
-
"type": "boolean"
|
|
133
|
+
"type": "boolean",
|
|
134
|
+
"default": true,
|
|
135
|
+
"x-deprecated": "Nx only supports standaloneConfig"
|
|
134
136
|
},
|
|
135
137
|
"setParserOptionsProject": {
|
|
136
138
|
"type": "boolean",
|
|
@@ -9,7 +9,7 @@ const test_runners_1 = require("../../utils/test-runners");
|
|
|
9
9
|
const library_1 = require("../library/library");
|
|
10
10
|
function createStorybookTestWorkspaceForLib(libName) {
|
|
11
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
-
let tree = (0, testing_1.
|
|
12
|
+
let tree = (0, testing_1.createTreeWithEmptyWorkspace)({ layout: 'apps-libs' });
|
|
13
13
|
const moduleGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'module');
|
|
14
14
|
const componentGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
15
15
|
yield (0, library_1.default)(tree, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":";;;;AACA,8DAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,27 +52,21 @@ function createApp(tree, appName, routing = true) {
|
|
|
52
52
|
tree.write(`/apps/${appName}-e2e/tsconfig.e2e.json`, JSON.stringify({
|
|
53
53
|
include: ['../**/*.ts'],
|
|
54
54
|
}));
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
architect: {
|
|
63
|
-
build: {
|
|
64
|
-
options: {
|
|
65
|
-
main: `apps/${appName}/src/main.ts`,
|
|
66
|
-
},
|
|
67
|
-
},
|
|
68
|
-
serve: {
|
|
69
|
-
options: {},
|
|
70
|
-
},
|
|
55
|
+
(0, devkit_1.addProjectConfiguration)(tree, appName, {
|
|
56
|
+
root: `apps/${appName}`,
|
|
57
|
+
sourceRoot: `apps/${appName}/src`,
|
|
58
|
+
targets: {
|
|
59
|
+
build: {
|
|
60
|
+
options: {
|
|
61
|
+
main: `apps/${appName}/src/main.ts`,
|
|
71
62
|
},
|
|
72
|
-
|
|
63
|
+
},
|
|
64
|
+
serve: {
|
|
65
|
+
options: {},
|
|
73
66
|
},
|
|
74
67
|
},
|
|
75
|
-
|
|
68
|
+
tags: [],
|
|
69
|
+
});
|
|
76
70
|
}
|
|
77
71
|
exports.createApp = createApp;
|
|
78
72
|
function createLib(tree, libName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/testing.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/testing.ts"],"names":[],"mappings":";;;AACA,yCAA0E;AAa1E,IAAI,SAAoB,CAAC,CAAC,iCAAiC;AAC3D,IAAI,SAAoB,CAAC;AAEzB,SAAgB,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,oCAEC;AAED,SAAgB,SAAS,CACvB,IAAU,EACV,OAAe,EACf,UAAmB,IAAI;IAEvB,OAAO,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAClC,0DAA0D;IAC1D,SAAS,GAAG;QACV,OAAO;QACP,SAAS,EAAE,SAAS,OAAO,wBAAwB;KACpD,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,SAAS,CAAC,SAAS,EACnB;;;OAGG,OAAO,CAAC,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAC,EAAE;;;kCAGpC,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE;;;;;GAKxE,CACA,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,cAAc,EAC9B;;;;;;;;;;;;;;GAcD,CACA,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,oBAAoB,EACpC,IAAI,CAAC,SAAS,CAAC;QACb,OAAO,EAAE,CAAC,SAAS,CAAC;KACrB,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,OAAO,wBAAwB,EACxC,IAAI,CAAC,SAAS,CAAC;QACb,OAAO,EAAE,CAAC,YAAY,CAAC;KACxB,CAAC,CACH,CAAC;IACF,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,EAAE;QACrC,IAAI,EAAE,QAAQ,OAAO,EAAE;QACvB,UAAU,EAAE,QAAQ,OAAO,MAAM;QACjC,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ,OAAO,cAAc;iBACpC;aACF;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,EAAE;aACZ;SACF;QACD,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;AACL,CAAC;AAxED,8BAwEC;AAED,SAAgB,SAAS,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;IAEnE,SAAS,GAAG;QACV,IAAI;QACJ,MAAM,EAAE,SAAS,YAAY,YAAY,QAAQ,YAAY;QAC7D,MAAM,EAAE,SAAS,YAAY,eAAe;KAC7C,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,SAAS,CAAC,MAAM,EAChB;;;;;;;;;qBASiB,SAAS;GAC3B,CACA,CAAC;IACF,IAAI,CAAC,KAAK,CACR,SAAS,CAAC,MAAM,EAChB;2BACuB,QAAQ;GAChC,CACA,CAAC;AACJ,CAAC;AA7BD,8BA6BC"}
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
const path = require('path');
|
|
2
|
-
const fs = require('fs');
|
|
3
|
-
|
|
4
|
-
try {
|
|
5
|
-
const root = findWorkspaceRoot(process.cwd());
|
|
6
|
-
if (path.basename(root) === 'workspace.json') {
|
|
7
|
-
const workspaceJson = JSON.parse(fs.readFileSync(root));
|
|
8
|
-
if (Object.keys(workspaceJson.projects).length === 0) {
|
|
9
|
-
const output = require('nx/src/utils/output').output;
|
|
10
|
-
output.warn({
|
|
11
|
-
title: '@nrwl/angular added to a Nx workspace powered by the Nx CLI.',
|
|
12
|
-
bodyLines: [
|
|
13
|
-
"You won't be able to use 'ng' to generate artifacts and run tasks.",
|
|
14
|
-
"If you want to use 'ng', you need to create a new workspace powered by the Angular CLI.",
|
|
15
|
-
"You can do it by providing --cli when creating a new workspace as follows: 'create-nx-workspace --cli=angular'.",
|
|
16
|
-
"You can invoke the Angular schematics with 'nx generate @nrwl/angular' to generate artifacts.",
|
|
17
|
-
],
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
} catch (e) {}
|
|
22
|
-
|
|
23
|
-
function findWorkspaceRoot(dir) {
|
|
24
|
-
if (path.dirname(dir) === dir) return null;
|
|
25
|
-
if (exists(path.join(dir, 'angular.json'))) {
|
|
26
|
-
return path.join(dir, 'angular.json');
|
|
27
|
-
} else if (exists(path.join(dir, 'workspace.json'))) {
|
|
28
|
-
return path.join(dir, 'workspace.json');
|
|
29
|
-
} else {
|
|
30
|
-
return findWorkspaceRoot(path.dirname(dir));
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
function exists(filePath) {
|
|
35
|
-
try {
|
|
36
|
-
return fs.statSync(filePath).isFile();
|
|
37
|
-
} catch (err) {
|
|
38
|
-
return false;
|
|
39
|
-
}
|
|
40
|
-
}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAllProjects = void 0;
|
|
4
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
function getAllProjects(tree) {
|
|
6
|
-
const projects = (0, devkit_1.getProjects)(tree);
|
|
7
|
-
const result = {
|
|
8
|
-
apps: [],
|
|
9
|
-
libs: [],
|
|
10
|
-
};
|
|
11
|
-
for (const [name, project] of projects) {
|
|
12
|
-
const migrationProject = {
|
|
13
|
-
config: project,
|
|
14
|
-
name,
|
|
15
|
-
};
|
|
16
|
-
if (project.projectType === 'library') {
|
|
17
|
-
result.libs.push(migrationProject);
|
|
18
|
-
}
|
|
19
|
-
else {
|
|
20
|
-
result.apps.push(migrationProject);
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
return result;
|
|
24
|
-
}
|
|
25
|
-
exports.getAllProjects = getAllProjects;
|
|
26
|
-
//# sourceMappingURL=get-all-projects.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"get-all-projects.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/get-all-projects.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAGjD,SAAgB,cAAc,CAAC,IAAU;IACvC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,MAAM,GAAsB;QAChC,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;KACT,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QACtC,MAAM,gBAAgB,GAAkC;YACtD,MAAM,EAAE,OAAO;YACf,IAAI;SACL,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpC;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,wCAqBC"}
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
function default_1(tree) {
|
|
6
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
-
let shouldFormat = false;
|
|
8
|
-
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
9
|
-
var _a, _b;
|
|
10
|
-
if ((_b = (_a = json.scripts) === null || _a === void 0 ? void 0 : _a.postinstall) === null || _b === void 0 ? void 0 : _b.includes('ngcc')) {
|
|
11
|
-
json.scripts.postinstall = json.scripts.postinstall.replace(/(.*)(ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points)(.*)/, '$1ngcc --properties es2015 browser module main$3');
|
|
12
|
-
shouldFormat = true;
|
|
13
|
-
}
|
|
14
|
-
return json;
|
|
15
|
-
});
|
|
16
|
-
if (shouldFormat) {
|
|
17
|
-
yield (0, devkit_1.formatFiles)(tree);
|
|
18
|
-
}
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
exports.default = default_1;
|
|
22
|
-
//# sourceMappingURL=update-ngcc-postinstall.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-ngcc-postinstall.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-0-0/update-ngcc-postinstall.ts"],"names":[],"mappings":";;;AACA,yCAAuD;AAEvD,mBAA+B,IAAU;;QACvC,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;YACxC,IAAI,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAW,0CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC/C,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CACzD,+FAA+F,EAC/F,kDAAkD,CACnD,CAAC;gBACF,YAAY,GAAG,IAAI,CAAC;aACrB;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE;YAChB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAlBD,4BAkBC"}
|
package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js
DELETED
|
@@ -1,104 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
function convertWebpackBrowserBuildTargetToDelegateBuild(host) {
|
|
6
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
-
const projects = (0, devkit_1.getProjects)(host);
|
|
8
|
-
for (const [projectName, project] of projects) {
|
|
9
|
-
const webpackBrowserTargets = Object.values(project.targets || {}).filter((target) => target.executor === '@nrwl/angular:webpack-browser');
|
|
10
|
-
for (const target of webpackBrowserTargets) {
|
|
11
|
-
const configurationOptions = getTargetConfigurationOptions(target);
|
|
12
|
-
const buildTargetName = yield getBuildTargetNameFromOptions(target.options, configurationOptions);
|
|
13
|
-
if (buildTargetName) {
|
|
14
|
-
target.executor = '@nrwl/angular:delegate-build';
|
|
15
|
-
updateTargetsOptions(project, target, buildTargetName);
|
|
16
|
-
yield updateTargetsConfigurations(project, projectName, target, buildTargetName, configurationOptions);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
(0, devkit_1.updateProjectConfiguration)(host, projectName, project);
|
|
20
|
-
}
|
|
21
|
-
yield (0, devkit_1.formatFiles)(host);
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
exports.default = convertWebpackBrowserBuildTargetToDelegateBuild;
|
|
25
|
-
function cleanupBuildTargetProperties(options) {
|
|
26
|
-
delete options.tsConfig;
|
|
27
|
-
delete options.outputPath;
|
|
28
|
-
}
|
|
29
|
-
function extractConfigurationBuildTarget(project, target, configuration, buildTarget) {
|
|
30
|
-
var _a;
|
|
31
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
32
|
-
if (buildTarget) {
|
|
33
|
-
const buildTargetObj = (0, devkit_1.parseTargetString)(buildTarget, yield (0, devkit_1.createProjectGraphAsync)());
|
|
34
|
-
return Object.assign(Object.assign({}, buildTargetObj), { configuration: (_a = buildTargetObj.configuration) !== null && _a !== void 0 ? _a : configuration });
|
|
35
|
-
}
|
|
36
|
-
return {
|
|
37
|
-
project: project,
|
|
38
|
-
target: target,
|
|
39
|
-
configuration: configuration,
|
|
40
|
-
};
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
function getBuildTargetNameFromOptions(baseOptions, configurationOptions) {
|
|
44
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
const pg = yield (0, devkit_1.createProjectGraphAsync)();
|
|
46
|
-
if (baseOptions.buildTarget) {
|
|
47
|
-
return (0, devkit_1.parseTargetString)(baseOptions.buildTarget, pg).target;
|
|
48
|
-
}
|
|
49
|
-
for (const [, options] of configurationOptions) {
|
|
50
|
-
if (options.buildTarget) {
|
|
51
|
-
return (0, devkit_1.parseTargetString)(options.buildTarget, pg).target;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
function getTargetConfigurationOptions(target) {
|
|
57
|
-
const targets = new Map();
|
|
58
|
-
if (target.configurations) {
|
|
59
|
-
for (const [name, options] of Object.entries(target.configurations)) {
|
|
60
|
-
if (options !== undefined) {
|
|
61
|
-
targets.set(name, options);
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
return targets;
|
|
66
|
-
}
|
|
67
|
-
function updateTargetsConfigurations(project, projectName, target, buildTargetName, configurationOptions) {
|
|
68
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
69
|
-
for (const [configurationName, options] of configurationOptions) {
|
|
70
|
-
const { buildTarget, tsConfig, outputPath } = options, delegateTargetOptions = tslib_1.__rest(options, ["buildTarget", "tsConfig", "outputPath"]);
|
|
71
|
-
const configurationBuildTarget = yield extractConfigurationBuildTarget(projectName, buildTargetName, configurationName, buildTarget);
|
|
72
|
-
if (!project.targets[buildTargetName].configurations) {
|
|
73
|
-
project.targets[buildTargetName].configurations = {};
|
|
74
|
-
}
|
|
75
|
-
// Update build target configuration options by overwriting them
|
|
76
|
-
const buildTargetConfigurations = project.targets[buildTargetName].configurations;
|
|
77
|
-
buildTargetConfigurations[configurationBuildTarget.configuration] = Object.assign(Object.assign({}, buildTargetConfigurations[configurationBuildTarget.configuration]), delegateTargetOptions);
|
|
78
|
-
// Delete options already present in the source target
|
|
79
|
-
cleanupBuildTargetProperties(buildTargetConfigurations[configurationBuildTarget.configuration]);
|
|
80
|
-
// Update source target configuration with buildTarget
|
|
81
|
-
target.configurations[configurationName] = {
|
|
82
|
-
buildTarget: (0, devkit_1.targetToTargetString)(configurationBuildTarget),
|
|
83
|
-
tsConfig,
|
|
84
|
-
outputPath,
|
|
85
|
-
};
|
|
86
|
-
}
|
|
87
|
-
});
|
|
88
|
-
}
|
|
89
|
-
function updateTargetsOptions(project, target, buildTargetName) {
|
|
90
|
-
if (target.options) {
|
|
91
|
-
const _a = target.options, { buildTarget, tsConfig, outputPath } = _a, delegateTargetOptions = tslib_1.__rest(_a, ["buildTarget", "tsConfig", "outputPath"]);
|
|
92
|
-
// Update build target options by overwriting them
|
|
93
|
-
project.targets[buildTargetName].options = Object.assign(Object.assign({}, project.targets[buildTargetName].options), delegateTargetOptions);
|
|
94
|
-
// Delete options already present in the source target
|
|
95
|
-
cleanupBuildTargetProperties(project.targets[buildTargetName].options);
|
|
96
|
-
// Update source target options to only contain what it needs
|
|
97
|
-
target.options = {
|
|
98
|
-
buildTarget,
|
|
99
|
-
tsConfig,
|
|
100
|
-
outputPath,
|
|
101
|
-
};
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
//# sourceMappingURL=convert-webpack-browser-build-target-to-delegate-build.js.map
|
package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"convert-webpack-browser-build-target-to-delegate-build.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// This migration is mostly copied from https://github.com/angular-eslint/angular-eslint/blob/3c5a9d43264c9cbdd8fe8f2ebb19c613396386c2/packages/schematics/src/migrations/update-12-0-0/update-12-0-0.ts
|
|
3
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const path_1 = require("path");
|
|
7
|
-
function default_1(tree) {
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
(0, devkit_1.visitNotIgnoredFiles)(tree, '', (file) => {
|
|
10
|
-
if ((0, path_1.basename)(file) !== '.eslintrc.json') {
|
|
11
|
-
return;
|
|
12
|
-
}
|
|
13
|
-
(0, devkit_1.updateJson)(tree, file, (eslintJson) => {
|
|
14
|
-
migrateAngularEsLintRules(eslintJson);
|
|
15
|
-
return eslintJson;
|
|
16
|
-
});
|
|
17
|
-
});
|
|
18
|
-
yield (0, devkit_1.formatFiles)(tree);
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
exports.default = default_1;
|
|
22
|
-
function migrateAngularEsLintRules({ overrides, rules }) {
|
|
23
|
-
var _a;
|
|
24
|
-
migrateToAccessibilityLabelHasAssociatedControlSchema(rules === null || rules === void 0 ? void 0 : rules['@angular-eslint/template/accessibility-label-for']);
|
|
25
|
-
migrateToAccessibilityLabelHasAssociatedControlName(rules);
|
|
26
|
-
addEqeqeqIfNeeded(rules);
|
|
27
|
-
for (const o of overrides !== null && overrides !== void 0 ? overrides : []) {
|
|
28
|
-
migrateToAccessibilityLabelHasAssociatedControlSchema((_a = o.rules) === null || _a === void 0 ? void 0 : _a['@angular-eslint/template/accessibility-label-for']);
|
|
29
|
-
migrateToAccessibilityLabelHasAssociatedControlName(o.rules);
|
|
30
|
-
addEqeqeqIfNeeded(o.rules);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
function migrateToAccessibilityLabelHasAssociatedControlName(rules) {
|
|
34
|
-
if (!rules)
|
|
35
|
-
return;
|
|
36
|
-
const accessibilityLabelForRule = rules['@angular-eslint/template/accessibility-label-for'];
|
|
37
|
-
delete rules['@angular-eslint/template/accessibility-label-for'];
|
|
38
|
-
rules['@angular-eslint/template/accessibility-label-has-associated-control'] =
|
|
39
|
-
accessibilityLabelForRule;
|
|
40
|
-
}
|
|
41
|
-
function migrateToAccessibilityLabelHasAssociatedControlSchema(rule) {
|
|
42
|
-
if (!Array.isArray(rule) || rule.length !== 2)
|
|
43
|
-
return;
|
|
44
|
-
const [, currentSchema] = rule;
|
|
45
|
-
rule[1] = {
|
|
46
|
-
controlComponents: currentSchema.controlComponents,
|
|
47
|
-
labelComponents: currentSchema.labelComponents.map((selector) => {
|
|
48
|
-
return { inputs: currentSchema.labelAttributes, selector };
|
|
49
|
-
}),
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
function addEqeqeqIfNeeded(rules) {
|
|
53
|
-
if (!rules ||
|
|
54
|
-
!rules['@angular-eslint/template/no-negated-async'] ||
|
|
55
|
-
rules['@angular-eslint/template/eqeqeq']) {
|
|
56
|
-
return;
|
|
57
|
-
}
|
|
58
|
-
rules['@angular-eslint/template/eqeqeq'] = 'error';
|
|
59
|
-
}
|
|
60
|
-
//# sourceMappingURL=update-angular-eslint-rules.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-angular-eslint-rules.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/update-angular-eslint-rules.ts"],"names":[],"mappings":";AAAA,wMAAwM;;;AAExM,yCAKsB;AACtB,+BAAgC;AAGhC,mBAA+B,IAAU;;QACvC,IAAA,6BAAoB,EAAC,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YACtC,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,gBAAgB,EAAE;gBACvC,OAAO;aACR;YAED,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,UAAyB,EAAE,EAAE;gBACnD,yBAAyB,CAAC,UAAU,CAAC,CAAC;gBACtC,OAAO,UAAU,CAAC;YACpB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAZD,4BAYC;AAED,SAAS,yBAAyB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAiB;;IACpE,qDAAqD,CACnD,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,kDAAkD,CAAC,CAC5D,CAAC;IACF,mDAAmD,CAAC,KAAK,CAAC,CAAC;IAC3D,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzB,KAAK,MAAM,CAAC,IAAI,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,EAAE;QAC/B,qDAAqD,CACnD,MAAA,CAAC,CAAC,KAAK,0CAAG,kDAAkD,CAAC,CAC9D,CAAC;QACF,mDAAmD,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7D,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KAC5B;AACH,CAAC;AAED,SAAS,mDAAmD,CAC1D,KAA8C;IAE9C,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,yBAAyB,GAC7B,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAC5D,OAAO,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACjE,KAAK,CAAC,qEAAqE,CAAC;QAC1E,yBAAyB,CAAC;AAC9B,CAAC;AAED,SAAS,qDAAqD,CAC5D,IAAkC;IAElC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACtD,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,GAAG;QACR,iBAAiB,EAAE,aAAa,CAAC,iBAAiB;QAClD,eAAe,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,QAAgB,EAAE,EAAE;YACtE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,eAAe,EAAE,QAAQ,EAAE,CAAC;QAC7D,CAAC,CAAC;KACH,CAAC;AACJ,CAAC;AACD,SAAS,iBAAiB,CAAC,KAA8C;IACvE,IACE,CAAC,KAAK;QACN,CAAC,KAAK,CAAC,2CAA2C,CAAC;QACnD,KAAK,CAAC,iCAAiC,CAAC,EACxC;QACA,OAAO;KACR;IAED,KAAK,CAAC,iCAAiC,CAAC,GAAG,OAAO,CAAC;AACrD,CAAC"}
|
|
@@ -1,64 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const semver_1 = require("semver");
|
|
6
|
-
const path_1 = require("path");
|
|
7
|
-
const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
|
|
8
|
-
function default_1(tree) {
|
|
9
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
-
let storybookVersion;
|
|
11
|
-
try {
|
|
12
|
-
storybookVersion = require('@storybook/core/package.json').version;
|
|
13
|
-
}
|
|
14
|
-
catch (_a) { }
|
|
15
|
-
if (!storybookVersion) {
|
|
16
|
-
return;
|
|
17
|
-
}
|
|
18
|
-
if ((0, semver_1.lt)(storybookVersion, '6.2.0')) {
|
|
19
|
-
devkit_1.logger.error((0, devkit_1.stripIndents) `NX Could not migrate to Angular 12
|
|
20
|
-
Angular 12 uses Webpack 5.
|
|
21
|
-
This workspace uses Storybook ${storybookVersion} which does not support Webpack 5.
|
|
22
|
-
Storybook 6.2+ is required to support Webpack 5.
|
|
23
|
-
See our documentation on migrating to Storybook 6:
|
|
24
|
-
https://nx.dev/storybook/overview-angular#upgrading-to-storybook-6-using-the-nx-migration-generator
|
|
25
|
-
`);
|
|
26
|
-
throw new Error('Could not migrate to Angular 12');
|
|
27
|
-
}
|
|
28
|
-
let updated;
|
|
29
|
-
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/storybook:storybook', (options) => {
|
|
30
|
-
var _a, _b;
|
|
31
|
-
if (options['uiFramework'] !== '@storybook/angular') {
|
|
32
|
-
return;
|
|
33
|
-
}
|
|
34
|
-
const configFolder = (_a = options === null || options === void 0 ? void 0 : options['config']) === null || _a === void 0 ? void 0 : _a.configFolder;
|
|
35
|
-
if (!configFolder) {
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
const configPath = (0, path_1.join)(configFolder, 'main.js');
|
|
39
|
-
if (!tree.exists(configPath)) {
|
|
40
|
-
devkit_1.logger.warn(`Could not migrate ${configPath} to use webpack 5. The config.core.builder should be set to "webpack5". See https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#upgrade`);
|
|
41
|
-
return;
|
|
42
|
-
}
|
|
43
|
-
updated = true;
|
|
44
|
-
const originalContents = tree.read(configPath).toString();
|
|
45
|
-
const configureWebpack5 = `module.exports.core = { ...module.exports.core, builder: 'webpack5' };`;
|
|
46
|
-
try {
|
|
47
|
-
const config = require((0, path_1.join)(tree.root, configPath));
|
|
48
|
-
if (((_b = config === null || config === void 0 ? void 0 : config.core) === null || _b === void 0 ? void 0 : _b.builder) !== 'webpack5') {
|
|
49
|
-
tree.write(configPath, originalContents + '\n' + configureWebpack5);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
catch (_c) { }
|
|
53
|
-
});
|
|
54
|
-
const installTask = updated
|
|
55
|
-
? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
56
|
-
'@storybook/builder-webpack5': storybookVersion,
|
|
57
|
-
})
|
|
58
|
-
: () => { };
|
|
59
|
-
yield (0, devkit_1.formatFiles)(tree);
|
|
60
|
-
return installTask;
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
exports.default = default_1;
|
|
64
|
-
//# sourceMappingURL=update-storybook.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-storybook.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/update-storybook.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,mCAA4B;AAC5B,+BAA4B;AAC5B,iGAA8F;AAE9F,mBAA+B,IAAU;;QACvC,IAAI,gBAAgB,CAAC;QAErB,IAAI;YACF,gBAAgB,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC,OAAO,CAAC;SACpE;QAAC,WAAM,GAAE;QAEV,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO;SACR;QAED,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE;YACjC,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAY,EAAA;;sCAES,gBAAgB;;;;KAIjD,CAAC,CAAC;YACH,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC;QACZ,IAAA,+CAAsB,EAAC,IAAI,EAAE,2BAA2B,EAAE,CAAC,OAAO,EAAE,EAAE;;YACpE,IAAI,OAAO,CAAC,aAAa,CAAC,KAAK,oBAAoB,EAAE;gBACnD,OAAO;aACR;YAED,MAAM,YAAY,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,QAAQ,CAAC,0CAAE,YAAY,CAAC;YAEvD,IAAI,CAAC,YAAY,EAAE;gBACjB,OAAO;aACR;YAED,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YAEjD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC5B,eAAM,CAAC,IAAI,CACT,qBAAqB,UAAU,sJAAsJ,CACtL,CAAC;gBACF,OAAO;aACR;YAED,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,iBAAiB,GAAG,wEAAwE,CAAC;YACnG,IAAI;gBACF,MAAM,MAAM,GAAG,OAAO,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;gBACpD,IAAI,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,OAAO,MAAK,UAAU,EAAE;oBACxC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI,GAAG,iBAAiB,CAAC,CAAC;iBACrE;aACF;YAAC,WAAM,GAAE;QACZ,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,OAAO;YACzB,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,6BAA6B,EAAE,gBAAgB;aAChD,CACF;YACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QACb,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAlED,4BAkEC"}
|
|
@@ -1,67 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const optionsToUpdate = [
|
|
6
|
-
['aot', false, true],
|
|
7
|
-
['vendorChunk', true, false],
|
|
8
|
-
['extractLicenses', false, true],
|
|
9
|
-
['buildOptimizer', false, true],
|
|
10
|
-
['sourceMap', true, false],
|
|
11
|
-
['optimization', false, true],
|
|
12
|
-
['namedChunks', true, false],
|
|
13
|
-
];
|
|
14
|
-
function updateAngularConfig(host) {
|
|
15
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
-
const projects = (0, devkit_1.getProjects)(host);
|
|
17
|
-
for (const [name, project] of projects) {
|
|
18
|
-
for (const target of Object.values(project.targets || {})) {
|
|
19
|
-
if (target.executor === '@nrwl/angular:webpack-browser') {
|
|
20
|
-
updateOptions(target, optionsToUpdate);
|
|
21
|
-
for (const options of allTargetOptions(target)) {
|
|
22
|
-
delete options.experimentalRollupPass;
|
|
23
|
-
delete options.lazyModules;
|
|
24
|
-
delete options.forkTypeChecker;
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
(0, devkit_1.updateProjectConfiguration)(host, name, project);
|
|
29
|
-
}
|
|
30
|
-
yield (0, devkit_1.formatFiles)(host);
|
|
31
|
-
});
|
|
32
|
-
}
|
|
33
|
-
exports.default = updateAngularConfig;
|
|
34
|
-
function* allTargetOptions(target) {
|
|
35
|
-
if (target.options) {
|
|
36
|
-
yield target.options;
|
|
37
|
-
}
|
|
38
|
-
if (!target.configurations) {
|
|
39
|
-
return;
|
|
40
|
-
}
|
|
41
|
-
for (const [, options] of Object.entries(target.configurations)) {
|
|
42
|
-
if (options !== undefined) {
|
|
43
|
-
yield options;
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
function updateOptions(target, options) {
|
|
48
|
-
if (!target.options) {
|
|
49
|
-
target.options = {};
|
|
50
|
-
}
|
|
51
|
-
const configurationOptions = target.configurations && Object.values(target.configurations);
|
|
52
|
-
for (const [optionName, oldDefault, newDefault] of options) {
|
|
53
|
-
let value = target.options[optionName];
|
|
54
|
-
if (value === newDefault) {
|
|
55
|
-
// Value is same as new default
|
|
56
|
-
delete target.options[optionName];
|
|
57
|
-
}
|
|
58
|
-
else if (value === undefined) {
|
|
59
|
-
// Value is not defined, hence the default in the executor was used.
|
|
60
|
-
target.options[optionName] = oldDefault;
|
|
61
|
-
value = oldDefault;
|
|
62
|
-
}
|
|
63
|
-
// Remove overrides in configurations which are no longer needed.
|
|
64
|
-
configurationOptions === null || configurationOptions === void 0 ? void 0 : configurationOptions.filter((o) => o && o[optionName] === value).forEach((o) => o && delete o[optionName]);
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
//# sourceMappingURL=update-webpack-browser-config.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-webpack-browser-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/update-webpack-browser-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
|
-
declare type AffectedLib = ProjectConfiguration;
|
|
3
|
-
declare type InvalidLibs = {
|
|
4
|
-
buildableLibs: AffectedLib[];
|
|
5
|
-
publishableLibs: AffectedLib[];
|
|
6
|
-
};
|
|
7
|
-
export default function (tree: Tree): Promise<void>;
|
|
8
|
-
export declare function findBuildableAndPublishableLibs(tree: Tree): InvalidLibs;
|
|
9
|
-
export declare function findInvalidLibs(tree: Tree, libs: InvalidLibs, tsconfigPath: string): InvalidLibs;
|
|
10
|
-
export {};
|