@nrwl/angular 15.6.1 → 15.7.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/README.md +1 -1
- package/migrations.json +0 -35
- package/package.json +8 -11
- package/src/builders/module-federation-dev-server/schema.json +2 -1
- package/src/builders/module-federation-dev-ssr/schema.json +2 -1
- package/src/builders/utilities/webpack.d.ts +1 -0
- package/src/builders/utilities/webpack.js +9 -1
- package/src/builders/utilities/webpack.js.map +1 -1
- package/src/builders/webpack-browser/schema.json +7 -1
- package/src/builders/webpack-browser/webpack-browser.impl.d.ts +1 -0
- package/src/builders/webpack-browser/webpack-browser.impl.js +20 -7
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/builders/webpack-dev-server/schema.json +2 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +17 -7
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-server/schema.json +3 -1
- package/src/executors/ng-packagr-lite/schema.json +2 -1
- package/src/executors/package/schema.json +2 -1
- package/src/generators/application/angular-v14/application.js +0 -7
- package/src/generators/application/angular-v14/application.js.map +1 -1
- package/src/generators/application/angular-v14/lib/add-e2e.js +0 -7
- package/src/generators/application/angular-v14/lib/add-e2e.js.map +1 -1
- package/src/generators/application/angular-v14/lib/normalize-options.js +2 -13
- package/src/generators/application/angular-v14/lib/normalize-options.js.map +1 -1
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js +1 -1
- package/src/generators/application/angular-v14/lib/update-config-files.js +1 -2
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-e2e-project.js +0 -1
- package/src/generators/application/angular-v14/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/application.js +0 -7
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/add-e2e.js +1 -8
- package/src/generators/application/lib/add-e2e.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +2 -13
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/nrwl-home-tpl.js +1 -1
- package/src/generators/application/lib/update-config-files.js +1 -2
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/lib/update-e2e-project.js +0 -1
- package/src/generators/application/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/schema.json +2 -1
- package/src/generators/host/schema.json +3 -1
- package/src/generators/library/lib/normalize-options.js +1 -10
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/library.js +0 -8
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +2 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +1 -2
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.d.ts +1 -0
- package/src/generators/ng-add/migrators/projects/app.migrator.js +21 -22
- package/src/generators/ng-add/migrators/projects/app.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/lib.migrator.d.ts +1 -1
- package/src/generators/ng-add/migrators/projects/lib.migrator.js +5 -6
- package/src/generators/ng-add/migrators/projects/lib.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/index.d.ts +1 -1
- package/src/generators/ng-add/utilities/index.js +1 -1
- package/src/generators/ng-add/utilities/index.js.map +1 -1
- package/src/generators/ng-add/utilities/{get-all-projects.d.ts → projects.d.ts} +2 -0
- package/src/generators/ng-add/utilities/projects.js +47 -0
- package/src/generators/ng-add/utilities/projects.js.map +1 -0
- package/src/generators/ng-add/utilities/workspace.js +4 -5
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/remote/schema.json +3 -1
- package/src/generators/utils/testing.js +1 -1
- package/src/generators/utils/testing.js.map +1 -1
- package/src/utils/nx-devkit/testing.js +12 -18
- package/src/utils/nx-devkit/testing.js.map +1 -1
- package/scripts/nx-cli-warning.js +0 -40
- package/src/generators/ng-add/utilities/get-all-projects.js +0 -26
- package/src/generators/ng-add/utilities/get-all-projects.js.map +0 -1
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.d.ts +0 -2
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.js +0 -22
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.js.map +0 -1
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.d.ts +0 -2
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js +0 -104
- package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js.map +0 -1
- package/src/migrations/update-12-3-0/update-angular-eslint-rules.d.ts +0 -2
- package/src/migrations/update-12-3-0/update-angular-eslint-rules.js +0 -60
- package/src/migrations/update-12-3-0/update-angular-eslint-rules.js.map +0 -1
- package/src/migrations/update-12-3-0/update-storybook.d.ts +0 -2
- package/src/migrations/update-12-3-0/update-storybook.js +0 -64
- package/src/migrations/update-12-3-0/update-storybook.js.map +0 -1
- package/src/migrations/update-12-3-0/update-webpack-browser-config.d.ts +0 -2
- package/src/migrations/update-12-3-0/update-webpack-browser-config.js +0 -67
- package/src/migrations/update-12-3-0/update-webpack-browser-config.js.map +0 -1
- package/src/migrations/update-12-9-0/update-invalid-import-paths.d.ts +0 -10
- package/src/migrations/update-12-9-0/update-invalid-import-paths.js +0 -94
- package/src/migrations/update-12-9-0/update-invalid-import-paths.js.map +0 -1
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
|
-
|
|
6
|
+
# [15.7.0-beta.0](https://github.com/nrwl/nx/compare/15.6.0...15.7.0-beta.0) (2023-01-26)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/README.md
CHANGED
|
@@ -55,7 +55,7 @@ npx nx@latest init
|
|
|
55
55
|
|
|
56
56
|
- [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
|
|
57
57
|
- [Intro to Nx](https://nx.dev/getting-started/intro)
|
|
58
|
-
- [Official Nx YouTube Channel](https://www.youtube.com
|
|
58
|
+
- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
|
|
59
59
|
- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
|
|
60
60
|
|
|
61
61
|
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
|
package/migrations.json
CHANGED
|
@@ -1,40 +1,5 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schematics": {
|
|
3
|
-
"update-ngcc-postinstall": {
|
|
4
|
-
"version": "12.0.0-beta.0",
|
|
5
|
-
"description": "adjusts the ngcc postinstall command to just leave 'ngcc' in there. This fixes Ivy in Jest tests and Storybooks",
|
|
6
|
-
"factory": "./src/migrations/update-12-0-0/update-ngcc-postinstall"
|
|
7
|
-
},
|
|
8
|
-
"update-webpack-browser-config": {
|
|
9
|
-
"cli": "nx",
|
|
10
|
-
"version": "12.3.1",
|
|
11
|
-
"description": "Remove deprecated options and update others according to new defaults. It syncs with the v12 migration of Angular builders.",
|
|
12
|
-
"factory": "./src/migrations/update-12-3-0/update-webpack-browser-config"
|
|
13
|
-
},
|
|
14
|
-
"update-storybook": {
|
|
15
|
-
"cli": "nx",
|
|
16
|
-
"version": "12.3.1",
|
|
17
|
-
"description": "Updates storybook configurations to support webpack 5",
|
|
18
|
-
"factory": "./src/migrations/update-12-3-0/update-storybook"
|
|
19
|
-
},
|
|
20
|
-
"update-angular-eslint-rules": {
|
|
21
|
-
"cli": "nx",
|
|
22
|
-
"version": "12.3.1",
|
|
23
|
-
"description": "Migrates some rules that have changed in Angular EsLint",
|
|
24
|
-
"factory": "./src/migrations/update-12-3-0/update-angular-eslint-rules"
|
|
25
|
-
},
|
|
26
|
-
"convert-webpack-browser-build-target-to-delegate-build": {
|
|
27
|
-
"cli": "nx",
|
|
28
|
-
"version": "12.3.5-beta.0",
|
|
29
|
-
"description": "Convert targets using @nrwl/angular:webpack-browser with the buildTarget option set to use the @nrwl/angular:delegate-build executor instead.",
|
|
30
|
-
"factory": "./src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build"
|
|
31
|
-
},
|
|
32
|
-
"update-invalid-import-paths": {
|
|
33
|
-
"cli": "nx",
|
|
34
|
-
"version": "12.9.0",
|
|
35
|
-
"description": "Fixes invalid importPaths for buildable and publishable libs.",
|
|
36
|
-
"factory": "./src/migrations/update-12-9-0/update-invalid-import-paths"
|
|
37
|
-
},
|
|
38
3
|
"add-postcss-packages": {
|
|
39
4
|
"cli": "nx",
|
|
40
5
|
"version": "13.0.0-beta.10",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.7.0-beta.0",
|
|
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": {
|
|
@@ -8,9 +8,6 @@
|
|
|
8
8
|
"url": "https://github.com/nrwl/nx.git",
|
|
9
9
|
"directory": "packages/angular"
|
|
10
10
|
},
|
|
11
|
-
"scripts": {
|
|
12
|
-
"postinstall": "node ./scripts/nx-cli-warning.js"
|
|
13
|
-
},
|
|
14
11
|
"keywords": [
|
|
15
12
|
"Monorepo",
|
|
16
13
|
"Angular",
|
|
@@ -67,12 +64,12 @@
|
|
|
67
64
|
},
|
|
68
65
|
"dependencies": {
|
|
69
66
|
"@angular-devkit/schematics": "~15.1.0",
|
|
70
|
-
"@nrwl/cypress": "15.
|
|
71
|
-
"@nrwl/devkit": "15.
|
|
72
|
-
"@nrwl/jest": "15.
|
|
73
|
-
"@nrwl/linter": "15.
|
|
74
|
-
"@nrwl/webpack": "15.
|
|
75
|
-
"@nrwl/workspace": "15.
|
|
67
|
+
"@nrwl/cypress": "15.7.0-beta.0",
|
|
68
|
+
"@nrwl/devkit": "15.7.0-beta.0",
|
|
69
|
+
"@nrwl/jest": "15.7.0-beta.0",
|
|
70
|
+
"@nrwl/linter": "15.7.0-beta.0",
|
|
71
|
+
"@nrwl/webpack": "15.7.0-beta.0",
|
|
72
|
+
"@nrwl/workspace": "15.7.0-beta.0",
|
|
76
73
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
77
74
|
"@schematics/angular": "~15.1.0",
|
|
78
75
|
"chalk": "^4.1.0",
|
|
@@ -107,5 +104,5 @@
|
|
|
107
104
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
108
105
|
"typings": "index.d.ts",
|
|
109
106
|
"sideEffects": false,
|
|
110
|
-
"gitHead": "
|
|
107
|
+
"gitHead": "657f62aff3c32cdefd1f562eb38d3acfe2025c94"
|
|
111
108
|
}
|
|
@@ -109,7 +109,8 @@
|
|
|
109
109
|
"items": {
|
|
110
110
|
"type": "string"
|
|
111
111
|
},
|
|
112
|
-
"description": "List of remote applications to run in development mode (i.e. using serve target)."
|
|
112
|
+
"description": "List of remote applications to run in development mode (i.e. using serve target).",
|
|
113
|
+
"x-priority": "important"
|
|
113
114
|
},
|
|
114
115
|
"skipRemotes": {
|
|
115
116
|
"type": "array",
|
|
@@ -65,7 +65,8 @@
|
|
|
65
65
|
"items": {
|
|
66
66
|
"type": "string"
|
|
67
67
|
},
|
|
68
|
-
"description": "List of remote applications to run in development mode (i.e. using serve target)."
|
|
68
|
+
"description": "List of remote applications to run in development mode (i.e. using serve target).",
|
|
69
|
+
"x-priority": "important"
|
|
69
70
|
},
|
|
70
71
|
"skipRemotes": {
|
|
71
72
|
"type": "array",
|
|
@@ -3,3 +3,4 @@ export declare function mergeCustomWebpackConfig(baseWebpackConfig: any, pathToW
|
|
|
3
3
|
[k: string]: any;
|
|
4
4
|
}, target: import('@angular-devkit/architect').Target): Promise<any>;
|
|
5
5
|
export declare function resolveCustomWebpackConfig(path: string, tsConfig: string): any;
|
|
6
|
+
export declare function resolveIndexHtmlTransformer(path: string, tsConfig: string, target: import('@angular-devkit/architect').Target): (indexHtml: any) => any;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveCustomWebpackConfig = exports.mergeCustomWebpackConfig = void 0;
|
|
3
|
+
exports.resolveIndexHtmlTransformer = exports.resolveCustomWebpackConfig = exports.mergeCustomWebpackConfig = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const webpack_merge_1 = require("webpack-merge");
|
|
6
6
|
function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, options, target) {
|
|
@@ -33,6 +33,14 @@ function resolveCustomWebpackConfig(path, tsConfig) {
|
|
|
33
33
|
return (_a = customWebpackConfig.default) !== null && _a !== void 0 ? _a : customWebpackConfig;
|
|
34
34
|
}
|
|
35
35
|
exports.resolveCustomWebpackConfig = resolveCustomWebpackConfig;
|
|
36
|
+
function resolveIndexHtmlTransformer(path, tsConfig, target) {
|
|
37
|
+
var _a;
|
|
38
|
+
tsNodeRegister(path, tsConfig);
|
|
39
|
+
const indexTransformer = require(path);
|
|
40
|
+
const transform = (_a = indexTransformer.default) !== null && _a !== void 0 ? _a : indexTransformer;
|
|
41
|
+
return (indexHtml) => transform(target, indexHtml);
|
|
42
|
+
}
|
|
43
|
+
exports.resolveIndexHtmlTransformer = resolveIndexHtmlTransformer;
|
|
36
44
|
function tsNodeRegister(file, tsConfig) {
|
|
37
45
|
if (!(file === null || file === void 0 ? void 0 : file.endsWith('.ts')))
|
|
38
46
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/webpack.ts"],"names":[],"mappings":";;;;AAAA,iDAAsC;AAEtC,SAAsB,wBAAwB,CAC5C,iBAAsB,EACtB,mBAA2B,EAC3B,OAA+C,EAC/C,MAAkD;;QAElD,MAAM,0BAA0B,GAAG,0BAA0B,CAC3D,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CACjB,CAAC;QACF,gFAAgF;QAChF,yFAAyF;QACzF,4CAA4C;QAC5C,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC;QAEhD,0FAA0F;QAC1F,4DAA4D;QAC5D,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;YAChC,OAAO,MAAM,CAAC,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;SACnD;aAAM;YACL,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;SACzC;IACH,CAAC;CAAA;AAtBD,4DAsBC;AAED,SAAgB,0BAA0B,CAAC,IAAY,EAAE,QAAgB;;IACvE,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/B,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,kDAAkD;IAClD,oEAAoE;IACpE,qDAAqD;IACrD,6DAA6D;IAC7D,yBAAyB;IACzB,OAAO,MAAA,mBAAmB,CAAC,OAAO,mCAAI,mBAAmB,CAAC;AAC5D,CAAC;AAVD,gEAUC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,QAAiB;IACrD,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;QAAE,OAAO;IACnC,8BAA8B;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;QAC1B,OAAO,EAAE,QAAQ;QACjB,eAAe,EAAE;YACf,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,6BAA6B;IAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChD,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,GACvC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,OAAO,IAAI,KAAK,EAAE;QACpB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;KAC5C;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/webpack.ts"],"names":[],"mappings":";;;;AAAA,iDAAsC;AAEtC,SAAsB,wBAAwB,CAC5C,iBAAsB,EACtB,mBAA2B,EAC3B,OAA+C,EAC/C,MAAkD;;QAElD,MAAM,0BAA0B,GAAG,0BAA0B,CAC3D,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CACjB,CAAC;QACF,gFAAgF;QAChF,yFAAyF;QACzF,4CAA4C;QAC5C,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC;QAEhD,0FAA0F;QAC1F,4DAA4D;QAC5D,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;YAChC,OAAO,MAAM,CAAC,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;SACnD;aAAM;YACL,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;SACzC;IACH,CAAC;CAAA;AAtBD,4DAsBC;AAED,SAAgB,0BAA0B,CAAC,IAAY,EAAE,QAAgB;;IACvE,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/B,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,kDAAkD;IAClD,oEAAoE;IACpE,qDAAqD;IACrD,6DAA6D;IAC7D,yBAAyB;IACzB,OAAO,MAAA,mBAAmB,CAAC,OAAO,mCAAI,mBAAmB,CAAC;AAC5D,CAAC;AAVD,gEAUC;AAED,SAAgB,2BAA2B,CACzC,IAAY,EACZ,QAAgB,EAChB,MAAkD;;IAElD,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/B,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,MAAA,gBAAgB,CAAC,OAAO,mCAAI,gBAAgB,CAAC;IAE/D,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACrD,CAAC;AAXD,kEAWC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,QAAiB;IACrD,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;QAAE,OAAO;IACnC,8BAA8B;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;QAC1B,OAAO,EAAE,QAAQ;QACjB,eAAe,EAAE;YACf,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,6BAA6B;IAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChD,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,GACvC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,OAAO,IAAI,KAAK,EAAE;QACpB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;KAC5C;AACH,CAAC"}
|
|
@@ -128,7 +128,8 @@
|
|
|
128
128
|
"pattern": "\\.(?:css|scss|sass|less|styl)$"
|
|
129
129
|
}
|
|
130
130
|
]
|
|
131
|
-
}
|
|
131
|
+
},
|
|
132
|
+
"x-priority": "important"
|
|
132
133
|
},
|
|
133
134
|
"inlineStyleLanguage": {
|
|
134
135
|
"description": "The stylesheet language to use for the application's inline component styles.",
|
|
@@ -454,8 +455,13 @@
|
|
|
454
455
|
"type": "string"
|
|
455
456
|
}
|
|
456
457
|
},
|
|
458
|
+
"x-priority": "important",
|
|
457
459
|
"additionalProperties": false
|
|
458
460
|
},
|
|
461
|
+
"indexFileTransformer": {
|
|
462
|
+
"description": "Path to transformer function to transform the index.html",
|
|
463
|
+
"type": "string"
|
|
464
|
+
},
|
|
459
465
|
"buildLibsFromSource": {
|
|
460
466
|
"type": "boolean",
|
|
461
467
|
"description": "Read buildable libraries from source instead of building them separately.",
|
|
@@ -3,6 +3,7 @@ export declare type BrowserBuilderSchema = import('@angular-devkit/build-angular
|
|
|
3
3
|
customWebpackConfig?: {
|
|
4
4
|
path: string;
|
|
5
5
|
};
|
|
6
|
+
indexFileTransformer?: string;
|
|
6
7
|
buildLibsFromSource?: boolean;
|
|
7
8
|
};
|
|
8
9
|
export declare function executeWebpackBrowserBuilder(options: BrowserBuilderSchema, context: import('@angular-devkit/architect').BuilderContext): Observable<import('@angular-devkit/architect').BuilderOutput>;
|
|
@@ -9,24 +9,37 @@ const webpack_1 = require("../utilities/webpack");
|
|
|
9
9
|
const buildable_libs_1 = require("../utilities/buildable-libs");
|
|
10
10
|
const operators_1 = require("rxjs/operators");
|
|
11
11
|
function buildApp(options, context) {
|
|
12
|
-
const { buildLibsFromSource, customWebpackConfig } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig"]);
|
|
12
|
+
const { buildLibsFromSource, customWebpackConfig, indexFileTransformer } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig", "indexFileTransformer"]);
|
|
13
|
+
// If there is a path to an indexFileTransformer
|
|
14
|
+
// check it exists and apply it to the build
|
|
15
|
+
const pathToIndexFileTransformer = indexFileTransformer &&
|
|
16
|
+
(0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
|
|
17
|
+
if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
|
|
18
|
+
throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
|
|
19
|
+
}
|
|
13
20
|
// If there is a path to custom webpack config
|
|
14
21
|
// Invoke our own support for custom webpack config
|
|
15
22
|
if (customWebpackConfig && customWebpackConfig.path) {
|
|
16
23
|
const pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
|
|
17
24
|
if ((0, fs_1.existsSync)(pathToWebpackConfig)) {
|
|
18
|
-
return buildAppWithCustomWebpackConfiguration(delegateOptions, context, pathToWebpackConfig);
|
|
25
|
+
return buildAppWithCustomWebpackConfiguration(delegateOptions, context, pathToWebpackConfig, pathToIndexFileTransformer);
|
|
19
26
|
}
|
|
20
27
|
else {
|
|
21
28
|
throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
|
|
22
29
|
}
|
|
23
30
|
}
|
|
24
|
-
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateOptions, context
|
|
31
|
+
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateOptions, context, Object.assign({}, (pathToIndexFileTransformer
|
|
32
|
+
? {
|
|
33
|
+
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, options.tsConfig, context.target),
|
|
34
|
+
}
|
|
35
|
+
: {})))));
|
|
25
36
|
}
|
|
26
|
-
function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
|
|
27
|
-
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(options, context, {
|
|
28
|
-
|
|
29
|
-
|
|
37
|
+
function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig, pathToIndexFileTransformer) {
|
|
38
|
+
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target) }, (pathToIndexFileTransformer
|
|
39
|
+
? {
|
|
40
|
+
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, options.tsConfig, context.target),
|
|
41
|
+
}
|
|
42
|
+
: {})))));
|
|
30
43
|
}
|
|
31
44
|
function executeWebpackBrowserBuilder(options, context) {
|
|
32
45
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AACjD,2BAAgC;AAChC,+BAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,7 +107,8 @@
|
|
|
107
107
|
},
|
|
108
108
|
"buildLibsFromSource": {
|
|
109
109
|
"type": "boolean",
|
|
110
|
-
"description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options."
|
|
110
|
+
"description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options.",
|
|
111
|
+
"x-priority": "important"
|
|
111
112
|
}
|
|
112
113
|
},
|
|
113
114
|
"additionalProperties": false,
|
|
@@ -14,7 +14,7 @@ const rxjs_1 = require("rxjs");
|
|
|
14
14
|
const operators_2 = require("rxjs/operators");
|
|
15
15
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
16
16
|
function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
17
|
-
var _a, _b, _c, _d, _e;
|
|
17
|
+
var _a, _b, _c, _d, _e, _f;
|
|
18
18
|
process.env.NX_TSCONFIG_PATH = (0, typescript_1.getRootTsConfigPath)();
|
|
19
19
|
const options = (0, lib_1.normalizeOptions)(rawOptions);
|
|
20
20
|
const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
|
|
@@ -30,13 +30,21 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
30
30
|
let pathToWebpackConfig;
|
|
31
31
|
if (customWebpackConfig && customWebpackConfig.path) {
|
|
32
32
|
pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
|
|
33
|
-
if (!(0, fs_1.existsSync)(pathToWebpackConfig)) {
|
|
33
|
+
if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
|
|
34
34
|
throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
+
const indexFileTransformer = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.indexFileTransformer) !== null && _e !== void 0 ? _e : buildTarget.options.indexFileTransformer;
|
|
38
|
+
let pathToIndexFileTransformer;
|
|
39
|
+
if (indexFileTransformer) {
|
|
40
|
+
pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
|
|
41
|
+
if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
|
|
42
|
+
throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
37
45
|
let dependencies;
|
|
38
46
|
if (!buildLibsFromSource) {
|
|
39
|
-
const buildTargetTsConfigPath = (
|
|
47
|
+
const buildTargetTsConfigPath = (_f = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.tsConfig) !== null && _f !== void 0 ? _f : buildTarget.options.tsConfig;
|
|
40
48
|
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context, parsedBrowserTarget.target);
|
|
41
49
|
dependencies = foundDependencies;
|
|
42
50
|
// We can't just pass the tsconfig path in memory to the angular builder
|
|
@@ -57,8 +65,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
57
65
|
// webpack-server implementation.
|
|
58
66
|
buildTargetConfiguration.tsConfig = tsConfigPath;
|
|
59
67
|
}
|
|
60
|
-
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, {
|
|
61
|
-
webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
68
|
+
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
62
69
|
if (!buildLibsFromSource) {
|
|
63
70
|
const workspaceDependencies = dependencies
|
|
64
71
|
.filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
|
|
@@ -75,8 +82,11 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
75
82
|
return baseWebpackConfig;
|
|
76
83
|
}
|
|
77
84
|
return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetConfiguration, context.target);
|
|
78
|
-
}),
|
|
79
|
-
|
|
85
|
+
}) }, (pathToIndexFileTransformer
|
|
86
|
+
? {
|
|
87
|
+
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetConfiguration.tsConfig, context.target),
|
|
88
|
+
}
|
|
89
|
+
: {})))));
|
|
80
90
|
}
|
|
81
91
|
exports.executeWebpackDevServerBuilder = executeWebpackDevServerBuilder;
|
|
82
92
|
exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackDevServerBuilder);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AACtB,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -235,12 +235,14 @@
|
|
|
235
235
|
"type": "string"
|
|
236
236
|
}
|
|
237
237
|
},
|
|
238
|
+
"x-priority": "important",
|
|
238
239
|
"additionalProperties": false
|
|
239
240
|
},
|
|
240
241
|
"buildLibsFromSource": {
|
|
241
242
|
"type": "boolean",
|
|
242
243
|
"description": "Read buildable libraries from source instead of building them separately.",
|
|
243
|
-
"default": true
|
|
244
|
+
"default": true,
|
|
245
|
+
"x-priority": "important"
|
|
244
246
|
}
|
|
245
247
|
},
|
|
246
248
|
"additionalProperties": false,
|
|
@@ -29,7 +29,8 @@
|
|
|
29
29
|
"type": "string",
|
|
30
30
|
"description": "The full path for the TypeScript configuration file, relative to the workspace root.",
|
|
31
31
|
"x-completion-type": "file",
|
|
32
|
-
"x-completion-glob": "tsconfig.*.json"
|
|
32
|
+
"x-completion-glob": "tsconfig.*.json",
|
|
33
|
+
"x-priority": "important"
|
|
33
34
|
},
|
|
34
35
|
"watch": {
|
|
35
36
|
"type": "boolean",
|
|
@@ -29,7 +29,8 @@
|
|
|
29
29
|
"type": "string",
|
|
30
30
|
"description": "The full path for the TypeScript configuration file, relative to the workspace root.",
|
|
31
31
|
"x-completion-type": "file",
|
|
32
|
-
"x-completion-glob": "tsconfig.*.json"
|
|
32
|
+
"x-completion-glob": "tsconfig.*.json",
|
|
33
|
+
"x-priority": "important"
|
|
33
34
|
},
|
|
34
35
|
"watch": {
|
|
35
36
|
"type": "boolean",
|
|
@@ -4,7 +4,6 @@ exports.applicationGenerator = void 0;
|
|
|
4
4
|
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
|
-
const generators_1 = require("@nrwl/workspace/generators");
|
|
8
7
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
9
8
|
const init_1 = require("../../init/init");
|
|
10
9
|
const setup_tailwind_1 = require("../../setup-tailwind/setup-tailwind");
|
|
@@ -73,12 +72,6 @@ function applicationGenerator(host, schema) {
|
|
|
73
72
|
else {
|
|
74
73
|
(0, lib_1.setApplicationStrictDefault)(host, false);
|
|
75
74
|
}
|
|
76
|
-
if (options.standaloneConfig) {
|
|
77
|
-
yield (0, generators_1.convertToNxProjectGenerator)(host, {
|
|
78
|
-
project: options.name,
|
|
79
|
-
all: false,
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
75
|
if (options.standalone) {
|
|
83
76
|
(0, lib_1.convertToStandaloneApp)(host, options);
|
|
84
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/angular-v14/application.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,8DAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/angular-v14/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,8 @@ const test_runners_1 = require("../../../../utils/test-runners");
|
|
|
8
8
|
const add_protractor_1 = require("./add-protractor");
|
|
9
9
|
const remove_scaffolded_e2e_1 = require("./remove-scaffolded-e2e");
|
|
10
10
|
const update_e2e_project_1 = require("./update-e2e-project");
|
|
11
|
-
const generators_1 = require("@nrwl/workspace/generators");
|
|
12
11
|
const linter_1 = require("@nrwl/linter");
|
|
13
12
|
function addE2e(tree, options) {
|
|
14
|
-
var _a;
|
|
15
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
14
|
if (options.e2eTestRunner === test_runners_1.E2eTestRunner.Protractor) {
|
|
17
15
|
yield (0, add_protractor_1.addProtractor)(tree, options);
|
|
@@ -33,11 +31,6 @@ function addE2e(tree, options) {
|
|
|
33
31
|
}
|
|
34
32
|
if (options.e2eTestRunner === test_runners_1.E2eTestRunner.Protractor) {
|
|
35
33
|
(0, update_e2e_project_1.updateE2eProject)(tree, options);
|
|
36
|
-
if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.getWorkspaceLayout)(tree).standaloneAsDefault) {
|
|
37
|
-
yield (0, generators_1.convertToNxProjectGenerator)(tree, {
|
|
38
|
-
project: `${options.e2eProjectName}`,
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
34
|
if (options.linter === linter_1.Linter.EsLint) {
|
|
42
35
|
yield (0, linter_1.lintProjectGenerator)(tree, {
|
|
43
36
|
project: options.e2eProjectName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/add-e2e.ts"],"names":[],"mappings":";;;;AACA,yCAAqE;AAGrE,2CAAwD;AAExD,iEAA+D;AAE/D,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/add-e2e.ts"],"names":[],"mappings":";;;;AACA,yCAAqE;AAGrE,2CAAwD;AAExD,iEAA+D;AAE/D,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,yCAA4D;AAE5D,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;QAChE,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,UAAU,EAAE;YACtD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,UAAU,EAAE;YACtD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;oBACxD,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;aACJ;SACF;IACH,CAAC;CAAA;AApCD,wBAoCC"}
|
|
@@ -26,19 +26,8 @@ function normalizeOptions(host, options) {
|
|
|
26
26
|
: [];
|
|
27
27
|
const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
|
|
28
28
|
options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
|
|
32
|
-
let newProjectRoot = null;
|
|
33
|
-
if (workspaceJsonPath) {
|
|
34
|
-
({ newProjectRoot } = (0, devkit_1.readJson)(host, workspaceJsonPath));
|
|
35
|
-
}
|
|
36
|
-
const ngCliSchematicAppRoot = newProjectRoot
|
|
37
|
-
? `${newProjectRoot}/${appProjectName}`
|
|
38
|
-
: appProjectName;
|
|
39
|
-
const ngCliSchematicE2ERoot = newProjectRoot
|
|
40
|
-
? `${newProjectRoot}/${e2eProjectName}`
|
|
41
|
-
: `${appProjectName}/e2e`;
|
|
29
|
+
const ngCliSchematicAppRoot = appProjectName;
|
|
30
|
+
const ngCliSchematicE2ERoot = `${appProjectName}/e2e`;
|
|
42
31
|
// Set defaults and then overwrite with user options
|
|
43
32
|
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, e2eTestRunner: test_runners_1.E2eTestRunner.Cypress, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix, name: appProjectName, appProjectRoot,
|
|
44
33
|
e2eProjectRoot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAGtB,iEAA+E;AAC/E,yCAAsC;AACtC,oDAIgC;AAEhC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxE,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAE1C,MAAM,EACJ,OAAO,EAAE,cAAc,EACvB,QAAQ,EACR,mBAAmB,GACpB,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEzD,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,qBAAqB,GAAG,cAAc,CAAC;IAC7C,MAAM,qBAAqB,GAAG,GAAG,cAAc,MAAM,CAAC;IAEtD,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,EAAE,6BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,4BAAa,CAAC,OAAO,EACpC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EACN,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AA3DD,4CA2DC"}
|
|
@@ -539,7 +539,7 @@ exports.nrwlHomeTemplate = {
|
|
|
539
539
|
/>
|
|
540
540
|
</svg>
|
|
541
541
|
</a>
|
|
542
|
-
<a href="https://www.youtube.com/
|
|
542
|
+
<a href="https://www.youtube.com/@NxDevtools/videos?utm_source=nx-project&sub_confirmation=1" target="_blank" rel="noreferrer" class="list-item-link">
|
|
543
543
|
<svg
|
|
544
544
|
role="img"
|
|
545
545
|
viewBox="0 0 24 24"
|
|
@@ -28,7 +28,6 @@ function updateTsConfigOptions(host, options) {
|
|
|
28
28
|
(0, create_ts_config_1.createTsConfig)(host, options.appProjectRoot, 'app', options, (0, typescript_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot));
|
|
29
29
|
}
|
|
30
30
|
function updateAppAndE2EProjectConfigurations(host, options) {
|
|
31
|
-
// workspace.json
|
|
32
31
|
let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
33
32
|
if (options.ngCliSchematicAppRoot !== options.appProjectRoot) {
|
|
34
33
|
project = (0, cli_config_utils_1.replaceAppNameWithPath)(project, options.ngCliSchematicAppRoot, options.appProjectRoot);
|
|
@@ -59,7 +58,7 @@ function updateAppAndE2EProjectConfigurations(host, options) {
|
|
|
59
58
|
* it back to workaround that.
|
|
60
59
|
*/
|
|
61
60
|
(0, devkit_1.removeProjectConfiguration)(host, options.name);
|
|
62
|
-
(0, devkit_1.addProjectConfiguration)(host, options.name, project
|
|
61
|
+
(0, devkit_1.addProjectConfiguration)(host, options.name, project);
|
|
63
62
|
if (options.unitTestRunner === test_runners_1.UnitTestRunner.None) {
|
|
64
63
|
host.delete(`${options.appProjectRoot}/src/app/app.component.spec.ts`);
|
|
65
64
|
host.delete(`${options.appProjectRoot}/tsconfig.spec.json`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-config-files.ts"],"names":[],"mappings":";;;;AACA,yCAQsB;AACtB,iFAAoF;AACpF,iEAA+E;AAE/E,sEAGyC;AACzC,yEAAyF;AAEzF,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACxB,IAAA,sCAAmB,EAAC,IAAI,CAAC,CAAC;KAC3B;IACD,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,oCAAoC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAND,8CAMC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IAClE,oBAAoB;IACpB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACrE,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,KAEjE,OAAO,EAAE;YACP,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,cAAc;gBACd,cAAc;aACf,CAAC;SACH,IACD,CAAC,CAAC;IAEJ,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,cAAc,EACtB,KAAK,EACL,OAAO,EACP,IAAA,0CAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAC5D,CAAC;AACJ,CAAC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,OAAyB;IAEzB,
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-config-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,6 @@ function updateE2eProject(tree, options) {
|
|
|
21
21
|
tags: [],
|
|
22
22
|
};
|
|
23
23
|
project.targets.e2e.options.protractorConfig = `${options.e2eProjectRoot}/protractor.conf.js`;
|
|
24
|
-
// update workspace.json / angular.json
|
|
25
24
|
(0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, project);
|
|
26
25
|
delete proj.targets.e2e;
|
|
27
26
|
(0, devkit_1.updateProjectConfiguration)(tree, options.name, proj);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,yEAAyF;AAGzF,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,WAAW,OAAO,CAAC,IAAI,EAAE,CAC1B,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;SACtB;QACD,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,EAAE;KACT,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC;IAC9F,
|
|
1
|
+
{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,yEAAyF;AAGzF,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,WAAW,OAAO,CAAC,IAAI,EAAE,CAC1B,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;SACtB;QACD,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,EAAE;KACT,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC;IAC9F,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IACxB,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErD,sBAAsB;IACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,EAAE;QAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,IAAI,CAAC,CAAC;KACjE;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACvE,uCACK,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE;IACJ,CAAC,CAAC,CAAC;IAEH,kBAAkB;IAClB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;QACnE,uCACK,IAAI,KACP,OAAO,EAAE,IAAA,0CAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,IACpE;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAtDD,4CAsDC"}
|
|
@@ -4,7 +4,6 @@ exports.applicationGenerator = void 0;
|
|
|
4
4
|
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
|
-
const generators_1 = require("@nrwl/workspace/generators");
|
|
8
7
|
const path_1 = require("path");
|
|
9
8
|
const test_runners_1 = require("../../utils/test-runners");
|
|
10
9
|
const init_1 = require("../init/init");
|
|
@@ -91,12 +90,6 @@ function applicationGenerator(tree, schema) {
|
|
|
91
90
|
else {
|
|
92
91
|
(0, lib_1.setApplicationStrictDefault)(tree, false);
|
|
93
92
|
}
|
|
94
|
-
if (options.standaloneConfig) {
|
|
95
|
-
yield (0, generators_1.convertToNxProjectGenerator)(tree, {
|
|
96
|
-
project: options.name,
|
|
97
|
-
all: false,
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
93
|
if (options.standalone) {
|
|
101
94
|
(0, lib_1.convertToStandaloneApp)(tree, options);
|
|
102
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,8DAAwE;AACxE
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|