@nrwl/angular 14.3.4 → 14.4.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/esm2020/testing/index.mjs +5 -5
  3. package/fesm2015/nrwl-angular-testing.mjs +4 -4
  4. package/fesm2015/nrwl-angular-testing.mjs.map +1 -1
  5. package/fesm2020/nrwl-angular-testing.mjs +4 -4
  6. package/fesm2020/nrwl-angular-testing.mjs.map +1 -1
  7. package/migrations.json +37 -0
  8. package/package.json +9 -8
  9. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +1 -1
  10. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +64 -25
  11. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
  12. package/src/builders/webpack-server/schema.d.ts +1 -0
  13. package/src/builders/webpack-server/schema.json +4 -0
  14. package/src/builders/webpack-server/webpack-server.impl.d.ts +3 -2
  15. package/src/builders/webpack-server/webpack-server.impl.js +58 -30
  16. package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
  17. package/src/generators/application/application.js +1 -0
  18. package/src/generators/application/application.js.map +1 -1
  19. package/src/generators/application/lib/index.d.ts +1 -0
  20. package/src/generators/application/lib/index.js +1 -0
  21. package/src/generators/application/lib/index.js.map +1 -1
  22. package/src/generators/application/lib/nrwl-home-tpl.js +1 -1
  23. package/src/generators/application/lib/set-default-project.d.ts +3 -0
  24. package/src/generators/application/lib/set-default-project.js +13 -0
  25. package/src/generators/application/lib/set-default-project.js.map +1 -0
  26. package/src/migrations/update-12-0-0/update-ngcc-postinstall.d.ts +2 -1
  27. package/src/migrations/update-12-0-0/update-ngcc-postinstall.js +16 -15
  28. package/src/migrations/update-12-0-0/update-ngcc-postinstall.js.map +1 -1
  29. package/src/utils/versions.d.ts +1 -1
  30. package/src/utils/versions.js +1 -1
  31. package/testing/index.d.ts +4 -4
  32. package/testing/index.js +4 -4
  33. package/src/utils/testing.d.ts +0 -3
  34. package/src/utils/testing.js +0 -22
  35. 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
- ## [14.3.4](https://github.com/nrwl/nx/compare/14.3.3...14.3.4) (2022-06-15)
6
+ # [14.4.0-beta.0](https://github.com/nrwl/nx/compare/14.3.6...14.4.0-beta.0) (2022-06-21)
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxJQUFJLElBQUksZUFBZSxFQUN2QixHQUFHLElBQUksY0FBYyxFQUNyQixnQkFBZ0IsSUFBSSx3QkFBd0IsRUFDNUMsSUFBSSxJQUFJLGVBQWUsR0FDeEIsTUFBTSxpQkFBaUIsQ0FBQztBQUV6Qjs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBRyxlQUFlLENBQUM7QUFDcEM7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxHQUFHLEdBQUcsY0FBYyxDQUFDO0FBQ2xDOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsd0JBQXdCLENBQUM7QUFDekQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsZUFBZSxDQUFDO0FBRXBDLE9BQU8sRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBjb2xkIGFzIHJ4anNNYXJibGVzQ29sZCxcbiAgaG90IGFzIHJ4anNNYXJibGVzSG90LFxuICBnZXRUZXN0U2NoZWR1bGVyIGFzIHJ4anNNYXJibGVzVGVzdFNjaGVkdWxlcixcbiAgdGltZSBhcyByeGpzTWFyYmxlc1RpbWUsXG59IGZyb20gJ2phc21pbmUtbWFyYmxlcyc7XG5cbi8qKlxuICogQGRlcHJlY2F0ZWQgSW1wb3J0IGZyb20gJ2phc21pbmUtbWFyYmxlcycgaW5zdGVhZFxuICovXG5leHBvcnQgY29uc3QgY29sZCA9IHJ4anNNYXJibGVzQ29sZDtcbi8qKlxuICogQGRlcHJlY2F0ZWQgSW1wb3J0IGZyb20gJ2phc21pbmUtbWFyYmxlcycgaW5zdGVhZFxuICovXG5leHBvcnQgY29uc3QgaG90ID0gcnhqc01hcmJsZXNIb3Q7XG4vKipcbiAqIEBkZXByZWNhdGVkIEltcG9ydCBmcm9tICdqYXNtaW5lLW1hcmJsZXMnIGluc3RlYWRcbiAqL1xuZXhwb3J0IGNvbnN0IGdldFRlc3RTY2hlZHVsZXIgPSByeGpzTWFyYmxlc1Rlc3RTY2hlZHVsZXI7XG4vKipcbiAqIEBkZXByZWNhdGVkIEltcG9ydCBmcm9tICdqYXNtaW5lLW1hcmJsZXMnIGluc3RlYWRcbiAqL1xuZXhwb3J0IGNvbnN0IHRpbWUgPSByeGpzTWFyYmxlc1RpbWU7XG5cbmV4cG9ydCB7IHJlYWRBbGwsIHJlYWRGaXJzdCB9IGZyb20gJy4vc3JjL3Rlc3RpbmctdXRpbHMnO1xuIl19
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\n */\nexport const cold = rxjsMarblesCold;\n/**\n * @deprecated Import from 'jasmine-marbles' instead\n */\nexport const hot = rxjsMarblesHot;\n/**\n * @deprecated Import from 'jasmine-marbles' instead\n */\nexport const getTestScheduler = rxjsMarblesTestScheduler;\n/**\n * @deprecated Import from 'jasmine-marbles' instead\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;;;;"}
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\n */\nexport const cold = rxjsMarblesCold;\n/**\n * @deprecated Import from 'jasmine-marbles' instead\n */\nexport const hot = rxjsMarblesHot;\n/**\n * @deprecated Import from 'jasmine-marbles' instead\n */\nexport const getTestScheduler = rxjsMarblesTestScheduler;\n/**\n * @deprecated Import from 'jasmine-marbles' instead\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;;;;"}
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/migrations.json CHANGED
@@ -1148,6 +1148,10 @@
1148
1148
  "version": "~14.0.0",
1149
1149
  "alwaysAddToPackageJson": false
1150
1150
  },
1151
+ "@schematics/angular": {
1152
+ "version": "~14.0.0",
1153
+ "alwaysAddToPackageJson": false
1154
+ },
1151
1155
  "@angular/core": {
1152
1156
  "version": "~14.0.0",
1153
1157
  "alwaysAddToPackageJson": true
@@ -1281,6 +1285,39 @@
1281
1285
  "alwaysAddToPackageJson": false
1282
1286
  }
1283
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
+ "alwaysAddToPackageJson": false
1319
+ }
1320
+ }
1284
1321
  }
1285
1322
  }
1286
1323
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/angular",
3
- "version": "14.3.4",
3
+ "version": "14.4.0-beta.0",
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,12 +65,13 @@
65
65
  },
66
66
  "dependencies": {
67
67
  "@angular-devkit/schematics": "~14.0.0",
68
- "@nrwl/cypress": "14.3.4",
69
- "@nrwl/devkit": "14.3.4",
70
- "@nrwl/jest": "14.3.4",
71
- "@nrwl/linter": "14.3.4",
72
- "@nrwl/storybook": "14.3.4",
73
- "@nrwl/workspace": "14.3.4",
68
+ "@nrwl/cypress": "14.4.0-beta.0",
69
+ "@nrwl/devkit": "14.4.0-beta.0",
70
+ "@nrwl/jest": "14.4.0-beta.0",
71
+ "@nrwl/linter": "14.4.0-beta.0",
72
+ "@nrwl/storybook": "14.4.0-beta.0",
73
+ "@nrwl/web": "14.4.0-beta.0",
74
+ "@nrwl/workspace": "14.4.0-beta.0",
74
75
  "@phenomnomnominal/tsquery": "4.1.1",
75
76
  "@schematics/angular": "~14.0.0",
76
77
  "chalk": "4.1.0",
@@ -93,5 +94,5 @@
93
94
  "fesm2015": "fesm2015/nrwl-angular.mjs",
94
95
  "typings": "index.d.ts",
95
96
  "sideEffects": false,
96
- "gitHead": "a4d9da4860dafc5176729620273033d2df752ba8"
97
+ "gitHead": "6a65101ec239f1b3eae28734e4109b56a3700599"
97
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/build-angular").DevServerBuilderOutput>;
4
+ export declare function executeModuleFederationDevServerBuilder(schema: Schema, context: BuilderContext): import("rxjs").Observable<import("@angular-devkit/architect").BuilderOutput>;
5
5
  declare const _default: import("@angular-devkit/architect/src/internal").Builder<JsonObject & Schema>;
6
6
  export default _default;
@@ -8,35 +8,37 @@ 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
- function getDynamicRemotesIfExists(context, p) {
11
+ function getDynamicRemotes(project, context, workspaceProjects) {
12
12
  // check for dynamic remotes
13
13
  // we should only check for dynamic based on what we generate
14
14
  // and fallback to empty array
15
- const standardPathToGeneratedMFManifestJson = (0, path_1.join)(context.workspaceRoot, p.sourceRoot, 'assets/module-federation.manifest.json');
15
+ const standardPathToGeneratedMFManifestJson = (0, path_1.join)(context.workspaceRoot, project.sourceRoot, 'assets/module-federation.manifest.json');
16
16
  if (!(0, fs_1.existsSync)(standardPathToGeneratedMFManifestJson)) {
17
17
  return [];
18
18
  }
19
19
  const moduleFederationManifestJson = (0, fs_1.readFileSync)(standardPathToGeneratedMFManifestJson, 'utf-8');
20
- if (moduleFederationManifestJson) {
21
- // This should have shape of
22
- // {
23
- // "remoteName": "remoteLocation",
24
- // }
25
- const parsedManifest = JSON.parse(moduleFederationManifestJson);
26
- if (!Object.keys(parsedManifest).every((key) => typeof key === 'string' && typeof parsedManifest[key] === 'string')) {
27
- return [];
28
- }
29
- return Object.entries(parsedManifest).reduce((remotesArray, [remoteName, remoteLocation]) => [
30
- ...remotesArray,
31
- [remoteName, remoteLocation],
32
- ], []);
20
+ if (!moduleFederationManifestJson) {
21
+ return [];
22
+ }
23
+ // This should have shape of
24
+ // {
25
+ // "remoteName": "remoteLocation",
26
+ // }
27
+ const parsedManifest = JSON.parse(moduleFederationManifestJson);
28
+ if (!Object.keys(parsedManifest).every((key) => typeof key === 'string' && typeof parsedManifest[key] === 'string')) {
29
+ return [];
33
30
  }
34
- return [];
31
+ const dynamicRemotes = Object.entries(parsedManifest).map(([remoteName]) => remoteName);
32
+ const invalidDynamicRemotes = dynamicRemotes.filter((remote) => !workspaceProjects[remote]);
33
+ if (invalidDynamicRemotes.length) {
34
+ throw new Error(invalidDynamicRemotes.length === 1
35
+ ? `Invalid dynamic remote configured in "${standardPathToGeneratedMFManifestJson}": ${invalidDynamicRemotes[0]}.`
36
+ : `Invalid dynamic remotes configured in "${standardPathToGeneratedMFManifestJson}": ${invalidDynamicRemotes.join(', ')}.`);
37
+ }
38
+ return dynamicRemotes;
35
39
  }
36
- function executeModuleFederationDevServerBuilder(schema, context) {
37
- const workspaceConfig = (0, devkit_1.readAllWorkspaceConfiguration)();
38
- const p = workspaceConfig.projects[context.target.project];
39
- const mfConfigPath = (0, path_1.join)(context.workspaceRoot, p.root, 'module-federation.config.js');
40
+ function getStaticRemotes(project, context, workspaceProjects) {
41
+ const mfConfigPath = (0, path_1.join)(context.workspaceRoot, project.root, 'module-federation.config.js');
40
42
  let mfeConfig;
41
43
  try {
42
44
  mfeConfig = require(mfConfigPath);
@@ -44,11 +46,34 @@ function executeModuleFederationDevServerBuilder(schema, context) {
44
46
  catch (_a) {
45
47
  throw new Error(`Could not load ${mfConfigPath}. Was this project generated with "@nrwl/angular:host"?`);
46
48
  }
49
+ const staticRemotes = mfeConfig.remotes.length > 0 ? mfeConfig.remotes : [];
50
+ const invalidStaticRemotes = staticRemotes.filter((remote) => !workspaceProjects[remote]);
51
+ if (invalidStaticRemotes.length) {
52
+ throw new Error(invalidStaticRemotes.length === 1
53
+ ? `Invalid static remote configured in "${mfConfigPath}": ${invalidStaticRemotes[0]}.`
54
+ : `Invalid static remotes configured in "${mfConfigPath}": ${invalidStaticRemotes.join(', ')}.`);
55
+ }
56
+ return staticRemotes;
57
+ }
58
+ function validateDevRemotes(options, workspaceProjects) {
59
+ var _a;
60
+ const invalidDevRemotes = (_a = options.devRemotes) === null || _a === void 0 ? void 0 : _a.filter((remote) => !workspaceProjects[remote]);
61
+ if (invalidDevRemotes.length) {
62
+ throw new Error(invalidDevRemotes.length === 1
63
+ ? `Invalid dev remote provided: ${invalidDevRemotes[0]}.`
64
+ : `Invalid dev remotes provided: ${invalidDevRemotes.join(', ')}.`);
65
+ }
66
+ }
67
+ function executeModuleFederationDevServerBuilder(schema, context) {
68
+ var _a, _b;
47
69
  const options = tslib_1.__rest(schema, []);
48
- let unparsedRemotes = mfeConfig.remotes.length > 0 ? mfeConfig.remotes : [];
49
- const dynamicRemotes = getDynamicRemotesIfExists(context, p);
50
- unparsedRemotes = [...unparsedRemotes, ...dynamicRemotes];
51
- const remotes = unparsedRemotes.map((a) => (Array.isArray(a) ? a[0] : a));
70
+ const ws = new devkit_1.Workspaces(devkit_1.workspaceRoot);
71
+ const { projects: workspaceProjects } = ws.readWorkspaceConfiguration();
72
+ const project = workspaceProjects[context.target.project];
73
+ validateDevRemotes(options, workspaceProjects);
74
+ const staticRemotes = getStaticRemotes(project, context, workspaceProjects);
75
+ const dynamicRemotes = getDynamicRemotes(project, context, workspaceProjects);
76
+ const remotes = [...staticRemotes, ...dynamicRemotes];
52
77
  const devServeRemotes = !options.devRemotes
53
78
  ? []
54
79
  : Array.isArray(options.devRemotes)
@@ -57,11 +82,25 @@ function executeModuleFederationDevServerBuilder(schema, context) {
57
82
  for (const remote of remotes) {
58
83
  const isDev = devServeRemotes.includes(remote);
59
84
  const target = isDev ? 'serve' : 'serve-static';
85
+ if (!((_a = workspaceProjects[remote].targets) === null || _a === void 0 ? void 0 : _a[target])) {
86
+ throw new Error(`Could not find "${target}" target in "${remote}" project.`);
87
+ }
88
+ else if (!((_b = workspaceProjects[remote].targets) === null || _b === void 0 ? void 0 : _b[target].executor)) {
89
+ throw new Error(`Could not find executor for "${target}" target in "${remote}" project.`);
90
+ }
91
+ const runOptions = {};
92
+ if (options.verbose) {
93
+ const [collection, executor] = workspaceProjects[remote].targets[target].executor.split(':');
94
+ const { schema } = ws.readExecutor(collection, executor);
95
+ if (schema.additionalProperties || 'verbose' in schema.properties) {
96
+ runOptions.verbose = options.verbose;
97
+ }
98
+ }
60
99
  (0, ngcli_adapter_1.scheduleTarget)(context.workspaceRoot, {
61
100
  project: remote,
62
101
  target,
63
102
  configuration: context.target.configuration,
64
- runOptions: {},
103
+ runOptions,
65
104
  executor: context.builder.builderName,
66
105
  }, options.verbose).then((obs) => {
67
106
  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":"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"}
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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"}
@@ -17,4 +17,5 @@ export interface Schema {
17
17
  hmr?: boolean;
18
18
  watch?: boolean;
19
19
  poll?: number;
20
+ buildLibsFromSource?: boolean;
20
21
  }
@@ -102,6 +102,10 @@
102
102
  "poll": {
103
103
  "type": "number",
104
104
  "description": "Enable and define the file watching poll time period in milliseconds."
105
+ },
106
+ "buildLibsFromSource": {
107
+ "type": "boolean",
108
+ "description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options."
105
109
  }
106
110
  },
107
111
  "additionalProperties": false,
@@ -1,5 +1,6 @@
1
- import { BuilderContext } from '@angular-devkit/architect';
1
+ import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
2
+ import { Observable } from 'rxjs';
2
3
  import type { Schema } from './schema';
3
- export declare function executeWebpackServerBuilder(schema: Schema, context: BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular/src/builders/dev-server").DevServerBuilderOutput>;
4
+ export declare function executeWebpackServerBuilder(rawOptions: Schema, context: BuilderContext): Observable<BuilderOutput>;
4
5
  declare const _default: any;
5
6
  export default _default;
@@ -3,51 +3,79 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.executeWebpackServerBuilder = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const architect_1 = require("@angular-devkit/architect");
6
- const dev_server_1 = require("@angular-devkit/build-angular/src/builders/dev-server");
6
+ const build_angular_1 = require("@angular-devkit/build-angular");
7
7
  const devkit_1 = require("@nrwl/devkit");
8
+ const webpack_nx_build_coordination_plugin_1 = require("@nrwl/web/src/plugins/webpack-nx-build-coordination-plugin");
9
+ const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
8
10
  const fs_1 = require("fs");
11
+ const operators_1 = require("nx/src/project-graph/operators");
9
12
  const webpack_merge_1 = require("webpack-merge");
10
13
  const webpack_1 = require("../utilities/webpack");
11
14
  const lib_1 = require("./lib");
12
- function executeWebpackServerBuilder(schema, context) {
13
- var _a;
14
- process.env.NX_TSCONFIG_PATH = (0, devkit_1.joinPathFragments)(context.workspaceRoot, 'tsconfig.base.json');
15
- const options = (0, lib_1.normalizeOptions)(schema);
15
+ function executeWebpackServerBuilder(rawOptions, context) {
16
+ var _a, _b, _c, _d, _e;
17
+ const options = (0, lib_1.normalizeOptions)(rawOptions);
16
18
  const workspaceConfig = (0, devkit_1.readAllWorkspaceConfiguration)();
17
19
  const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget);
18
20
  const buildTarget = workspaceConfig.projects[parsedBrowserTarget.project].targets[parsedBrowserTarget.target];
19
- const selectedConfiguration = parsedBrowserTarget.configuration
21
+ const buildTargetConfiguration = parsedBrowserTarget.configuration
20
22
  ? buildTarget.configurations[parsedBrowserTarget.configuration]
21
23
  : buildTarget.defaultConfiguration
22
24
  ? buildTarget.configurations[buildTarget.defaultConfiguration]
23
- : buildTarget.options;
24
- const customWebpackConfig = (_a = selectedConfiguration.customWebpackConfig) !== null && _a !== void 0 ? _a : buildTarget.options.customWebpackConfig;
25
+ : undefined;
26
+ const buildLibsFromSource = (_c = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.buildLibsFromSource) !== null && _b !== void 0 ? _b : buildTarget.options.buildLibsFromSource) !== null && _c !== void 0 ? _c : true;
27
+ const customWebpackConfig = (_d = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.customWebpackConfig) !== null && _d !== void 0 ? _d : buildTarget.options.customWebpackConfig;
28
+ let pathToWebpackConfig;
25
29
  if (customWebpackConfig && customWebpackConfig.path) {
26
- const pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
27
- if ((0, fs_1.existsSync)(pathToWebpackConfig)) {
28
- return (0, dev_server_1.serveWebpackBrowser)(options, context, {
29
- webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
30
- const customWebpackConfiguration = (0, webpack_1.resolveCustomWebpackConfig)(pathToWebpackConfig, buildTarget.options.tsConfig);
31
- // The extra Webpack configuration file can also export a Promise, for instance:
32
- // `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
33
- // then await will just resolve that object.
34
- const config = yield customWebpackConfiguration;
35
- // The extra Webpack configuration file can export a synchronous or asynchronous function,
36
- // for instance: `module.exports = async config => { ... }`.
37
- if (typeof config === 'function') {
38
- return config(baseWebpackConfig, selectedConfiguration, context.target);
39
- }
40
- else {
41
- return (0, webpack_merge_1.merge)(baseWebpackConfig, config);
42
- }
43
- }),
44
- });
45
- }
46
- else {
30
+ pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
31
+ if (!(0, fs_1.existsSync)(pathToWebpackConfig)) {
47
32
  throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
48
33
  }
49
34
  }
50
- return (0, dev_server_1.serveWebpackBrowser)(options, context);
35
+ let dependencies;
36
+ if (!buildLibsFromSource) {
37
+ const buildTargetTsConfigPath = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.tsConfig) !== null && _e !== void 0 ? _e : buildTarget.options.tsConfig;
38
+ const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, parsedBrowserTarget.target, context.target.configuration);
39
+ dependencies = result.dependencies;
40
+ const updatedTsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetTsConfigPath), context.workspaceRoot, result.target.data.root, dependencies);
41
+ process.env.NX_TSCONFIG_PATH = updatedTsConfig;
42
+ // We can't just pass the tsconfig path in memory to the angular builder
43
+ // function because we can't pass the build target options to it, the build
44
+ // targets options will be retrieved by the builder from the project
45
+ // configuration. Therefore, we patch the method in the context to retrieve
46
+ // the target options to overwrite the tsconfig path to use the generated
47
+ // one with the updated path mappings.
48
+ const originalGetTargetOptions = context.getTargetOptions;
49
+ context.getTargetOptions = (target) => tslib_1.__awaiter(this, void 0, void 0, function* () {
50
+ const options = yield originalGetTargetOptions(target);
51
+ options.tsConfig = updatedTsConfig;
52
+ return options;
53
+ });
54
+ }
55
+ return (0, build_angular_1.executeDevServerBuilder)(options, context, {
56
+ webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
57
+ if (!buildLibsFromSource) {
58
+ const workspaceDependencies = dependencies
59
+ .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
60
+ .map((dep) => dep.node.name);
61
+ baseWebpackConfig.plugins.push(new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBrowserTarget.target} --projects=${workspaceDependencies.join(',')}`));
62
+ }
63
+ if (!pathToWebpackConfig) {
64
+ return baseWebpackConfig;
65
+ }
66
+ const customWebpackConfiguration = (0, webpack_1.resolveCustomWebpackConfig)(pathToWebpackConfig, buildTarget.options.tsConfig);
67
+ // The extra Webpack configuration file can also export a Promise, for instance:
68
+ // `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
69
+ // then await will just resolve that object.
70
+ const config = yield customWebpackConfiguration;
71
+ // The extra Webpack configuration file can export a synchronous or asynchronous function,
72
+ // for instance: `module.exports = async config => { ... }`.
73
+ if (typeof config === 'function') {
74
+ return config(baseWebpackConfig, buildTargetConfiguration, context.target);
75
+ }
76
+ return (0, webpack_merge_1.merge)(baseWebpackConfig, config);
77
+ }),
78
+ });
51
79
  }
52
80
  exports.executeWebpackServerBuilder = executeWebpackServerBuilder;
53
81
  exports.default = (0, architect_1.createBuilder)(executeWebpackServerBuilder);
@@ -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,yDAA0E;AAC1E,sFAG+D;AAE/D,yCAKsB;AACtB,2BAAgC;AAChC,iDAAsC;AACtC,kDAAkE;AAClE,+BAAyC;AAGzC,SAAgB,2BAA2B,CACzC,MAAc,EACd,OAAuB;;IAEvB,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,0BAAiB,EAC9C,OAAO,CAAC,aAAa,EACrB,oBAAoB,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,MAAM,CAAC,CAAC;IACzC,MAAM,eAAe,GAAG,IAAA,sCAA6B,GAAE,CAAC;IAExD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,MAAM,WAAW,GACf,eAAe,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,OAAO,CAC3D,mBAAmB,CAAC,MAAM,CAC3B,CAAC;IAEJ,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,aAAa;QAC7D,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC;IAExB,MAAM,mBAAmB,GACvB,MAAA,qBAAqB,CAAC,mBAAmB,mCACzC,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,IAAA,gCAAmB,EACxB,OAAkC,EAClC,OAAc,EACd;gBACE,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;oBAChD,MAAM,0BAA0B,GAAG,IAAA,oCAA0B,EAC3D,mBAAmB,EACnB,WAAW,CAAC,OAAO,CAAC,QAAQ,CAC7B,CAAC;oBACF,gFAAgF;oBAChF,yFAAyF;oBACzF,4CAA4C;oBAC5C,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC;oBAEhD,0FAA0F;oBAC1F,4DAA4D;oBAC5D,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;wBAChC,OAAO,MAAM,CACX,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,CAAC,MAAM,CACf,CAAC;qBACH;yBAAM;wBACL,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;qBACzC;gBACH,CAAC,CAAA;aACF,CACF,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,IAAA,gCAAmB,EACxB,OAAkC,EAClC,OAAc,CACf,CAAC;AACJ,CAAC;AA1ED,kEA0EC;AAED,kBAAe,IAAA,yBAAa,EAC1B,2BAA2B,CACrB,CAAC"}
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,+BAgBe;AAGf,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAuB;;QAEvB,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC1B,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,aAAa,CACd,CAAC;QACF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,qBAAqB,KAAK,OAAO,CAAC,cAAc,EAAE;YAC5D,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,cAAc,CACvB,CAAC;SACH;QAED,IAAA,iBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,gCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1C,gCAAgC;QAChC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE;YACpC,IAAI,EAAE,WAAW;YACjB,cAAc,EAAE,IAAI;YACpB,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,IAAI;YACV,iBAAiB,EAAE,MAAM;YACzB,OAAO,EAAE,OAAO,CAAC,IAAI;SACtB,CAAC,CAAC;QACH,IAAA,+BAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,MAAM,IAAA,uCAAsB,EAAC,IAAI,EAAE;gBACjC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,cAAc,qCAAwB,EAAE;YAClD,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,gCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC3C;QAED,IAAA,gBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpC,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/B;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACzC;aAAM;YACL,IAAA,iCAA2B,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC1C;QAED,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,MAAM,IAAA,wCAA2B,EAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AA3GD,oDA2GC;AAED,kBAAe,oBAAoB,CAAC"}
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,+BAiBe;AAGf,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAuB;;QAEvB,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC1B,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,aAAa,CACd,CAAC;QACF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,qBAAqB,KAAK,OAAO,CAAC,cAAc,EAAE;YAC5D,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,cAAc,CACvB,CAAC;SACH;QAED,IAAA,iBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,gCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1C,gCAAgC;QAChC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE;YACpC,IAAI,EAAE,WAAW;YACjB,cAAc,EAAE,IAAI;YACpB,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,IAAI;YACV,iBAAiB,EAAE,MAAM;YACzB,OAAO,EAAE,OAAO,CAAC,IAAI;SACtB,CAAC,CAAC;QACH,IAAA,+BAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,MAAM,IAAA,uCAAsB,EAAC,IAAI,EAAE;gBACjC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,cAAc,qCAAwB,EAAE;YAClD,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,gCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC3C;QAED,IAAA,gBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEjC,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/B;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACzC;aAAM;YACL,IAAA,iCAA2B,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC1C;QAED,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,MAAM,IAAA,wCAA2B,EAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AA5GD,oDA4GC;AAED,kBAAe,oBAAoB,CAAC"}
@@ -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"}
@@ -569,7 +569,7 @@ exports.nrwlHomeTemplate = {
569
569
  />
570
570
  </svg>
571
571
  </a>
572
- <a href="https://nx.dev/tutorial/01-create-application?utm_source=nx-project" target="_blank" rel="noreferrer" class="list-item-link">
572
+ <a href="https://nx.dev/angular-tutorial/01-create-application?utm_source=nx-project" target="_blank" rel="noreferrer" class="list-item-link">
573
573
  <svg
574
574
  fill="none"
575
575
  stroke="currentColor"
@@ -0,0 +1,3 @@
1
+ import type { Tree } from '@nrwl/devkit';
2
+ import type { NormalizedSchema } from './normalized-schema';
3
+ export declare function setDefaultProject(tree: Tree, options: NormalizedSchema): void;
@@ -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 +1,2 @@
1
- export default function (): import("@angular-devkit/schematics").Rule;
1
+ import type { Tree } from '@nrwl/devkit';
2
+ export default function (tree: Tree): Promise<void>;
@@ -1,21 +1,22 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const schematics_1 = require("@angular-devkit/schematics");
4
- const workspace_1 = require("@nrwl/workspace");
5
- const workspace_2 = require("@nrwl/workspace");
6
- const udpateNgccPostinstallScript = (host, context) => {
7
- (0, workspace_1.updateJsonInTree)('package.json', (json) => {
8
- if (json.scripts &&
9
- json.scripts.postinstall &&
10
- json.scripts.postinstall.includes('ngcc')) {
11
- // if exists, add execution of this script
12
- json.scripts.postinstall = json.scripts.postinstall.replace(/(.*)(ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points)(.*)/, '$1ngcc --properties es2015 browser module main$3');
3
+ const tslib_1 = require("tslib");
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ function default_1(tree) {
6
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
7
+ let shouldFormat = false;
8
+ (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
9
+ var _a, _b;
10
+ if ((_b = (_a = json.scripts) === null || _a === void 0 ? void 0 : _a.postinstall) === null || _b === void 0 ? void 0 : _b.includes('ngcc')) {
11
+ json.scripts.postinstall = json.scripts.postinstall.replace(/(.*)(ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points)(.*)/, '$1ngcc --properties es2015 browser module main$3');
12
+ shouldFormat = true;
13
+ }
14
+ return json;
15
+ });
16
+ if (shouldFormat) {
17
+ yield (0, devkit_1.formatFiles)(tree);
13
18
  }
14
- return json;
15
- })(host, context);
16
- };
17
- function default_1() {
18
- return (0, schematics_1.chain)([udpateNgccPostinstallScript, (0, workspace_2.formatFiles)()]);
19
+ });
19
20
  }
20
21
  exports.default = default_1;
21
22
  //# sourceMappingURL=update-ngcc-postinstall.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"update-ngcc-postinstall.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-0-0/update-ngcc-postinstall.ts"],"names":[],"mappings":";;AAAA,2DAA2E;AAC3E,+CAAmD;AACnD,+CAA8C;AAE9C,MAAM,2BAA2B,GAAG,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;IAC5E,IAAA,4BAAgB,EAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IACE,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,OAAO,CAAC,WAAW;YACxB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EACzC;YACA,0CAA0C;YAC1C,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CACzD,+FAA+F,EAC/F,kDAAkD,CACnD,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACpB,CAAC,CAAC;AAEF;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,2BAA2B,EAAE,IAAA,uBAAW,GAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAFD,4BAEC"}
1
+ {"version":3,"file":"update-ngcc-postinstall.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-0-0/update-ngcc-postinstall.ts"],"names":[],"mappings":";;;AACA,yCAAuD;AAEvD,mBAA+B,IAAU;;QACvC,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;YACxC,IAAI,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAW,0CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC/C,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CACzD,+FAA+F,EAC/F,kDAAkD,CACnD,CAAC;gBACF,YAAY,GAAG,IAAI,CAAC;aACrB;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE;YAChB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAlBD,4BAkBC"}
@@ -3,7 +3,7 @@ export declare const angularVersion = "~14.0.0";
3
3
  export declare const angularDevkitVersion = "~14.0.0";
4
4
  export declare const ngPackagrVersion = "~14.0.0";
5
5
  export declare const angularJsVersion = "1.7.9";
6
- export declare const ngrxVersion = "~13.2.0";
6
+ export declare const ngrxVersion = "~14.0.0";
7
7
  export declare const rxjsVersion = "~7.4.0";
8
8
  export declare const jestPresetAngularVersion = "~11.1.2";
9
9
  export declare const angularEslintVersion = "~13.2.1";
@@ -6,7 +6,7 @@ exports.angularVersion = '~14.0.0';
6
6
  exports.angularDevkitVersion = '~14.0.0';
7
7
  exports.ngPackagrVersion = '~14.0.0';
8
8
  exports.angularJsVersion = '1.7.9';
9
- exports.ngrxVersion = '~13.2.0';
9
+ exports.ngrxVersion = '~14.0.0';
10
10
  exports.rxjsVersion = '~7.4.0';
11
11
  exports.jestPresetAngularVersion = '~11.1.2';
12
12
  exports.angularEslintVersion = '~13.2.1';
@@ -1,18 +1,18 @@
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 declare const cold: typeof 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 declare const hot: typeof 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 declare const getTestScheduler: typeof 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 declare const time: typeof rxjsMarblesTime;
18
18
  export { readAll, readFirst } from './src/testing-utils';
package/testing/index.js CHANGED
@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.readFirst = exports.readAll = exports.time = exports.getTestScheduler = exports.hot = exports.cold = void 0;
4
4
  const jasmine_marbles_1 = require("jasmine-marbles");
5
5
  /**
6
- * @deprecated Import from 'jasmine-marbles' instead
6
+ * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
7
7
  */
8
8
  exports.cold = jasmine_marbles_1.cold;
9
9
  /**
10
- * @deprecated Import from 'jasmine-marbles' instead
10
+ * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
11
11
  */
12
12
  exports.hot = jasmine_marbles_1.hot;
13
13
  /**
14
- * @deprecated Import from 'jasmine-marbles' instead
14
+ * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
15
15
  */
16
16
  exports.getTestScheduler = jasmine_marbles_1.getTestScheduler;
17
17
  /**
18
- * @deprecated Import from 'jasmine-marbles' instead
18
+ * @deprecated Import from 'jasmine-marbles' instead. Will be removed in Nx v15.
19
19
  */
20
20
  exports.time = jasmine_marbles_1.time;
21
21
  var testing_utils_1 = require("./src/testing-utils");
@@ -1,3 +0,0 @@
1
- import { Rule, Tree } from '@angular-devkit/schematics';
2
- export declare function runMigration<SchemaOptions extends object = any>(schematicName: string, options: SchemaOptions, tree: Tree): Promise<import("@angular-devkit/schematics/testing").UnitTestTree>;
3
- export declare function callRule(rule: Rule, tree: Tree): Promise<import("@angular-devkit/schematics/src/tree/interface").Tree>;
@@ -1,22 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.callRule = exports.runMigration = void 0;
4
- const path_1 = require("path");
5
- const testing_1 = require("@angular-devkit/schematics/testing");
6
- const testRunner = new testing_1.SchematicTestRunner('@nrwl/angular', (0, path_1.join)(__dirname, '../../generators.json'));
7
- testRunner.registerCollection('@nrwl/jest', (0, path_1.join)(__dirname, '../../../jest/generators.json'));
8
- testRunner.registerCollection('@nrwl/workspace', (0, path_1.join)(__dirname, '../../../workspace/generators.json'));
9
- testRunner.registerCollection('@nrwl/cypress', (0, path_1.join)(__dirname, '../../../cypress/generators.json'));
10
- testRunner.registerCollection('@nrwl/storybook', (0, path_1.join)(__dirname, '../../../storybook/generators.json'));
11
- const migrationTestRunner = new testing_1.SchematicTestRunner('@nrwl/workspace', (0, path_1.join)(__dirname, '../../migrations.json'));
12
- function runMigration(schematicName, options, tree) {
13
- return migrationTestRunner
14
- .runSchematicAsync(schematicName, options, tree)
15
- .toPromise();
16
- }
17
- exports.runMigration = runMigration;
18
- function callRule(rule, tree) {
19
- return testRunner.callRule(rule, tree).toPromise();
20
- }
21
- exports.callRule = callRule;
22
- //# sourceMappingURL=testing.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/testing.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,gEAAyE;AAGzE,MAAM,UAAU,GAAG,IAAI,6BAAmB,CACxC,eAAe,EACf,IAAA,WAAI,EAAC,SAAS,EAAE,uBAAuB,CAAC,CACzC,CAAC;AAEF,UAAU,CAAC,kBAAkB,CAC3B,YAAY,EACZ,IAAA,WAAI,EAAC,SAAS,EAAE,+BAA+B,CAAC,CACjD,CAAC;AAEF,UAAU,CAAC,kBAAkB,CAC3B,iBAAiB,EACjB,IAAA,WAAI,EAAC,SAAS,EAAE,oCAAoC,CAAC,CACtD,CAAC;AAEF,UAAU,CAAC,kBAAkB,CAC3B,eAAe,EACf,IAAA,WAAI,EAAC,SAAS,EAAE,kCAAkC,CAAC,CACpD,CAAC;AAEF,UAAU,CAAC,kBAAkB,CAC3B,iBAAiB,EACjB,IAAA,WAAI,EAAC,SAAS,EAAE,oCAAoC,CAAC,CACtD,CAAC;AAEF,MAAM,mBAAmB,GAAG,IAAI,6BAAmB,CACjD,iBAAiB,EACjB,IAAA,WAAI,EAAC,SAAS,EAAE,uBAAuB,CAAC,CACzC,CAAC;AAEF,SAAgB,YAAY,CAC1B,aAAqB,EACrB,OAAsB,EACtB,IAAU;IAEV,OAAO,mBAAmB;SACvB,iBAAiB,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC;SAC/C,SAAS,EAAE,CAAC;AACjB,CAAC;AARD,oCAQC;AAED,SAAgB,QAAQ,CAAC,IAAU,EAAE,IAAU;IAC7C,OAAO,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AACrD,CAAC;AAFD,4BAEC"}