@nx/angular 17.3.0 → 17.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/executors.d.ts +1 -1
  2. package/generators.json +6 -1
  3. package/migrations.json +6 -0
  4. package/package.json +11 -11
  5. package/plugins/component-testing.d.ts +2 -1
  6. package/src/builders/dev-server/dev-server.impl.js +6 -3
  7. package/src/builders/dev-server/schema.json +1 -1
  8. package/src/builders/webpack-browser/schema.d.ts +5 -1
  9. package/src/builders/webpack-browser/schema.json +3 -2
  10. package/src/builders/webpack-browser/webpack-browser.impl.js +4 -3
  11. package/src/executors/module-federation-dev-server/schema.json +1 -1
  12. package/src/executors/ng-packagr-lite/schema.json +1 -1
  13. package/src/executors/package/schema.json +1 -1
  14. package/src/generators/add-linting/schema.json +1 -1
  15. package/src/generators/application/files/ng-module/src/app/nx-welcome.component.ts__tpl__ +19 -0
  16. package/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__ +19 -0
  17. package/src/generators/application/schema.json +4 -4
  18. package/src/generators/component/schema.d.ts +3 -3
  19. package/src/generators/component/schema.json +2 -2
  20. package/src/generators/component-cypress-spec/schema.json +1 -1
  21. package/src/generators/component-test/schema.json +1 -1
  22. package/src/generators/convert-to-application-executor/convert-to-application-executor.d.ts +4 -0
  23. package/src/generators/convert-to-application-executor/convert-to-application-executor.js +240 -0
  24. package/src/generators/convert-to-application-executor/schema.d.ts +4 -0
  25. package/src/generators/convert-to-application-executor/schema.json +26 -0
  26. package/src/generators/directive/schema.d.ts +3 -3
  27. package/src/generators/directive/schema.json +2 -2
  28. package/src/generators/federate-module/schema.json +1 -1
  29. package/src/generators/host/host.js +2 -0
  30. package/src/generators/host/schema.json +4 -4
  31. package/src/generators/init/schema.json +1 -1
  32. package/src/generators/library/schema.json +1 -1
  33. package/src/generators/library-secondary-entry-point/schema.json +1 -1
  34. package/src/generators/move/schema.json +1 -1
  35. package/src/generators/ng-add/schema.json +1 -1
  36. package/src/generators/ngrx/schema.json +1 -1
  37. package/src/generators/ngrx-feature-store/schema.json +1 -1
  38. package/src/generators/ngrx-root-store/schema.json +1 -1
  39. package/src/generators/pipe/schema.d.ts +3 -3
  40. package/src/generators/pipe/schema.json +2 -2
  41. package/src/generators/remote/remote.js +2 -0
  42. package/src/generators/remote/schema.json +4 -4
  43. package/src/generators/scam/schema.d.ts +3 -3
  44. package/src/generators/scam/schema.json +2 -2
  45. package/src/generators/scam-directive/schema.d.ts +3 -3
  46. package/src/generators/scam-directive/schema.json +2 -2
  47. package/src/generators/scam-pipe/schema.d.ts +3 -3
  48. package/src/generators/scam-pipe/schema.json +2 -2
  49. package/src/generators/scam-to-standalone/schema.json +1 -1
  50. package/src/generators/setup-mf/schema.json +1 -1
  51. package/src/generators/setup-ssr/lib/add-hydration.js +11 -5
  52. package/src/generators/setup-ssr/lib/update-project-config.js +3 -1
  53. package/src/generators/setup-ssr/schema.json +1 -1
  54. package/src/generators/setup-ssr/setup-ssr.js +2 -1
  55. package/src/generators/setup-tailwind/schema.json +1 -1
  56. package/src/generators/stories/schema.json +1 -1
  57. package/src/generators/storybook-configuration/schema.json +4 -4
  58. package/src/generators/storybook-configuration/storybook-configuration.js +1 -1
  59. package/src/generators/utils/add-mf-env-to-inputs.d.ts +2 -0
  60. package/src/generators/utils/add-mf-env-to-inputs.js +24 -0
  61. package/src/migrations/update-17-1-0/replace-nguniversal-engines.js +2 -14
  62. package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.d.ts +2 -0
  63. package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.js +26 -0
  64. package/src/utils/targets.d.ts +2 -0
  65. package/src/utils/targets.js +17 -0
@@ -13,15 +13,15 @@ export interface Schema {
13
13
  export?: boolean;
14
14
  skipFormat?: boolean;
15
15
  /**
16
- * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
16
+ * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
17
17
  */
18
18
  flat?: boolean;
19
19
  /**
20
- * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
20
+ * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
21
21
  */
22
22
  path?: string;
23
23
  /**
24
- * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
24
+ * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
25
25
  */
26
26
  project?: string;
27
27
  }
@@ -34,7 +34,7 @@
34
34
  "$source": "projectName"
35
35
  },
36
36
  "x-dropdown": "projects",
37
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
37
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
38
38
  },
39
39
  "prefix": {
40
40
  "type": "string",
@@ -74,7 +74,7 @@
74
74
  "type": "boolean",
75
75
  "description": "When true (the default), creates the new files at the top level of the current project.",
76
76
  "default": true,
77
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
77
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
78
78
  },
79
79
  "module": {
80
80
  "type": "string",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "cli": "nx",
4
4
  "$id": "NxReactFederateModule",
5
5
  "title": "Federate Module",
@@ -8,6 +8,7 @@ const application_1 = require("../application/application");
8
8
  const remote_1 = require("../remote/remote");
9
9
  const setup_mf_1 = require("../setup-mf/setup-mf");
10
10
  const lib_1 = require("./lib");
11
+ const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
11
12
  async function host(tree, options) {
12
13
  return await hostInternal(tree, {
13
14
  projectNameAndRootFormat: 'derived',
@@ -90,6 +91,7 @@ async function hostInternal(tree, schema) {
90
91
  typescriptConfiguration,
91
92
  });
92
93
  }
94
+ (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
93
95
  if (!options.skipFormat) {
94
96
  await (0, devkit_1.formatFiles)(tree);
95
97
  }
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxMFHost",
4
4
  "cli": "nx",
5
5
  "title": "Nx Module Federation Host Application",
@@ -55,15 +55,15 @@
55
55
  },
56
56
  {
57
57
  "value": "scss",
58
- "label": "SASS(.scss) [ http://sass-lang.com ]"
58
+ "label": "SASS(.scss) [ https://sass-lang.com ]"
59
59
  },
60
60
  {
61
61
  "value": "sass",
62
- "label": "SASS(.sass) [ http://sass-lang.com ]"
62
+ "label": "SASS(.sass) [ https://sass-lang.com ]"
63
63
  },
64
64
  {
65
65
  "value": "less",
66
- "label": "LESS [ http://lesscss.org ]"
66
+ "label": "LESS [ https://lesscss.org ]"
67
67
  }
68
68
  ]
69
69
  }
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "SchematicsAngularModuleInit",
4
4
  "cli": "nx",
5
5
  "title": "Init Angular Plugin",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "GeneratorAngularLibrary",
4
4
  "title": "Create a library",
5
5
  "description": "Creates an Angular library.",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxAngularLibrarySecondaryEntryPoint",
4
4
  "title": "Creates a secondary entry point for a library",
5
5
  "description": "Creates a secondary entry point for an Angular publishable library.",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxAngularMove",
4
4
  "cli": "nx",
5
5
  "title": "Nx Angular Move",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxAngularNgAddGenerator",
4
4
  "title": "Angular plugin initialization",
5
5
  "cli": "nx",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxNgrxGenerator",
4
4
  "title": "Add NgRx support to an application or library.",
5
5
  "description": "Adds NgRx support to an application or library.",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxNgrxFeatureStoreGenerator",
4
4
  "title": "NgRx Feature Store Generator",
5
5
  "description": "Add an NgRx Feature Store to an application or library.",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxNgrxRootStoreGenerator",
4
4
  "title": "Add NgRx support to an application.",
5
5
  "description": "Adds NgRx support to an application.",
@@ -11,15 +11,15 @@ export interface Schema {
11
11
  export?: boolean;
12
12
  skipFormat?: boolean;
13
13
  /**
14
- * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
14
+ * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
15
15
  */
16
16
  flat?: boolean;
17
17
  /**
18
- * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
18
+ * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
19
19
  */
20
20
  path?: string;
21
21
  /**
22
- * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
22
+ * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
23
23
  */
24
24
  project?: string;
25
25
  }
@@ -34,13 +34,13 @@
34
34
  "$source": "projectName"
35
35
  },
36
36
  "x-dropdown": "projects",
37
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
37
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
38
38
  },
39
39
  "flat": {
40
40
  "type": "boolean",
41
41
  "default": true,
42
42
  "description": "When true (the default) creates files at the top level of the project.",
43
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
43
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
44
44
  },
45
45
  "skipTests": {
46
46
  "type": "boolean",
@@ -8,6 +8,7 @@ const application_1 = require("../application/application");
8
8
  const setup_mf_1 = require("../setup-mf/setup-mf");
9
9
  const lib_1 = require("./lib");
10
10
  const versions_1 = require("@nx/js/src/utils/versions");
11
+ const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
11
12
  async function remote(tree, options) {
12
13
  return await remoteInternal(tree, {
13
14
  projectNameAndRootFormat: 'derived',
@@ -68,6 +69,7 @@ async function remoteInternal(tree, schema) {
68
69
  });
69
70
  installTasks.push(ssrInstallTask);
70
71
  }
72
+ (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
71
73
  if (!options.skipFormat) {
72
74
  await (0, devkit_1.formatFiles)(tree);
73
75
  }
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxMFRemote",
4
4
  "cli": "nx",
5
5
  "title": "Nx Module Federation Remote App",
@@ -55,15 +55,15 @@
55
55
  },
56
56
  {
57
57
  "value": "scss",
58
- "label": "SASS(.scss) [ http://sass-lang.com ]"
58
+ "label": "SASS(.scss) [ https://sass-lang.com ]"
59
59
  },
60
60
  {
61
61
  "value": "sass",
62
- "label": "SASS(.sass) [ http://sass-lang.com ]"
62
+ "label": "SASS(.sass) [ https://sass-lang.com ]"
63
63
  },
64
64
  {
65
65
  "value": "less",
66
- "label": "LESS [ http://lesscss.org ]"
66
+ "label": "LESS [ https://lesscss.org ]"
67
67
  }
68
68
  ]
69
69
  }
@@ -19,15 +19,15 @@ export interface Schema {
19
19
  export?: boolean;
20
20
  skipFormat?: boolean;
21
21
  /**
22
- * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
22
+ * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
23
23
  */
24
24
  flat?: boolean;
25
25
  /**
26
- * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
26
+ * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
27
27
  */
28
28
  path?: string;
29
29
  /**
30
- * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
30
+ * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
31
31
  */
32
32
  project?: string;
33
33
  }
@@ -40,7 +40,7 @@
40
40
  "$source": "projectName"
41
41
  },
42
42
  "x-dropdown": "projects",
43
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
43
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
44
44
  },
45
45
  "displayBlock": {
46
46
  "description": "Specifies if the style will contain `:host { display: block; }`.",
@@ -94,7 +94,7 @@
94
94
  "type": "boolean",
95
95
  "description": "Create the new files at the top level of the current project.",
96
96
  "default": false,
97
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
97
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
98
98
  },
99
99
  "selector": {
100
100
  "type": "string",
@@ -11,15 +11,15 @@ export interface Schema {
11
11
  export?: boolean;
12
12
  skipFormat?: boolean;
13
13
  /**
14
- * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
14
+ * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
15
15
  */
16
16
  flat?: boolean;
17
17
  /**
18
- * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
18
+ * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
19
19
  */
20
20
  path?: string;
21
21
  /**
22
- * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
22
+ * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
23
23
  */
24
24
  project?: string;
25
25
  }
@@ -41,7 +41,7 @@
41
41
  "$source": "projectName"
42
42
  },
43
43
  "x-dropdown": "projects",
44
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
44
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
45
45
  },
46
46
  "skipTests": {
47
47
  "type": "boolean",
@@ -58,7 +58,7 @@
58
58
  "type": "boolean",
59
59
  "description": "Create the new files at the top level of the current project.",
60
60
  "default": true,
61
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
61
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
62
62
  },
63
63
  "selector": {
64
64
  "type": "string",
@@ -9,15 +9,15 @@ export interface Schema {
9
9
  export?: boolean;
10
10
  skipFormat?: boolean;
11
11
  /**
12
- * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
12
+ * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
13
13
  */
14
14
  flat?: boolean;
15
15
  /**
16
- * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
16
+ * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
17
17
  */
18
18
  path?: string;
19
19
  /**
20
- * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
20
+ * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
21
21
  */
22
22
  project?: string;
23
23
  }
@@ -41,7 +41,7 @@
41
41
  "$source": "projectName"
42
42
  },
43
43
  "x-dropdown": "projects",
44
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
44
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
45
45
  },
46
46
  "skipTests": {
47
47
  "type": "boolean",
@@ -58,7 +58,7 @@
58
58
  "type": "boolean",
59
59
  "description": "Create the new files at the top level of the current project.",
60
60
  "default": true,
61
- "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
61
+ "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
62
62
  },
63
63
  "export": {
64
64
  "type": "boolean",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "GeneratorAngularScamToStandalone",
4
4
  "cli": "nx",
5
5
  "title": "Convert an Inline SCAM to Standalone Component",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "GeneratorAngularMFSetup",
4
4
  "cli": "nx",
5
5
  "title": "Generate Module Federation Setup for Angular App",
@@ -2,23 +2,29 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addHydration = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
- const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
6
- const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
7
5
  const js_1 = require("@nx/js");
6
+ const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
7
+ const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
8
8
  let tsModule;
9
+ let tsquery;
9
10
  function addHydration(tree, options) {
10
11
  const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
11
12
  if (!tsModule) {
12
13
  tsModule = (0, ensure_typescript_1.ensureTypescript)();
14
+ tsquery = require('@phenomnomnominal/tsquery').tsquery;
13
15
  }
14
- const addImport = (source, symbolName, packageName, filePath, isDefault = false) => {
15
- return (0, js_1.insertImport)(tree, source, filePath, symbolName, packageName, isDefault);
16
- };
17
16
  const pathToClientConfigFile = options.standalone
18
17
  ? (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.config.ts')
19
18
  : (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.module.ts');
20
19
  const sourceText = tree.read(pathToClientConfigFile, 'utf-8');
21
20
  let sourceFile = tsModule.createSourceFile(pathToClientConfigFile, sourceText, tsModule.ScriptTarget.Latest, true);
21
+ const provideClientHydrationCallExpression = tsquery(sourceFile, 'ObjectLiteralExpression PropertyAssignment:has(Identifier[name=providers]) ArrayLiteralExpression CallExpression:has(Identifier[name=provideClientHydration])')[0];
22
+ if (provideClientHydrationCallExpression) {
23
+ return;
24
+ }
25
+ const addImport = (source, symbolName, packageName, filePath, isDefault = false) => {
26
+ return (0, js_1.insertImport)(tree, source, filePath, symbolName, packageName, isDefault);
27
+ };
22
28
  sourceFile = addImport(sourceFile, 'provideClientHydration', '@angular/platform-browser', pathToClientConfigFile);
23
29
  if (options.standalone) {
24
30
  (0, ast_utils_1.addProviderToAppConfig)(tree, pathToClientConfigFile, 'provideClientHydration()');
@@ -46,7 +46,9 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
46
46
  }
47
47
  projectConfig.targets.server = {
48
48
  dependsOn: ['build'],
49
- executor: '@angular-devkit/build-angular:server',
49
+ executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
50
+ ? '@angular-devkit/build-angular:server'
51
+ : '@nx/angular:webpack-server',
50
52
  options: {
51
53
  outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'),
52
54
  main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "GeneratorAngularUniversalSetup",
4
4
  "cli": "nx",
5
5
  "title": "Generate Angular Universal (SSR) setup for an Angular App",
@@ -8,7 +8,8 @@ async function setupSsr(tree, schema) {
8
8
  (0, lib_1.validateOptions)(tree, schema);
9
9
  const options = (0, lib_1.normalizeOptions)(tree, schema);
10
10
  const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
11
- const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application';
11
+ const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
12
+ targets.build.executor === '@nx/angular:application';
12
13
  (0, lib_1.addDependencies)(tree, isUsingApplicationBuilder);
13
14
  (0, lib_1.generateSSRFiles)(tree, options, isUsingApplicationBuilder);
14
15
  if (!options.standalone) {
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxAngularTailwindSetupGenerator",
4
4
  "cli": "nx",
5
5
  "title": "Configures Tailwind CSS for an application or a buildable/publishable library.",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxAngularStorybookStoriesGenerator",
4
4
  "title": "Create Storybook stories/specs",
5
5
  "description": "Creates Storybook stories/specs for all Angular components declared in a project.",
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "https://json-schema.org/schema",
3
3
  "$id": "NxAngularStorybookConfigurationGenerator",
4
4
  "title": "Adds Storybook configuration to a project.",
5
5
  "description": "Adds Storybook configuration to a project to be able to use and create stories.",
@@ -29,7 +29,7 @@
29
29
  "configureCypress": {
30
30
  "type": "boolean",
31
31
  "description": "Specifies whether to configure Cypress or not.",
32
- "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
32
+ "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
33
33
  },
34
34
  "generateStories": {
35
35
  "type": "boolean",
@@ -41,7 +41,7 @@
41
41
  "generateCypressSpecs": {
42
42
  "type": "boolean",
43
43
  "description": "Specifies whether to automatically generate test files in the generated Cypress e2e app.",
44
- "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
44
+ "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
45
45
  },
46
46
  "configureStaticServe": {
47
47
  "type": "boolean",
@@ -53,7 +53,7 @@
53
53
  "cypressDirectory": {
54
54
  "type": "string",
55
55
  "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
56
- "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
56
+ "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
57
57
  },
58
58
  "linter": {
59
59
  "description": "The tool to use for running lint checks.",
@@ -6,7 +6,7 @@ const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-s
6
6
  const generate_stories_1 = require("./lib/generate-stories");
7
7
  const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
8
8
  const validate_options_1 = require("./lib/validate-options");
9
- // TODO(katerina): Nx 18 -> remove Cypress
9
+ // TODO(katerina): Nx 19 -> remove Cypress
10
10
  async function storybookConfigurationGenerator(tree, options) {
11
11
  (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
12
12
  (0, validate_options_1.validateOptions)(options);
@@ -0,0 +1,2 @@
1
+ import { type Tree } from '@nx/devkit';
2
+ export declare function addMfEnvToTargetDefaultInputs(tree: Tree): void;
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.addMfEnvToTargetDefaultInputs = void 0;
4
+ const devkit_1 = require("@nx/devkit");
5
+ function addMfEnvToTargetDefaultInputs(tree) {
6
+ const nxJson = (0, devkit_1.readNxJson)(tree);
7
+ const webpackExecutor = '@nx/angular:webpack-browser';
8
+ const mfEnvVar = 'NX_MF_DEV_SERVER_STATIC_REMOTES';
9
+ nxJson.targetDefaults ??= {};
10
+ nxJson.targetDefaults[webpackExecutor] ??= {};
11
+ nxJson.targetDefaults[webpackExecutor].inputs ??= [];
12
+ let mfEnvVarExists = false;
13
+ for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
14
+ if (typeof input === 'object' && input['env'] === mfEnvVar) {
15
+ mfEnvVarExists = true;
16
+ break;
17
+ }
18
+ }
19
+ if (!mfEnvVarExists) {
20
+ nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
21
+ (0, devkit_1.updateNxJson)(tree, nxJson);
22
+ }
23
+ }
24
+ exports.addMfEnvToTargetDefaultInputs = addMfEnvToTargetDefaultInputs;
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const devkit_1 = require("@nx/devkit");
4
4
  const path_1 = require("path");
5
5
  const version_utils_1 = require("../../generators/utils/version-utils");
6
+ const targets_1 = require("../../utils/targets");
6
7
  const projects_1 = require("../utils/projects");
7
8
  const UNIVERSAL_PACKAGES = [
8
9
  '@nguniversal/common',
@@ -38,7 +39,7 @@ async function default_1(tree) {
38
39
  continue;
39
40
  }
40
41
  const outputPath = project.targets.build?.options?.outputPath;
41
- for (const [, { main }] of allTargetOptions(target)) {
42
+ for (const [, { main }] of (0, targets_1.allTargetOptions)(target)) {
42
43
  if (typeof main === 'string' &&
43
44
  typeof outputPath === 'string' &&
44
45
  tree.read(main, 'utf-8').includes('ngExpressEngine')) {
@@ -91,19 +92,6 @@ async function default_1(tree) {
91
92
  await (0, devkit_1.formatFiles)(tree);
92
93
  }
93
94
  exports.default = default_1;
94
- function* allTargetOptions(target) {
95
- if (target.options) {
96
- yield [undefined, target.options];
97
- }
98
- if (!target.configurations) {
99
- return;
100
- }
101
- for (const [name, options] of Object.entries(target.configurations)) {
102
- if (options !== undefined) {
103
- yield [name, options];
104
- }
105
- }
106
- }
107
95
  const TOKENS_FILE_CONTENT = `
108
96
  import { InjectionToken } from '@angular/core';
109
97
  import { Request, Response } from 'express';
@@ -0,0 +1,2 @@
1
+ import { type Tree } from '@nx/devkit';
2
+ export default function (tree: Tree): Promise<void>;
@@ -0,0 +1,26 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const devkit_1 = require("@nx/devkit");
4
+ const add_mf_env_to_inputs_1 = require("../../generators/utils/add-mf-env-to-inputs");
5
+ async function default_1(tree) {
6
+ if (!isWebpackBrowserUsed(tree)) {
7
+ return;
8
+ }
9
+ (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
10
+ await (0, devkit_1.formatFiles)(tree);
11
+ }
12
+ exports.default = default_1;
13
+ function isWebpackBrowserUsed(tree) {
14
+ const projects = (0, devkit_1.getProjects)(tree);
15
+ for (const project of projects.values()) {
16
+ const targets = project.targets;
17
+ for (const [_, target] of Object.entries(targets)) {
18
+ if (target.executor === '@nx/angular:webpack-browser' &&
19
+ (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.ts')) ||
20
+ tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js')))) {
21
+ return true;
22
+ }
23
+ }
24
+ }
25
+ return false;
26
+ }
@@ -0,0 +1,2 @@
1
+ import { TargetConfiguration } from '@nx/devkit';
2
+ export declare function allTargetOptions<T>(target: TargetConfiguration<T>): Iterable<[string | undefined, T]>;
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.allTargetOptions = void 0;
4
+ function* allTargetOptions(target) {
5
+ if (target.options) {
6
+ yield [undefined, target.options];
7
+ }
8
+ if (!target.configurations) {
9
+ return;
10
+ }
11
+ for (const [name, options] of Object.entries(target.configurations)) {
12
+ if (options !== undefined) {
13
+ yield [name, options];
14
+ }
15
+ }
16
+ }
17
+ exports.allTargetOptions = allTargetOptions;