@nrwl/angular 15.2.1 → 15.2.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.
- package/CHANGELOG.md +1 -1
- package/fesm2015/nrwl-angular-mf.mjs +0 -1
- package/fesm2015/nrwl-angular-testing.mjs +0 -1
- package/fesm2015/nrwl-angular.mjs +0 -1
- package/fesm2020/nrwl-angular-mf.mjs +0 -1
- package/fesm2020/nrwl-angular-testing.mjs +0 -1
- package/fesm2020/nrwl-angular.mjs +0 -1
- package/package.json +9 -9
- package/src/builders/utilities/buildable-libs.d.ts +1 -1
- package/src/builders/utilities/buildable-libs.js +2 -2
- package/src/builders/utilities/buildable-libs.js.map +1 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +1 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/generators/karma-project/lib/update-tsconfig.js +11 -1
- package/src/generators/karma-project/lib/update-tsconfig.js.map +1 -1
- package/src/generators/karma-project/lib/update-workspace-config.js +4 -1
- package/src/generators/karma-project/lib/update-workspace-config.js.map +1 -1
- package/src/migrations/update-15-2-0/update-typescript-target.js +2 -0
- package/src/migrations/update-15-2-0/update-typescript-target.js.map +1 -1
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
|
-
## [15.2.
|
|
6
|
+
## [15.2.2](https://github.com/nrwl/nx/compare/15.2.1...15.2.2) (2022-11-29)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.2.
|
|
3
|
+
"version": "15.2.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -67,13 +67,13 @@
|
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~15.0.0",
|
|
70
|
-
"@nrwl/cypress": "15.2.
|
|
71
|
-
"@nrwl/devkit": "15.2.
|
|
72
|
-
"@nrwl/jest": "15.2.
|
|
73
|
-
"@nrwl/linter": "15.2.
|
|
74
|
-
"@nrwl/storybook": "15.2.
|
|
75
|
-
"@nrwl/webpack": "15.2.
|
|
76
|
-
"@nrwl/workspace": "15.2.
|
|
70
|
+
"@nrwl/cypress": "15.2.2",
|
|
71
|
+
"@nrwl/devkit": "15.2.2",
|
|
72
|
+
"@nrwl/jest": "15.2.2",
|
|
73
|
+
"@nrwl/linter": "15.2.2",
|
|
74
|
+
"@nrwl/storybook": "15.2.2",
|
|
75
|
+
"@nrwl/webpack": "15.2.2",
|
|
76
|
+
"@nrwl/workspace": "15.2.2",
|
|
77
77
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
78
78
|
"@schematics/angular": "~15.0.0",
|
|
79
79
|
"chalk": "4.1.0",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
100
100
|
"typings": "index.d.ts",
|
|
101
101
|
"sideEffects": false,
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "08165463eb7a2022fd751f0bf383aa2613c806f5"
|
|
103
103
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BuilderContext } from '@angular-devkit/architect';
|
|
2
2
|
import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
|
|
3
|
-
export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: BuilderContext): {
|
|
3
|
+
export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: BuilderContext, target?: string): {
|
|
4
4
|
tsConfigPath: string;
|
|
5
5
|
dependencies: DependentBuildableProjectNode[];
|
|
6
6
|
};
|
|
@@ -4,9 +4,9 @@ exports.createTmpTsConfigForBuildableLibs = void 0;
|
|
|
4
4
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
function createTmpTsConfigForBuildableLibs(tsConfigPath, context) {
|
|
7
|
+
function createTmpTsConfigForBuildableLibs(tsConfigPath, context, target) {
|
|
8
8
|
let dependencies;
|
|
9
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, context.target.target, context.target.configuration);
|
|
9
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, target !== null && target !== void 0 ? target : context.target.target, context.target.configuration);
|
|
10
10
|
dependencies = result.dependencies;
|
|
11
11
|
const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.workspaceRoot, tsConfigPath), context.workspaceRoot, result.target.data.root, dependencies);
|
|
12
12
|
process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildable-libs.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/buildable-libs.ts"],"names":[],"mappings":";;;AACA,6FAI4D;AAC5D,yCAAsD;AACtD,+BAA4B;AAE5B,SAAgB,iCAAiC,CAC/C,YAAoB,EACpB,OAAuB;
|
|
1
|
+
{"version":3,"file":"buildable-libs.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/buildable-libs.ts"],"names":[],"mappings":";;;AACA,6FAI4D;AAC5D,yCAAsD;AACtD,+BAA4B;AAE5B,SAAgB,iCAAiC,CAC/C,YAAoB,EACpB,OAAuB,EACvB,MAAe;IAEf,IAAI,YAA6C,CAAC;IAClD,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,IAAA,+BAAsB,GAAE,EACxB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAC/B,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;IACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAEnC,MAAM,eAAe,GAAG,IAAA,wCAAiB,EACvC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,EACzC,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EACvB,YAAY,CACb,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,eAAe,CAAC;IAE/C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AACzD,CAAC;AAxBD,8EAwBC"}
|
|
@@ -36,7 +36,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
36
36
|
let dependencies;
|
|
37
37
|
if (!buildLibsFromSource) {
|
|
38
38
|
const buildTargetTsConfigPath = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.tsConfig) !== null && _e !== void 0 ? _e : buildTarget.options.tsConfig;
|
|
39
|
-
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context);
|
|
39
|
+
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context, parsedBrowserTarget.target);
|
|
40
40
|
dependencies = foundDependencies;
|
|
41
41
|
// We can't just pass the tsconfig path in memory to the angular builder
|
|
42
42
|
// function because we can't pass the build target options to it, the build
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAC1E,iEAGuC;AAEvC,yCAAoE;AACpE,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAAgE;AAChE,+BAAyC;AAEzC,gEAAgF;AAEhF,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,OAAuB;;IAEvB,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,0BAAiB,EAC9C,OAAO,CAAC,aAAa,EACrB,oBAAoB,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,MAAM,iCAAiC,GAAG,IAAA,8CAA8B,EACtE,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IAEF,MAAM,WAAW,GACf,iCAAiC,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,wBAAwB,GAAG,mBAAmB,CAAC,aAAa;QAChE,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,mBAAmB,GACvB,MAAA,MAAA,MAAA,OAAO,CAAC,mBAAmB,mCAC3B,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,mCACvC,IAAI,CAAC;IAEP,MAAM,mBAAmB,GACvB,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAA2B,CAAC;IAChC,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,mBAAmB,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,CAAC,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,IAAI,YAA6C,CAAC;IAClD,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,uBAAuB,GAC3B,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,mCAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,GACrD,IAAA,kDAAiC,
|
|
1
|
+
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAC1E,iEAGuC;AAEvC,yCAAoE;AACpE,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAAgE;AAChE,+BAAyC;AAEzC,gEAAgF;AAEhF,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,OAAuB;;IAEvB,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,0BAAiB,EAC9C,OAAO,CAAC,aAAa,EACrB,oBAAoB,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,MAAM,iCAAiC,GAAG,IAAA,8CAA8B,EACtE,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IAEF,MAAM,WAAW,GACf,iCAAiC,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,wBAAwB,GAAG,mBAAmB,CAAC,aAAa;QAChE,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,mBAAmB,GACvB,MAAA,MAAA,MAAA,OAAO,CAAC,mBAAmB,mCAC3B,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,mCACvC,IAAI,CAAC;IAEP,MAAM,mBAAmB,GACvB,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAA2B,CAAC;IAChC,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,mBAAmB,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,CAAC,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,IAAI,YAA6C,CAAC;IAClD,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,uBAAuB,GAC3B,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,mCAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,GACrD,IAAA,kDAAiC,EAC/B,uBAAuB,EACvB,OAAO,EACP,mBAAmB,CAAC,MAAM,CAC3B,CAAC;QACJ,YAAY,GAAG,iBAAiB,CAAC;QAEjC,wEAAwE;QACxE,2EAA2E;QAC3E,oEAAoE;QACpE,2EAA2E;QAC3E,yEAAyE;QACzE,sCAAsC;QACtC,MAAM,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAC1D,OAAO,CAAC,gBAAgB,GAAG,CAAO,MAAM,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,CAAC;YACvD,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC;YAChC,OAAO,OAAO,CAAC;QACjB,CAAC,CAAA,CAAC;QAEF,6EAA6E;QAC7E,8EAA8E;QAC9E,qEAAqE;QACrE,iCAAiC;QACjC,wBAAwB,CAAC,QAAQ,GAAG,YAAY,CAAC;KAClD;IAED,OAAO,IAAA,uCAAuB,EAAC,OAAkC,EAAE,OAAO,EAAE;QAC1E,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,IAAI,CAAC,mBAAmB,EAAE;gBACxB,MAAM,qBAAqB,GAAG,YAAY;qBACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAA,wBAAY,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;qBACxC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/B,8CAA8C;gBAC9C,sEAAsE;gBACtE,mCAAmC;gBACnC,kDAAkD;gBAClD,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAC5B,IAAI,uEAAgC,CAClC,wBACE,mBAAmB,CAAC,MACtB,eAAe,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACjD,CACF,CAAC;iBACH;aACF;YAED,IAAI,CAAC,mBAAmB,EAAE;gBACxB,OAAO,iBAAiB,CAAC;aAC1B;YAED,OAAO,IAAA,kCAAwB,EAC7B,iBAAiB,EACjB,mBAAmB,EACnB,wBAAwB,EACxB,OAAO,CAAC,MAAM,CACf,CAAC;QACJ,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAlHD,wEAkHC;AAED,kBAAe,IAAA,yBAAa,EAC1B,8BAA8B,CACxB,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateTsConfigs = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function updateTsConfigs(tree, project) {
|
|
6
|
+
var _a, _b;
|
|
6
7
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
7
8
|
(0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), (json) => {
|
|
8
9
|
return Object.assign(Object.assign({}, json), { references: [
|
|
@@ -12,7 +13,16 @@ function updateTsConfigs(tree, project) {
|
|
|
12
13
|
},
|
|
13
14
|
] });
|
|
14
15
|
});
|
|
15
|
-
|
|
16
|
+
let extraFiles = [];
|
|
17
|
+
if (projectConfig.projectType == 'application' &&
|
|
18
|
+
((_b = (_a = projectConfig.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.polyfills) &&
|
|
19
|
+
typeof projectConfig.targets.build.options.polyfills === 'string') {
|
|
20
|
+
let polyfillsPath = projectConfig.targets.build.options.polyfills;
|
|
21
|
+
polyfillsPath = polyfillsPath.startsWith(projectConfig.root)
|
|
22
|
+
? polyfillsPath.replace(`${projectConfig.root}/`, '')
|
|
23
|
+
: polyfillsPath;
|
|
24
|
+
extraFiles = [polyfillsPath];
|
|
25
|
+
}
|
|
16
26
|
return (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json'), (json) => {
|
|
17
27
|
return Object.assign(Object.assign({}, json), { files: [...json.files, ...extraFiles] });
|
|
18
28
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;;IACzD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE9D,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EACtD,CAAC,IAAI,EAAE,EAAE;QACP,uCACK,IAAI,KACP,UAAU,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;gBAC1B;oBACE,IAAI,EAAE,sBAAsB;iBAC7B;aACF,IACD;IACJ,CAAC,CACF,CAAC;IAEF,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IACE,aAAa,CAAC,WAAW,IAAI,aAAa;SAC1C,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,0CAAE,SAAS,CAAA;QAC/C,OAAO,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,EACjE;QACA,IAAI,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAClE,aAAa,GAAG,aAAa,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC;YAC1D,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC;YACrD,CAAC,CAAC,aAAa,CAAC;QAClB,UAAU,GAAG,CAAC,aAAa,CAAC,CAAC;KAC9B;IAED,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAC3D,CAAC,IAAI,EAAE,EAAE;QACP,uCACK,IAAI,KACP,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,UAAU,CAAC,IACrC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AA1CD,0CA0CC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateWorkspaceConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function updateWorkspaceConfig(tree, project) {
|
|
6
|
+
var _a, _b;
|
|
6
7
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
7
8
|
projectConfig.targets.test = {
|
|
8
9
|
executor: '@angular-devkit/build-angular:karma',
|
|
@@ -13,7 +14,9 @@ function updateWorkspaceConfig(tree, project) {
|
|
|
13
14
|
},
|
|
14
15
|
};
|
|
15
16
|
if (projectConfig.projectType === 'application') {
|
|
16
|
-
|
|
17
|
+
const polyfills = (_b = (_a = projectConfig.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.polyfills;
|
|
18
|
+
let polyfillsPath = polyfills && typeof polyfills === 'string' ? polyfills : undefined;
|
|
19
|
+
projectConfig.targets.test.options = Object.assign(Object.assign({}, projectConfig.targets.test.options), { polyfills: polyfillsPath !== null && polyfillsPath !== void 0 ? polyfillsPath : ['zone.js', 'zone.js/testing'], styles: [], scripts: [], assets: [] });
|
|
17
20
|
}
|
|
18
21
|
if (projectConfig.targets.lint &&
|
|
19
22
|
projectConfig.targets.lint.executor ===
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-workspace-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-workspace-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAe
|
|
1
|
+
{"version":3,"file":"update-workspace-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-workspace-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAe;;IAC/D,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,aAAa,CAAC,OAAO,CAAC,IAAI,GAAG;QAC3B,QAAQ,EAAE,qCAAqC;QAC/C,OAAO,EAAE;YACP,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC;YAC5D,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC;YACrE,WAAW,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC;SACpE;KACF,CAAC;IAEF,IAAI,aAAa,CAAC,WAAW,KAAK,aAAa,EAAE;QAC/C,MAAM,SAAS,GAAG,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,0CAAE,SAAS,CAAC;QAClE,IAAI,aAAa,GACf,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;QAErE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,mCAC7B,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,KACrC,SAAS,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAC1D,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,EAAE,EACX,MAAM,EAAE,EAAE,GACX,CAAC;KACH;IAED,IACE,aAAa,CAAC,OAAO,CAAC,IAAI;QAC1B,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ;YACjC,sCAAsC,EACxC;QACA,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG;YAC5C,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC9C,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC;SAC5D,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC;AArCD,sDAqCC"}
|
|
@@ -13,6 +13,8 @@ function updateTypescriptTarget(tree) {
|
|
|
13
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
14
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
15
15
|
for (const [, project] of projects) {
|
|
16
|
+
if (!project.targets)
|
|
17
|
+
continue;
|
|
16
18
|
for (const [, target] of Object.entries(project.targets)) {
|
|
17
19
|
// Update all other known CLI builders that use a tsconfig
|
|
18
20
|
const tsConfigs = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-typescript-target.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/update-typescript-target.ts"],"names":[],"mappings":";;;AACA,yCAAoE;AACpE,mFAAwE;AAExE,SAAS,YAAY,CAAC,IAAU,EAAE,YAAoB;IACpD,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA,iCACpC,IAAI,KACP,eAAe,kCACV,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,MAAM,EAAE,QAAQ,EAChB,uBAAuB,EAAE,KAAK,OAEhC,CAAA;KAAA,CAAC,CAAC;AACN,CAAC;AAED,SAA8B,sBAAsB,CAAC,IAAU;;QAC7D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YAClC,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACxD,0DAA0D;gBAC1D,MAAM,SAAS,GAAG;oBAChB,MAAM,CAAC,OAAO,IAAI,EAAE;oBACpB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;iBAC9C;qBACE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,KAAK,QAAQ,CAAC;qBAClD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAA4B,CAAC,QAAQ,CAAC,CAAC;gBAExD,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;gBAEhD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC9B,SAAS;iBACV;gBAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;oBACjC,2BAAQ,CAAC,MAAM;oBACf,2BAAQ,CAAC,KAAK;oBACd,2BAAQ,CAAC,OAAO;oBAChB,2BAAQ,CAAC,SAAS;oBAClB,+BAA+B;oBAC/B,+BAA+B;oBAC/B,uBAAuB;oBACvB,8BAA8B;oBAC9B,iBAAiB;iBAClB,CAAC,CAAC;gBAEH,IAAI,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBAC3C,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;wBACtC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBAC9B;iBACF;aACF;SACF;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"update-typescript-target.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/update-typescript-target.ts"],"names":[],"mappings":";;;AACA,yCAAoE;AACpE,mFAAwE;AAExE,SAAS,YAAY,CAAC,IAAU,EAAE,YAAoB;IACpD,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA,iCACpC,IAAI,KACP,eAAe,kCACV,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,MAAM,EAAE,QAAQ,EAChB,uBAAuB,EAAE,KAAK,OAEhC,CAAA;KAAA,CAAC,CAAC;AACN,CAAC;AAED,SAA8B,sBAAsB,CAAC,IAAU;;QAC7D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YAClC,IAAI,CAAC,OAAO,CAAC,OAAO;gBAAE,SAAS;YAE/B,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACxD,0DAA0D;gBAC1D,MAAM,SAAS,GAAG;oBAChB,MAAM,CAAC,OAAO,IAAI,EAAE;oBACpB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;iBAC9C;qBACE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,KAAK,QAAQ,CAAC;qBAClD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAA4B,CAAC,QAAQ,CAAC,CAAC;gBAExD,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;gBAEhD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC9B,SAAS;iBACV;gBAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;oBACjC,2BAAQ,CAAC,MAAM;oBACf,2BAAQ,CAAC,KAAK;oBACd,2BAAQ,CAAC,OAAO;oBAChB,2BAAQ,CAAC,SAAS;oBAClB,+BAA+B;oBAC/B,+BAA+B;oBAC/B,uBAAuB;oBACvB,8BAA8B;oBAC9B,iBAAiB;iBAClB,CAAC,CAAC;gBAEH,IAAI,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBAC3C,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;wBACtC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBAC9B;iBACF;aACF;SACF;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAzCD,yCAyCC"}
|