@nrwl/angular 14.3.6 → 14.4.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/esm2020/testing/index.mjs +5 -5
- package/fesm2015/nrwl-angular-testing.mjs +4 -4
- package/fesm2015/nrwl-angular-testing.mjs.map +1 -1
- package/fesm2020/nrwl-angular-testing.mjs +4 -4
- package/fesm2020/nrwl-angular-testing.mjs.map +1 -1
- package/generators.d.ts +1 -0
- package/generators.js +1 -0
- package/generators.js.map +1 -1
- package/migrations.json +49 -0
- package/package.json +9 -9
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +1 -1
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +66 -25
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-server/webpack-server.impl.d.ts +2 -3
- package/src/builders/webpack-server/webpack-server.impl.js +4 -2
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/generators/application/application.js +1 -0
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/index.d.ts +1 -0
- package/src/generators/application/lib/index.js +1 -0
- package/src/generators/application/lib/index.js.map +1 -1
- package/src/generators/application/lib/set-default-project.d.ts +3 -0
- package/src/generators/application/lib/set-default-project.js +13 -0
- package/src/generators/application/lib/set-default-project.js.map +1 -0
- package/src/generators/change-storybook-targets/change-storybook-targets.d.ts +2 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js +5 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js.map +1 -1
- package/src/generators/change-storybook-targets/compat.d.ts +1 -1
- package/src/generators/change-storybook-targets/schema.d.ts +3 -0
- package/src/generators/change-storybook-targets/schema.json +7 -1
- package/src/generators/component/component.d.ts +1 -1
- package/src/generators/component/component.js +7 -4
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/component.d.ts +2 -2
- package/src/generators/component/lib/component.js +8 -15
- package/src/generators/component/lib/component.js.map +1 -1
- package/src/generators/component/lib/entry-point.d.ts +0 -1
- package/src/generators/component/lib/entry-point.js +3 -21
- package/src/generators/component/lib/entry-point.js.map +1 -1
- package/src/generators/component/lib/module.d.ts +2 -2
- package/src/generators/component/lib/module.js.map +1 -1
- package/src/generators/component/lib/normalize-options.d.ts +3 -0
- package/src/generators/component/lib/normalize-options.js +16 -0
- package/src/generators/component/lib/normalize-options.js.map +1 -0
- package/src/generators/component/schema.d.ts +6 -0
- package/src/generators/component-cypress-spec/component-cypress-spec.js +3 -0
- package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
- package/src/generators/component-cypress-spec/schema.d.ts +1 -0
- package/src/generators/component-cypress-spec/schema.json +5 -0
- package/src/generators/component-story/component-story.js +3 -0
- package/src/generators/component-story/component-story.js.map +1 -1
- package/src/generators/component-story/schema.d.ts +1 -0
- package/src/generators/component-story/schema.json +5 -0
- package/src/generators/library/lib/normalize-options.js +2 -1
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/ng-add/utilities/normalize-options.js +5 -9
- package/src/generators/ng-add/utilities/normalize-options.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.js +7 -13
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.actions.ts__tmpl__ +2 -2
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.facade.spec.ts__tmpl__ +2 -2
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.reducer.spec.ts__tmpl__ +3 -3
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.reducer.ts__tmpl__ +2 -2
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.selectors.spec.ts__tmpl__ +5 -5
- package/src/generators/scam/lib/convert-component-to-scam.d.ts +4 -0
- package/src/generators/scam/lib/convert-component-to-scam.js +44 -0
- package/src/generators/scam/lib/convert-component-to-scam.js.map +1 -0
- package/src/generators/scam/lib/export-scam.d.ts +4 -0
- package/src/generators/scam/lib/export-scam.js +37 -0
- package/src/generators/scam/lib/export-scam.js.map +1 -0
- package/src/generators/scam/lib/index.d.ts +3 -0
- package/src/generators/scam/lib/index.js +6 -0
- package/src/generators/scam/lib/index.js.map +1 -1
- package/src/generators/scam/lib/normalize-options.d.ts +3 -0
- package/src/generators/scam/lib/normalize-options.js +16 -0
- package/src/generators/scam/lib/normalize-options.js.map +1 -0
- package/src/generators/scam/scam.d.ts +1 -1
- package/src/generators/scam/scam.js +10 -6
- package/src/generators/scam/scam.js.map +1 -1
- package/src/generators/scam/schema.d.ts +6 -0
- package/src/generators/stories/schema.d.ts +1 -0
- package/src/generators/stories/schema.json +5 -0
- package/src/generators/stories/stories.js +5 -0
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -0
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +1 -0
- package/src/generators/storybook-configuration/schema.json +5 -0
- package/src/generators/storybook-configuration/storybook-configuration.d.ts +1 -1
- package/src/generators/storybook-configuration/storybook-configuration.js +5 -1
- package/src/generators/storybook-configuration/storybook-configuration.js.map +1 -1
- package/src/generators/utils/component.d.ts +14 -0
- package/src/generators/utils/component.js +20 -0
- package/src/generators/utils/component.js.map +1 -0
- package/src/generators/utils/entry-point.d.ts +2 -0
- package/src/generators/utils/entry-point.js +22 -0
- package/src/generators/utils/entry-point.js.map +1 -0
- package/src/generators/utils/path.d.ts +1 -0
- package/src/generators/utils/path.js +7 -1
- package/src/generators/utils/path.js.map +1 -1
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.d.ts +2 -1
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.js +16 -15
- package/src/migrations/update-12-0-0/update-ngcc-postinstall.js.map +1 -1
- package/src/utils/mfe/with-module-federation.js +5 -4
- package/src/utils/mfe/with-module-federation.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +2 -2
- package/testing/index.d.ts +4 -4
- package/testing/index.js +4 -4
- package/src/generators/component/lib/path.d.ts +0 -1
- package/src/generators/component/lib/path.js +0 -11
- package/src/generators/component/lib/path.js.map +0 -1
- package/src/generators/scam/lib/create-module.d.ts +0 -3
- package/src/generators/scam/lib/create-module.js +0 -90
- package/src/generators/scam/lib/create-module.js.map +0 -1
- package/src/utils/testing.d.ts +0 -3
- package/src/utils/testing.js +0 -22
- package/src/utils/testing.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
|
+
# [14.4.0-beta.2](https://github.com/nrwl/nx/compare/14.3.6...14.4.0-beta.2) (2022-06-27)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { cold as rxjsMarblesCold, hot as rxjsMarblesHot, getTestScheduler as rxjsMarblesTestScheduler, time as rxjsMarblesTime, } from 'jasmine-marbles';
|
|
2
2
|
/**
|
|
3
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
3
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
4
4
|
*/
|
|
5
5
|
export const cold = rxjsMarblesCold;
|
|
6
6
|
/**
|
|
7
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
7
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
8
8
|
*/
|
|
9
9
|
export const hot = rxjsMarblesHot;
|
|
10
10
|
/**
|
|
11
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
11
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
12
12
|
*/
|
|
13
13
|
export const getTestScheduler = rxjsMarblesTestScheduler;
|
|
14
14
|
/**
|
|
15
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
15
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
16
16
|
*/
|
|
17
17
|
export const time = rxjsMarblesTime;
|
|
18
18
|
export { readAll, readFirst } from './src/testing-utils';
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxJQUFJLElBQUksZUFBZSxFQUN2QixHQUFHLElBQUksY0FBYyxFQUNyQixnQkFBZ0IsSUFBSSx3QkFBd0IsRUFDNUMsSUFBSSxJQUFJLGVBQWUsR0FDeEIsTUFBTSxpQkFBaUIsQ0FBQztBQUV6Qjs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBRyxlQUFlLENBQUM7QUFDcEM7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxHQUFHLEdBQUcsY0FBYyxDQUFDO0FBQ2xDOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsd0JBQXdCLENBQUM7QUFDekQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsZUFBZSxDQUFDO0FBRXBDLE9BQU8sRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBjb2xkIGFzIHJ4anNNYXJibGVzQ29sZCxcbiAgaG90IGFzIHJ4anNNYXJibGVzSG90LFxuICBnZXRUZXN0U2NoZWR1bGVyIGFzIHJ4anNNYXJibGVzVGVzdFNjaGVkdWxlcixcbiAgdGltZSBhcyByeGpzTWFyYmxlc1RpbWUsXG59IGZyb20gJ2phc21pbmUtbWFyYmxlcyc7XG5cbi8qKlxuICogQGRlcHJlY2F0ZWQgSW1wb3J0IGZyb20gJ2phc21pbmUtbWFyYmxlcycgaW5zdGVhZC4gV2lsbCBiZSByZW1vdmVkIGluIE54IHYxNS5cbiAqL1xuZXhwb3J0IGNvbnN0IGNvbGQgPSByeGpzTWFyYmxlc0NvbGQ7XG4vKipcbiAqIEBkZXByZWNhdGVkIEltcG9ydCBmcm9tICdqYXNtaW5lLW1hcmJsZXMnIGluc3RlYWQuIFdpbGwgYmUgcmVtb3ZlZCBpbiBOeCB2MTUuXG4gKi9cbmV4cG9ydCBjb25zdCBob3QgPSByeGpzTWFyYmxlc0hvdDtcbi8qKlxuICogQGRlcHJlY2F0ZWQgSW1wb3J0IGZyb20gJ2phc21pbmUtbWFyYmxlcycgaW5zdGVhZC4gV2lsbCBiZSByZW1vdmVkIGluIE54IHYxNS5cbiAqL1xuZXhwb3J0IGNvbnN0IGdldFRlc3RTY2hlZHVsZXIgPSByeGpzTWFyYmxlc1Rlc3RTY2hlZHVsZXI7XG4vKipcbiAqIEBkZXByZWNhdGVkIEltcG9ydCBmcm9tICdqYXNtaW5lLW1hcmJsZXMnIGluc3RlYWQuIFdpbGwgYmUgcmVtb3ZlZCBpbiBOeCB2MTUuXG4gKi9cbmV4cG9ydCBjb25zdCB0aW1lID0gcnhqc01hcmJsZXNUaW1lO1xuXG5leHBvcnQgeyByZWFkQWxsLCByZWFkRmlyc3QgfSBmcm9tICcuL3NyYy90ZXN0aW5nLXV0aWxzJztcbiJdfQ==
|
|
@@ -33,19 +33,19 @@ function readFirst(o) {
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
/**
|
|
36
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
36
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
37
37
|
*/
|
|
38
38
|
const cold = cold$1;
|
|
39
39
|
/**
|
|
40
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
40
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
41
41
|
*/
|
|
42
42
|
const hot = hot$1;
|
|
43
43
|
/**
|
|
44
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
44
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
45
45
|
*/
|
|
46
46
|
const getTestScheduler = getTestScheduler$1;
|
|
47
47
|
/**
|
|
48
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
48
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
49
49
|
*/
|
|
50
50
|
const time = time$1;
|
|
51
51
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nrwl-angular-testing.mjs","sources":["../../testing/src/testing-utils.ts","../../testing/index.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","import {\n cold as rxjsMarblesCold,\n hot as rxjsMarblesHot,\n getTestScheduler as rxjsMarblesTestScheduler,\n time as rxjsMarblesTime,\n} from 'jasmine-marbles';\n\n/**\n * @deprecated Import from 'jasmine-marbles' instead
|
|
1
|
+
{"version":3,"file":"nrwl-angular-testing.mjs","sources":["../../testing/src/testing-utils.ts","../../testing/index.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","import {\n cold as rxjsMarblesCold,\n hot as rxjsMarblesHot,\n getTestScheduler as rxjsMarblesTestScheduler,\n time as rxjsMarblesTime,\n} from 'jasmine-marbles';\n\n/**\n * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.\n */\nexport const cold = rxjsMarblesCold;\n/**\n * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.\n */\nexport const hot = rxjsMarblesHot;\n/**\n * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.\n */\nexport const getTestScheduler = rxjsMarblesTestScheduler;\n/**\n * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.\n */\nexport const time = rxjsMarblesTime;\n\nexport { readAll, readFirst } from './src/testing-utils';\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":["rxjsMarblesCold","rxjsMarblesHot","rxjsMarblesTestScheduler","rxjsMarblesTime"],"mappings":";;;AAGA;;;;;;;;;;;AAWG;AACG,SAAU,OAAO,CAAI,CAAgB,EAAA;IACzC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;;;;;;AAWG;AACG,SAAU,SAAS,CAAI,CAAgB,EAAA;IAC3C,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AACrC;;AC1BA;;AAEG;AACI,MAAM,IAAI,GAAGA,OAAgB;AACpC;;AAEG;AACI,MAAM,GAAG,GAAGC,MAAe;AAClC;;AAEG;AACI,MAAM,gBAAgB,GAAGC,mBAAyB;AACzD;;AAEG;AACI,MAAM,IAAI,GAAGC;;ACtBpB;;AAEG;;;;"}
|
|
@@ -33,19 +33,19 @@ function readFirst(o) {
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
/**
|
|
36
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
36
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
37
37
|
*/
|
|
38
38
|
const cold = cold$1;
|
|
39
39
|
/**
|
|
40
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
40
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
41
41
|
*/
|
|
42
42
|
const hot = hot$1;
|
|
43
43
|
/**
|
|
44
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
44
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
45
45
|
*/
|
|
46
46
|
const getTestScheduler = getTestScheduler$1;
|
|
47
47
|
/**
|
|
48
|
-
* @deprecated Import from 'jasmine-marbles' instead
|
|
48
|
+
* @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
|
|
49
49
|
*/
|
|
50
50
|
const time = time$1;
|
|
51
51
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nrwl-angular-testing.mjs","sources":["../../testing/src/testing-utils.ts","../../testing/index.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","import {\n cold as rxjsMarblesCold,\n hot as rxjsMarblesHot,\n getTestScheduler as rxjsMarblesTestScheduler,\n time as rxjsMarblesTime,\n} from 'jasmine-marbles';\n\n/**\n * @deprecated Import from 'jasmine-marbles' instead
|
|
1
|
+
{"version":3,"file":"nrwl-angular-testing.mjs","sources":["../../testing/src/testing-utils.ts","../../testing/index.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","import {\n cold as rxjsMarblesCold,\n hot as rxjsMarblesHot,\n getTestScheduler as rxjsMarblesTestScheduler,\n time as rxjsMarblesTime,\n} from 'jasmine-marbles';\n\n/**\n * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.\n */\nexport const cold = rxjsMarblesCold;\n/**\n * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.\n */\nexport const hot = rxjsMarblesHot;\n/**\n * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.\n */\nexport const getTestScheduler = rxjsMarblesTestScheduler;\n/**\n * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.\n */\nexport const time = rxjsMarblesTime;\n\nexport { readAll, readFirst } from './src/testing-utils';\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":["rxjsMarblesCold","rxjsMarblesHot","rxjsMarblesTestScheduler","rxjsMarblesTime"],"mappings":";;;AAGA;;;;;;;;;;;AAWG;AACG,SAAU,OAAO,CAAI,CAAgB,EAAA;IACzC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;;;;;;AAWG;AACG,SAAU,SAAS,CAAI,CAAgB,EAAA;IAC3C,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AACrC;;AC1BA;;AAEG;AACI,MAAM,IAAI,GAAGA,OAAgB;AACpC;;AAEG;AACI,MAAM,GAAG,GAAGC,MAAe;AAClC;;AAEG;AACI,MAAM,gBAAgB,GAAGC,mBAAyB;AACzD;;AAEG;AACI,MAAM,IAAI,GAAGC;;ACtBpB;;AAEG;;;;"}
|
package/generators.d.ts
CHANGED
|
@@ -23,3 +23,4 @@ export * from './src/generators/component-story/component-story';
|
|
|
23
23
|
export * from './src/generators/web-worker/web-worker';
|
|
24
24
|
export * from './src/generators/remote/remote';
|
|
25
25
|
export * from './src/generators/change-storybook-targets/change-storybook-targets';
|
|
26
|
+
export * from './src/generators/component/component';
|
package/generators.js
CHANGED
|
@@ -26,4 +26,5 @@ tslib_1.__exportStar(require("./src/generators/component-story/component-story")
|
|
|
26
26
|
tslib_1.__exportStar(require("./src/generators/web-worker/web-worker"), exports);
|
|
27
27
|
tslib_1.__exportStar(require("./src/generators/remote/remote"), exports);
|
|
28
28
|
tslib_1.__exportStar(require("./src/generators/change-storybook-targets/change-storybook-targets"), exports);
|
|
29
|
+
tslib_1.__exportStar(require("./src/generators/component/component"), exports);
|
|
29
30
|
//# sourceMappingURL=generators.js.map
|
package/generators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,uEAA6C;AAC7C,uFAA6D;AAC7D,2EAAiD;AACjD,uHAA6F;AAC7F,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,+EAAqD;AACrD,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,+EAAqD;AACrD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,iFAAuD;AACvD,yEAA+C;AAC/C,6GAAmF"}
|
|
1
|
+
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,6GAAmF;AACnF,6FAAmE;AACnE,qEAA2C;AAC3C,uEAA6C;AAC7C,uFAA6D;AAC7D,2EAAiD;AACjD,uHAA6F;AAC7F,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,yFAA+D;AAC/D,+EAAqD;AACrD,qEAA2C;AAC3C,qEAA2C;AAC3C,yFAA+D;AAC/D,+EAAqD;AACrD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,iFAAuD;AACvD,yEAA+C;AAC/C,6GAAmF;AACnF,+EAAqD"}
|
package/migrations.json
CHANGED
|
@@ -1285,6 +1285,55 @@
|
|
|
1285
1285
|
"alwaysAddToPackageJson": false
|
|
1286
1286
|
}
|
|
1287
1287
|
}
|
|
1288
|
+
},
|
|
1289
|
+
"14.3.7": {
|
|
1290
|
+
"version": "14.3.7-beta.0",
|
|
1291
|
+
"packages": {
|
|
1292
|
+
"@ngrx/store": {
|
|
1293
|
+
"version": "~14.0.0",
|
|
1294
|
+
"alwaysAddToPackageJson": false
|
|
1295
|
+
},
|
|
1296
|
+
"@ngrx/effects": {
|
|
1297
|
+
"version": "~14.0.0",
|
|
1298
|
+
"alwaysAddToPackageJson": false
|
|
1299
|
+
},
|
|
1300
|
+
"@ngrx/entity": {
|
|
1301
|
+
"version": "~14.0.0",
|
|
1302
|
+
"alwaysAddToPackageJson": false
|
|
1303
|
+
},
|
|
1304
|
+
"@ngrx/router-store": {
|
|
1305
|
+
"version": "~14.0.0",
|
|
1306
|
+
"alwaysAddToPackageJson": false
|
|
1307
|
+
},
|
|
1308
|
+
"@ngrx/schematics": {
|
|
1309
|
+
"version": "~14.0.0",
|
|
1310
|
+
"alwaysAddToPackageJson": false
|
|
1311
|
+
},
|
|
1312
|
+
"@ngrx/store-devtools": {
|
|
1313
|
+
"version": "~14.0.0",
|
|
1314
|
+
"alwaysAddToPackageJson": false
|
|
1315
|
+
},
|
|
1316
|
+
"@ngrx/component-store": {
|
|
1317
|
+
"version": "~14.0.0"
|
|
1318
|
+
}
|
|
1319
|
+
}
|
|
1320
|
+
},
|
|
1321
|
+
"14.4.0": {
|
|
1322
|
+
"version": "14.4.0-beta.1",
|
|
1323
|
+
"packages": {
|
|
1324
|
+
"@angular-eslint/eslint-plugin": {
|
|
1325
|
+
"version": "~14.0.0",
|
|
1326
|
+
"alwaysAddToPackageJson": false
|
|
1327
|
+
},
|
|
1328
|
+
"@angular-eslint/eslint-plugin-template": {
|
|
1329
|
+
"version": "~14.0.0",
|
|
1330
|
+
"alwaysAddToPackageJson": false
|
|
1331
|
+
},
|
|
1332
|
+
"@angular-eslint/template-parser": {
|
|
1333
|
+
"version": "~14.0.0",
|
|
1334
|
+
"alwaysAddToPackageJson": false
|
|
1335
|
+
}
|
|
1336
|
+
}
|
|
1288
1337
|
}
|
|
1289
1338
|
}
|
|
1290
1339
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.4.0-beta.2",
|
|
4
4
|
"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.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -65,13 +65,13 @@
|
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@angular-devkit/schematics": "~14.0.0",
|
|
68
|
-
"@nrwl/cypress": "14.
|
|
69
|
-
"@nrwl/devkit": "14.
|
|
70
|
-
"@nrwl/jest": "14.
|
|
71
|
-
"@nrwl/linter": "14.
|
|
72
|
-
"@nrwl/storybook": "14.
|
|
73
|
-
"@nrwl/web": "14.
|
|
74
|
-
"@nrwl/workspace": "14.
|
|
68
|
+
"@nrwl/cypress": "14.4.0-beta.2",
|
|
69
|
+
"@nrwl/devkit": "14.4.0-beta.2",
|
|
70
|
+
"@nrwl/jest": "14.4.0-beta.2",
|
|
71
|
+
"@nrwl/linter": "14.4.0-beta.2",
|
|
72
|
+
"@nrwl/storybook": "14.4.0-beta.2",
|
|
73
|
+
"@nrwl/web": "14.4.0-beta.2",
|
|
74
|
+
"@nrwl/workspace": "14.4.0-beta.2",
|
|
75
75
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
76
76
|
"@schematics/angular": "~14.0.0",
|
|
77
77
|
"chalk": "4.1.0",
|
|
@@ -94,5 +94,5 @@
|
|
|
94
94
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
95
95
|
"typings": "index.d.ts",
|
|
96
96
|
"sideEffects": false,
|
|
97
|
-
"gitHead": "
|
|
97
|
+
"gitHead": "bf11bbf70947113abdf3495eaaa5fbfd1e26a894"
|
|
98
98
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Schema } from './schema';
|
|
2
2
|
import { BuilderContext } from '@angular-devkit/architect';
|
|
3
3
|
import { JsonObject } from '@angular-devkit/core';
|
|
4
|
-
export declare function executeModuleFederationDevServerBuilder(schema: Schema, context: BuilderContext): import("rxjs").Observable<import("@angular-devkit/
|
|
4
|
+
export declare function executeModuleFederationDevServerBuilder(schema: Schema, context: BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular").DevServerBuilderOutput>;
|
|
5
5
|
declare const _default: import("@angular-devkit/architect/src/internal").Builder<JsonObject & Schema>;
|
|
6
6
|
export default _default;
|
|
@@ -8,35 +8,38 @@ const architect_1 = require("@angular-devkit/architect");
|
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const webpack_server_impl_1 = require("../webpack-server/webpack-server.impl");
|
|
10
10
|
const fs_1 = require("fs");
|
|
11
|
-
|
|
11
|
+
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
12
|
+
function getDynamicRemotes(project, context, workspaceProjects) {
|
|
12
13
|
// check for dynamic remotes
|
|
13
14
|
// we should only check for dynamic based on what we generate
|
|
14
15
|
// and fallback to empty array
|
|
15
|
-
const standardPathToGeneratedMFManifestJson = (0, path_1.join)(context.workspaceRoot,
|
|
16
|
+
const standardPathToGeneratedMFManifestJson = (0, path_1.join)(context.workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json');
|
|
16
17
|
if (!(0, fs_1.existsSync)(standardPathToGeneratedMFManifestJson)) {
|
|
17
18
|
return [];
|
|
18
19
|
}
|
|
19
20
|
const moduleFederationManifestJson = (0, fs_1.readFileSync)(standardPathToGeneratedMFManifestJson, 'utf-8');
|
|
20
|
-
if (moduleFederationManifestJson) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
return
|
|
30
|
-
...remotesArray,
|
|
31
|
-
[remoteName, remoteLocation],
|
|
32
|
-
], []);
|
|
21
|
+
if (!moduleFederationManifestJson) {
|
|
22
|
+
return [];
|
|
23
|
+
}
|
|
24
|
+
// This should have shape of
|
|
25
|
+
// {
|
|
26
|
+
// "remoteName": "remoteLocation",
|
|
27
|
+
// }
|
|
28
|
+
const parsedManifest = JSON.parse(moduleFederationManifestJson);
|
|
29
|
+
if (!Object.keys(parsedManifest).every((key) => typeof key === 'string' && typeof parsedManifest[key] === 'string')) {
|
|
30
|
+
return [];
|
|
33
31
|
}
|
|
34
|
-
|
|
32
|
+
const dynamicRemotes = Object.entries(parsedManifest).map(([remoteName]) => remoteName);
|
|
33
|
+
const invalidDynamicRemotes = dynamicRemotes.filter((remote) => !workspaceProjects[remote]);
|
|
34
|
+
if (invalidDynamicRemotes.length) {
|
|
35
|
+
throw new Error(invalidDynamicRemotes.length === 1
|
|
36
|
+
? `Invalid dynamic remote configured in "${standardPathToGeneratedMFManifestJson}": ${invalidDynamicRemotes[0]}.`
|
|
37
|
+
: `Invalid dynamic remotes configured in "${standardPathToGeneratedMFManifestJson}": ${invalidDynamicRemotes.join(', ')}.`);
|
|
38
|
+
}
|
|
39
|
+
return dynamicRemotes;
|
|
35
40
|
}
|
|
36
|
-
function
|
|
37
|
-
const
|
|
38
|
-
const p = workspaceConfig.projects[context.target.project];
|
|
39
|
-
const mfConfigPath = (0, path_1.join)(context.workspaceRoot, p.root, 'module-federation.config.js');
|
|
41
|
+
function getStaticRemotes(project, context, workspaceProjects) {
|
|
42
|
+
const mfConfigPath = (0, path_1.join)(context.workspaceRoot, project.root, 'module-federation.config.js');
|
|
40
43
|
let mfeConfig;
|
|
41
44
|
try {
|
|
42
45
|
mfeConfig = require(mfConfigPath);
|
|
@@ -44,11 +47,35 @@ function executeModuleFederationDevServerBuilder(schema, context) {
|
|
|
44
47
|
catch (_a) {
|
|
45
48
|
throw new Error(`Could not load ${mfConfigPath}. Was this project generated with "@nrwl/angular:host"?`);
|
|
46
49
|
}
|
|
50
|
+
const staticRemotes = mfeConfig.remotes.length > 0 ? mfeConfig.remotes : [];
|
|
51
|
+
const invalidStaticRemotes = staticRemotes.filter((remote) => !workspaceProjects[remote]);
|
|
52
|
+
if (invalidStaticRemotes.length) {
|
|
53
|
+
throw new Error(invalidStaticRemotes.length === 1
|
|
54
|
+
? `Invalid static remote configured in "${mfConfigPath}": ${invalidStaticRemotes[0]}.`
|
|
55
|
+
: `Invalid static remotes configured in "${mfConfigPath}": ${invalidStaticRemotes.join(', ')}.`);
|
|
56
|
+
}
|
|
57
|
+
return staticRemotes;
|
|
58
|
+
}
|
|
59
|
+
function validateDevRemotes(options, workspaceProjects) {
|
|
60
|
+
var _a;
|
|
61
|
+
const invalidDevRemotes = (_a = options.devRemotes) === null || _a === void 0 ? void 0 : _a.filter((remote) => !workspaceProjects[remote]);
|
|
62
|
+
if (invalidDevRemotes.length) {
|
|
63
|
+
throw new Error(invalidDevRemotes.length === 1
|
|
64
|
+
? `Invalid dev remote provided: ${invalidDevRemotes[0]}.`
|
|
65
|
+
: `Invalid dev remotes provided: ${invalidDevRemotes.join(', ')}.`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
function executeModuleFederationDevServerBuilder(schema, context) {
|
|
69
|
+
var _a, _b;
|
|
47
70
|
const options = tslib_1.__rest(schema, []);
|
|
48
|
-
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
const
|
|
71
|
+
const projectGraph = (0, devkit_1.readCachedProjectGraph)();
|
|
72
|
+
const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
|
|
73
|
+
const ws = new devkit_1.Workspaces(devkit_1.workspaceRoot);
|
|
74
|
+
const project = workspaceProjects[context.target.project];
|
|
75
|
+
validateDevRemotes(options, workspaceProjects);
|
|
76
|
+
const staticRemotes = getStaticRemotes(project, context, workspaceProjects);
|
|
77
|
+
const dynamicRemotes = getDynamicRemotes(project, context, workspaceProjects);
|
|
78
|
+
const remotes = [...staticRemotes, ...dynamicRemotes];
|
|
52
79
|
const devServeRemotes = !options.devRemotes
|
|
53
80
|
? []
|
|
54
81
|
: Array.isArray(options.devRemotes)
|
|
@@ -57,11 +84,25 @@ function executeModuleFederationDevServerBuilder(schema, context) {
|
|
|
57
84
|
for (const remote of remotes) {
|
|
58
85
|
const isDev = devServeRemotes.includes(remote);
|
|
59
86
|
const target = isDev ? 'serve' : 'serve-static';
|
|
87
|
+
if (!((_a = workspaceProjects[remote].targets) === null || _a === void 0 ? void 0 : _a[target])) {
|
|
88
|
+
throw new Error(`Could not find "${target}" target in "${remote}" project.`);
|
|
89
|
+
}
|
|
90
|
+
else if (!((_b = workspaceProjects[remote].targets) === null || _b === void 0 ? void 0 : _b[target].executor)) {
|
|
91
|
+
throw new Error(`Could not find executor for "${target}" target in "${remote}" project.`);
|
|
92
|
+
}
|
|
93
|
+
const runOptions = {};
|
|
94
|
+
if (options.verbose) {
|
|
95
|
+
const [collection, executor] = workspaceProjects[remote].targets[target].executor.split(':');
|
|
96
|
+
const { schema } = ws.readExecutor(collection, executor);
|
|
97
|
+
if (schema.additionalProperties || 'verbose' in schema.properties) {
|
|
98
|
+
runOptions.verbose = options.verbose;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
60
101
|
(0, ngcli_adapter_1.scheduleTarget)(context.workspaceRoot, {
|
|
61
102
|
project: remote,
|
|
62
103
|
target,
|
|
63
104
|
configuration: context.target.configuration,
|
|
64
|
-
runOptions
|
|
105
|
+
runOptions,
|
|
65
106
|
executor: context.builder.builderName,
|
|
66
107
|
}, options.verbose).then((obs) => {
|
|
67
108
|
obs.toPromise().catch((err) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { BuilderContext
|
|
2
|
-
import { Observable } from 'rxjs';
|
|
1
|
+
import { BuilderContext } from '@angular-devkit/architect';
|
|
3
2
|
import type { Schema } from './schema';
|
|
4
|
-
export declare function executeWebpackServerBuilder(rawOptions: Schema, context: BuilderContext): Observable<
|
|
3
|
+
export declare function executeWebpackServerBuilder(rawOptions: Schema, context: BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular").DevServerBuilderOutput>;
|
|
5
4
|
declare const _default: any;
|
|
6
5
|
export default _default;
|
|
@@ -7,6 +7,7 @@ const build_angular_1 = require("@angular-devkit/build-angular");
|
|
|
7
7
|
const devkit_1 = require("@nrwl/devkit");
|
|
8
8
|
const webpack_nx_build_coordination_plugin_1 = require("@nrwl/web/src/plugins/webpack-nx-build-coordination-plugin");
|
|
9
9
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
10
|
+
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
10
11
|
const fs_1 = require("fs");
|
|
11
12
|
const operators_1 = require("nx/src/project-graph/operators");
|
|
12
13
|
const webpack_merge_1 = require("webpack-merge");
|
|
@@ -14,10 +15,11 @@ const webpack_1 = require("../utilities/webpack");
|
|
|
14
15
|
const lib_1 = require("./lib");
|
|
15
16
|
function executeWebpackServerBuilder(rawOptions, context) {
|
|
16
17
|
var _a, _b, _c, _d, _e;
|
|
18
|
+
process.env.NX_TSCONFIG_PATH = (0, devkit_1.joinPathFragments)(context.workspaceRoot, 'tsconfig.base.json');
|
|
17
19
|
const options = (0, lib_1.normalizeOptions)(rawOptions);
|
|
18
|
-
const workspaceConfig = (0, devkit_1.readAllWorkspaceConfiguration)();
|
|
19
20
|
const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget);
|
|
20
|
-
const
|
|
21
|
+
const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
|
|
22
|
+
const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
|
|
21
23
|
const buildTargetConfiguration = parsedBrowserTarget.configuration
|
|
22
24
|
? buildTarget.configurations[parsedBrowserTarget.configuration]
|
|
23
25
|
: buildTarget.defaultConfiguration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,6 +62,7 @@ function applicationGenerator(host, schema) {
|
|
|
62
62
|
yield (0, lib_1.addUnitTestRunner)(host, options);
|
|
63
63
|
yield (0, lib_1.addE2e)(host, options);
|
|
64
64
|
(0, lib_1.updateEditorTsConfig)(host, options);
|
|
65
|
+
(0, lib_1.setDefaultProject)(host, options);
|
|
65
66
|
if (options.backendProject) {
|
|
66
67
|
(0, lib_1.addProxyConfig)(host, options);
|
|
67
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,8DAAwE;AACxE,2DAAyE;AAEzE,uCAAoD;AACpD,qEAA0E;AAC1E,+
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export * from './nrwl-home-tpl';
|
|
|
12
12
|
export * from './remove-scaffolded-e2e';
|
|
13
13
|
export * from './root-router-config';
|
|
14
14
|
export * from './set-app-strict-default';
|
|
15
|
+
export * from './set-default-project';
|
|
15
16
|
export * from './update-component-spec';
|
|
16
17
|
export * from './update-app-component-template';
|
|
17
18
|
export * from './update-nx-component-template';
|
|
@@ -15,6 +15,7 @@ tslib_1.__exportStar(require("./nrwl-home-tpl"), exports);
|
|
|
15
15
|
tslib_1.__exportStar(require("./remove-scaffolded-e2e"), exports);
|
|
16
16
|
tslib_1.__exportStar(require("./root-router-config"), exports);
|
|
17
17
|
tslib_1.__exportStar(require("./set-app-strict-default"), exports);
|
|
18
|
+
tslib_1.__exportStar(require("./set-default-project"), exports);
|
|
18
19
|
tslib_1.__exportStar(require("./update-component-spec"), exports);
|
|
19
20
|
tslib_1.__exportStar(require("./update-app-component-template"), exports);
|
|
20
21
|
tslib_1.__exportStar(require("./update-nx-component-template"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,wDAA8B;AAC9B,oDAA0B;AAC1B,2DAAiC;AACjC,6DAAmC;AACnC,iEAAuC;AACvC,yDAA+B;AAC/B,wEAA8C;AAC9C,8DAAoC;AACpC,8DAAoC;AACpC,0DAAgC;AAChC,kEAAwC;AACxC,+DAAqC;AACrC,mEAAyC;AACzC,kEAAwC;AACxC,0EAAgD;AAChD,yEAA+C;AAC/C,gEAAsC;AACtC,+DAAqC;AACrC,mEAAyC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,wDAA8B;AAC9B,oDAA0B;AAC1B,2DAAiC;AACjC,6DAAmC;AACnC,iEAAuC;AACvC,yDAA+B;AAC/B,wEAA8C;AAC9C,8DAAoC;AACpC,8DAAoC;AACpC,0DAAgC;AAChC,kEAAwC;AACxC,+DAAqC;AACrC,mEAAyC;AACzC,gEAAsC;AACtC,kEAAwC;AACxC,0EAAgD;AAChD,yEAA+C;AAC/C,gEAAsC;AACtC,+DAAqC;AACrC,mEAAyC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setDefaultProject = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
function setDefaultProject(tree, options) {
|
|
6
|
+
const workspace = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
7
|
+
if (!workspace.defaultProject) {
|
|
8
|
+
workspace.defaultProject = options.name;
|
|
9
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspace);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.setDefaultProject = setDefaultProject;
|
|
13
|
+
//# sourceMappingURL=set-default-project.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"set-default-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/set-default-project.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AAGtB,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC7B,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;QACxC,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC/C;AACH,CAAC;AAPD,8CAOC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
|
-
|
|
2
|
+
import type { Schema } from './schema';
|
|
3
|
+
export declare function angularChangeStorybookTargestGenerator(tree: Tree, schema: Schema): Promise<void>;
|
|
3
4
|
export default angularChangeStorybookTargestGenerator;
|
|
@@ -2,10 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.angularChangeStorybookTargestGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
6
|
const storybook_1 = require("@nrwl/storybook");
|
|
6
|
-
function angularChangeStorybookTargestGenerator(tree) {
|
|
7
|
+
function angularChangeStorybookTargestGenerator(tree, schema) {
|
|
7
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
9
|
yield (0, storybook_1.changeStorybookTargetsGenerator)(tree);
|
|
10
|
+
if (!schema.skipFormat) {
|
|
11
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
12
|
+
}
|
|
9
13
|
});
|
|
10
14
|
}
|
|
11
15
|
exports.angularChangeStorybookTargestGenerator = angularChangeStorybookTargestGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-storybook-targets.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/change-storybook-targets/change-storybook-targets.ts"],"names":[],"mappings":";;;;AACA,+CAAkE;
|
|
1
|
+
{"version":3,"file":"change-storybook-targets.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/change-storybook-targets/change-storybook-targets.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+CAAkE;AAIlE,SAAsB,sCAAsC,CAC1D,IAAU,EACV,MAAc;;QAEd,MAAM,IAAA,2CAA+B,EAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AATD,wFASC;AAED,kBAAe,sCAAsC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (generatorOptions:
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -5,7 +5,13 @@
|
|
|
5
5
|
"description": "Change the Storybook target executors.",
|
|
6
6
|
"type": "object",
|
|
7
7
|
"cli": "nx",
|
|
8
|
-
"properties": {
|
|
8
|
+
"properties": {
|
|
9
|
+
"skipFormat": {
|
|
10
|
+
"description": "Skip formatting files.",
|
|
11
|
+
"type": "boolean",
|
|
12
|
+
"default": false
|
|
13
|
+
}
|
|
14
|
+
},
|
|
9
15
|
"additionalProperties": false,
|
|
10
16
|
"required": []
|
|
11
17
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { Schema } from './schema';
|
|
3
|
-
export declare function componentGenerator(tree: Tree,
|
|
3
|
+
export declare function componentGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
|
|
4
4
|
export default componentGenerator;
|
|
@@ -6,12 +6,15 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
7
7
|
const path_1 = require("../utils/path");
|
|
8
8
|
const component_1 = require("./lib/component");
|
|
9
|
-
|
|
9
|
+
const normalize_options_1 = require("./lib/normalize-options");
|
|
10
|
+
function componentGenerator(tree, rawOptions) {
|
|
10
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
-
|
|
12
|
+
const options = (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
|
|
13
|
+
const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
|
|
14
|
+
checkPathUnderProjectRoot(tree, options);
|
|
12
15
|
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
13
|
-
yield angularComponentSchematic(tree,
|
|
14
|
-
(0, component_1.exportComponentInEntryPoint)(tree,
|
|
16
|
+
yield angularComponentSchematic(tree, schematicOptions);
|
|
17
|
+
(0, component_1.exportComponentInEntryPoint)(tree, options);
|
|
15
18
|
yield (0, devkit_1.formatFiles)(tree);
|
|
16
19
|
});
|
|
17
20
|
}
|