@nrwl/angular 15.9.0-beta.8 → 15.9.0-rc.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 (64) hide show
  1. package/executors.json +0 -10
  2. package/migrations.json +6 -0
  3. package/package.json +9 -9
  4. package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js +1 -6
  5. package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js.map +1 -1
  6. package/src/generators/application/lib/add-e2e.js +14 -1
  7. package/src/generators/application/lib/add-e2e.js.map +1 -1
  8. package/src/generators/application/lib/add-unit-test-runner.js +0 -1
  9. package/src/generators/application/lib/add-unit-test-runner.js.map +1 -1
  10. package/src/generators/component-cypress-spec/component-cypress-spec.d.ts +1 -1
  11. package/src/generators/component-cypress-spec/component-cypress-spec.js +27 -24
  12. package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
  13. package/src/generators/component-story/component-story.d.ts +1 -1
  14. package/src/generators/component-story/component-story.js +19 -16
  15. package/src/generators/component-story/component-story.js.map +1 -1
  16. package/src/generators/init/init.js +53 -46
  17. package/src/generators/init/init.js.map +1 -1
  18. package/src/generators/library/library.js +4 -4
  19. package/src/generators/library/library.js.map +1 -1
  20. package/src/generators/ngrx/lib/add-ngrx-to-package-json.js +2 -4
  21. package/src/generators/ngrx/lib/add-ngrx-to-package-json.js.map +1 -1
  22. package/src/generators/setup-mf/lib/setup-serve-target.js +1 -1
  23. package/src/generators/setup-mf/lib/setup-serve-target.js.map +1 -1
  24. package/src/generators/setup-mf/setup-mf.d.ts +1 -1
  25. package/src/generators/setup-mf/setup-mf.js +4 -0
  26. package/src/generators/setup-mf/setup-mf.js.map +1 -1
  27. package/src/generators/setup-ssr/setup-ssr.js +5 -7
  28. package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
  29. package/src/generators/setup-tailwind/lib/add-tailwind-required-packages.js +5 -4
  30. package/src/generators/setup-tailwind/lib/add-tailwind-required-packages.js.map +1 -1
  31. package/src/generators/stories/stories.d.ts +1 -1
  32. package/src/generators/stories/stories.js +40 -37
  33. package/src/generators/stories/stories.js.map +1 -1
  34. package/src/generators/storybook-configuration/lib/generate-stories.d.ts +1 -1
  35. package/src/generators/storybook-configuration/lib/generate-stories.js +10 -7
  36. package/src/generators/storybook-configuration/lib/generate-stories.js.map +1 -1
  37. package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -0
  38. package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
  39. package/src/generators/storybook-configuration/schema.d.ts +1 -0
  40. package/src/generators/storybook-configuration/schema.json +7 -0
  41. package/src/generators/storybook-configuration/storybook-configuration.js +1 -1
  42. package/src/generators/storybook-configuration/storybook-configuration.js.map +1 -1
  43. package/src/generators/utils/dependencies.js +6 -5
  44. package/src/generators/utils/dependencies.js.map +1 -1
  45. package/src/generators/utils/insert-ngmodule-import.js +5 -2
  46. package/src/generators/utils/insert-ngmodule-import.js.map +1 -1
  47. package/src/generators/utils/testing.js +12 -12
  48. package/src/generators/utils/testing.js.map +1 -1
  49. package/src/generators/utils/version-utils.d.ts +2 -0
  50. package/src/generators/utils/version-utils.js +13 -1
  51. package/src/generators/utils/version-utils.js.map +1 -1
  52. package/src/generators/utils/warn-for-schematic-usage.js +1 -1
  53. package/src/generators/utils/warn-for-schematic-usage.js.map +1 -1
  54. package/src/migrations/update-15-9-0/update-file-server-executor.d.ts +2 -0
  55. package/src/migrations/update-15-9-0/update-file-server-executor.js +46 -0
  56. package/src/migrations/update-15-9-0/update-file-server-executor.js.map +1 -0
  57. package/src/executors/file-server/compat.d.ts +0 -2
  58. package/src/executors/file-server/compat.js +0 -6
  59. package/src/executors/file-server/compat.js.map +0 -1
  60. package/src/executors/file-server/file-server.impl.d.ts +0 -8
  61. package/src/executors/file-server/file-server.impl.js +0 -177
  62. package/src/executors/file-server/file-server.impl.js.map +0 -1
  63. package/src/executors/file-server/schema.d.ts +0 -16
  64. package/src/executors/file-server/schema.json +0 -80
package/executors.json CHANGED
@@ -14,11 +14,6 @@
14
14
  "implementation": "./src/executors/package/package.impl",
15
15
  "schema": "./src/executors/package/schema.json",
16
16
  "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\nThis executor is similar to the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds."
17
- },
18
- "file-server": {
19
- "implementation": "./src/executors/file-server/file-server.impl",
20
- "schema": "./src/executors/file-server/schema.json",
21
- "description": "Serves a static web application from a folder."
22
17
  }
23
18
  },
24
19
  "builders": {
@@ -61,11 +56,6 @@
61
56
  "implementation": "./src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl",
62
57
  "schema": "./src/builders/module-federation-dev-ssr/schema.json",
63
58
  "description": "The module-federation-dev-ssr executor is reserved exclusively for use with host Module Federation applications that use SSR. It allows the user to specify which remote applications should be served with the host."
64
- },
65
- "file-server": {
66
- "implementation": "./src/executors/file-server/compat",
67
- "schema": "./src/executors/file-server/schema.json",
68
- "description": "Serve a web application from a folder."
69
59
  }
70
60
  }
71
61
  }
package/migrations.json CHANGED
@@ -158,6 +158,12 @@
158
158
  "version": "15.9.0-beta.3",
159
159
  "description": "Update the tsconfig.spec.json to use target es2016 for jest-preset-angular v13",
160
160
  "factory": "./src/migrations/update-15-9-0/update-testing-tsconfig"
161
+ },
162
+ "update-file-server-executor": {
163
+ "cli": "nx",
164
+ "version": "15.9.0-beta.9",
165
+ "description": "Update the file-server executor to use @nrwl/web:file-server",
166
+ "factory": "./src/migrations/update-15-9-0/update-file-server-executor"
161
167
  }
162
168
  },
163
169
  "packageJsonUpdates": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/angular",
3
- "version": "15.9.0-beta.8",
3
+ "version": "15.9.0-rc.0",
4
4
  "private": false,
5
5
  "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
6
6
  "repository": {
@@ -63,13 +63,13 @@
63
63
  "migrations": "./migrations.json"
64
64
  },
65
65
  "dependencies": {
66
- "@nrwl/cypress": "15.9.0-beta.8",
67
- "@nrwl/devkit": "15.9.0-beta.8",
68
- "@nrwl/jest": "15.9.0-beta.8",
69
- "@nrwl/js": "15.9.0-beta.8",
70
- "@nrwl/linter": "15.9.0-beta.8",
71
- "@nrwl/webpack": "15.9.0-beta.8",
72
- "@nrwl/workspace": "15.9.0-beta.8",
66
+ "@nrwl/cypress": "15.9.0-rc.0",
67
+ "@nrwl/devkit": "15.9.0-rc.0",
68
+ "@nrwl/jest": "15.9.0-rc.0",
69
+ "@nrwl/js": "15.9.0-rc.0",
70
+ "@nrwl/linter": "15.9.0-rc.0",
71
+ "@nrwl/webpack": "15.9.0-rc.0",
72
+ "@nrwl/workspace": "15.9.0-rc.0",
73
73
  "@phenomnomnominal/tsquery": "4.1.1",
74
74
  "chalk": "^4.1.0",
75
75
  "chokidar": "^3.5.1",
@@ -108,5 +108,5 @@
108
108
  "fesm2015": "fesm2015/nrwl-angular.mjs",
109
109
  "typings": "index.d.ts",
110
110
  "sideEffects": false,
111
- "gitHead": "e744f0429fab28464bd20f9733132aea664e0957"
111
+ "gitHead": "31ab8cc9ec171a5025b51c46dc2b6ae020d60573"
112
112
  }
@@ -2,14 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addAngularEsLintDependencies = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
- const versions_1 = require("../../../utils/versions");
6
5
  const version_utils_1 = require("../../utils/version-utils");
7
- const backward_compatible_versions_1 = require("../../../utils/backward-compatible-versions");
8
6
  function addAngularEsLintDependencies(tree) {
9
- const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
10
- const angularEslintVersionToInstall = installedAngularVersionInfo.major === 14
11
- ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularEslintVersion
12
- : versions_1.angularEslintVersion;
7
+ const angularEslintVersionToInstall = (0, version_utils_1.versions)(tree).angularEslintVersion;
13
8
  return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
14
9
  '@angular-eslint/eslint-plugin': angularEslintVersionToInstall,
15
10
  '@angular-eslint/eslint-plugin-template': angularEslintVersionToInstall,
@@ -1 +1 @@
1
- {"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,sDAA+D;AAC/D,6DAA2E;AAC3E,8FAAyF;AAEzF,SAAgB,4BAA4B,CAAC,IAAU;IACrD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IACzE,MAAM,6BAA6B,GACjC,2BAA2B,CAAC,KAAK,KAAK,EAAE;QACtC,CAAC,CAAC,yDAA0B,CAAC,UAAU,CAAC,oBAAoB;QAC5D,CAAC,CAAC,+BAAoB,CAAC;IAC3B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,6BAA6B;QAC9D,wCAAwC,EAAE,6BAA6B;QACvE,iCAAiC,EAAE,6BAA6B;KACjE,CACF,CAAC;AACJ,CAAC;AAfD,oEAeC"}
1
+ {"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,6DAAqD;AAErD,SAAgB,4BAA4B,CAAC,IAAU;IACrD,MAAM,6BAA6B,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC;IAC1E,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,6BAA6B;QAC9D,wCAAwC,EAAE,6BAA6B;QACvE,iCAAiC,EAAE,6BAA6B;KACjE,CACF,CAAC;AACJ,CAAC;AAXD,oEAWC"}
@@ -2,12 +2,15 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addE2e = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ const devkit_1 = require("@nrwl/devkit");
5
6
  const cypress_1 = require("@nrwl/cypress");
6
7
  const remove_scaffolded_e2e_1 = require("./remove-scaffolded-e2e");
7
8
  function addE2e(tree, options) {
8
9
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
10
  (0, remove_scaffolded_e2e_1.removeScaffoldedE2e)(tree, options, options.ngCliSchematicE2ERoot);
10
11
  if (options.e2eTestRunner === 'cypress') {
12
+ // TODO: This can call `@nrwl/web:static-config` generator once we merge `@nrwl/angular:file-server` into `@nrwl/web:file-server`.
13
+ addFileServerTarget(tree, options, 'serve-static');
11
14
  yield (0, cypress_1.cypressProjectGenerator)(tree, {
12
15
  name: options.e2eProjectName,
13
16
  directory: options.directory,
@@ -16,10 +19,20 @@ function addE2e(tree, options) {
16
19
  skipFormat: options.skipFormat,
17
20
  standaloneConfig: options.standaloneConfig,
18
21
  skipPackageJson: options.skipPackageJson,
19
- rootProject: options.rootProject,
20
22
  });
21
23
  }
22
24
  });
23
25
  }
24
26
  exports.addE2e = addE2e;
27
+ function addFileServerTarget(tree, options, targetName) {
28
+ const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
29
+ projectConfig.targets[targetName] = {
30
+ executor: '@nrwl/angular:file-server',
31
+ options: {
32
+ buildTarget: `${options.name}:build`,
33
+ port: options.port,
34
+ },
35
+ };
36
+ (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfig);
37
+ }
25
38
  //# sourceMappingURL=add-e2e.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AACxD,mEAA8D;AAE9D,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;QAChE,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAClE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAdD,wBAcC"}
1
+ {"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,yCAGsB;AACtB,2CAAwD;AACxD,mEAA8D;AAE9D,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;QAChE,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAElE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,kIAAkI;YAClI,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;YAEnD,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAjBD,wBAiBC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAAyB,EACzB,UAAkB;IAElB,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;QAClC,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,QAAQ;YACpC,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC"}
@@ -13,7 +13,6 @@ function addUnitTestRunner(host, options) {
13
13
  supportTsx: false,
14
14
  skipSerializers: false,
15
15
  skipPackageJson: options.skipPackageJson,
16
- rootProject: options.rootProject,
17
16
  });
18
17
  }
19
18
  });
@@ -1 +1 @@
1
- {"version":3,"file":"add-unit-test-runner.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":";;;;AAGA,qCAAkD;AAElD,8DAA6D;AAE7D,SAAsB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QAC3E,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;YAClD,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAXD,8CAWC"}
1
+ {"version":3,"file":"add-unit-test-runner.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":";;;;AAGA,qCAAkD;AAElD,8DAA6D;AAE7D,SAAsB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QAC3E,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;YAClD,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAVD,8CAUC"}
@@ -1,4 +1,4 @@
1
1
  import type { Tree } from '@nrwl/devkit';
2
2
  import type { ComponentCypressSpecGeneratorOptions } from './schema';
3
- export declare function componentCypressSpecGenerator(tree: Tree, options: ComponentCypressSpecGeneratorOptions): void;
3
+ export declare function componentCypressSpecGenerator(tree: Tree, options: ComponentCypressSpecGeneratorOptions): Promise<void>;
4
4
  export default componentCypressSpecGenerator;
@@ -1,36 +1,39 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.componentCypressSpecGenerator = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const devkit_1 = require("@nrwl/devkit");
5
6
  const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
6
7
  const get_args_default_value_1 = require("./lib/get-args-default-value");
7
8
  const get_component_selector_1 = require("./lib/get-component-selector");
8
9
  function componentCypressSpecGenerator(tree, options) {
9
- const { cypressProject, projectName, projectPath, componentPath, componentFileName, componentName, specDirectory, } = options;
10
- const e2eProjectName = cypressProject || `${projectName}-e2e`;
11
- const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
12
- const isCypressV10 = tree.exists((0, devkit_1.joinPathFragments)(root, 'cypress.config.ts'));
13
- const e2eLibIntegrationFolderPath = (0, devkit_1.joinPathFragments)(sourceRoot, isCypressV10 ? 'e2e' : 'integration');
14
- const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
15
- const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, specDirectory !== null && specDirectory !== void 0 ? specDirectory : componentPath);
16
- const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.${isCypressV10 ? 'cy' : 'spec'}.ts`);
17
- if (tree.exists(storyFile)) {
18
- return;
19
- }
20
- const fullComponentPath = (0, devkit_1.joinPathFragments)(projectPath, componentPath, `${componentFileName}.ts`);
21
- const props = (0, storybook_inputs_1.getComponentProps)(tree, fullComponentPath, get_args_default_value_1.getArgsDefaultValue);
22
- const componentSelector = (0, get_component_selector_1.getComponentSelector)(tree, fullComponentPath);
23
- (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
24
- projectName,
25
- componentFileName,
26
- componentName,
27
- componentSelector,
28
- props,
29
- fileExt: isCypressV10 ? 'cy.ts' : 'spec.ts',
10
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
11
+ const { cypressProject, projectName, projectPath, componentPath, componentFileName, componentName, specDirectory, } = options;
12
+ const e2eProjectName = cypressProject || `${projectName}-e2e`;
13
+ const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
14
+ const isCypressV10 = tree.exists((0, devkit_1.joinPathFragments)(root, 'cypress.config.ts'));
15
+ const e2eLibIntegrationFolderPath = (0, devkit_1.joinPathFragments)(sourceRoot, isCypressV10 ? 'e2e' : 'integration');
16
+ const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
17
+ const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, specDirectory !== null && specDirectory !== void 0 ? specDirectory : componentPath);
18
+ const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.${isCypressV10 ? 'cy' : 'spec'}.ts`);
19
+ if (tree.exists(storyFile)) {
20
+ return;
21
+ }
22
+ const fullComponentPath = (0, devkit_1.joinPathFragments)(projectPath, componentPath, `${componentFileName}.ts`);
23
+ const props = (0, storybook_inputs_1.getComponentProps)(tree, fullComponentPath, get_args_default_value_1.getArgsDefaultValue);
24
+ const componentSelector = (0, get_component_selector_1.getComponentSelector)(tree, fullComponentPath);
25
+ (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
26
+ projectName,
27
+ componentFileName,
28
+ componentName,
29
+ componentSelector,
30
+ props,
31
+ fileExt: isCypressV10 ? 'cy.ts' : 'spec.ts',
32
+ });
33
+ if (!options.skipFormat) {
34
+ yield (0, devkit_1.formatFiles)(tree);
35
+ }
30
36
  });
31
- if (!options.skipFormat) {
32
- (0, devkit_1.formatFiles)(tree);
33
- }
34
37
  }
35
38
  exports.componentCypressSpecGenerator = componentCypressSpecGenerator;
36
39
  exports.default = componentCypressSpecGenerator;
@@ -1 +1 @@
1
- {"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,8EAA4E;AAC5E,yEAAmE;AACnE,yEAAoE;AAGpE,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAA6C;IAE7C,MAAM,EACJ,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,GAAG,OAAO,CAAC;IACZ,MAAM,cAAc,GAAG,cAAc,IAAI,GAAG,WAAW,MAAM,CAAC;IAC9D,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,IAAA,0BAAiB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAC7C,CAAC;IACF,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,UAAU,EACV,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CACrC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,2BAA2B,EAC3B,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAC/B,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAC1D,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,WAAW,EACX,aAAa,EACb,GAAG,iBAAiB,KAAK,CAC1B,CAAC;IACF,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAAC,IAAI,EAAE,iBAAiB,EAAE,4CAAmB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAExE,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,WAAW;QACX,iBAAiB;QACjB,aAAa;QACb,iBAAiB;QACjB,KAAK;QACL,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;KAC5C,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAzDD,sEAyDC;AAED,kBAAe,6BAA6B,CAAC"}
1
+ {"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8EAA4E;AAC5E,yEAAmE;AACnE,yEAAoE;AAGpE,SAAsB,6BAA6B,CACjD,IAAU,EACV,OAA6C;;QAE7C,MAAM,EACJ,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,GAAG,OAAO,CAAC;QACZ,MAAM,cAAc,GAAG,cAAc,IAAI,GAAG,WAAW,MAAM,CAAC;QAC9D,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,IAAA,0BAAiB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAC7C,CAAC;QACF,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,UAAU,EACV,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CACrC,CAAC;QAEF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,2BAA2B,EAC3B,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAC/B,CAAC;QACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAC1D,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC1B,OAAO;SACR;QAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,WAAW,EACX,aAAa,EACb,GAAG,iBAAiB,KAAK,CAC1B,CAAC;QACF,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAAC,IAAI,EAAE,iBAAiB,EAAE,4CAAmB,CAAC,CAAC;QAC9E,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAExE,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;YAChD,WAAW;YACX,iBAAiB;YACjB,aAAa;YACb,iBAAiB;YACjB,KAAK;YACL,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;SAC5C,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAzDD,sEAyDC;AAED,kBAAe,6BAA6B,CAAC"}
@@ -1,4 +1,4 @@
1
1
  import type { Tree } from '@nrwl/devkit';
2
2
  import type { ComponentStoryGeneratorOptions } from './schema';
3
- export declare function componentStoryGenerator(tree: Tree, options: ComponentStoryGeneratorOptions): void;
3
+ export declare function componentStoryGenerator(tree: Tree, options: ComponentStoryGeneratorOptions): Promise<void>;
4
4
  export default componentStoryGenerator;
@@ -1,26 +1,29 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.componentStoryGenerator = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const devkit_1 = require("@nrwl/devkit");
5
6
  const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
6
7
  function componentStoryGenerator(tree, options) {
7
- const { componentFileName, componentName, componentPath, projectPath } = options;
8
- const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
9
- const destinationDir = (0, devkit_1.joinPathFragments)(projectPath, componentPath);
10
- const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.stories.ts`);
11
- if (tree.exists(storyFile)) {
12
- return;
13
- }
14
- const props = (0, storybook_inputs_1.getComponentProps)(tree, (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.ts`));
15
- (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
16
- componentFileName: componentFileName,
17
- componentName: componentName,
18
- props: props.filter((p) => typeof p.defaultValue !== 'undefined'),
19
- tmpl: '',
8
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
+ const { componentFileName, componentName, componentPath, projectPath } = options;
10
+ const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
11
+ const destinationDir = (0, devkit_1.joinPathFragments)(projectPath, componentPath);
12
+ const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.stories.ts`);
13
+ if (tree.exists(storyFile)) {
14
+ return;
15
+ }
16
+ const props = (0, storybook_inputs_1.getComponentProps)(tree, (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.ts`));
17
+ (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
18
+ componentFileName: componentFileName,
19
+ componentName: componentName,
20
+ props: props.filter((p) => typeof p.defaultValue !== 'undefined'),
21
+ tmpl: '',
22
+ });
23
+ if (!options.skipFormat) {
24
+ yield (0, devkit_1.formatFiles)(tree);
25
+ }
20
26
  });
21
- if (!options.skipFormat) {
22
- (0, devkit_1.formatFiles)(tree);
23
- }
24
27
  }
25
28
  exports.componentStoryGenerator = componentStoryGenerator;
26
29
  exports.default = componentStoryGenerator;
@@ -1 +1 @@
1
- {"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;AACA,yCAA6E;AAC7E,8EAA4E;AAG5E,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAuC;IAEvC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,GACpE,OAAO,CAAC;IAEV,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,aAAa,CAClC,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAC7B,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,GAAG,iBAAiB,KAAK,CAAC,CAC7D,CAAC;IAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,iBAAiB,EAAE,iBAAiB;QACpC,aAAa,EAAE,aAAa;QAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC;QACjE,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAjCD,0DAiCC;AAED,kBAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;;AACA,yCAA6E;AAC7E,8EAA4E;AAG5E,SAAsB,uBAAuB,CAC3C,IAAU,EACV,OAAuC;;QAEvC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,GACpE,OAAO,CAAC;QAEV,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACrE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,aAAa,CAClC,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC1B,OAAO;SACR;QAED,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAC7B,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,GAAG,iBAAiB,KAAK,CAAC,CAC7D,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;YAChD,iBAAiB,EAAE,iBAAiB;YACpC,aAAa,EAAE,aAAa;YAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC;YACjE,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAjCD,0DAiCC;AAED,kBAAe,uBAAuB,CAAC"}
@@ -8,14 +8,12 @@ const jest_1 = require("@nrwl/jest");
8
8
  const linter_1 = require("@nrwl/linter");
9
9
  const js_1 = require("@nrwl/js");
10
10
  const test_runners_1 = require("../../utils/test-runners");
11
- const versions_1 = require("../../utils/versions");
12
11
  const version_utils_1 = require("../utils/version-utils");
13
- const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
14
12
  function angularInitGenerator(tree, rawOptions) {
15
13
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
16
- const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
17
14
  const tasks = [];
18
15
  const options = normalizeOptions(rawOptions);
16
+ const pkgVersions = (0, version_utils_1.versions)(tree);
19
17
  const peerDepsToInstall = [
20
18
  '@angular-devkit/core',
21
19
  '@angular-devkit/schematics',
@@ -26,9 +24,7 @@ function angularInitGenerator(tree, rawOptions) {
26
24
  var _a;
27
25
  const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
28
26
  if (!packageVersion) {
29
- devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : (installedAngularVersionInfo.major === 14
30
- ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularDevkitVersion
31
- : versions_1.angularDevkitVersion));
27
+ devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : pkgVersions.angularDevkitVersion);
32
28
  try {
33
29
  (0, devkit_1.ensurePackage)(pkg, devkitVersion);
34
30
  }
@@ -44,13 +40,13 @@ function angularInitGenerator(tree, rawOptions) {
44
40
  const jsTask = yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
45
41
  tasks.push(jsTask);
46
42
  if (!options.skipPackageJson) {
47
- tasks.push(updateDependencies(tree, installedAngularVersionInfo.major));
43
+ tasks.push(updateDependencies(tree, pkgVersions));
48
44
  }
49
- const unitTestTask = yield addUnitTestRunner(tree, options, installedAngularVersionInfo.major);
45
+ const unitTestTask = yield addUnitTestRunner(tree, options, pkgVersions.jestPresetAngularVersion);
50
46
  tasks.push(unitTestTask);
51
47
  const e2eTask = yield addE2ETestRunner(tree, options);
52
48
  tasks.push(e2eTask);
53
- addGitIgnoreEntry(tree, '.angular');
49
+ ignoreAngularCacheDirectory(tree);
54
50
  if (!options.skipFormat) {
55
51
  yield (0, devkit_1.formatFiles)(tree);
56
52
  }
@@ -79,48 +75,39 @@ function setDefaults(host, options) {
79
75
  nxJson.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (nxJson.generators['@nrwl/angular:component'] || {}));
80
76
  (0, devkit_1.updateNxJson)(host, nxJson);
81
77
  }
82
- function updateDependencies(tree, angularMajorVersion) {
83
- var _a, _b;
84
- const angularVersionToInstall = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : (angularMajorVersion === 14
85
- ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularVersion
86
- : versions_1.angularVersion);
87
- const angularDevkitVersionToInstall = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : (angularMajorVersion === 14
88
- ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularDevkitVersion
89
- : versions_1.angularDevkitVersion);
78
+ function updateDependencies(tree, versions) {
79
+ var _a, _b, _c, _d, _e;
80
+ const angularVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : versions.angularVersion;
81
+ const angularDevkitVersion = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : versions.angularDevkitVersion;
82
+ const rxjsVersion = (_c = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs')) !== null && _c !== void 0 ? _c : versions.rxjsVersion;
83
+ const tsLibVersion = (_d = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib')) !== null && _d !== void 0 ? _d : versions.tsLibVersion;
84
+ const zoneJsVersion = (_e = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js')) !== null && _e !== void 0 ? _e : versions.zoneJsVersion;
90
85
  return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
91
- '@angular/animations': angularVersionToInstall,
92
- '@angular/common': angularVersionToInstall,
93
- '@angular/compiler': angularVersionToInstall,
94
- '@angular/core': angularVersionToInstall,
95
- '@angular/forms': angularVersionToInstall,
96
- '@angular/platform-browser': angularVersionToInstall,
97
- '@angular/platform-browser-dynamic': angularVersionToInstall,
98
- '@angular/router': angularVersionToInstall,
99
- rxjs: angularMajorVersion === 14
100
- ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.rxjsVersion
101
- : versions_1.rxjsVersion,
102
- tslib: angularMajorVersion === 14
103
- ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.tsLibVersion
104
- : versions_1.tsLibVersion,
105
- 'zone.js': angularMajorVersion === 14
106
- ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.zoneJsVersion
107
- : versions_1.zoneJsVersion,
86
+ '@angular/animations': angularVersion,
87
+ '@angular/common': angularVersion,
88
+ '@angular/compiler': angularVersion,
89
+ '@angular/core': angularVersion,
90
+ '@angular/forms': angularVersion,
91
+ '@angular/platform-browser': angularVersion,
92
+ '@angular/platform-browser-dynamic': angularVersion,
93
+ '@angular/router': angularVersion,
94
+ rxjs: rxjsVersion,
95
+ tslib: tsLibVersion,
96
+ 'zone.js': zoneJsVersion,
108
97
  }, {
109
- '@angular/cli': angularDevkitVersionToInstall,
110
- '@angular/compiler-cli': angularVersionToInstall,
111
- '@angular/language-service': angularVersionToInstall,
112
- '@angular-devkit/build-angular': angularDevkitVersionToInstall,
98
+ '@angular/cli': angularDevkitVersion,
99
+ '@angular/compiler-cli': angularVersion,
100
+ '@angular/language-service': angularVersion,
101
+ '@angular-devkit/build-angular': angularDevkitVersion,
113
102
  });
114
103
  }
115
- function addUnitTestRunner(tree, options, angularMajorVersion) {
104
+ function addUnitTestRunner(tree, options, jestPresetAngularVersion) {
116
105
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
117
106
  switch (options.unitTestRunner) {
118
107
  case test_runners_1.UnitTestRunner.Jest:
119
108
  if (!options.skipPackageJson) {
120
109
  (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
121
- 'jest-preset-angular': angularMajorVersion === 14
122
- ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.jestPresetAngularVersion
123
- : versions_1.jestPresetAngularVersion,
110
+ 'jest-preset-angular': jestPresetAngularVersion,
124
111
  });
125
112
  }
126
113
  return (0, jest_1.jestInitGenerator)(tree, {
@@ -143,18 +130,38 @@ function addE2ETestRunner(tree, options) {
143
130
  }
144
131
  });
145
132
  }
146
- function addGitIgnoreEntry(host, entry) {
147
- if (host.exists('.gitignore')) {
148
- let content = host.read('.gitignore', 'utf-8');
133
+ function ignoreAngularCacheDirectory(tree) {
134
+ var _a, _b;
135
+ const { cli } = (0, devkit_1.readNxJson)(tree);
136
+ // angular-specific cli config is supported though is not included in the
137
+ // NxJsonConfiguration type
138
+ const angularCacheDir = (_b = (_a = cli === null || cli === void 0 ? void 0 : cli.cache) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : '.angular';
139
+ addGitIgnoreEntry(tree, angularCacheDir);
140
+ addPrettierIgnoreEntry(tree, angularCacheDir);
141
+ }
142
+ function addGitIgnoreEntry(tree, entry) {
143
+ if (tree.exists('.gitignore')) {
144
+ let content = tree.read('.gitignore', 'utf-8');
149
145
  if (/^\.angular$/gm.test(content)) {
150
146
  return;
151
147
  }
152
148
  content = `${content}\n${entry}\n`;
153
- host.write('.gitignore', content);
149
+ tree.write('.gitignore', content);
154
150
  }
155
151
  else {
156
152
  devkit_1.logger.warn(`Couldn't find .gitignore file to update`);
157
153
  }
158
154
  }
155
+ function addPrettierIgnoreEntry(tree, entry) {
156
+ if (!tree.exists('.prettierignore')) {
157
+ return;
158
+ }
159
+ let content = tree.read('.prettierignore', 'utf-8');
160
+ if (/^\.angular$/gm.test(content)) {
161
+ return;
162
+ }
163
+ content = `${content}\n${entry}\n`;
164
+ tree.write('.prettierignore', content);
165
+ }
159
166
  exports.default = angularInitGenerator;
160
167
  //# sourceMappingURL=init.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAUsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,iCAA4D;AAC5D,2DAAyE;AACzE,0DAIgC;AAIhC,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;QAElB,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAE7C,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,iBAAiB,GAAG;YACxB,sBAAsB;YACtB,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QACF,IAAI,aAAqB,CAAC;QAC1B,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;YAChC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAE7D,IAAI,CAAC,cAAc,EAAE;gBACnB,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GACX,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,+BAA+B,CAAC,mCACjE,WAAW,CAAC,oBAAoB,EAAC;gBAEnC,IAAI;oBACF,IAAA,sBAAa,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;iBACnC;gBAAC,WAAM;oBACN,iHAAiH;iBAClH;gBAED,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;oBAC5B,KAAK,CAAC,IAAI,CACR,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,CAAC,CACjE,CAAC;iBACH;aACF;QACH,CAAC,CAAC,CAAC;QACH,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACpC,OAAO,KACV,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,EAC1E,EAAE,EAAE,KAAK,EACT,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEnB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;SACnD;QACD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAC1C,IAAI,EACJ,OAAO,EACP,WAAW,CAAC,wBAAwB,CACrC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpB,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAElC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAjED,oDAiEC;AAED,SAAS,gBAAgB,CAAC,OAAe;;IACvC,OAAO;QACL,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,4BAAa,CAAC,OAAO;QAC7D,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM;QACvC,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK;QACvC,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK;QACzC,eAAe,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,KAAK;QACjD,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK;QAC7B,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,6BAAc,CAAC,IAAI;QAC7D,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAe;IAC9C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,mBAC5C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,aAAa,EAAE,OAAO,CAAC,aAAa,IACjC,CAAC,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAC1D,CAAC;IACF,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBACxC,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,IACnC,CAAC,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CACtD,CAAC;IACF,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,mBAC1C,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,CAAC,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CACxD,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAU,EACV,QAAyB;;IAEzB,MAAM,cAAc,GAClB,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,mCACjD,QAAQ,CAAC,cAAc,CAAC;IAC1B,MAAM,oBAAoB,GACxB,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,+BAA+B,CAAC,mCACjE,QAAQ,CAAC,oBAAoB,CAAC;IAChC,MAAM,WAAW,GACf,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,mCAAI,QAAQ,CAAC,WAAW,CAAC;IACnE,MAAM,YAAY,GAChB,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,QAAQ,CAAC,YAAY,CAAC;IACrE,MAAM,aAAa,GACjB,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,SAAS,CAAC,mCAAI,QAAQ,CAAC,aAAa,CAAC;IAExE,OAAO,IAAA,uDAAuC,EAC5C,IAAI,EACJ;QACE,qBAAqB,EAAE,cAAc;QACrC,iBAAiB,EAAE,cAAc;QACjC,mBAAmB,EAAE,cAAc;QACnC,eAAe,EAAE,cAAc;QAC/B,gBAAgB,EAAE,cAAc;QAChC,2BAA2B,EAAE,cAAc;QAC3C,mCAAmC,EAAE,cAAc;QACnD,iBAAiB,EAAE,cAAc;QACjC,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,YAAY;QACnB,SAAS,EAAE,aAAa;KACzB,EACD;QACE,cAAc,EAAE,oBAAoB;QACpC,uBAAuB,EAAE,cAAc;QACvC,2BAA2B,EAAE,cAAc;QAC3C,+BAA+B,EAAE,oBAAoB;KACtD,CACF,CAAC;AACJ,CAAC;AAED,SAAe,iBAAiB,CAC9B,IAAU,EACV,OAAe,EACf,wBAAgC;;QAEhC,QAAQ,OAAO,CAAC,cAAc,EAAE;YAC9B,KAAK,6BAAc,CAAC,IAAI;gBACtB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;oBAC5B,IAAA,uDAAuC,EACrC,IAAI,EACJ,EAAE,EACF;wBACE,qBAAqB,EAAE,wBAAwB;qBAChD,CACF,CAAC;iBACH;gBAED,OAAO,IAAA,wBAAiB,EAAC,IAAI,EAAE;oBAC7B,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;YACL;gBACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACnB;IACH,CAAC;CAAA;AAED,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,QAAQ,OAAO,CAAC,aAAa,EAAE;YAC7B,KAAK,4BAAa,CAAC,OAAO;gBACxB,OAAO,IAAA,8BAAoB,EAAC,IAAI,EAAE;oBAChC,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;YACL;gBACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACnB;IACH,CAAC;CAAA;AAED,SAAS,2BAA2B,CAAC,IAAU;;IAC7C,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IACjC,yEAAyE;IACzE,2BAA2B;IAC3B,MAAM,eAAe,GAAG,MAAA,MAAC,GAAW,aAAX,GAAG,uBAAH,GAAG,CAAU,KAAK,0CAAE,IAAI,mCAAI,UAAU,CAAC;IAEhE,iBAAiB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACzC,sBAAsB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,KAAa;IAClD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACjC,OAAO;SACR;QAED,OAAO,GAAG,GAAG,OAAO,KAAK,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;KACnC;SAAM;QACL,eAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACxD;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,KAAa;IACvD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QACnC,OAAO;KACR;IAED,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IACpD,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACjC,OAAO;KACR;IAED,OAAO,GAAG,GAAG,OAAO,KAAK,KAAK,IAAI,CAAC;IACnC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
@@ -9,10 +9,9 @@ const js_1 = require("@nrwl/js");
9
9
  const semver_1 = require("semver");
10
10
  const init_1 = require("../../generators/init/init");
11
11
  const test_runners_1 = require("../../utils/test-runners");
12
- const version_utils_1 = require("../../utils/version-utils");
13
12
  const add_linting_1 = require("../add-linting/add-linting");
14
13
  const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
15
- const version_utils_2 = require("../utils/version-utils");
14
+ const version_utils_1 = require("../utils/version-utils");
16
15
  const dependencies_1 = require("../utils/dependencies");
17
16
  const add_module_1 = require("./lib/add-module");
18
17
  const add_standalone_component_1 = require("./lib/add-standalone-component");
@@ -34,12 +33,13 @@ function libraryGenerator(tree, schema) {
34
33
  if (schema.addTailwind && !schema.buildable && !schema.publishable) {
35
34
  throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
36
35
  }
37
- const userInstalledAngularVersion = (0, version_utils_2.getInstalledAngularVersionInfo)(tree);
36
+ const userInstalledAngularVersion = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
38
37
  if ((0, semver_1.lt)(userInstalledAngularVersion.version, '14.1.0') && schema.standalone) {
39
38
  throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
40
39
  }
41
40
  const options = (0, normalize_options_1.normalizeOptions)(tree, schema);
42
41
  const { libraryOptions } = options;
42
+ const pkgVersions = (0, version_utils_1.versions)(tree);
43
43
  yield (0, init_1.default)(tree, Object.assign(Object.assign({}, libraryOptions), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
44
44
  const project = (0, add_project_1.addProject)(tree, libraryOptions);
45
45
  (0, create_files_1.createFiles)(tree, options, project);
@@ -63,7 +63,7 @@ function libraryGenerator(tree, schema) {
63
63
  if (libraryOptions.buildable || libraryOptions.publishable) {
64
64
  (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['ng-packagr']);
65
65
  (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
66
- 'ng-packagr': (0, version_utils_1.getPkgVersionForAngularMajorVersion)('ngPackagrVersion', userInstalledAngularVersion.major),
66
+ 'ng-packagr': pkgVersions.ngPackagrVersion,
67
67
  });
68
68
  (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
69
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,qCAAkD;AAClD,yCAAsC;AACtC,iCAA8C;AAC9C,mCAA4B;AAC5B,qDAA8C;AAC9C,2DAAyD;AACzD,4DAA6D;AAC7D,qEAAsE;AACtE,0DAGgC;AAChC,wDAAiF;AACjF,iDAA6C;AAC7C,6EAAwE;AACxE,mFAG2C;AAC3C,+DAA2D;AAE3D,qFAA8E;AAC9E,2DAAuD;AAEvD,qDAAiD;AACjD,mDAA+C;AAE/C,SAAsB,gBAAgB,CACpC,IAAU,EACV,MAAc;;QAEd,4BAA4B;QAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QAED,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAClE,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;SACH;QAED,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QACzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE;YAC1E,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;QAEnC,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,IAAA,cAAI,EAAC,IAAI,kCACV,cAAc,KACjB,UAAU,EAAE,IAAI,EAChB,aAAa,EAAE,4BAAa,CAAC,IAAI,IACjC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,wBAAU,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEjD,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,gCAAc,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACrC,MAAM,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC9C,sCAAsC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE7D,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE;YAC9B,IAAA,sBAAS,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACjC;aAAM;YACL,MAAM,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC7C;QAED,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACpC,MAAM,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEvC,IAAI,cAAc,CAAC,WAAW,EAAE;YAC9B,MAAM,IAAA,wBAAsB,EAAC,IAAI,EAAE;gBACjC,OAAO,EAAE,cAAc,CAAC,IAAI;gBAC5B,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;QAED,IAAI,cAAc,CAAC,SAAS,IAAI,cAAc,CAAC,WAAW,EAAE;YAC1D,IAAA,0CAAiC,EAAC,IAAI,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;YAC5D,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,YAAY,EAAE,WAAW,CAAC,gBAAgB;aAC3C,CACF,CAAC;YACF,IAAA,uDAAwC,EAAC,IAAI,CAAC,CAAC;SAChD;QAED,IAAA,uBAAkB,EAAC,IAAI,kCAAO,cAAc,KAAE,EAAE,EAAE,KAAK,IAAG,CAAC;QAE3D,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE;YAC9B,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;AAnFD,4CAmFC;AAED,SAAe,iBAAiB,CAC9B,IAAU,EACV,OAA2C;;QAE3C,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAED,SAAS,sCAAsC,CAC7C,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,IAAA,uDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACzC;AACH,CAAC;AAED,SAAS,aAAa,CACpB,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,IAAA,sDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACzC;SAAM;QACL,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;KAC/C;AACH,CAAC;AAED,SAAe,UAAU,CACvB,IAAU,EACV,OAA2C;;QAE3C,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAClC,OAAO;SACR;QACD,MAAM,IAAA,qBAAmB,EAAC,IAAI,EAAE;YAC9B,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,kBAAe,gBAAgB,CAAC"}
@@ -4,9 +4,8 @@ exports.addNgRxToPackageJson = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const semver_1 = require("@nrwl/devkit/src/utils/semver");
6
6
  const semver_2 = require("semver");
7
- const version_utils_1 = require("../../../utils/version-utils");
8
7
  const versions_1 = require("../../../utils/versions");
9
- const version_utils_2 = require("../../utils/version-utils");
8
+ const version_utils_1 = require("../../utils/version-utils");
10
9
  function addNgRxToPackageJson(tree) {
11
10
  let rxjsVersion;
12
11
  try {
@@ -16,8 +15,7 @@ function addNgRxToPackageJson(tree) {
16
15
  rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
17
16
  }
18
17
  const jasmineMarblesVersion = (0, semver_2.gte)(rxjsVersion, '7.0.0') ? '~0.9.1' : '~0.8.3';
19
- const angularMajorVersion = (0, version_utils_2.getInstalledAngularMajorVersion)(tree);
20
- const ngrxVersion = (0, version_utils_1.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularMajorVersion);
18
+ const ngrxVersion = (0, version_utils_1.versions)(tree).ngrxVersion;
21
19
  return (0, devkit_1.addDependenciesToPackageJson)(tree, {
22
20
  '@ngrx/store': ngrxVersion,
23
21
  '@ngrx/effects': ngrxVersion,
@@ -1 +1 @@
1
- {"version":3,"file":"add-ngrx-to-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-ngrx-to-package-json.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,0DAAwE;AACxE,mCAA6B;AAC7B,gEAAmF;AACnF,sDAA4E;AAC5E,6DAA4E;AAE5E,SAAgB,oBAAoB,CAAC,IAAU;IAC7C,IAAI,WAAmB,CAAC;IACxB,IAAI;QACF,WAAW,GAAG,IAAA,gCAAuB,EACnC,MAAM,EACN,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;KACH;IAAC,WAAM;QACN,WAAW,GAAG,IAAA,gCAAuB,EAAC,MAAM,EAAE,sBAAkB,CAAC,CAAC;KACnE;IACD,MAAM,qBAAqB,GAAG,IAAA,YAAG,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE9E,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,IAAA,mDAAmC,EACrD,aAAa,EACb,mBAAmB,CACpB,CAAC;IAEF,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,WAAW;QAC3B,oBAAoB,EAAE,WAAW;QACjC,uBAAuB,EAAE,WAAW;KACrC,EACD;QACE,kBAAkB,EAAE,WAAW;QAC/B,sBAAsB,EAAE,WAAW;QACnC,iBAAiB,EAAE,qBAAqB;KACzC,CACF,CAAC;AACJ,CAAC;AAjCD,oDAiCC"}
1
+ {"version":3,"file":"add-ngrx-to-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-ngrx-to-package-json.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,0DAAwE;AACxE,mCAA6B;AAC7B,sDAA4E;AAC5E,6DAAqD;AAErD,SAAgB,oBAAoB,CAAC,IAAU;IAC7C,IAAI,WAAmB,CAAC;IACxB,IAAI;QACF,WAAW,GAAG,IAAA,gCAAuB,EACnC,MAAM,EACN,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;KACH;IAAC,WAAM;QACN,WAAW,GAAG,IAAA,gCAAuB,EAAC,MAAM,EAAE,sBAAkB,CAAC,CAAC;KACnE;IAED,MAAM,qBAAqB,GAAG,IAAA,YAAG,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC9E,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,CAAC;IAE/C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,WAAW;QAC3B,oBAAoB,EAAE,WAAW;QACjC,uBAAuB,EAAE,WAAW;KACrC,EACD;QACE,kBAAkB,EAAE,WAAW;QAC/B,sBAAsB,EAAE,WAAW;QACnC,iBAAiB,EAAE,qBAAqB;KACzC,CACF,CAAC;AACJ,CAAC;AA7BD,oDA6BC"}
@@ -10,7 +10,7 @@ function setupServeTarget(host, options) {
10
10
  : '@nrwl/angular:webpack-dev-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
11
11
  if (options.mfType === 'remote') {
12
12
  appConfig.targets['serve-static'] = {
13
- executor: '@nrwl/angular:file-server',
13
+ executor: '@nrwl/web:file-server',
14
14
  defaultConfiguration: 'development',
15
15
  options: {
16
16
  buildTarget: `${options.appName}:build`,