@nrwl/angular 15.7.0-beta.4 → 15.7.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.
- package/package.json +8 -8
- package/src/builders/webpack-server/schema.d.ts +1 -0
- package/src/builders/webpack-server/schema.json +1 -2
- package/src/builders/webpack-server/webpack-server.impl.js +10 -0
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +25 -21
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +24 -21
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma/angular-v14/karma.js +2 -1
- package/src/generators/karma/angular-v14/karma.js.map +1 -1
- package/src/generators/karma/karma.js +1 -1
- package/src/generators/karma/karma.js.map +1 -1
- package/src/generators/library/schema.json +11 -11
- package/src/generators/setup-mf/schema.json +1 -1
- package/src/generators/utils/version-utils.d.ts +4 -2
- package/src/generators/utils/version-utils.js +22 -9
- package/src/generators/utils/version-utils.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.7.0-beta.
|
|
3
|
+
"version": "15.7.0-beta.5",
|
|
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": {
|
|
@@ -63,12 +63,12 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.7.0-beta.
|
|
67
|
-
"@nrwl/devkit": "15.7.0-beta.
|
|
68
|
-
"@nrwl/jest": "15.7.0-beta.
|
|
69
|
-
"@nrwl/linter": "15.7.0-beta.
|
|
70
|
-
"@nrwl/webpack": "15.7.0-beta.
|
|
71
|
-
"@nrwl/workspace": "15.7.0-beta.
|
|
66
|
+
"@nrwl/cypress": "15.7.0-beta.5",
|
|
67
|
+
"@nrwl/devkit": "15.7.0-beta.5",
|
|
68
|
+
"@nrwl/jest": "15.7.0-beta.5",
|
|
69
|
+
"@nrwl/linter": "15.7.0-beta.5",
|
|
70
|
+
"@nrwl/webpack": "15.7.0-beta.5",
|
|
71
|
+
"@nrwl/workspace": "15.7.0-beta.5",
|
|
72
72
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
73
73
|
"chalk": "^4.1.0",
|
|
74
74
|
"chokidar": "^3.5.1",
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
107
107
|
"typings": "index.d.ts",
|
|
108
108
|
"sideEffects": false,
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "3330da3d035c89a79a065a0a2e7fcd0720470c8f"
|
|
110
110
|
}
|
|
@@ -200,8 +200,7 @@
|
|
|
200
200
|
"default": []
|
|
201
201
|
},
|
|
202
202
|
"bundleDependencies": {
|
|
203
|
-
"description": "Which external dependencies to bundle into the bundle. By default, all of node_modules will be bundled.",
|
|
204
|
-
"default": true,
|
|
203
|
+
"description": "Which external dependencies to bundle into the bundle. By default, all of node_modules will be bundled. _Note: This is only supported in Angular versions >= 14.0.0, < 15.0.0. It was removed in Angular 15._",
|
|
205
204
|
"oneOf": [
|
|
206
205
|
{
|
|
207
206
|
"type": "boolean"
|
|
@@ -56,6 +56,16 @@ function executeWebpackServerBuilder(options, context) {
|
|
|
56
56
|
throw new Error((0, devkit_1.stripIndents) `The "assets" option is only supported in Angular >= 15.1.0. You are currently using ${installedAngularVersionInfo.version}.
|
|
57
57
|
You can resolve this error by removing the "assets" option or by migrating to Angular 15.1.0.`);
|
|
58
58
|
}
|
|
59
|
+
if ((0, semver_1.gte)(installedAngularVersionInfo.version, '15.0.0') &&
|
|
60
|
+
options.bundleDependencies) {
|
|
61
|
+
throw new Error((0, devkit_1.stripIndents) `The "bundleDependencies" option was removed in Angular version 15. You are currently using ${installedAngularVersionInfo.version}.
|
|
62
|
+
You can resolve this error by removing the "bundleDependencies" option.`);
|
|
63
|
+
}
|
|
64
|
+
// default bundleDependencies to true if supported by Angular version
|
|
65
|
+
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '15.0.0') &&
|
|
66
|
+
options.bundleDependencies === undefined) {
|
|
67
|
+
options.bundleDependencies = true;
|
|
68
|
+
}
|
|
59
69
|
(_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
|
|
60
70
|
if (!options.buildLibsFromSource) {
|
|
61
71
|
const { tsConfigPath } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(options.tsConfig, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAA+D;AAC/D,2BAAgC;AAChC,+BAAwC;AACxC,kDAAgE;AAEhE,gEAAgF;AAChF,8CAA2C;AAC3C,2FAAiG;AACjG,
|
|
1
|
+
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-i
|
|
|
10
10
|
const backward_compatible_versions_1 = require("../../../utils/backward-compatible-versions");
|
|
11
11
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
12
12
|
const karma_1 = require("../../karma/karma");
|
|
13
|
+
const version_utils_1 = require("../../utils/version-utils");
|
|
13
14
|
function angularInitGenerator(host, rawOptions) {
|
|
14
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
16
|
const options = normalizeOptions(rawOptions);
|
|
@@ -47,40 +48,43 @@ function setDefaults(host, options) {
|
|
|
47
48
|
nxJson.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (nxJson.generators['@nrwl/angular:component'] || {}));
|
|
48
49
|
(0, devkit_1.updateNxJson)(host, nxJson);
|
|
49
50
|
}
|
|
50
|
-
function updateDependencies(
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
'@angular/
|
|
56
|
-
'@angular/
|
|
57
|
-
'@angular/
|
|
58
|
-
'@angular/
|
|
59
|
-
'@angular/
|
|
51
|
+
function updateDependencies(tree) {
|
|
52
|
+
var _a, _b;
|
|
53
|
+
const angularVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularVersion;
|
|
54
|
+
const angularDevkitVersion = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularDevkitVersion;
|
|
55
|
+
return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
|
|
56
|
+
'@angular/animations': angularVersion,
|
|
57
|
+
'@angular/common': angularVersion,
|
|
58
|
+
'@angular/compiler': angularVersion,
|
|
59
|
+
'@angular/core': angularVersion,
|
|
60
|
+
'@angular/forms': angularVersion,
|
|
61
|
+
'@angular/platform-browser': angularVersion,
|
|
62
|
+
'@angular/platform-browser-dynamic': angularVersion,
|
|
63
|
+
'@angular/router': angularVersion,
|
|
60
64
|
rxjs: backward_compatible_versions_1.backwardCompatibleVersions.angularV14.rxjsVersion,
|
|
61
65
|
tslib: backward_compatible_versions_1.backwardCompatibleVersions.angularV14.tsLibVersion,
|
|
62
66
|
'zone.js': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.zoneJsVersion,
|
|
63
67
|
}, {
|
|
64
|
-
'@angular/cli':
|
|
65
|
-
'@angular/compiler-cli':
|
|
66
|
-
'@angular/language-service':
|
|
67
|
-
'@angular-devkit/build-angular':
|
|
68
|
+
'@angular/cli': angularDevkitVersion,
|
|
69
|
+
'@angular/compiler-cli': angularVersion,
|
|
70
|
+
'@angular/language-service': angularVersion,
|
|
71
|
+
'@angular-devkit/build-angular': angularDevkitVersion,
|
|
68
72
|
});
|
|
69
73
|
}
|
|
70
|
-
function addUnitTestRunner(
|
|
74
|
+
function addUnitTestRunner(tree, options) {
|
|
71
75
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
72
76
|
switch (options.unitTestRunner) {
|
|
73
77
|
case test_runners_1.UnitTestRunner.Karma:
|
|
74
|
-
return yield (0, karma_1.karmaGenerator)(
|
|
78
|
+
return yield (0, karma_1.karmaGenerator)(tree, {
|
|
75
79
|
skipPackageJson: options.skipPackageJson,
|
|
76
80
|
});
|
|
77
81
|
case test_runners_1.UnitTestRunner.Jest:
|
|
78
82
|
if (!options.skipPackageJson) {
|
|
79
|
-
(0,
|
|
83
|
+
(0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
80
84
|
'jest-preset-angular': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.jestPresetAngularVersion,
|
|
81
85
|
});
|
|
82
86
|
}
|
|
83
|
-
return (0, jest_1.jestInitGenerator)(
|
|
87
|
+
return (0, jest_1.jestInitGenerator)(tree, {
|
|
84
88
|
skipPackageJson: options.skipPackageJson,
|
|
85
89
|
});
|
|
86
90
|
default:
|
|
@@ -88,11 +92,11 @@ function addUnitTestRunner(host, options) {
|
|
|
88
92
|
}
|
|
89
93
|
});
|
|
90
94
|
}
|
|
91
|
-
function addE2ETestRunner(
|
|
95
|
+
function addE2ETestRunner(tree, options) {
|
|
92
96
|
switch (options.e2eTestRunner) {
|
|
93
97
|
case test_runners_1.E2eTestRunner.Protractor:
|
|
94
98
|
return !options.skipPackageJson
|
|
95
|
-
? (0,
|
|
99
|
+
? (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
96
100
|
protractor: backward_compatible_versions_1.backwardCompatibleVersions.angularV14.protractorVersion,
|
|
97
101
|
'jasmine-core': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.jasmineCoreVersion,
|
|
98
102
|
'jasmine-spec-reporter': backward_compatible_versions_1.backwardCompatibleVersions.angularV14
|
|
@@ -103,7 +107,7 @@ function addE2ETestRunner(host, options) {
|
|
|
103
107
|
})
|
|
104
108
|
: () => { };
|
|
105
109
|
case test_runners_1.E2eTestRunner.Cypress:
|
|
106
|
-
return (0, cypress_1.cypressInitGenerator)(
|
|
110
|
+
return (0, cypress_1.cypressInitGenerator)(tree, {
|
|
107
111
|
skipPackageJson: options.skipPackageJson,
|
|
108
112
|
});
|
|
109
113
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,40 +55,43 @@ function setDefaults(host, options) {
|
|
|
55
55
|
nxJson.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (nxJson.generators['@nrwl/angular:component'] || {}));
|
|
56
56
|
(0, devkit_1.updateNxJson)(host, nxJson);
|
|
57
57
|
}
|
|
58
|
-
function updateDependencies(
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
'@angular/
|
|
64
|
-
'@angular/
|
|
65
|
-
'@angular/
|
|
66
|
-
'@angular/
|
|
67
|
-
'@angular/
|
|
58
|
+
function updateDependencies(tree) {
|
|
59
|
+
var _a, _b;
|
|
60
|
+
const angularVersionToInstall = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : versions_1.angularVersion;
|
|
61
|
+
const angularDevkitVersionToInstall = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : versions_1.angularDevkitVersion;
|
|
62
|
+
return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
|
|
63
|
+
'@angular/animations': angularVersionToInstall,
|
|
64
|
+
'@angular/common': angularVersionToInstall,
|
|
65
|
+
'@angular/compiler': angularVersionToInstall,
|
|
66
|
+
'@angular/core': angularVersionToInstall,
|
|
67
|
+
'@angular/forms': angularVersionToInstall,
|
|
68
|
+
'@angular/platform-browser': angularVersionToInstall,
|
|
69
|
+
'@angular/platform-browser-dynamic': angularVersionToInstall,
|
|
70
|
+
'@angular/router': angularVersionToInstall,
|
|
68
71
|
rxjs: versions_1.rxjsVersion,
|
|
69
72
|
tslib: versions_1.tsLibVersion,
|
|
70
73
|
'zone.js': versions_1.zoneJsVersion,
|
|
71
74
|
}, {
|
|
72
|
-
'@angular/cli':
|
|
73
|
-
'@angular/compiler-cli':
|
|
74
|
-
'@angular/language-service':
|
|
75
|
-
'@angular-devkit/build-angular':
|
|
75
|
+
'@angular/cli': angularDevkitVersionToInstall,
|
|
76
|
+
'@angular/compiler-cli': angularVersionToInstall,
|
|
77
|
+
'@angular/language-service': angularVersionToInstall,
|
|
78
|
+
'@angular-devkit/build-angular': angularDevkitVersionToInstall,
|
|
76
79
|
});
|
|
77
80
|
}
|
|
78
|
-
function addUnitTestRunner(
|
|
81
|
+
function addUnitTestRunner(tree, options) {
|
|
79
82
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
80
83
|
switch (options.unitTestRunner) {
|
|
81
84
|
case test_runners_1.UnitTestRunner.Karma:
|
|
82
|
-
return yield (0, karma_1.karmaGenerator)(
|
|
85
|
+
return yield (0, karma_1.karmaGenerator)(tree, {
|
|
83
86
|
skipPackageJson: options.skipPackageJson,
|
|
84
87
|
});
|
|
85
88
|
case test_runners_1.UnitTestRunner.Jest:
|
|
86
89
|
if (!options.skipPackageJson) {
|
|
87
|
-
(0,
|
|
90
|
+
(0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
88
91
|
'jest-preset-angular': versions_1.jestPresetAngularVersion,
|
|
89
92
|
});
|
|
90
93
|
}
|
|
91
|
-
return (0, jest_1.jestInitGenerator)(
|
|
94
|
+
return (0, jest_1.jestInitGenerator)(tree, {
|
|
92
95
|
skipPackageJson: options.skipPackageJson,
|
|
93
96
|
});
|
|
94
97
|
default:
|
|
@@ -96,11 +99,11 @@ function addUnitTestRunner(host, options) {
|
|
|
96
99
|
}
|
|
97
100
|
});
|
|
98
101
|
}
|
|
99
|
-
function addE2ETestRunner(
|
|
102
|
+
function addE2ETestRunner(tree, options) {
|
|
100
103
|
switch (options.e2eTestRunner) {
|
|
101
104
|
case test_runners_1.E2eTestRunner.Protractor:
|
|
102
105
|
return !options.skipPackageJson
|
|
103
|
-
? (0,
|
|
106
|
+
? (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
104
107
|
protractor: versions_1.protractorVersion,
|
|
105
108
|
'jasmine-core': versions_1.jasmineCoreVersion,
|
|
106
109
|
'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
|
|
@@ -110,7 +113,7 @@ function addE2ETestRunner(host, options) {
|
|
|
110
113
|
})
|
|
111
114
|
: () => { };
|
|
112
115
|
case test_runners_1.E2eTestRunner.Cypress:
|
|
113
|
-
return (0, cypress_1.cypressInitGenerator)(
|
|
116
|
+
return (0, cypress_1.cypressInitGenerator)(tree, {
|
|
114
117
|
skipPackageJson: options.skipPackageJson,
|
|
115
118
|
});
|
|
116
119
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.karmaGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const backward_compatible_versions_1 = require("../../../utils/backward-compatible-versions");
|
|
6
|
+
const version_utils_1 = require("../../utils/version-utils");
|
|
6
7
|
function addTestInputs(tree) {
|
|
7
8
|
var _a, _b, _c, _d;
|
|
8
9
|
var _e, _f;
|
|
@@ -40,7 +41,7 @@ function karmaGenerator(tree, options) {
|
|
|
40
41
|
if (options.skipPackageJson || packageJson.devDependencies['karma']) {
|
|
41
42
|
return () => { };
|
|
42
43
|
}
|
|
43
|
-
return (0,
|
|
44
|
+
return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
44
45
|
karma: backward_compatible_versions_1.backwardCompatibleVersions.angularV14.karmaVersion,
|
|
45
46
|
'karma-chrome-launcher': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.karmaChromeLauncherVersion,
|
|
46
47
|
'karma-coverage': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.karmaCoverageVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma/angular-v14/karma.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma/angular-v14/karma.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,8FAAyF;AACzF,6DAAoF;AAGpF,SAAS,aAAa,CAAC,IAAU;;;IAC/B,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,iBAAiB,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAC;IACzD,IAAI,iBAAiB,EAAE;QACrB,iBAAiB,CAAC,IAAI;QACpB,6CAA6C;QAC7C,gCAAgC;QAChC,4BAA4B;QAC5B,mCAAmC;QACnC,uBAAuB;QACvB,8BAA8B,CAC/B,CAAC;QACF,iBAAiB;QACjB,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;KACxE;IAED,0FAA0F;IAC1F,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;IAC7B,YAAA,MAAM,CAAC,cAAc,EAAC,IAAI,uCAAJ,IAAI,GAAK,EAAE,EAAC;IAClC,YAAA,MAAM,CAAC,cAAc,CAAC,IAAI,EAAC,MAAM,uCAAN,MAAM,GAAK;QACpC,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IACF,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAExE,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;YAC9D,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,aAAa,CAAC,IAAI,CAAC,CAAC;KACrB;IAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,OAAO,IAAA,uDAAuC,EAC5C,IAAI,EACJ,EAAE,EACF;QACE,KAAK,EAAE,yDAA0B,CAAC,UAAU,CAAC,YAAY;QACzD,uBAAuB,EACrB,yDAA0B,CAAC,UAAU,CAAC,0BAA0B;QAClE,gBAAgB,EACd,yDAA0B,CAAC,UAAU,CAAC,oBAAoB;QAC5D,eAAe,EACb,yDAA0B,CAAC,UAAU,CAAC,mBAAmB;QAC3D,6BAA6B,EAC3B,yDAA0B,CAAC,UAAU,CAAC,+BAA+B;QACvE,cAAc,EAAE,yDAA0B,CAAC,UAAU,CAAC,kBAAkB;QACxE,uBAAuB,EACrB,yDAA0B,CAAC,UAAU,CAAC,0BAA0B;QAClE,gBAAgB,EACd,yDAA0B,CAAC,UAAU,CAAC,mBAAmB;QAC3D,aAAa,EAAE,yDAA0B,CAAC,UAAU,CAAC,gBAAgB;KACtE,CACF,CAAC;AACJ,CAAC;AApCD,wCAoCC;AAED,kBAAe,cAAc,CAAC"}
|
|
@@ -50,7 +50,7 @@ function karmaGenerator(tree, options) {
|
|
|
50
50
|
if (options.skipPackageJson || packageJson.devDependencies['karma']) {
|
|
51
51
|
return () => { };
|
|
52
52
|
}
|
|
53
|
-
return (0,
|
|
53
|
+
return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
54
54
|
karma: versions_1.karmaVersion,
|
|
55
55
|
'karma-chrome-launcher': versions_1.karmaChromeLauncherVersion,
|
|
56
56
|
'karma-coverage': versions_1.karmaCoverageVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AACtB,+BAA4B;AAC5B,mDAU8B;AAC9B,0DAGgC;AAGhC,SAAS,aAAa,CAAC,IAAU;;;IAC/B,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,iBAAiB,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAC;IACzD,IAAI,iBAAiB,EAAE;QACrB,iBAAiB,CAAC,IAAI;QACpB,6CAA6C;QAC7C,gCAAgC;QAChC,4BAA4B;QAC5B,mCAAmC;QACnC,uBAAuB;QACvB,8BAA8B,CAC/B,CAAC;QACF,iBAAiB;QACjB,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;KACxE;IAED,0FAA0F;IAC1F,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;IAC7B,YAAA,MAAM,CAAC,cAAc,EAAC,IAAI,uCAAJ,IAAI,GAAK,EAAE,EAAC;IAClC,YAAA,MAAM,CAAC,cAAc,CAAC,IAAI,EAAC,MAAM,uCAAN,MAAM,GAAK;QACpC,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IACF,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAExE,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAsB,cAAc,CAAC,IAAU,EAAE,OAAyB;;QACxE,MAAM,kBAAkB,GACtB,IAAA,+DAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAC7C,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO;SACR;QACD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;gBAC9D,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,aAAa,CAAC,IAAI,CAAC,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,IAAA,uDAAuC,EAC5C,IAAI,EACJ,EAAE,EACF;YACE,KAAK,EAAE,uBAAY;YACnB,uBAAuB,EAAE,qCAA0B;YACnD,gBAAgB,EAAE,+BAAoB;YACtC,eAAe,EAAE,8BAAmB;YACpC,6BAA6B,EAAE,0CAA+B;YAC9D,cAAc,EAAE,6BAAkB;YAClC,uBAAuB,EAAE,qCAA0B;YACnD,gBAAgB,EAAE,8BAAmB;YACrC,aAAa,EAAE,2BAAgB;SAChC,CACF,CAAC;IACJ,CAAC;CAAA;AAvCD,wCAuCC;AAED,kBAAe,cAAc,CAAC"}
|
|
@@ -143,65 +143,65 @@
|
|
|
143
143
|
},
|
|
144
144
|
"standalone": {
|
|
145
145
|
"type": "boolean",
|
|
146
|
-
"description": "Generate a library that uses a standalone component instead of a module as the entry point.",
|
|
146
|
+
"description": "Generate a library that uses a standalone component instead of a module as the entry point. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
147
147
|
"default": false
|
|
148
148
|
},
|
|
149
149
|
"displayBlock": {
|
|
150
|
-
"description": "Specifies if the component generated style will contain `:host { display: block; }`. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
|
|
150
|
+
"description": "Specifies if the component generated style will contain `:host { display: block; }`. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
151
151
|
"type": "boolean",
|
|
152
152
|
"default": false,
|
|
153
153
|
"alias": "b"
|
|
154
154
|
},
|
|
155
155
|
"inlineStyle": {
|
|
156
|
-
"description": "Include styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
|
|
156
|
+
"description": "Include styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
157
157
|
"type": "boolean",
|
|
158
158
|
"default": false,
|
|
159
159
|
"alias": "s"
|
|
160
160
|
},
|
|
161
161
|
"inlineTemplate": {
|
|
162
|
-
"description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
|
|
162
|
+
"description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
163
163
|
"type": "boolean",
|
|
164
164
|
"default": false,
|
|
165
165
|
"alias": "t"
|
|
166
166
|
},
|
|
167
167
|
"viewEncapsulation": {
|
|
168
|
-
"description": "The view encapsulation strategy to use in the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
|
|
168
|
+
"description": "The view encapsulation strategy to use in the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
169
169
|
"enum": ["Emulated", "None", "ShadowDom"],
|
|
170
170
|
"type": "string",
|
|
171
171
|
"alias": "v"
|
|
172
172
|
},
|
|
173
173
|
"changeDetection": {
|
|
174
|
-
"description": "The change detection strategy to use in the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
|
|
174
|
+
"description": "The change detection strategy to use in the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
175
175
|
"enum": ["Default", "OnPush"],
|
|
176
176
|
"type": "string",
|
|
177
177
|
"default": "Default",
|
|
178
178
|
"alias": "c"
|
|
179
179
|
},
|
|
180
180
|
"style": {
|
|
181
|
-
"description": "The file extension or preprocessor to use for style files, or `none` to skip generating the style file. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
|
|
181
|
+
"description": "The file extension or preprocessor to use for style files, or `none` to skip generating the style file. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
182
182
|
"type": "string",
|
|
183
183
|
"default": "css",
|
|
184
184
|
"enum": ["css", "scss", "sass", "less", "none"]
|
|
185
185
|
},
|
|
186
186
|
"skipTests": {
|
|
187
187
|
"type": "boolean",
|
|
188
|
-
"description": "Do not create `spec.ts` test files for the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
|
|
188
|
+
"description": "Do not create `spec.ts` test files for the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
189
189
|
"default": false
|
|
190
190
|
},
|
|
191
191
|
"selector": {
|
|
192
192
|
"type": "string",
|
|
193
193
|
"format": "html-selector",
|
|
194
|
-
"description": "The HTML selector to use for this component. Disclaimer: This option is only valid when `--standalone` is set to `true`."
|
|
194
|
+
"description": "The HTML selector to use for this component. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_"
|
|
195
195
|
},
|
|
196
196
|
"skipSelector": {
|
|
197
197
|
"type": "boolean",
|
|
198
198
|
"default": false,
|
|
199
|
-
"description": "Specifies if the component should have a selector or not. Disclaimer: This option is only valid when `--standalone` is set to `true`."
|
|
199
|
+
"description": "Specifies if the component should have a selector or not. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_"
|
|
200
200
|
},
|
|
201
201
|
"flat": {
|
|
202
202
|
"type": "boolean",
|
|
203
203
|
"default": false,
|
|
204
|
-
"description": "Ensure the generated standalone component is not placed in a subdirectory. Disclaimer: This option is only valid when `--standalone` is set to `true`."
|
|
204
|
+
"description": "Ensure the generated standalone component is not placed in a subdirectory. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_"
|
|
205
205
|
}
|
|
206
206
|
},
|
|
207
207
|
"additionalProperties": false,
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
},
|
|
72
72
|
"standalone": {
|
|
73
73
|
"type": "boolean",
|
|
74
|
-
"description": "Whether the application is a standalone application.",
|
|
74
|
+
"description": "Whether the application is a standalone application. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
75
75
|
"default": false
|
|
76
76
|
}
|
|
77
77
|
},
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Tree } from '@nrwl/devkit';
|
|
1
|
+
import type { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
export declare function getGeneratorDirectoryForInstalledAngularVersion(tree: Tree): string | null;
|
|
3
3
|
export declare function getInstalledAngularVersion(tree: Tree): string;
|
|
4
4
|
export declare function getInstalledAngularMajorVersion(tree: Tree): number;
|
|
@@ -6,7 +6,9 @@ export declare function getInstalledAngularVersionInfo(tree: Tree): {
|
|
|
6
6
|
version: string;
|
|
7
7
|
major: number;
|
|
8
8
|
};
|
|
9
|
+
export declare function getInstalledPackageVersion(tree: Tree, pkgName: string): string | null;
|
|
9
10
|
export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: string): {
|
|
10
11
|
major: number;
|
|
11
|
-
version:
|
|
12
|
+
version: string;
|
|
12
13
|
};
|
|
14
|
+
export declare function addDependenciesToPackageJsonIfDontExist(tree: Tree, dependencies: Record<string, string>, devDependencies: Record<string, string>, packageJsonPath?: string): GeneratorCallback;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getInstalledPackageVersionInfo = exports.getInstalledAngularVersionInfo = exports.getInstalledAngularMajorVersion = exports.getInstalledAngularVersion = exports.getGeneratorDirectoryForInstalledAngularVersion = void 0;
|
|
3
|
+
exports.addDependenciesToPackageJsonIfDontExist = exports.getInstalledPackageVersionInfo = exports.getInstalledPackageVersion = exports.getInstalledAngularVersionInfo = exports.getInstalledAngularMajorVersion = exports.getInstalledAngularVersion = exports.getGeneratorDirectoryForInstalledAngularVersion = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const semver_1 = require("semver");
|
|
6
6
|
const versions_1 = require("../../utils/versions");
|
|
@@ -37,15 +37,28 @@ function getInstalledAngularVersionInfo(tree) {
|
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
|
|
40
|
+
function getInstalledPackageVersion(tree, pkgName) {
|
|
41
|
+
var _a;
|
|
42
|
+
const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
|
|
43
|
+
const version = (_a = dependencies === null || dependencies === void 0 ? void 0 : dependencies[pkgName]) !== null && _a !== void 0 ? _a : devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[pkgName];
|
|
44
|
+
return version;
|
|
45
|
+
}
|
|
46
|
+
exports.getInstalledPackageVersion = getInstalledPackageVersion;
|
|
40
47
|
function getInstalledPackageVersionInfo(tree, pkgName) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const version = (_b = (_a = (0, devkit_1.readJson)(tree, 'package.json').dependencies) === null || _a === void 0 ? void 0 : _a[pkgName]) !== null && _b !== void 0 ? _b : (_c = (0, devkit_1.readJson)(tree, 'package.json').devDependencies) === null || _c === void 0 ? void 0 : _c[pkgName];
|
|
44
|
-
return { major: (0, semver_1.major)((0, semver_1.coerce)(version)), version };
|
|
45
|
-
}
|
|
46
|
-
catch (_d) {
|
|
47
|
-
return null;
|
|
48
|
-
}
|
|
48
|
+
const version = getInstalledPackageVersion(tree, pkgName);
|
|
49
|
+
return version ? { major: (0, semver_1.major)((0, semver_1.coerce)(version)), version } : null;
|
|
49
50
|
}
|
|
50
51
|
exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
|
|
52
|
+
function addDependenciesToPackageJsonIfDontExist(tree, dependencies, devDependencies, packageJsonPath = 'package.json') {
|
|
53
|
+
const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
|
|
54
|
+
function filterExisting(deps) {
|
|
55
|
+
return Object.keys(deps)
|
|
56
|
+
.filter((d) => { var _a, _b; return !((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[d]) && !((_b = packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b[d]); })
|
|
57
|
+
.reduce((acc, d) => (Object.assign(Object.assign({}, acc), { [d]: deps[d] })), {});
|
|
58
|
+
}
|
|
59
|
+
const depsToAdd = filterExisting(dependencies);
|
|
60
|
+
const devDepsToAdd = filterExisting(devDependencies);
|
|
61
|
+
return (0, devkit_1.addDependenciesToPackageJson)(tree, depsToAdd, devDepsToAdd, packageJsonPath);
|
|
62
|
+
}
|
|
63
|
+
exports.addDependenciesToPackageJsonIfDontExist = addDependenciesToPackageJsonIfDontExist;
|
|
51
64
|
//# sourceMappingURL=version-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"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"}
|