@nrwl/angular 14.6.0-beta.3 → 14.6.0-beta.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (108) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/generators.d.ts +15 -13
  3. package/generators.js +15 -13
  4. package/generators.js.map +1 -1
  5. package/generators.json +10 -0
  6. package/migrations.json +18 -0
  7. package/package.json +9 -9
  8. package/src/generators/add-linting/add-linting.js +1 -0
  9. package/src/generators/add-linting/add-linting.js.map +1 -1
  10. package/src/generators/add-linting/schema.d.ts +1 -0
  11. package/src/generators/application/application.js +6 -1
  12. package/src/generators/application/application.js.map +1 -1
  13. package/src/generators/application/lib/add-e2e.js +4 -2
  14. package/src/generators/application/lib/add-e2e.js.map +1 -1
  15. package/src/generators/application/lib/add-linting.js +1 -0
  16. package/src/generators/application/lib/add-linting.js.map +1 -1
  17. package/src/generators/application/lib/add-unit-test-runner.js +3 -2
  18. package/src/generators/application/lib/add-unit-test-runner.js.map +1 -1
  19. package/src/generators/application/lib/convert-to-standalone-app.d.ts +3 -0
  20. package/src/generators/application/lib/convert-to-standalone-app.js +83 -0
  21. package/src/generators/application/lib/convert-to-standalone-app.js.map +1 -0
  22. package/src/generators/application/lib/index.d.ts +1 -0
  23. package/src/generators/application/lib/index.js +1 -0
  24. package/src/generators/application/lib/index.js.map +1 -1
  25. package/src/generators/application/lib/normalize-options.js +2 -1
  26. package/src/generators/application/lib/normalize-options.js.map +1 -1
  27. package/src/generators/application/lib/update-config-files.js +3 -2
  28. package/src/generators/application/lib/update-config-files.js.map +1 -1
  29. package/src/generators/application/schema.d.ts +1 -0
  30. package/src/generators/application/schema.json +5 -0
  31. package/src/generators/host/schema.d.ts +6 -0
  32. package/src/generators/init/init.js +7 -6
  33. package/src/generators/init/init.js.map +1 -1
  34. package/src/generators/karma/karma.d.ts +1 -1
  35. package/src/generators/library/lib/add-children.d.ts +1 -1
  36. package/src/generators/library/lib/add-children.js +18 -7
  37. package/src/generators/library/lib/add-children.js.map +1 -1
  38. package/src/generators/library/lib/add-load-children.d.ts +1 -1
  39. package/src/generators/library/lib/add-load-children.js +13 -4
  40. package/src/generators/library/lib/add-load-children.js.map +1 -1
  41. package/src/generators/library/lib/add-standalone-component.d.ts +3 -0
  42. package/src/generators/library/lib/add-standalone-component.js +44 -0
  43. package/src/generators/library/lib/add-standalone-component.js.map +1 -0
  44. package/src/generators/library/lib/normalize-options.js +10 -10
  45. package/src/generators/library/lib/normalize-options.js.map +1 -1
  46. package/src/generators/library/lib/normalized-schema.d.ts +1 -0
  47. package/src/generators/library/lib/update-project.js +2 -2
  48. package/src/generators/library/lib/update-project.js.map +1 -1
  49. package/src/generators/library/library.d.ts +1 -1
  50. package/src/generators/library/library.js +27 -19
  51. package/src/generators/library/library.js.map +1 -1
  52. package/src/generators/library/schema.d.ts +1 -0
  53. package/src/generators/library/schema.json +7 -1
  54. package/src/generators/ng-add/migrate-from-angular-cli.js +1 -1
  55. package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
  56. package/src/generators/ng-add/utilities/e2e.migrator.js +1 -0
  57. package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -1
  58. package/src/generators/ng-add/utilities/workspace.d.ts +1 -1
  59. package/src/generators/ng-add/utilities/workspace.js +2 -2
  60. package/src/generators/ng-add/utilities/workspace.js.map +1 -1
  61. package/src/generators/remote/schema.d.ts +6 -0
  62. package/src/generators/scam-to-standalone/compat.d.ts +2 -0
  63. package/src/generators/scam-to-standalone/compat.js +6 -0
  64. package/src/generators/scam-to-standalone/compat.js.map +1 -0
  65. package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.d.ts +3 -0
  66. package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js +34 -0
  67. package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js.map +1 -0
  68. package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.d.ts +6 -0
  69. package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.js +19 -0
  70. package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.js.map +1 -0
  71. package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.d.ts +9 -0
  72. package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.js +65 -0
  73. package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.js.map +1 -0
  74. package/src/generators/scam-to-standalone/lib/get-target-project.d.ts +2 -0
  75. package/src/generators/scam-to-standalone/lib/get-target-project.js +15 -0
  76. package/src/generators/scam-to-standalone/lib/get-target-project.js.map +1 -0
  77. package/src/generators/scam-to-standalone/lib/index.d.ts +8 -0
  78. package/src/generators/scam-to-standalone/lib/index.js +12 -0
  79. package/src/generators/scam-to-standalone/lib/index.js.map +1 -0
  80. package/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.d.ts +2 -0
  81. package/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.js +20 -0
  82. package/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.js.map +1 -0
  83. package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.d.ts +2 -0
  84. package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.js +9 -0
  85. package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.js.map +1 -0
  86. package/src/generators/scam-to-standalone/lib/verify-is-inline-scam.d.ts +2 -0
  87. package/src/generators/scam-to-standalone/lib/verify-is-inline-scam.js +12 -0
  88. package/src/generators/scam-to-standalone/lib/verify-is-inline-scam.js.map +1 -0
  89. package/src/generators/scam-to-standalone/lib/verify-module-is-scam.d.ts +1 -0
  90. package/src/generators/scam-to-standalone/lib/verify-module-is-scam.js +13 -0
  91. package/src/generators/scam-to-standalone/lib/verify-module-is-scam.js.map +1 -0
  92. package/src/generators/scam-to-standalone/scam-to-standalone.d.ts +4 -0
  93. package/src/generators/scam-to-standalone/scam-to-standalone.js +31 -0
  94. package/src/generators/scam-to-standalone/scam-to-standalone.js.map +1 -0
  95. package/src/generators/scam-to-standalone/schema.d.ts +5 -0
  96. package/src/generators/scam-to-standalone/schema.json +28 -0
  97. package/src/generators/utils/testing.js +2 -1
  98. package/src/generators/utils/testing.js.map +1 -1
  99. package/src/utils/mf/mf-webpack.js +23 -11
  100. package/src/utils/mf/mf-webpack.js.map +1 -1
  101. package/src/utils/nx-devkit/standalone-utils.d.ts +2 -0
  102. package/src/utils/nx-devkit/standalone-utils.js +37 -0
  103. package/src/utils/nx-devkit/standalone-utils.js.map +1 -0
  104. package/src/utils/test-runners.d.ts +2 -2
  105. package/src/utils/test-runners.js +17 -0
  106. package/src/utils/test-runners.js.map +1 -1
  107. package/src/utils/versions.d.ts +2 -2
  108. package/src/utils/versions.js +2 -2
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
5
5
  const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
6
6
  const testing_1 = require("@nrwl/devkit/testing");
7
7
  const linter_1 = require("@nrwl/linter");
8
+ const test_runners_1 = require("../../utils/test-runners");
8
9
  const library_1 = require("../library/library");
9
10
  function createStorybookTestWorkspaceForLib(libName) {
10
11
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -18,7 +19,7 @@ function createStorybookTestWorkspaceForLib(libName) {
18
19
  publishable: false,
19
20
  simpleModuleName: false,
20
21
  skipFormat: false,
21
- unitTestRunner: "jest" /* UnitTestRunner.Jest */,
22
+ unitTestRunner: test_runners_1.UnitTestRunner.Jest,
22
23
  });
23
24
  yield componentGenerator(tree, {
24
25
  name: 'test-button',
@@ -1 +1 @@
1
- {"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":"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"}
@@ -9,18 +9,30 @@ const path_1 = require("path");
9
9
  const webpack_1 = require("webpack");
10
10
  const typescript_2 = require("./typescript");
11
11
  const utils_1 = require("./utils");
12
- function collectWorkspaceLibrarySecondaryEntryPoints(library, libraryRoot, tsconfigPathAliases) {
13
- const aliasesUnderLibrary = Object.keys(tsconfigPathAliases).filter((libName) => libName.startsWith(library) && libName !== library);
12
+ function collectWorkspaceLibrarySecondaryEntryPoints(library, tsconfigPathAliases) {
13
+ const libraryRoot = (0, path_1.join)(devkit_1.workspaceRoot, library.root);
14
+ const needsSecondaryEntryPointsCollected = (0, fs_1.existsSync)((0, path_1.join)(libraryRoot, 'ng-package.json'));
14
15
  const secondaryEntryPoints = [];
15
- for (const alias of aliasesUnderLibrary) {
16
- const pathToLib = (0, path_1.dirname)((0, path_1.join)(devkit_1.workspaceRoot, tsconfigPathAliases[alias][0]));
17
- let searchDir = pathToLib;
18
- while (searchDir !== libraryRoot) {
19
- if ((0, fs_1.existsSync)((0, path_1.join)(searchDir, 'ng-package.json'))) {
20
- secondaryEntryPoints.push({ name: alias, path: pathToLib });
21
- break;
16
+ if (needsSecondaryEntryPointsCollected) {
17
+ const tsConfigAliasesForLibWithSecondaryEntryPoints = Object.entries(tsconfigPathAliases).reduce((acc, [tsKey, tsPaths]) => {
18
+ if (!tsKey.startsWith(library.importKey)) {
19
+ return Object.assign({}, acc);
20
+ }
21
+ if (tsPaths.some((path) => path.startsWith(`${library.root}/`))) {
22
+ acc = Object.assign(Object.assign({}, acc), { [tsKey]: tsPaths });
23
+ }
24
+ return acc;
25
+ }, {});
26
+ for (const [alias] of Object.entries(tsConfigAliasesForLibWithSecondaryEntryPoints)) {
27
+ const pathToLib = (0, path_1.dirname)((0, path_1.join)(devkit_1.workspaceRoot, tsconfigPathAliases[alias][0]));
28
+ let searchDir = pathToLib;
29
+ while (searchDir !== libraryRoot) {
30
+ if ((0, fs_1.existsSync)((0, path_1.join)(searchDir, 'ng-package.json'))) {
31
+ secondaryEntryPoints.push({ name: alias, path: pathToLib });
32
+ break;
33
+ }
34
+ searchDir = (0, path_1.dirname)(searchDir);
22
35
  }
23
- searchDir = (0, path_1.dirname)(searchDir);
24
36
  }
25
37
  }
26
38
  return secondaryEntryPoints;
@@ -41,7 +53,7 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
41
53
  if (!library) {
42
54
  continue;
43
55
  }
44
- collectWorkspaceLibrarySecondaryEntryPoints(key, (0, path_1.join)(devkit_1.workspaceRoot, library.root), tsconfigPathAliases).forEach(({ name, path }) => pathMappings.push({
56
+ collectWorkspaceLibrarySecondaryEntryPoints(library, tsconfigPathAliases).forEach(({ name, path }) => pathMappings.push({
45
57
  name,
46
58
  path,
47
59
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"mf-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/mf-webpack.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mf-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/mf-webpack.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ export declare function addStandaloneRoute(tree: Tree, parentPath: string, route: string, lazy?: boolean, routesConst?: string, importPath?: string): void;
@@ -0,0 +1,37 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.addStandaloneRoute = void 0;
4
+ const tsquery_1 = require("@phenomnomnominal/tsquery");
5
+ const ts = require("typescript");
6
+ const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
7
+ function addStandaloneRoute(tree, parentPath, route, lazy = true, routesConst, importPath) {
8
+ if (!tree.exists(parentPath)) {
9
+ throw new Error(`Path to parent routing declaration (${parentPath}) does not exist. Please ensure path is correct.`);
10
+ }
11
+ let parentContents = tree.read(parentPath, 'utf-8');
12
+ if (!lazy) {
13
+ let parentSourceFile = ts.createSourceFile(parentPath, parentContents, ts.ScriptTarget.Latest, true);
14
+ parentSourceFile = (0, ast_utils_1.insertImport)(tree, parentSourceFile, parentPath, routesConst, importPath);
15
+ parentContents = tree.read(parentPath, 'utf-8');
16
+ }
17
+ const ast = tsquery_1.tsquery.ast(parentContents);
18
+ const IMPORT_PROVIDERS_FROM_ROUTER_MODULE_SELECTOR = 'CallExpression:has(Identifier[name=importProvidersFrom]) CallExpression:has(PropertyAccessExpression:has(Identifier[name=RouterModule])) > ArrayLiteralExpression';
19
+ const ROUTES_ARRAY_SELECTOR = 'VariableDeclaration:has(ArrayType > TypeReference > Identifier[name=Route]) > ArrayLiteralExpression';
20
+ const routerModuleNodes = (0, tsquery_1.tsquery)(ast, IMPORT_PROVIDERS_FROM_ROUTER_MODULE_SELECTOR, { visitAllChildren: true });
21
+ const isImportProvidersFromRouterSetup = routerModuleNodes.length > 0;
22
+ const routesArrayNodes = (0, tsquery_1.tsquery)(ast, ROUTES_ARRAY_SELECTOR, {
23
+ visitAllChildren: true,
24
+ });
25
+ const isRoutesArray = routesArrayNodes.length > 0;
26
+ if (!isImportProvidersFromRouterSetup && !isRoutesArray) {
27
+ throw new Error('Parent routing declaration does not contain a routing configuration. Please ensure the parent contains a routing configuration.');
28
+ }
29
+ const nodes = isImportProvidersFromRouterSetup
30
+ ? routerModuleNodes
31
+ : routesArrayNodes;
32
+ const newParentContents = `${parentContents.slice(0, nodes[0].getStart() + 1)}
33
+ ${route},${parentContents.slice(nodes[0].getStart() + 1, -1)}`;
34
+ tree.write(parentPath, newParentContents);
35
+ }
36
+ exports.addStandaloneRoute = addStandaloneRoute;
37
+ //# sourceMappingURL=standalone-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"standalone-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/standalone-utils.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iCAAiC;AACjC,uEAAuE;AAEvE,SAAgB,kBAAkB,CAChC,IAAU,EACV,UAAkB,EAClB,KAAa,EACb,OAAgB,IAAI,EACpB,WAAoB,EACpB,UAAmB;IAEnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,kDAAkD,CACpG,CAAC;KACH;IAED,IAAI,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CACxC,UAAU,EACV,cAAc,EACd,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,UAAU,CACX,CAAC;QAEF,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;KACjD;IAED,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAExC,MAAM,4CAA4C,GAChD,mKAAmK,CAAC;IAEtK,MAAM,qBAAqB,GACzB,sGAAsG,CAAC;IAEzG,MAAM,iBAAiB,GAAG,IAAA,iBAAO,EAC/B,GAAG,EACH,4CAA4C,EAC5C,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;IACF,MAAM,gCAAgC,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;IAEtE,MAAM,gBAAgB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,qBAAqB,EAAE;QAC3D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAElD,IAAI,CAAC,gCAAgC,IAAI,CAAC,aAAa,EAAE;QACvD,MAAM,IAAI,KAAK,CACb,iIAAiI,CAClI,CAAC;KACH;IAED,MAAM,KAAK,GAAG,gCAAgC;QAC5C,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,gBAAgB,CAAC;IAErB,MAAM,iBAAiB,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;MACzE,KAAK,IAAI,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEjE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAC5C,CAAC;AArED,gDAqEC"}
@@ -1,9 +1,9 @@
1
- export declare const enum UnitTestRunner {
1
+ export declare enum UnitTestRunner {
2
2
  Karma = "karma",
3
3
  Jest = "jest",
4
4
  None = "none"
5
5
  }
6
- export declare const enum E2eTestRunner {
6
+ export declare enum E2eTestRunner {
7
7
  /**
8
8
  * @deprecated Protractor is no longer maintained. Support for generating
9
9
  * E2E tests with it will be removed in v15.
@@ -1,3 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.E2eTestRunner = exports.UnitTestRunner = void 0;
4
+ var UnitTestRunner;
5
+ (function (UnitTestRunner) {
6
+ UnitTestRunner["Karma"] = "karma";
7
+ UnitTestRunner["Jest"] = "jest";
8
+ UnitTestRunner["None"] = "none";
9
+ })(UnitTestRunner = exports.UnitTestRunner || (exports.UnitTestRunner = {}));
10
+ var E2eTestRunner;
11
+ (function (E2eTestRunner) {
12
+ /**
13
+ * @deprecated Protractor is no longer maintained. Support for generating
14
+ * E2E tests with it will be removed in v15.
15
+ */
16
+ E2eTestRunner["Protractor"] = "protractor";
17
+ E2eTestRunner["Cypress"] = "cypress";
18
+ E2eTestRunner["None"] = "none";
19
+ })(E2eTestRunner = exports.E2eTestRunner || (exports.E2eTestRunner = {}));
3
20
  //# sourceMappingURL=test-runners.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"test-runners.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/test-runners.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"test-runners.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/test-runners.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,+BAAa,CAAA;IACb,+BAAa,CAAA;AACf,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AACD,IAAY,aAQX;AARD,WAAY,aAAa;IACvB;;;OAGG;IACH,0CAAyB,CAAA;IACzB,oCAAmB,CAAA;IACnB,8BAAa,CAAA;AACf,CAAC,EARW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAQxB"}
@@ -3,7 +3,7 @@ export declare const angularVersion = "~14.1.1";
3
3
  export declare const angularDevkitVersion = "~14.1.1";
4
4
  export declare const ngPackagrVersion = "~14.1.0";
5
5
  export declare const ngrxVersion = "~14.0.0";
6
- export declare const rxjsVersion = "~7.4.0";
6
+ export declare const rxjsVersion = "~7.5.0";
7
7
  export declare const zoneJsVersion = "~0.11.4";
8
8
  export declare const angularJsVersion = "1.7.9";
9
9
  export declare const tsLibVersion = "^2.3.0";
@@ -15,7 +15,7 @@ export declare const postcssPresetEnvVersion = "~7.5.0";
15
15
  export declare const postcssUrlVersion = "~10.1.3";
16
16
  export declare const autoprefixerVersion = "^10.4.0";
17
17
  export declare const tsNodeVersion = "10.9.1";
18
- export declare const jestPresetAngularVersion = "~11.1.2";
18
+ export declare const jestPresetAngularVersion = "~12.2.0";
19
19
  export declare const protractorVersion = "~7.0.0";
20
20
  export declare const karmaVersion = "~6.4.0";
21
21
  export declare const karmaChromeLauncherVersion = "~3.1.0";
@@ -6,7 +6,7 @@ exports.angularVersion = '~14.1.1';
6
6
  exports.angularDevkitVersion = '~14.1.1';
7
7
  exports.ngPackagrVersion = '~14.1.0';
8
8
  exports.ngrxVersion = '~14.0.0';
9
- exports.rxjsVersion = '~7.4.0';
9
+ exports.rxjsVersion = '~7.5.0';
10
10
  exports.zoneJsVersion = '~0.11.4';
11
11
  exports.angularJsVersion = '1.7.9';
12
12
  exports.tsLibVersion = '^2.3.0';
@@ -18,7 +18,7 @@ exports.postcssPresetEnvVersion = '~7.5.0';
18
18
  exports.postcssUrlVersion = '~10.1.3';
19
19
  exports.autoprefixerVersion = '^10.4.0';
20
20
  exports.tsNodeVersion = '10.9.1';
21
- exports.jestPresetAngularVersion = '~11.1.2';
21
+ exports.jestPresetAngularVersion = '~12.2.0';
22
22
  exports.protractorVersion = '~7.0.0';
23
23
  exports.karmaVersion = '~6.4.0';
24
24
  exports.karmaChromeLauncherVersion = '~3.1.0';