@nrwl/angular 15.4.5 → 15.4.6
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/LICENSE +22 -22
- package/package.json +8 -8
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js +25 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js +0 -3
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +25 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js +0 -3
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/executors/utilities/angular-version-utils.d.ts +6 -0
- package/src/executors/utilities/angular-version-utils.js +16 -0
- package/src/executors/utilities/angular-version-utils.js.map +1 -0
- package/src/generators/add-linting/add-linting.js +3 -3
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/application/application.js +3 -3
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/init/init.js +3 -3
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma/karma.js +3 -3
- package/src/generators/karma/karma.js.map +1 -1
- package/src/generators/library/library.js +10 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +0 -2
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.d.ts +0 -1
- package/src/generators/ng-add/utilities/workspace.js +1 -28
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/setup-mf/setup-mf.js +6 -0
- package/src/generators/setup-mf/setup-mf.js.map +1 -1
- package/src/generators/setup-ssr/setup-ssr.js +13 -3
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
- package/src/generators/utils/angular-version-utils.d.ts +8 -0
- package/src/generators/utils/angular-version-utils.js +40 -0
- package/src/generators/utils/angular-version-utils.js.map +1 -0
- package/src/generators/utils/create-ts-config.d.ts +1 -1
- package/src/generators/utils/create-ts-config.js +5 -3
- package/src/generators/utils/create-ts-config.js.map +1 -1
- package/src/migrations/update-12-3-0/update-storybook.js +2 -2
- package/src/migrations/update-12-3-0/update-storybook.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +2 -2
- package/src/utils/versions.js.map +1 -1
- package/src/utils/get-generator-directory-for-ng-version.d.ts +0 -2
- package/src/utils/get-generator-directory-for-ng-version.js +0 -22
- package/src/utils/get-generator-directory-for-ng-version.js.map +0 -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.4.
|
|
6
|
+
## [15.4.6](https://github.com/nrwl/nx/compare/15.4.5...15.4.6) (2023-01-12)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/LICENSE
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
(The MIT License)
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2017-
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining
|
|
6
|
-
a copy of this software and associated documentation files (the
|
|
7
|
-
'Software'), to deal in the Software without restriction, including
|
|
8
|
-
without limitation the rights to use, copy, modify, merge, publish,
|
|
9
|
-
distribute, sublicense, and/or sell copies of the Software, and to
|
|
10
|
-
permit persons to whom the Software is furnished to do so, subject to
|
|
11
|
-
the following conditions:
|
|
12
|
-
|
|
13
|
-
The above copyright notice and this permission notice shall be
|
|
14
|
-
included in all copies or substantial portions of the Software.
|
|
15
|
-
|
|
16
|
-
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
17
|
-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
18
|
-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
19
|
-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
20
|
-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
21
|
-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
22
|
-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
1
|
+
(The MIT License)
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2017-2023 Narwhal Technologies Inc.
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
|
6
|
+
a copy of this software and associated documentation files (the
|
|
7
|
+
'Software'), to deal in the Software without restriction, including
|
|
8
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
|
9
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
|
10
|
+
permit persons to whom the Software is furnished to do so, subject to
|
|
11
|
+
the following conditions:
|
|
12
|
+
|
|
13
|
+
The above copyright notice and this permission notice shall be
|
|
14
|
+
included in all copies or substantial portions of the Software.
|
|
15
|
+
|
|
16
|
+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
17
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
18
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
19
|
+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
20
|
+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
21
|
+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
22
|
+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.4.
|
|
3
|
+
"version": "15.4.6",
|
|
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": {
|
|
@@ -68,12 +68,12 @@
|
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~15.0.1",
|
|
70
70
|
"@nguniversal/builders": "~15.0.0",
|
|
71
|
-
"@nrwl/cypress": "15.4.
|
|
72
|
-
"@nrwl/devkit": "15.4.
|
|
73
|
-
"@nrwl/jest": "15.4.
|
|
74
|
-
"@nrwl/linter": "15.4.
|
|
75
|
-
"@nrwl/webpack": "15.4.
|
|
76
|
-
"@nrwl/workspace": "15.4.
|
|
71
|
+
"@nrwl/cypress": "15.4.6",
|
|
72
|
+
"@nrwl/devkit": "15.4.6",
|
|
73
|
+
"@nrwl/jest": "15.4.6",
|
|
74
|
+
"@nrwl/linter": "15.4.6",
|
|
75
|
+
"@nrwl/webpack": "15.4.6",
|
|
76
|
+
"@nrwl/workspace": "15.4.6",
|
|
77
77
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
78
78
|
"@schematics/angular": "~15.0.1",
|
|
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": "38bc77e8ecc42de9225eb498027558c85c10e21a"
|
|
103
103
|
}
|
|
@@ -19,8 +19,9 @@ const log = require("ng-packagr/lib/utils/log");
|
|
|
19
19
|
const path_1 = require("path");
|
|
20
20
|
const postcssPresetEnv = require("postcss-preset-env");
|
|
21
21
|
const postcssUrl = require("postcss-url");
|
|
22
|
-
const tailwindcss_1 = require("../../../utilities/tailwindcss");
|
|
23
22
|
const url_1 = require("url");
|
|
23
|
+
const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
|
|
24
|
+
const tailwindcss_1 = require("../../../utilities/tailwindcss");
|
|
24
25
|
const postcss = require('postcss');
|
|
25
26
|
var CssUrl;
|
|
26
27
|
(function (CssUrl) {
|
|
@@ -172,6 +173,18 @@ class StylesheetProcessor {
|
|
|
172
173
|
switch (ext) {
|
|
173
174
|
case '.sass':
|
|
174
175
|
case '.scss': {
|
|
176
|
+
const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
|
|
177
|
+
if (angularVersion && angularVersion.major < 15) {
|
|
178
|
+
return (yield Promise.resolve().then(() => require('sass')))
|
|
179
|
+
.renderSync({
|
|
180
|
+
file: filePath,
|
|
181
|
+
data: css,
|
|
182
|
+
indentedSyntax: '.sass' === ext,
|
|
183
|
+
importer: customSassImporter,
|
|
184
|
+
includePaths: this.styleIncludePaths,
|
|
185
|
+
})
|
|
186
|
+
.css.toString();
|
|
187
|
+
}
|
|
175
188
|
return (yield Promise.resolve().then(() => require('sass')))
|
|
176
189
|
.compileString(css, {
|
|
177
190
|
url: (0, url_1.pathToFileURL)(filePath),
|
|
@@ -230,4 +243,15 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
|
|
|
230
243
|
}
|
|
231
244
|
return transformed.length ? transformed : undefined;
|
|
232
245
|
}
|
|
246
|
+
function customSassImporter(url, prev) {
|
|
247
|
+
// NB: Sass importer should always be sync as otherwise it will cause
|
|
248
|
+
// sass to go in the async path which is slower.
|
|
249
|
+
if (url[0] !== '~') {
|
|
250
|
+
return undefined;
|
|
251
|
+
}
|
|
252
|
+
return {
|
|
253
|
+
file: url.slice(1),
|
|
254
|
+
prev,
|
|
255
|
+
};
|
|
256
|
+
}
|
|
233
257
|
//# sourceMappingURL=stylesheet-processor.js.map
|
package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;AAEH,6CAA6C;AAC7C,2BAAgC;AAChC,8EAA0E;AAC1E,sDAIoC;AACpC,gDAAgD;AAChD,+BAA8C;AAC9C,uDAAuD;AACvD,0CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,9 +62,6 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
62
62
|
fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
-
// Rename file to index.d.ts so that TypeScript can resolve types without
|
|
66
|
-
// them needing to be referenced in the package.json manifest.
|
|
67
|
-
fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
|
|
68
65
|
sourceFiles.forEach((source) => {
|
|
69
66
|
const cache = sourcesFileCache.getOrCreate(source.fileName);
|
|
70
67
|
if (!cache.declarationFileName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,9 @@ const log = require("ng-packagr/lib/utils/log");
|
|
|
19
19
|
const path_1 = require("path");
|
|
20
20
|
const postcssPresetEnv = require("postcss-preset-env");
|
|
21
21
|
const postcssUrl = require("postcss-url");
|
|
22
|
-
const tailwindcss_1 = require("../../../utilities/tailwindcss");
|
|
23
22
|
const url_1 = require("url");
|
|
23
|
+
const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
|
|
24
|
+
const tailwindcss_1 = require("../../../utilities/tailwindcss");
|
|
24
25
|
const postcss = require('postcss');
|
|
25
26
|
var CssUrl;
|
|
26
27
|
(function (CssUrl) {
|
|
@@ -165,6 +166,18 @@ class StylesheetProcessor {
|
|
|
165
166
|
switch (ext) {
|
|
166
167
|
case '.sass':
|
|
167
168
|
case '.scss': {
|
|
169
|
+
const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
|
|
170
|
+
if (angularVersion && angularVersion.major < 15) {
|
|
171
|
+
return (yield Promise.resolve().then(() => require('sass')))
|
|
172
|
+
.renderSync({
|
|
173
|
+
file: filePath,
|
|
174
|
+
data: css,
|
|
175
|
+
indentedSyntax: '.sass' === ext,
|
|
176
|
+
importer: customSassImporter,
|
|
177
|
+
includePaths: this.styleIncludePaths,
|
|
178
|
+
})
|
|
179
|
+
.css.toString();
|
|
180
|
+
}
|
|
168
181
|
return (yield Promise.resolve().then(() => require('sass')))
|
|
169
182
|
.compileString(css, {
|
|
170
183
|
url: (0, url_1.pathToFileURL)(filePath),
|
|
@@ -223,4 +236,15 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
|
|
|
223
236
|
}
|
|
224
237
|
return transformed.length ? transformed : undefined;
|
|
225
238
|
}
|
|
239
|
+
function customSassImporter(url, prev) {
|
|
240
|
+
// NB: Sass importer should always be sync as otherwise it will cause
|
|
241
|
+
// sass to go in the async path which is slower.
|
|
242
|
+
if (url[0] !== '~') {
|
|
243
|
+
return undefined;
|
|
244
|
+
}
|
|
245
|
+
return {
|
|
246
|
+
file: url.slice(1),
|
|
247
|
+
prev,
|
|
248
|
+
};
|
|
249
|
+
}
|
|
226
250
|
//# sourceMappingURL=stylesheet-processor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;AAEH,6CAA6C;AAC7C,2BAAgC;AAChC,8EAA0E;AAC1E,sDAIoC;AACpC,gDAAgD;AAChD,+BAA8C;AAC9C,uDAAuD;AACvD,0CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,9 +62,6 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
62
62
|
fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
-
// Rename file to index.d.ts so that TypeScript can resolve types without
|
|
66
|
-
// them needing to be referenced in the package.json manifest.
|
|
67
|
-
fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
|
|
68
65
|
sourceFiles.forEach((source) => {
|
|
69
66
|
const cache = sourcesFileCache.getOrCreate(source.fileName);
|
|
70
67
|
if (!cache.declarationFileName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,mCAAoC;AAGpC,oDAAiD;AACjD,2DAA0E;AAC1E,oDAA2D;AAE3D,6BAA6B;AAC7B,iCAAiC;AAGjC,SAAgB,iBAAiB,CAC/B,KAAiB,EACjB,UAA0B,EAC1B,eAAgC,EAChC,qBAA+C,EAC/C,mBAAyC,EACzC,mBAA4D,EAC5D,mBAA8B,UAAU,CAAC,KAAK,CAAC,gBAAgB;IAE/D,MAAM,YAAY,GAAG,EAAE,CAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAEvE,MAAM,OAAO,GAAG,CAAC,QAAgB,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,IAAA,eAAO,EAAC,IAAA,qBAAc,EAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,IAAI,WAAI,CAAC,OAAO,CAAC,CAAC;YACzB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACjB;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;QACvC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/B,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,GAClD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;IAC7B,MAAM,yBAAyB,GAAG,GAAG,cAAc,OAAO,CAAC;IAC3D,MAAM,qBAAqB,GAAG,IAAA,qBAAc,EAC1C,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,yBAAyB,CAAC,CACtD,CAAC;IACF,MAAM,iBAAiB,GACrB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK,UAAU,CAAC;IAExD,uCACK,YAAY;QAEf,cAAc;QACd,UAAU,EAAE,CAAC,QAAgB,EAAE,EAAE;YAC/B,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC9B,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC7D;YAED,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC,EAED,aAAa,EAAE,CAAC,QAAgB,EAAE,eAAgC,EAAE,EAAE;YACpE,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;gBACrB,KAAK,CAAC,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC,IAAI,CAChD,IAAI,EACJ,QAAQ,EACR,eAAe,CAChB,CAAC;aACH;YAED,OAAO,KAAK,CAAC,UAAU,CAAC;QAC1B,CAAC,EAED,SAAS,EAAE,CACT,QAAgB,EAChB,IAAY,EACZ,kBAA2B,EAC3B,OAAmC,EACnC,WAA0C,EAC1C,EAAE;YACF,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC9B,IAAI,QAAQ,KAAK,qBAAqB,EAAE;oBACtC,IAAI,iBAAiB,EAAE;wBACrB,6GAA6G;wBAC7G,oCAAoC;wBACpC,OAAO;qBACR;yBAAM;wBACL,yEAAyE;wBACzE,8DAA8D;wBAC9D,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACzB,yBAAyB,EACzB,YAAY,CACb,CAAC;qBACH;iBACF;gBAED,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC7B,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC5D,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE;wBAC9B,KAAK,CAAC,mBAAmB,GAAG,IAAA,qBAAc,EAAC,QAAQ,CAAC,CAAC;qBACtD;gBACH,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;gBACvD,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC;gBAEjD,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE;oBACxB,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBACzD,CAAC,CAAC;aACJ;YAED,YAAY,CAAC,SAAS,CAAC,IAAI,CACzB,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,kBAAkB,EAClB,OAAO,EACP,WAAW,CACZ,CAAC;QACJ,CAAC,EAED,QAAQ,EAAE,CAAC,QAAgB,EAAE,EAAE;YAC7B,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC/B,KAAK,CAAC,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC5D;YAED,OAAO,KAAK,CAAC,OAAO,CAAC;QACvB,CAAC,EAED,kBAAkB,EAAE,CAAC,WAAqB,EAAE,cAAsB,EAAE,EAAE;YACpE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;gBACpC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAC7C,UAAU,EACV,IAAA,qBAAc,EAAC,cAAc,CAAC,EAC9B,eAAe,EACf,YAAY,EACZ,qBAAqB,CACtB,CAAC;gBAEF,OAAO,cAAc,CAAC;YACxB,CAAC,CAAC,CAAC;QACL,CAAC,EAED,sBAAsB,EAAE,CACtB,YAAoB,EACpB,kBAA0B,EAC1B,EAAE;YACF,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAC/B,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAChC,YAAY,CACb,CAAC;YACF,MAAM,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;YACnD,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;YAC3C,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAEvC,OAAO,YAAY,CAAC;QACtB,CAAC,EAED,YAAY,EAAE,CAAO,QAAgB,EAAE,EAAE;YACvC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEtB,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC/B,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE;oBACjD,WAAW;oBACX,KAAK,CAAC,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;iBAC5D;qBAAM;oBACL,aAAa;oBACb,KAAK,CAAC,OAAO,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC;wBAChD,QAAQ,EAAE,QAAQ;wBAClB,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;qBACpD,CAAC,CAAC;iBACJ;gBAED,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,GAAG,CAAC,CAAC;iBAClD;gBAED,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;aACrB;YAED,OAAO,KAAK,CAAC,OAAO,CAAC;QACvB,CAAC,CAAA,EACD,iBAAiB,EAAE,CAAO,IAAI,EAAE,OAAO,EAAE,EAAE;YACzC,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE;gBACpD,OAAO,IAAI,CAAC;aACb;YAED,IAAI,mBAAmB,EAAE;gBACvB,MAAM,GAAG,GAAG,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC1D,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,cAAc,IAAI,GAAG,IAAI,mBAAmB,EAAE,CAAC;gBAC3E,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACrD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE;oBAC/B,KAAK,CAAC,OAAO,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC;wBAChD,QAAQ,EAAE,OAAO,CAAC,cAAc;wBAChC,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC;oBAEH,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAC1C,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;oBAC3D,eAAe,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;iBAC/C;gBAED,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;gBAEpB,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;aACnC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAA,IACD;AACJ,CAAC;AA7MD,8CA6MC;AAED,SAAgB,4BAA4B,CAAC,OAAmB;IAC9D,MAAM,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IAClD,OAAO,CAAC,cAAc,GAAG,UAAU,GAAG,UAAU;QAC9C,MAAM,KAAK,GACT,kBAAkB,CAAC,GAAG,UAAU,CAAC,CAAC;QAEpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACrE;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAdD,oEAcC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getInstalledAngularVersionInfo = void 0;
|
|
4
|
+
const package_json_1 = require("nx/src/utils/package-json");
|
|
5
|
+
const semver_1 = require("semver");
|
|
6
|
+
function getInstalledAngularVersionInfo() {
|
|
7
|
+
try {
|
|
8
|
+
const { packageJson: { version }, } = (0, package_json_1.readModulePackageJson)('@angular/core');
|
|
9
|
+
return { major: (0, semver_1.major)(version), version };
|
|
10
|
+
}
|
|
11
|
+
catch (_a) {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
|
|
16
|
+
//# sourceMappingURL=angular-version-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"angular-version-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/angular-version-utils.ts"],"names":[],"mappings":";;;AAAA,4DAAkE;AAClE,mCAA+B;AAI/B,SAAgB,8BAA8B;IAC5C,IAAI;QACF,MAAM,EACJ,WAAW,EAAE,EAAE,OAAO,EAAE,GACzB,GAAG,IAAA,oCAAqB,EAAC,eAAe,CAAC,CAAC;QAE3C,OAAO,EAAE,KAAK,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;KAC3C;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAVD,wEAUC"}
|
|
@@ -6,13 +6,13 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
8
8
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
const angular_version_utils_1 = require("../utils/angular-version-utils");
|
|
9
11
|
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
10
12
|
const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
|
|
11
|
-
const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
|
|
12
|
-
const path_1 = require("path");
|
|
13
13
|
function addLintingGenerator(tree, options) {
|
|
14
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
-
const generatorDirectory = (0,
|
|
15
|
+
const generatorDirectory = (0, angular_version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
16
16
|
if (generatorDirectory) {
|
|
17
17
|
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'add-linting')));
|
|
18
18
|
yield previousGenerator.default(tree, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,2FAAqF;AACrF,mFAA4E;
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,+BAA4B;AAC5B,0EAAiG;AACjG,2FAAqF;AACrF,mFAA4E;AAG5E,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,kBAAkB,GACtB,IAAA,uEAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,aAAa,CAAC,EACnD,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO;SACR;QAED,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA7CD,kDA6CC;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -5,15 +5,15 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
7
7
|
const generators_1 = require("@nrwl/workspace/generators");
|
|
8
|
+
const path_1 = require("path");
|
|
8
9
|
const test_runners_1 = require("../../utils/test-runners");
|
|
9
10
|
const init_1 = require("../init/init");
|
|
10
11
|
const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
|
|
12
|
+
const angular_version_utils_1 = require("../utils/angular-version-utils");
|
|
11
13
|
const lib_1 = require("./lib");
|
|
12
|
-
const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
|
|
13
|
-
const path_1 = require("path");
|
|
14
14
|
function applicationGenerator(tree, schema) {
|
|
15
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
-
const generatorDirectory = (0,
|
|
16
|
+
const generatorDirectory = (0, angular_version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
17
17
|
if (generatorDirectory) {
|
|
18
18
|
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'application')));
|
|
19
19
|
yield previousGenerator.default(tree, schema);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,8DAAwE;AACxE,2DAAyE;AACzE,2DAA0D;AAC1D,uCAAoD;AACpD,qEAA0E;AAC1E,+BAgBe;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,14 +7,14 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
const linter_1 = require("@nrwl/linter");
|
|
9
9
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
10
|
+
const path_1 = require("path");
|
|
10
11
|
const test_runners_1 = require("../../utils/test-runners");
|
|
11
12
|
const versions_1 = require("../../utils/versions");
|
|
12
13
|
const karma_1 = require("../karma/karma");
|
|
13
|
-
const
|
|
14
|
-
const path_1 = require("path");
|
|
14
|
+
const angular_version_utils_1 = require("../utils/angular-version-utils");
|
|
15
15
|
function angularInitGenerator(tree, rawOptions) {
|
|
16
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
|
-
const generatorDirectory = (0,
|
|
17
|
+
const generatorDirectory = (0, angular_version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
18
18
|
if (generatorDirectory) {
|
|
19
19
|
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'init')));
|
|
20
20
|
yield previousGenerator.default(tree, rawOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAQsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;AACrF,2DAAyE;AACzE,mDAa8B;AAC9B,0CAAgD;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.karmaGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const versions_1 = require("../../utils/versions");
|
|
7
|
-
const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
|
|
8
6
|
const path_1 = require("path");
|
|
7
|
+
const versions_1 = require("../../utils/versions");
|
|
8
|
+
const angular_version_utils_1 = require("../utils/angular-version-utils");
|
|
9
9
|
function addTestInputs(tree) {
|
|
10
10
|
var _a, _b, _c, _d;
|
|
11
11
|
var _e, _f;
|
|
@@ -34,7 +34,7 @@ function addTestInputs(tree) {
|
|
|
34
34
|
}
|
|
35
35
|
function karmaGenerator(tree, options) {
|
|
36
36
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
37
|
-
const generatorDirectory = (0,
|
|
37
|
+
const generatorDirectory = (0, angular_version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
38
38
|
if (generatorDirectory) {
|
|
39
39
|
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'karma')));
|
|
40
40
|
yield previousGenerator.default(tree, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;AACtB,mDAU8B;
|
|
1
|
+
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;AACtB,+BAA4B;AAC5B,mDAU8B;AAC9B,0EAAiG;AAGjG,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,uEAA+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,qCAA4B,EACjC,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"}
|
|
@@ -21,7 +21,10 @@ const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-sco
|
|
|
21
21
|
const update_project_1 = require("./lib/update-project");
|
|
22
22
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
23
23
|
const add_standalone_component_1 = require("./lib/add-standalone-component");
|
|
24
|
+
const angular_version_utils_1 = require("../utils/angular-version-utils");
|
|
25
|
+
const semver_1 = require("semver");
|
|
24
26
|
function libraryGenerator(tree, schema) {
|
|
27
|
+
var _a, _b;
|
|
25
28
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
29
|
// Do some validation checks
|
|
27
30
|
if (!schema.routing && schema.lazy) {
|
|
@@ -33,6 +36,10 @@ function libraryGenerator(tree, schema) {
|
|
|
33
36
|
if (schema.addTailwind && !schema.buildable && !schema.publishable) {
|
|
34
37
|
throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
|
|
35
38
|
}
|
|
39
|
+
const userInstalledAngularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
40
|
+
if ((0, semver_1.lt)(userInstalledAngularVersion.version, '14.1.0') && schema.standalone) {
|
|
41
|
+
throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
|
|
42
|
+
}
|
|
36
43
|
const options = (0, normalize_options_1.normalizeOptions)(tree, schema);
|
|
37
44
|
const { libraryOptions, componentOptions } = options;
|
|
38
45
|
yield (0, init_1.default)(tree, Object.assign(Object.assign({}, libraryOptions), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
|
|
@@ -69,7 +76,9 @@ function libraryGenerator(tree, schema) {
|
|
|
69
76
|
if (libraryOptions.buildable || libraryOptions.publishable) {
|
|
70
77
|
(0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['ng-packagr']);
|
|
71
78
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
72
|
-
'ng-packagr': versions_1.
|
|
79
|
+
'ng-packagr': userInstalledAngularVersion.major < (0, semver_1.major)((0, semver_1.coerce)(versions_1.angularVersion))
|
|
80
|
+
? (_b = (_a = versions_1.versions[`angularV${userInstalledAngularVersion.major}`]) === null || _a === void 0 ? void 0 : _a.ngPackagrVersion) !== null && _b !== void 0 ? _b : versions_1.ngPackagrVersion
|
|
81
|
+
: versions_1.ngPackagrVersion,
|
|
73
82
|
});
|
|
74
83
|
(0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
|
|
75
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,8DAAwE;AACxE,qCAAkD;AAClD,yCAAsC;AACtC,2DAAyE;AACzE,qDAA8C;AAC9C,2DAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,6 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
21
21
|
prettier: versions_1.prettierVersion,
|
|
22
22
|
});
|
|
23
23
|
(0, utilities_1.createNxJson)(tree, options, angularJson.defaultProject);
|
|
24
|
-
(0, utilities_1.decorateAngularCli)(tree);
|
|
25
24
|
(0, utilities_1.updateVsCodeRecommendedExtensions)(tree);
|
|
26
25
|
yield (0, utilities_1.updatePrettierConfig)(tree);
|
|
27
26
|
// convert workspace config format to standalone project configs
|
|
@@ -49,7 +48,6 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
49
48
|
(0, utilities_1.updateWorkspaceConfigDefaults)(tree);
|
|
50
49
|
(0, utilities_1.updateRootTsConfig)(tree);
|
|
51
50
|
(0, utilities_1.updatePackageJson)(tree);
|
|
52
|
-
(0, utilities_1.decorateAngularCli)(tree);
|
|
53
51
|
yield (0, utilities_1.createWorkspaceFiles)(tree);
|
|
54
52
|
// migrate all projects
|
|
55
53
|
for (const migrator of migrators) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,2DAAyE;AACzE,iEAAqE;AACrE,mDAAiD;AAEjD,2CAAuD;AAEvD,
|
|
1
|
+
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ import type { GeneratorOptions } from '../schema';
|
|
|
4
4
|
import type { WorkspaceRootFileTypesInfo } from './types';
|
|
5
5
|
export declare function validateWorkspace(tree: Tree): void;
|
|
6
6
|
export declare function createNxJson(tree: Tree, options: GeneratorOptions, defaultProject: string | undefined): void;
|
|
7
|
-
export declare function decorateAngularCli(tree: Tree): void;
|
|
8
7
|
export declare function updateWorkspaceConfigDefaults(tree: Tree): void;
|
|
9
8
|
export declare function updateRootTsConfig(tree: Tree): void;
|
|
10
9
|
export declare function updatePackageJson(tree: Tree): void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updatePrettierConfig = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.
|
|
3
|
+
exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updatePrettierConfig = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.createNxJson = exports.validateWorkspace = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
@@ -9,9 +9,6 @@ const default_base_1 = require("@nrwl/workspace/src/utilities/default-base");
|
|
|
9
9
|
const prettier_1 = require("@nrwl/workspace/src/utilities/prettier");
|
|
10
10
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
11
11
|
const versions_1 = require("@nrwl/workspace/src/utils/versions");
|
|
12
|
-
const fs_1 = require("fs");
|
|
13
|
-
const package_json_1 = require("nx/src/utils/package-json");
|
|
14
|
-
const path_1 = require("path");
|
|
15
12
|
const versions_2 = require("../../../utils/versions");
|
|
16
13
|
function validateWorkspace(tree) {
|
|
17
14
|
const errors = [];
|
|
@@ -104,30 +101,6 @@ function getWorkspaceCommonTargets(tree) {
|
|
|
104
101
|
}
|
|
105
102
|
return targets;
|
|
106
103
|
}
|
|
107
|
-
function decorateAngularCli(tree) {
|
|
108
|
-
const nrwlWorkspacePath = (0, package_json_1.readModulePackageJson)('@nrwl/workspace').path;
|
|
109
|
-
const decorateCli = (0, fs_1.readFileSync)((0, path_1.join)((0, path_1.dirname)(nrwlWorkspacePath), 'src/generators/utils/decorate-angular-cli.js__tmpl__'), 'utf-8');
|
|
110
|
-
tree.write('decorate-angular-cli.js', decorateCli);
|
|
111
|
-
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
112
|
-
var _a;
|
|
113
|
-
if (json.scripts &&
|
|
114
|
-
json.scripts.postinstall &&
|
|
115
|
-
!json.scripts.postinstall.includes('decorate-angular-cli.js')) {
|
|
116
|
-
// if exists, add execution of this script
|
|
117
|
-
json.scripts.postinstall += ' && node ./decorate-angular-cli.js';
|
|
118
|
-
}
|
|
119
|
-
else {
|
|
120
|
-
(_a = json.scripts) !== null && _a !== void 0 ? _a : (json.scripts = {});
|
|
121
|
-
// if doesn't exist, set to execute this script
|
|
122
|
-
json.scripts.postinstall = 'node ./decorate-angular-cli.js';
|
|
123
|
-
}
|
|
124
|
-
if (json.scripts.ng) {
|
|
125
|
-
json.scripts.ng = 'nx';
|
|
126
|
-
}
|
|
127
|
-
return json;
|
|
128
|
-
});
|
|
129
|
-
}
|
|
130
|
-
exports.decorateAngularCli = decorateAngularCli;
|
|
131
104
|
function updateWorkspaceConfigDefaults(tree) {
|
|
132
105
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
133
106
|
delete nxJson.newProjectRoot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,15 @@ exports.setupMf = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const lib_1 = require("./lib");
|
|
7
|
+
const angular_version_utils_1 = require("../utils/angular-version-utils");
|
|
8
|
+
const semver_1 = require("semver");
|
|
7
9
|
function setupMf(tree, options) {
|
|
8
10
|
var _a;
|
|
9
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
const installedAngularInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
13
|
+
if ((0, semver_1.lt)(installedAngularInfo.version, '14.1.0') && options.standalone) {
|
|
14
|
+
throw new Error(`The --standalone flag is not supported in your current version of Angular (${installedAngularInfo.version}). Please update to a version of Angular that supports Standalone Components (>= 14.1.0).`);
|
|
15
|
+
}
|
|
10
16
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
|
|
11
17
|
options.federationType = (_a = options.federationType) !== null && _a !== void 0 ? _a : 'static';
|
|
12
18
|
if (options.mfType === 'host') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":";;;;AACA,yCAAqE;AAGrE,+BAae;
|
|
1
|
+
{"version":3,"file":"setup-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":";;;;AACA,yCAAqE;AAGrE,+BAae;AACf,0EAAgF;AAChF,mCAA4B;AAE5B,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAe;;;QACvD,MAAM,oBAAoB,GAAG,IAAA,sDAA8B,EAAC,IAAI,CAAC,CAAC;QAElE,IAAI,IAAA,WAAE,EAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YACpE,MAAM,IAAI,KAAK,CACb,8EAA8E,oBAAoB,CAAC,OAAO,2FAA2F,CACtM,CAAC;SACH;QACD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YAClD,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACzC;QAED,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5C;QAED,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CACF;AAzCD,0BAyCC;AAED,kBAAe,OAAO,CAAC"}
|
|
@@ -5,17 +5,27 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const lib_1 = require("./lib");
|
|
7
7
|
const versions_1 = require("../../utils/versions");
|
|
8
|
+
const angular_version_utils_1 = require("../utils/angular-version-utils");
|
|
9
|
+
const semver_1 = require("semver");
|
|
8
10
|
function setupSsr(tree, schema) {
|
|
11
|
+
var _a, _b, _c, _d;
|
|
9
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
13
|
const options = (0, lib_1.normalizeOptions)(tree, schema);
|
|
11
14
|
(0, lib_1.generateSSRFiles)(tree, options);
|
|
12
15
|
(0, lib_1.updateAppModule)(tree, options);
|
|
13
16
|
(0, lib_1.updateProjectConfig)(tree, options);
|
|
17
|
+
const installedAngularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
18
|
+
const ngUniversalVersionToUse = installedAngularVersion.major < (0, semver_1.major)((0, semver_1.coerce)(versions_1.angularVersion))
|
|
19
|
+
? (_b = (_a = versions_1.versions[`angularV${installedAngularVersion.major}`]) === null || _a === void 0 ? void 0 : _a.ngUniversalVersion) !== null && _b !== void 0 ? _b : versions_1.ngUniversalVersion
|
|
20
|
+
: versions_1.ngUniversalVersion;
|
|
21
|
+
const ngPlatformServerVersionToUse = installedAngularVersion.major < (0, semver_1.major)((0, semver_1.coerce)(versions_1.angularVersion))
|
|
22
|
+
? (_d = (_c = versions_1.versions[`angularV${installedAngularVersion.major}`]) === null || _c === void 0 ? void 0 : _c.angularVersion) !== null && _d !== void 0 ? _d : versions_1.angularVersion
|
|
23
|
+
: versions_1.angularVersion;
|
|
14
24
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
15
|
-
'@nguniversal/express-engine':
|
|
16
|
-
'@angular/platform-server':
|
|
25
|
+
'@nguniversal/express-engine': ngUniversalVersionToUse,
|
|
26
|
+
'@angular/platform-server': ngPlatformServerVersionToUse,
|
|
17
27
|
}, {
|
|
18
|
-
'@nguniversal/builders':
|
|
28
|
+
'@nguniversal/builders': ngUniversalVersionToUse,
|
|
19
29
|
});
|
|
20
30
|
if (!options.skipFormat) {
|
|
21
31
|
yield (0, devkit_1.formatFiles)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AAEtB,+BAKe;AACf,
|
|
1
|
+
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AAEtB,+BAKe;AACf,mDAI8B;AAC9B,0EAAgF;AAChF,mCAAuC;AAEvC,SAAsB,QAAQ,CAAC,IAAU,EAAE,MAAc;;;QACvD,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,MAAM,uBAAuB,GAAG,IAAA,sDAA8B,EAAC,IAAI,CAAC,CAAC;QACrE,MAAM,uBAAuB,GAC3B,uBAAuB,CAAC,KAAK,GAAG,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,yBAAc,CAAC,CAAC;YAC3D,CAAC,CAAC,MAAA,MAAA,mBAAQ,CAAC,WAAW,uBAAuB,CAAC,KAAK,EAAE,CAAC,0CAChD,kBAAkB,mCAAI,6BAAkB;YAC9C,CAAC,CAAC,6BAAkB,CAAC;QAEzB,MAAM,4BAA4B,GAChC,uBAAuB,CAAC,KAAK,GAAG,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,yBAAc,CAAC,CAAC;YAC3D,CAAC,CAAC,MAAA,MAAA,mBAAQ,CAAC,WAAW,uBAAuB,CAAC,KAAK,EAAE,CAAC,0CAAE,cAAc,mCACpE,yBAAc;YAChB,CAAC,CAAC,yBAAc,CAAC;QAErB,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,6BAA6B,EAAE,uBAAuB;YACtD,0BAA0B,EAAE,4BAA4B;SACzD,EACD;YACE,uBAAuB,EAAE,uBAAuB;SACjD,CACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;;CACH;AAtCD,4BAsCC;AAED,kBAAe,QAAQ,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Tree } from '@nrwl/devkit';
|
|
2
|
+
export declare function getGeneratorDirectoryForInstalledAngularVersion(tree: Tree): string | null;
|
|
3
|
+
export declare function getInstalledAngularVersion(tree: Tree): string;
|
|
4
|
+
export declare function getInstalledAngularMajorVersion(tree: Tree): number;
|
|
5
|
+
export declare function getInstalledAngularVersionInfo(tree: Tree): {
|
|
6
|
+
version: string;
|
|
7
|
+
major: number;
|
|
8
|
+
};
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getInstalledAngularVersionInfo = exports.getInstalledAngularMajorVersion = exports.getInstalledAngularVersion = exports.getGeneratorDirectoryForInstalledAngularVersion = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const semver_1 = require("semver");
|
|
6
|
+
const versions_1 = require("../../utils/versions");
|
|
7
|
+
function getGeneratorDirectoryForInstalledAngularVersion(tree) {
|
|
8
|
+
var _a;
|
|
9
|
+
const majorAngularVersion = getInstalledAngularMajorVersion(tree);
|
|
10
|
+
const directoryDictionary = {
|
|
11
|
+
14: 'angular-v14',
|
|
12
|
+
};
|
|
13
|
+
return (_a = directoryDictionary[majorAngularVersion]) !== null && _a !== void 0 ? _a : null;
|
|
14
|
+
}
|
|
15
|
+
exports.getGeneratorDirectoryForInstalledAngularVersion = getGeneratorDirectoryForInstalledAngularVersion;
|
|
16
|
+
function getInstalledAngularVersion(tree) {
|
|
17
|
+
var _a, _b;
|
|
18
|
+
const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
19
|
+
const installedAngularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
|
|
20
|
+
if (!installedAngularVersion ||
|
|
21
|
+
installedAngularVersion === 'latest' ||
|
|
22
|
+
installedAngularVersion === 'next') {
|
|
23
|
+
return (_a = (0, semver_1.clean)(versions_1.angularVersion)) !== null && _a !== void 0 ? _a : (0, semver_1.coerce)(versions_1.angularVersion).version;
|
|
24
|
+
}
|
|
25
|
+
return ((_b = (0, semver_1.clean)(installedAngularVersion)) !== null && _b !== void 0 ? _b : (0, semver_1.coerce)(installedAngularVersion).version);
|
|
26
|
+
}
|
|
27
|
+
exports.getInstalledAngularVersion = getInstalledAngularVersion;
|
|
28
|
+
function getInstalledAngularMajorVersion(tree) {
|
|
29
|
+
return (0, semver_1.major)(getInstalledAngularVersion(tree));
|
|
30
|
+
}
|
|
31
|
+
exports.getInstalledAngularMajorVersion = getInstalledAngularMajorVersion;
|
|
32
|
+
function getInstalledAngularVersionInfo(tree) {
|
|
33
|
+
const installedVersion = getInstalledAngularVersion(tree);
|
|
34
|
+
return {
|
|
35
|
+
version: installedVersion,
|
|
36
|
+
major: (0, semver_1.major)(installedVersion),
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
|
|
40
|
+
//# sourceMappingURL=angular-version-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"angular-version-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/angular-version-utils.ts"],"names":[],"mappings":";;;AACA,yCAAwC;AACxC,mCAA8C;AAC9C,mDAAsD;AAEtD,SAAgB,+CAA+C,CAC7D,IAAU;;IAEV,MAAM,mBAAmB,GAAG,+BAA+B,CAAC,IAAI,CAAC,CAAC;IAElE,MAAM,mBAAmB,GAAG;QAC1B,EAAE,EAAE,aAAa;KAClB,CAAC;IAEF,OAAO,MAAA,mBAAmB,CAAC,mBAAmB,CAAC,mCAAI,IAAI,CAAC;AAC1D,CAAC;AAVD,0GAUC;AAED,SAAgB,0BAA0B,CAAC,IAAU;;IACnD,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,uBAAuB,GAC3B,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAEhE,IACE,CAAC,uBAAuB;QACxB,uBAAuB,KAAK,QAAQ;QACpC,uBAAuB,KAAK,MAAM,EAClC;QACA,OAAO,MAAA,IAAA,cAAK,EAAC,yBAAc,CAAC,mCAAI,IAAA,eAAM,EAAC,yBAAc,CAAC,CAAC,OAAO,CAAC;KAChE;IAED,OAAO,CACL,MAAA,IAAA,cAAK,EAAC,uBAAuB,CAAC,mCAAI,IAAA,eAAM,EAAC,uBAAuB,CAAC,CAAC,OAAO,CAC1E,CAAC;AACJ,CAAC;AAhBD,gEAgBC;AAED,SAAgB,+BAA+B,CAAC,IAAU;IACxD,OAAO,IAAA,cAAK,EAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,0EAEC;AAED,SAAgB,8BAA8B,CAAC,IAAU;IACvD,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO;QACL,OAAO,EAAE,gBAAgB;QACzB,KAAK,EAAE,IAAA,cAAK,EAAC,gBAAgB,CAAC;KAC/B,CAAC;AACJ,CAAC;AAPD,wEAOC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Tree } from '
|
|
1
|
+
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
export { extractTsConfigBase } from '@nrwl/workspace/src/utils/create-ts-config';
|
|
3
3
|
export declare function createTsConfig(host: Tree, projectRoot: string, type: 'app' | 'lib', options: {
|
|
4
4
|
strict?: boolean;
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createTsConfig = exports.extractTsConfigBase = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
4
5
|
const create_ts_config_1 = require("@nrwl/workspace/src/utils/create-ts-config");
|
|
5
|
-
const
|
|
6
|
+
const angular_version_utils_1 = require("./angular-version-utils");
|
|
6
7
|
var create_ts_config_2 = require("@nrwl/workspace/src/utils/create-ts-config");
|
|
7
8
|
Object.defineProperty(exports, "extractTsConfigBase", { enumerable: true, get: function () { return create_ts_config_2.extractTsConfigBase; } });
|
|
8
9
|
function createTsConfig(host, projectRoot, type, options, relativePathToRootTsConfig) {
|
|
10
|
+
const majorAngularVersion = (0, angular_version_utils_1.getInstalledAngularMajorVersion)(host);
|
|
9
11
|
const json = {
|
|
10
12
|
compilerOptions: {
|
|
11
|
-
target: 'es2022',
|
|
13
|
+
target: majorAngularVersion === 14 ? 'es2020' : 'es2022',
|
|
12
14
|
useDefineForClassFields: false,
|
|
13
15
|
},
|
|
14
16
|
files: [],
|
|
@@ -28,7 +30,7 @@ function createTsConfig(host, projectRoot, type, options, relativePathToRootTsCo
|
|
|
28
30
|
else {
|
|
29
31
|
json.extends = relativePathToRootTsConfig;
|
|
30
32
|
}
|
|
31
|
-
(0,
|
|
33
|
+
(0, devkit_1.writeJson)(host, `${projectRoot}/tsconfig.json`, json);
|
|
32
34
|
}
|
|
33
35
|
exports.createTsConfig = createTsConfig;
|
|
34
36
|
//# sourceMappingURL=create-ts-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-ts-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/create-ts-config.ts"],"names":[],"mappings":";;;AACA,iFAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"create-ts-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/create-ts-config.ts"],"names":[],"mappings":";;;AACA,yCAAyC;AACzC,iFAAiF;AACjF,mEAA0E;AAE1E,+EAAiF;AAAxE,uHAAA,mBAAmB,OAAA;AAE5B,SAAgB,cAAc,CAC5B,IAAU,EACV,WAAmB,EACnB,IAAmB,EACnB,OAKC,EACD,0BAAkC;IAElC,MAAM,mBAAmB,GAAG,IAAA,uDAA+B,EAAC,IAAI,CAAC,CAAC;IAElE,MAAM,IAAI,GAAG;QACX,eAAe,EAAE;YACf,MAAM,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;YACxD,uBAAuB,EAAE,KAAK;SAC/B;QACD,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;QACX,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB;aACrE;SACF;KACK,CAAC;IAET,6CAA6C;IAC7C,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,eAAe,mCAAQ,sCAAmB,GAAK,IAAI,CAAC,eAAe,CAAE,CAAC;QAC3E,IAAI,CAAC,OAAO,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;KACxC;SAAM;QACL,IAAI,CAAC,OAAO,GAAG,0BAA0B,CAAC;KAC3C;IAED,IAAA,kBAAS,EAAC,IAAI,EAAE,GAAG,WAAW,gBAAgB,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC;AAtCD,wCAsCC"}
|
|
@@ -28,10 +28,10 @@ function default_1(tree) {
|
|
|
28
28
|
let updated;
|
|
29
29
|
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/storybook:storybook', (options) => {
|
|
30
30
|
var _a, _b;
|
|
31
|
-
if (options
|
|
31
|
+
if (options['uiFramework'] !== '@storybook/angular') {
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
|
-
const configFolder = (_a = options === null || options === void 0 ? void 0 : options
|
|
34
|
+
const configFolder = (_a = options === null || options === void 0 ? void 0 : options['config']) === null || _a === void 0 ? void 0 : _a.configFolder;
|
|
35
35
|
if (!configFolder) {
|
|
36
36
|
return;
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare const tsLibVersion = "^2.3.0";
|
|
|
10
10
|
export declare const ngUniversalVersion = "~15.0.0";
|
|
11
11
|
export declare const corsVersion = "~2.8.5";
|
|
12
12
|
export declare const expressVersion = "~4.18.2";
|
|
13
|
-
export declare const moduleFederationNodeVersion = "~0.
|
|
13
|
+
export declare const moduleFederationNodeVersion = "~0.10.1";
|
|
14
14
|
export declare const angularEslintVersion = "~15.0.0";
|
|
15
15
|
export declare const tailwindVersion = "^3.0.2";
|
|
16
16
|
export declare const postcssVersion = "^8.4.5";
|
package/src/utils/versions.js
CHANGED
|
@@ -13,7 +13,7 @@ exports.tsLibVersion = '^2.3.0';
|
|
|
13
13
|
exports.ngUniversalVersion = '~15.0.0';
|
|
14
14
|
exports.corsVersion = '~2.8.5';
|
|
15
15
|
exports.expressVersion = '~4.18.2';
|
|
16
|
-
exports.moduleFederationNodeVersion = '~0.
|
|
16
|
+
exports.moduleFederationNodeVersion = '~0.10.1';
|
|
17
17
|
exports.angularEslintVersion = '~15.0.0';
|
|
18
18
|
exports.tailwindVersion = '^3.0.2';
|
|
19
19
|
exports.postcssVersion = '^8.4.5';
|
|
@@ -48,7 +48,7 @@ exports.versions = {
|
|
|
48
48
|
ngUniversalVersion: '~14.2.0',
|
|
49
49
|
corsVersion: '~2.8.5',
|
|
50
50
|
expressVersion: '~4.18.2',
|
|
51
|
-
moduleFederationNodeVersion: '
|
|
51
|
+
moduleFederationNodeVersion: '^0.10.1',
|
|
52
52
|
angularEslintVersion: '~14.0.4',
|
|
53
53
|
tailwindVersion: '^3.0.2',
|
|
54
54
|
postcssVersion: '^8.4.5',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAC/B,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,2BAA2B,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAC/B,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,2BAA2B,GAAG,SAAS,CAAC;AAExC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAEjC,QAAA,QAAQ,GAAG;IACtB,UAAU,EAAE;QACV,cAAc,EAAE,SAAS;QACzB,oBAAoB,EAAE,SAAS;QAC/B,gBAAgB,EAAE,SAAS;QAC3B,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,QAAQ;QACrB,aAAa,EAAE,SAAS;QACxB,gBAAgB,EAAE,OAAO;QACzB,YAAY,EAAE,QAAQ;QACtB,kBAAkB,EAAE,SAAS;QAC7B,WAAW,EAAE,QAAQ;QACrB,cAAc,EAAE,SAAS;QACzB,2BAA2B,EAAE,SAAS;QACtC,oBAAoB,EAAE,SAAS;QAC/B,eAAe,EAAE,QAAQ;QACzB,cAAc,EAAE,QAAQ;QACxB,oBAAoB,EAAE,SAAS;QAC/B,uBAAuB,EAAE,QAAQ;QACjC,iBAAiB,EAAE,SAAS;QAC5B,mBAAmB,EAAE,SAAS;QAC9B,aAAa,EAAE,QAAQ;QACvB,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,QAAQ;QAC3B,YAAY,EAAE,QAAQ;QACtB,0BAA0B,EAAE,QAAQ;QACpC,oBAAoB,EAAE,QAAQ;QAC9B,mBAAmB,EAAE,QAAQ;QAC7B,+BAA+B,EAAE,QAAQ;QACzC,kBAAkB,EAAE,QAAQ;QAC5B,0BAA0B,EAAE,QAAQ;QACpC,mBAAmB,EAAE,QAAQ;QAC7B,sBAAsB,EAAE,QAAQ;QAChC,gBAAgB,EAAE,SAAS;QAC3B,qBAAqB,EAAE,QAAQ;KAChC;CACF,CAAC"}
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getGeneratorDirectoryForInstalledAngularVersion = void 0;
|
|
4
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const semver_1 = require("semver");
|
|
6
|
-
function getGeneratorDirectoryForInstalledAngularVersion(tree) {
|
|
7
|
-
var _a, _b;
|
|
8
|
-
const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
9
|
-
const angularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
|
|
10
|
-
if (!angularVersion ||
|
|
11
|
-
angularVersion === 'latest' ||
|
|
12
|
-
angularVersion === 'next') {
|
|
13
|
-
return null;
|
|
14
|
-
}
|
|
15
|
-
const majorAngularVersion = (0, semver_1.major)((_a = (0, semver_1.clean)(angularVersion)) !== null && _a !== void 0 ? _a : (0, semver_1.coerce)(angularVersion));
|
|
16
|
-
const directoryDictionary = {
|
|
17
|
-
14: 'angular-v14',
|
|
18
|
-
};
|
|
19
|
-
return (_b = directoryDictionary[majorAngularVersion]) !== null && _b !== void 0 ? _b : null;
|
|
20
|
-
}
|
|
21
|
-
exports.getGeneratorDirectoryForInstalledAngularVersion = getGeneratorDirectoryForInstalledAngularVersion;
|
|
22
|
-
//# sourceMappingURL=get-generator-directory-for-ng-version.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"get-generator-directory-for-ng-version.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-generator-directory-for-ng-version.ts"],"names":[],"mappings":";;;AACA,yCAAwC;AACxC,mCAA8C;AAE9C,SAAgB,+CAA+C,CAAC,IAAU;;IACxE,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,cAAc,GAClB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAEhE,IACE,CAAC,cAAc;QACf,cAAc,KAAK,QAAQ;QAC3B,cAAc,KAAK,MAAM,EACzB;QACA,OAAO,IAAI,CAAC;KACb;IAED,MAAM,mBAAmB,GAAG,IAAA,cAAK,EAC/B,MAAA,IAAA,cAAK,EAAC,cAAc,CAAC,mCAAI,IAAA,eAAM,EAAC,cAAc,CAAC,CAChD,CAAC;IAEF,MAAM,mBAAmB,GAAG;QAC1B,EAAE,EAAE,aAAa;KAClB,CAAC;IAEF,OAAO,MAAA,mBAAmB,CAAC,mBAAmB,CAAC,mCAAI,IAAI,CAAC;AAC1D,CAAC;AAtBD,0GAsBC"}
|