@nrwl/angular 15.6.3 → 15.7.0-alpha.1
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/esm2020/testing/src/testing-utils.mjs +5 -1
- package/fesm2015/nrwl-angular-testing.mjs +4 -0
- package/fesm2015/nrwl-angular-testing.mjs.map +1 -1
- package/fesm2020/nrwl-angular-testing.mjs +4 -0
- package/fesm2020/nrwl-angular-testing.mjs.map +1 -1
- package/migrations.json +0 -35
- package/package.json +8 -11
- package/src/generators/application/angular-v14/application.js +17 -22
- 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/angular-v14/schema.d.ts +1 -0
- package/src/generators/application/application.js +17 -22
- 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.d.ts +1 -0
- package/src/generators/application/schema.json +7 -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/setup-mf/lib/add-remote-entry.js +3 -1
- package/src/generators/setup-mf/lib/add-remote-entry.js.map +1 -1
- package/src/generators/setup-mf/lib/fix-bootstrap.js +10 -6
- package/src/generators/setup-mf/lib/fix-bootstrap.js.map +1 -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 -24
- package/src/utils/nx-devkit/testing.js.map +1 -1
- package/testing/src/testing-utils.d.ts +4 -0
- package/testing/src/testing-utils.js +4 -0
- package/testing/src/testing-utils.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
|
+
|
|
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"
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { first, toArray } from 'rxjs/operators';
|
|
2
2
|
/**
|
|
3
|
+
* @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$.pipe(toArray())) or lastValueFrom(obs$.pipe(toArray())).
|
|
4
|
+
*
|
|
3
5
|
* @whatItDoes reads all the values from an observable and returns a promise
|
|
4
6
|
* with an array of all values. This should be used in combination with async/await.
|
|
5
7
|
*
|
|
@@ -15,6 +17,8 @@ export function readAll(o) {
|
|
|
15
17
|
return o.pipe(toArray()).toPromise();
|
|
16
18
|
}
|
|
17
19
|
/**
|
|
20
|
+
* @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$)
|
|
21
|
+
*
|
|
18
22
|
* @whatItDoes reads the first value from an observable and returns a promise
|
|
19
23
|
* with it. This should be used in combination with async/await.
|
|
20
24
|
*
|
|
@@ -29,4 +33,4 @@ export function readAll(o) {
|
|
|
29
33
|
export function readFirst(o) {
|
|
30
34
|
return o.pipe(first()).toPromise();
|
|
31
35
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy11dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Rlc3Rpbmcvc3JjL3Rlc3RpbmctdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVoRDs7Ozs7Ozs7Ozs7OztHQWFHO0FBQ0gsTUFBTSxVQUFVLE9BQU8sQ0FBSSxDQUFnQjtJQUN6QyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztBQUN2QyxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7R0FhRztBQUNILE1BQU0sVUFBVSxTQUFTLENBQUksQ0FBZ0I7SUFDM0MsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7QUFDckMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgZmlyc3QsIHRvQXJyYXkgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbi8qKlxuICogQGRlcHJlY2F0ZWQgVGhpcyB3aWxsIGJlIHJlbW92ZWQgaW4gYSBsYXRlciB2ZXJzaW9uIG9mIE54LiBTaW5jZSBSeEpTIDcsIHVzZSBmaXJzdFZhbHVlRnJvbShvYnMkLnBpcGUodG9BcnJheSgpKSkgb3IgbGFzdFZhbHVlRnJvbShvYnMkLnBpcGUodG9BcnJheSgpKSkuXG4gKlxuICogQHdoYXRJdERvZXMgcmVhZHMgYWxsIHRoZSB2YWx1ZXMgZnJvbSBhbiBvYnNlcnZhYmxlIGFuZCByZXR1cm5zIGEgcHJvbWlzZVxuICogd2l0aCBhbiBhcnJheSBvZiBhbGwgdmFsdWVzLiBUaGlzIHNob3VsZCBiZSB1c2VkIGluIGNvbWJpbmF0aW9uIHdpdGggYXN5bmMvYXdhaXQuXG4gKlxuICogIyMgRXhhbXBsZVxuICpcbiAqIGBgYHR5cGVzY3JpcHRcbiAqIGNvbnN0IG9icyA9IG9mKDEsIDIsIDMsIDQpO1xuICogY29uc3QgcmVzID0gYXdhaXQgcmVhZEFsbChvYnMpXG4gKiBleHBlY3QocmVzKS50b0VxdWFsKFsxLCAyLCAzLCA0XSk7XG4gKiBgYGBcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlYWRBbGw8VD4obzogT2JzZXJ2YWJsZTxUPik6IFByb21pc2U8VFtdPiB7XG4gIHJldHVybiBvLnBpcGUodG9BcnJheSgpKS50b1Byb21pc2UoKTtcbn1cblxuLyoqXG4gKiBAZGVwcmVjYXRlZCBUaGlzIHdpbGwgYmUgcmVtb3ZlZCBpbiBhIGxhdGVyIHZlcnNpb24gb2YgTnguIFNpbmNlIFJ4SlMgNywgdXNlIGZpcnN0VmFsdWVGcm9tKG9icyQpXG4gKlxuICogQHdoYXRJdERvZXMgcmVhZHMgdGhlIGZpcnN0IHZhbHVlIGZyb20gYW4gb2JzZXJ2YWJsZSBhbmQgcmV0dXJucyBhIHByb21pc2VcbiAqIHdpdGggaXQuIFRoaXMgc2hvdWxkIGJlIHVzZWQgaW4gY29tYmluYXRpb24gd2l0aCBhc3luYy9hd2FpdC5cbiAqXG4gKiAjIyBFeGFtcGxlXG4gKlxuICogYGBgdHlwZXNjcmlwdFxuICogY29uc3Qgb2JzID0gb2YoMSwgMiwgMywgNCk7XG4gKiBjb25zdCByZXMgPSBhd2FpdCByZWFkRmlyc3Qob2JzKVxuICogZXhwZWN0KHJlcykudG9FcXVhbCgxKTtcbiAqIGBgYFxuICovXG5leHBvcnQgZnVuY3Rpb24gcmVhZEZpcnN0PFQ+KG86IE9ic2VydmFibGU8VD4pOiBQcm9taXNlPFQ+IHtcbiAgcmV0dXJuIG8ucGlwZShmaXJzdCgpKS50b1Byb21pc2UoKTtcbn1cbiJdfQ==
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { toArray, first } from 'rxjs/operators';
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
|
+
* @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$.pipe(toArray())) or lastValueFrom(obs$.pipe(toArray())).
|
|
5
|
+
*
|
|
4
6
|
* @whatItDoes reads all the values from an observable and returns a promise
|
|
5
7
|
* with an array of all values. This should be used in combination with async/await.
|
|
6
8
|
*
|
|
@@ -16,6 +18,8 @@ function readAll(o) {
|
|
|
16
18
|
return o.pipe(toArray()).toPromise();
|
|
17
19
|
}
|
|
18
20
|
/**
|
|
21
|
+
* @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$)
|
|
22
|
+
*
|
|
19
23
|
* @whatItDoes reads the first value from an observable and returns a promise
|
|
20
24
|
* with it. This should be used in combination with async/await.
|
|
21
25
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nrwl-angular-testing.mjs","sources":["../../testing/src/testing-utils.ts","../../testing/nrwl-angular-testing.ts"],"sourcesContent":["import type { Observable } from 'rxjs';\nimport { first, toArray } from 'rxjs/operators';\n\n/**\n * @whatItDoes reads all the values from an observable and returns a promise\n * with an array of all values. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readAll(obs)\n * expect(res).toEqual([1, 2, 3, 4]);\n * ```\n */\nexport function readAll<T>(o: Observable<T>): Promise<T[]> {\n return o.pipe(toArray()).toPromise();\n}\n\n/**\n * @whatItDoes reads the first value from an observable and returns a promise\n * with it. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readFirst(obs)\n * expect(res).toEqual(1);\n * ```\n */\nexport function readFirst<T>(o: Observable<T>): Promise<T> {\n return o.pipe(first()).toPromise();\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;AAGA
|
|
1
|
+
{"version":3,"file":"nrwl-angular-testing.mjs","sources":["../../testing/src/testing-utils.ts","../../testing/nrwl-angular-testing.ts"],"sourcesContent":["import type { Observable } from 'rxjs';\nimport { first, toArray } from 'rxjs/operators';\n\n/**\n * @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$.pipe(toArray())) or lastValueFrom(obs$.pipe(toArray())).\n *\n * @whatItDoes reads all the values from an observable and returns a promise\n * with an array of all values. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readAll(obs)\n * expect(res).toEqual([1, 2, 3, 4]);\n * ```\n */\nexport function readAll<T>(o: Observable<T>): Promise<T[]> {\n return o.pipe(toArray()).toPromise();\n}\n\n/**\n * @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$)\n *\n * @whatItDoes reads the first value from an observable and returns a promise\n * with it. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readFirst(obs)\n * expect(res).toEqual(1);\n * ```\n */\nexport function readFirst<T>(o: Observable<T>): Promise<T> {\n return o.pipe(first()).toPromise();\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;AAGA;;;;;;;;;;;;;AAaG;AACG,SAAU,OAAO,CAAI,CAAgB,EAAA;IACzC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;;;;;;;;AAaG;AACG,SAAU,SAAS,CAAI,CAAgB,EAAA;IAC3C,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AACrC;;ACrCA;;AAEG;;;;"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { toArray, first } from 'rxjs/operators';
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
|
+
* @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$.pipe(toArray())) or lastValueFrom(obs$.pipe(toArray())).
|
|
5
|
+
*
|
|
4
6
|
* @whatItDoes reads all the values from an observable and returns a promise
|
|
5
7
|
* with an array of all values. This should be used in combination with async/await.
|
|
6
8
|
*
|
|
@@ -16,6 +18,8 @@ function readAll(o) {
|
|
|
16
18
|
return o.pipe(toArray()).toPromise();
|
|
17
19
|
}
|
|
18
20
|
/**
|
|
21
|
+
* @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$)
|
|
22
|
+
*
|
|
19
23
|
* @whatItDoes reads the first value from an observable and returns a promise
|
|
20
24
|
* with it. This should be used in combination with async/await.
|
|
21
25
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nrwl-angular-testing.mjs","sources":["../../testing/src/testing-utils.ts","../../testing/nrwl-angular-testing.ts"],"sourcesContent":["import type { Observable } from 'rxjs';\nimport { first, toArray } from 'rxjs/operators';\n\n/**\n * @whatItDoes reads all the values from an observable and returns a promise\n * with an array of all values. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readAll(obs)\n * expect(res).toEqual([1, 2, 3, 4]);\n * ```\n */\nexport function readAll<T>(o: Observable<T>): Promise<T[]> {\n return o.pipe(toArray()).toPromise();\n}\n\n/**\n * @whatItDoes reads the first value from an observable and returns a promise\n * with it. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readFirst(obs)\n * expect(res).toEqual(1);\n * ```\n */\nexport function readFirst<T>(o: Observable<T>): Promise<T> {\n return o.pipe(first()).toPromise();\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;AAGA
|
|
1
|
+
{"version":3,"file":"nrwl-angular-testing.mjs","sources":["../../testing/src/testing-utils.ts","../../testing/nrwl-angular-testing.ts"],"sourcesContent":["import type { Observable } from 'rxjs';\nimport { first, toArray } from 'rxjs/operators';\n\n/**\n * @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$.pipe(toArray())) or lastValueFrom(obs$.pipe(toArray())).\n *\n * @whatItDoes reads all the values from an observable and returns a promise\n * with an array of all values. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readAll(obs)\n * expect(res).toEqual([1, 2, 3, 4]);\n * ```\n */\nexport function readAll<T>(o: Observable<T>): Promise<T[]> {\n return o.pipe(toArray()).toPromise();\n}\n\n/**\n * @deprecated This will be removed in a later version of Nx. Since RxJS 7, use firstValueFrom(obs$)\n *\n * @whatItDoes reads the first value from an observable and returns a promise\n * with it. This should be used in combination with async/await.\n *\n * ## Example\n *\n * ```typescript\n * const obs = of(1, 2, 3, 4);\n * const res = await readFirst(obs)\n * expect(res).toEqual(1);\n * ```\n */\nexport function readFirst<T>(o: Observable<T>): Promise<T> {\n return o.pipe(first()).toPromise();\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;AAGA;;;;;;;;;;;;;AAaG;AACG,SAAU,OAAO,CAAI,CAAgB,EAAA;IACzC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;;;;;;;;AAaG;AACG,SAAU,SAAS,CAAI,CAAgB,EAAA;IAC3C,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AACrC;;ACrCA;;AAEG;;;;"}
|
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-alpha.1",
|
|
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-alpha.1",
|
|
68
|
+
"@nrwl/devkit": "15.7.0-alpha.1",
|
|
69
|
+
"@nrwl/jest": "15.7.0-alpha.1",
|
|
70
|
+
"@nrwl/linter": "15.7.0-alpha.1",
|
|
71
|
+
"@nrwl/webpack": "15.7.0-alpha.1",
|
|
72
|
+
"@nrwl/workspace": "15.7.0-alpha.1",
|
|
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": "42d38047ff854942cc8832dda035e5cc7d0a2dc0"
|
|
111
108
|
}
|
|
@@ -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");
|
|
@@ -32,21 +31,23 @@ function applicationGenerator(host, schema) {
|
|
|
32
31
|
(0, lib_1.createFiles)(host, options);
|
|
33
32
|
(0, lib_1.updateConfigFiles)(host, options);
|
|
34
33
|
(0, lib_1.updateAppComponentTemplate)(host, options);
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
34
|
+
if (!options.minimal) {
|
|
35
|
+
// Create the NxWelcomeComponent
|
|
36
|
+
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
37
|
+
yield angularComponentSchematic(host, {
|
|
38
|
+
name: 'NxWelcome',
|
|
39
|
+
inlineTemplate: true,
|
|
40
|
+
inlineStyle: true,
|
|
41
|
+
prefix: options.prefix,
|
|
42
|
+
skipTests: true,
|
|
43
|
+
style: options.style,
|
|
44
|
+
flat: true,
|
|
45
|
+
viewEncapsulation: 'None',
|
|
46
|
+
project: options.name,
|
|
47
|
+
standalone: options.standalone,
|
|
48
|
+
});
|
|
49
|
+
(0, lib_1.updateNxComponentTemplate)(host, options);
|
|
50
|
+
}
|
|
50
51
|
if (options.addTailwind) {
|
|
51
52
|
yield (0, setup_tailwind_1.setupTailwindGenerator)(host, {
|
|
52
53
|
project: options.name,
|
|
@@ -73,12 +74,6 @@ function applicationGenerator(host, schema) {
|
|
|
73
74
|
else {
|
|
74
75
|
(0, lib_1.setApplicationStrictDefault)(host, false);
|
|
75
76
|
}
|
|
76
|
-
if (options.standaloneConfig) {
|
|
77
|
-
yield (0, generators_1.convertToNxProjectGenerator)(host, {
|
|
78
|
-
project: options.name,
|
|
79
|
-
all: false,
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
77
|
if (options.standalone) {
|
|
83
78
|
(0, lib_1.convertToStandaloneApp)(host, options);
|
|
84
79
|
}
|
|
@@ -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");
|
|
@@ -45,21 +44,23 @@ function applicationGenerator(tree, schema) {
|
|
|
45
44
|
(0, lib_1.createFiles)(tree, options);
|
|
46
45
|
(0, lib_1.updateConfigFiles)(tree, options);
|
|
47
46
|
(0, lib_1.updateAppComponentTemplate)(tree, options);
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
47
|
+
if (!options.minimal) {
|
|
48
|
+
// Create the NxWelcomeComponent
|
|
49
|
+
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
50
|
+
yield angularComponentSchematic(tree, {
|
|
51
|
+
name: 'NxWelcome',
|
|
52
|
+
inlineTemplate: true,
|
|
53
|
+
inlineStyle: true,
|
|
54
|
+
prefix: options.prefix,
|
|
55
|
+
skipTests: true,
|
|
56
|
+
style: options.style,
|
|
57
|
+
flat: true,
|
|
58
|
+
viewEncapsulation: 'None',
|
|
59
|
+
project: options.name,
|
|
60
|
+
standalone: options.standalone,
|
|
61
|
+
});
|
|
62
|
+
(0, lib_1.updateNxComponentTemplate)(tree, options);
|
|
63
|
+
}
|
|
63
64
|
if (options.addTailwind) {
|
|
64
65
|
yield (0, setup_tailwind_1.setupTailwindGenerator)(tree, {
|
|
65
66
|
project: options.name,
|
|
@@ -91,12 +92,6 @@ function applicationGenerator(tree, schema) {
|
|
|
91
92
|
else {
|
|
92
93
|
(0, lib_1.setApplicationStrictDefault)(tree, false);
|
|
93
94
|
}
|
|
94
|
-
if (options.standaloneConfig) {
|
|
95
|
-
yield (0, generators_1.convertToNxProjectGenerator)(tree, {
|
|
96
|
-
project: options.name,
|
|
97
|
-
all: false,
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
95
|
if (options.standalone) {
|
|
101
96
|
(0, lib_1.convertToStandaloneApp)(tree, options);
|
|
102
97
|
}
|
|
@@ -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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"}
|
|
@@ -2,16 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addE2e = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
6
|
const cypress_1 = require("@nrwl/cypress");
|
|
6
7
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
7
8
|
const add_protractor_1 = require("./add-protractor");
|
|
8
9
|
const remove_scaffolded_e2e_1 = require("./remove-scaffolded-e2e");
|
|
9
10
|
const update_e2e_project_1 = require("./update-e2e-project");
|
|
10
|
-
const generators_1 = require("@nrwl/workspace/generators");
|
|
11
11
|
const linter_1 = require("@nrwl/linter");
|
|
12
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
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/lib/add-e2e.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AACA,yCAAiD;AAGjD,2CAAwD;AAExD,8DAA4D;AAE5D,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"}
|
|
@@ -27,19 +27,8 @@ function normalizeOptions(host, options) {
|
|
|
27
27
|
: [];
|
|
28
28
|
const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
|
|
29
29
|
options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
|
|
33
|
-
let newProjectRoot = null;
|
|
34
|
-
if (workspaceJsonPath) {
|
|
35
|
-
({ newProjectRoot } = (0, devkit_1.readJson)(host, workspaceJsonPath));
|
|
36
|
-
}
|
|
37
|
-
const ngCliSchematicAppRoot = newProjectRoot
|
|
38
|
-
? `${newProjectRoot}/${appProjectName}`
|
|
39
|
-
: appProjectName;
|
|
40
|
-
const ngCliSchematicE2ERoot = newProjectRoot
|
|
41
|
-
? `${newProjectRoot}/${e2eProjectName}`
|
|
42
|
-
: `${appProjectName}/e2e`;
|
|
30
|
+
const ngCliSchematicAppRoot = appProjectName;
|
|
31
|
+
const ngCliSchematicE2ERoot = `${appProjectName}/e2e`;
|
|
43
32
|
// Set defaults and then overwrite with user options
|
|
44
33
|
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,
|
|
45
34
|
e2eProjectRoot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA+E;AAI/E,yCAAyD;AACzD,8DAA4E;AAC5E,yCAAsC;AACtC,iDAI6B;AAE7B,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"
|
|
@@ -26,7 +26,6 @@ function updateTsConfigOptions(host, options) {
|
|
|
26
26
|
(0, create_ts_config_1.createTsConfig)(host, options.appProjectRoot, 'app', options, (0, typescript_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot));
|
|
27
27
|
}
|
|
28
28
|
function updateAppAndE2EProjectConfigurations(host, options) {
|
|
29
|
-
// workspace.json
|
|
30
29
|
let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
31
30
|
if (options.ngCliSchematicAppRoot !== options.appProjectRoot) {
|
|
32
31
|
project = (0, cli_config_utils_1.replaceAppNameWithPath)(project, options.ngCliSchematicAppRoot, options.appProjectRoot);
|
|
@@ -57,7 +56,7 @@ function updateAppAndE2EProjectConfigurations(host, options) {
|
|
|
57
56
|
* it back to workaround that.
|
|
58
57
|
*/
|
|
59
58
|
(0, devkit_1.removeProjectConfiguration)(host, options.name);
|
|
60
|
-
(0, devkit_1.addProjectConfiguration)(host, options.name, project
|
|
59
|
+
(0, devkit_1.addProjectConfiguration)(host, options.name, project);
|
|
61
60
|
if (options.unitTestRunner === test_runners_1.UnitTestRunner.None) {
|
|
62
61
|
host.delete(`${options.appProjectRoot}/src/app/app.component.spec.ts`);
|
|
63
62
|
host.delete(`${options.appProjectRoot}/tsconfig.spec.json`);
|