nx 14.1.9 → 14.2.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (174) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/bin/{init.d.ts → compute-project-graph.d.ts} +0 -0
  3. package/bin/{init.js → compute-project-graph.js} +1 -1
  4. package/bin/compute-project-graph.js.map +1 -0
  5. package/bin/nx.js +9 -1
  6. package/bin/nx.js.map +1 -1
  7. package/bin/run-executor.js +15 -2
  8. package/bin/run-executor.js.map +1 -1
  9. package/migrations.json +6 -0
  10. package/package.json +18 -8
  11. package/presets/core.json +13 -8
  12. package/presets/npm.json +13 -7
  13. package/src/adapter/compat.js +4 -4
  14. package/src/adapter/compat.js.map +1 -1
  15. package/src/adapter/ngcli-adapter.d.ts +4 -4
  16. package/src/adapter/ngcli-adapter.js +3 -0
  17. package/src/adapter/ngcli-adapter.js.map +1 -1
  18. package/src/command-line/affected.js +8 -2
  19. package/src/command-line/affected.js.map +1 -1
  20. package/src/command-line/connect-to-nx-cloud.js +3 -3
  21. package/src/command-line/connect-to-nx-cloud.js.map +1 -1
  22. package/src/command-line/dep-graph.js +7 -7
  23. package/src/command-line/dep-graph.js.map +1 -1
  24. package/src/command-line/format.d.ts +2 -2
  25. package/src/command-line/format.js +4 -3
  26. package/src/command-line/format.js.map +1 -1
  27. package/src/command-line/generate.js +137 -45
  28. package/src/command-line/generate.js.map +1 -1
  29. package/src/command-line/init.d.ts +1 -0
  30. package/src/command-line/init.js +39 -0
  31. package/src/command-line/init.js.map +1 -0
  32. package/src/command-line/lint.js +2 -2
  33. package/src/command-line/lint.js.map +1 -1
  34. package/src/command-line/list.js +2 -2
  35. package/src/command-line/list.js.map +1 -1
  36. package/src/command-line/migrate.js +9 -0
  37. package/src/command-line/migrate.js.map +1 -1
  38. package/src/command-line/nx-commands.js +60 -9
  39. package/src/command-line/nx-commands.js.map +1 -1
  40. package/src/command-line/print-affected.js +10 -10
  41. package/src/command-line/print-affected.js.map +1 -1
  42. package/src/command-line/read-environment.js +3 -3
  43. package/src/command-line/read-environment.js.map +1 -1
  44. package/src/command-line/report.js +3 -3
  45. package/src/command-line/report.js.map +1 -1
  46. package/src/command-line/run-many.js +2 -2
  47. package/src/command-line/run-many.js.map +1 -1
  48. package/src/command-line/run-one.js +4 -6
  49. package/src/command-line/run-one.js.map +1 -1
  50. package/src/command-line/run.d.ts +2 -2
  51. package/src/command-line/run.js.map +1 -1
  52. package/src/command-line/workspace-generators.js +2 -2
  53. package/src/command-line/workspace-generators.js.map +1 -1
  54. package/src/config/configuration.d.ts +11 -0
  55. package/src/config/configuration.js +26 -0
  56. package/src/config/configuration.js.map +1 -0
  57. package/src/config/misc-interfaces.d.ts +3 -3
  58. package/src/config/workspace-json-project-json.d.ts +8 -4
  59. package/src/config/workspaces.d.ts +11 -7
  60. package/src/config/workspaces.js +29 -23
  61. package/src/config/workspaces.js.map +1 -1
  62. package/src/core/dep-graph/main.esm.js +1 -1
  63. package/src/daemon/client/client.js +3 -3
  64. package/src/daemon/client/client.js.map +1 -1
  65. package/src/daemon/server/project-graph-incremental-recomputation.js +3 -3
  66. package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
  67. package/src/daemon/server/server.js +7 -7
  68. package/src/daemon/server/server.js.map +1 -1
  69. package/src/daemon/server/shutdown-utils.js +2 -2
  70. package/src/daemon/server/shutdown-utils.js.map +1 -1
  71. package/src/daemon/server/watcher.js +10 -10
  72. package/src/daemon/server/watcher.js.map +1 -1
  73. package/src/generators/utils/project-configuration.d.ts +3 -3
  74. package/src/generators/utils/project-configuration.js.map +1 -1
  75. package/src/hasher/file-hasher-base.js +4 -4
  76. package/src/hasher/file-hasher-base.js.map +1 -1
  77. package/src/hasher/file-hasher.js +2 -2
  78. package/src/hasher/file-hasher.js.map +1 -1
  79. package/src/hasher/git-based-file-hasher.js +5 -5
  80. package/src/hasher/git-based-file-hasher.js.map +1 -1
  81. package/src/hasher/hasher.js +4 -4
  82. package/src/hasher/hasher.js.map +1 -1
  83. package/src/hasher/node-based-file-hasher.js +6 -6
  84. package/src/hasher/node-based-file-hasher.js.map +1 -1
  85. package/src/migrations/update-14-2-0/remove-default-collection.d.ts +2 -0
  86. package/src/migrations/update-14-2-0/remove-default-collection.js +19 -0
  87. package/src/migrations/update-14-2-0/remove-default-collection.js.map +1 -0
  88. package/src/project-graph/affected/affected-project-graph.d.ts +2 -2
  89. package/src/project-graph/affected/affected-project-graph.js +2 -1
  90. package/src/project-graph/affected/affected-project-graph.js.map +1 -1
  91. package/src/project-graph/build-nodes/npm-packages.js +2 -2
  92. package/src/project-graph/build-nodes/npm-packages.js.map +1 -1
  93. package/src/project-graph/build-nodes/workspace-projects.js +2 -2
  94. package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
  95. package/src/project-graph/build-project-graph.d.ts +2 -2
  96. package/src/project-graph/build-project-graph.js +5 -5
  97. package/src/project-graph/build-project-graph.js.map +1 -1
  98. package/src/project-graph/file-utils.d.ts +1 -17
  99. package/src/project-graph/file-utils.js +8 -48
  100. package/src/project-graph/file-utils.js.map +1 -1
  101. package/src/project-graph/nx-deps-cache.d.ts +2 -2
  102. package/src/project-graph/nx-deps-cache.js.map +1 -1
  103. package/src/project-graph/project-graph.js +2 -1
  104. package/src/project-graph/project-graph.js.map +1 -1
  105. package/src/tasks-runner/batch/run-batch.js +6 -6
  106. package/src/tasks-runner/batch/run-batch.js.map +1 -1
  107. package/src/tasks-runner/cache.js +2 -2
  108. package/src/tasks-runner/cache.js.map +1 -1
  109. package/src/tasks-runner/create-task-graph.d.ts +21 -0
  110. package/src/tasks-runner/create-task-graph.js +138 -0
  111. package/src/tasks-runner/create-task-graph.js.map +1 -0
  112. package/src/tasks-runner/default-tasks-runner.js +2 -5
  113. package/src/tasks-runner/default-tasks-runner.js.map +1 -1
  114. package/src/tasks-runner/forked-process-task-runner.js +10 -4
  115. package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
  116. package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +12 -12
  117. package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
  118. package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +1 -1
  119. package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
  120. package/src/tasks-runner/run-command.d.ts +0 -12
  121. package/src/tasks-runner/run-command.js +30 -193
  122. package/src/tasks-runner/run-command.js.map +1 -1
  123. package/src/tasks-runner/task-graph-utils.d.ts +3 -0
  124. package/src/tasks-runner/task-graph-utils.js +56 -0
  125. package/src/tasks-runner/task-graph-utils.js.map +1 -0
  126. package/src/tasks-runner/task-orchestrator.d.ts +3 -1
  127. package/src/tasks-runner/task-orchestrator.js +23 -11
  128. package/src/tasks-runner/task-orchestrator.js.map +1 -1
  129. package/src/tasks-runner/tasks-runner-v2.d.ts +2 -0
  130. package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
  131. package/src/tasks-runner/tasks-runner.d.ts +4 -1
  132. package/src/tasks-runner/tasks-schedule.js +0 -4
  133. package/src/tasks-runner/tasks-schedule.js.map +1 -1
  134. package/src/tasks-runner/utils.js +2 -2
  135. package/src/tasks-runner/utils.js.map +1 -1
  136. package/src/utils/add-command-prefix.d.ts +5 -0
  137. package/src/utils/add-command-prefix.js +59 -0
  138. package/src/utils/add-command-prefix.js.map +1 -0
  139. package/src/utils/cache-directory.js +2 -2
  140. package/src/utils/cache-directory.js.map +1 -1
  141. package/src/utils/command-line-utils.d.ts +6 -8
  142. package/src/utils/command-line-utils.js +9 -13
  143. package/src/utils/command-line-utils.js.map +1 -1
  144. package/src/utils/find-workspace-root.js +9 -7
  145. package/src/utils/find-workspace-root.js.map +1 -1
  146. package/src/utils/nx-plugin.js +10 -10
  147. package/src/utils/nx-plugin.js.map +1 -1
  148. package/src/utils/output.d.ts +1 -1
  149. package/src/utils/output.js +2 -2
  150. package/src/utils/output.js.map +1 -1
  151. package/src/utils/params.d.ts +2 -2
  152. package/src/utils/params.js.map +1 -1
  153. package/src/utils/plugins/models.d.ts +3 -14
  154. package/src/utils/plugins/plugin-capabilities.js +2 -2
  155. package/src/utils/plugins/plugin-capabilities.js.map +1 -1
  156. package/src/utils/register.d.ts +8 -1
  157. package/src/utils/register.js +81 -10
  158. package/src/utils/register.js.map +1 -1
  159. package/src/utils/target-project-locator.js +2 -2
  160. package/src/utils/target-project-locator.js.map +1 -1
  161. package/src/utils/typescript.js +5 -5
  162. package/src/utils/typescript.js.map +1 -1
  163. package/src/utils/versions.d.ts +6 -4
  164. package/src/utils/versions.js +7 -5
  165. package/src/utils/versions.js.map +1 -1
  166. package/src/utils/{app-root.d.ts → workspace-root.d.ts} +5 -4
  167. package/src/utils/workspace-root.js +41 -0
  168. package/src/utils/workspace-root.js.map +1 -0
  169. package/bin/init.js.map +0 -1
  170. package/src/tasks-runner/task-graph-creator.d.ts +0 -13
  171. package/src/tasks-runner/task-graph-creator.js +0 -71
  172. package/src/tasks-runner/task-graph-creator.js.map +0 -1
  173. package/src/utils/app-root.js +0 -39
  174. package/src/utils/app-root.js.map +0 -1
package/src/command-line/dep-graph.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateGraph = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const app_root_1 = require("nx/src/utils/app-root");
5
+ const workspace_root_1 = require("nx/src/utils/workspace-root");
6
6
  const chokidar_1 = require("chokidar");
7
7
  const crypto_1 = require("crypto");
8
8
  const fs_1 = require("fs");
@@ -13,7 +13,7 @@ const open = require("open");
13
13
  const path_1 = require("path");
14
14
  const perf_hooks_1 = require("perf_hooks");
15
15
  const url_1 = require("url");
16
- const file_utils_1 = require("../project-graph/file-utils");
16
+ const configuration_1 = require("../config/configuration");
17
17
  const file_hasher_1 = require("../hasher/file-hasher");
18
18
  const output_1 = require("../utils/output");
19
19
  const fileutils_1 = require("../utils/fileutils");
@@ -110,7 +110,7 @@ function filterGraph(graph, focus, exclude) {
110
110
  function generateGraph(args, affectedProjects) {
111
111
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
112
112
  let graph = (0, operators_1.pruneExternalNodes)(yield (0, project_graph_1.createProjectGraphAsync)());
113
- const layout = (0, file_utils_1.workspaceLayout)();
113
+ const layout = (0, configuration_1.workspaceLayout)();
114
114
  const projects = Object.values(graph.nodes);
115
115
  projects.sort((a, b) => {
116
116
  return a.name.localeCompare(b.name);
@@ -142,7 +142,7 @@ function generateGraph(args, affectedProjects) {
142
142
  let html = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../core/dep-graph/index.html'), 'utf-8');
143
143
  graph = filterGraph(graph, args.focus || null, args.exclude || []);
144
144
  if (args.file) {
145
- const workspaceFolder = app_root_1.workspaceRoot;
145
+ const workspaceFolder = workspace_root_1.workspaceRoot;
146
146
  const ext = (0, path_1.extname)(args.file);
147
147
  const fullFilePath = (0, path_1.isAbsolute)(args.file)
148
148
  ? args.file
@@ -299,7 +299,7 @@ function getIgnoredGlobs(root) {
299
299
  return ig;
300
300
  }
301
301
  function startWatcher() {
302
- createFileWatcher(app_root_1.workspaceRoot, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
302
+ createFileWatcher(workspace_root_1.workspaceRoot, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
303
303
  output_1.output.note({ title: 'Recalculating project graph...' });
304
304
  const newGraphClientResponse = yield createDepGraphClientResponse();
305
305
  if (newGraphClientResponse.hash !== currentDepGraphClientResponse.hash) {
@@ -322,7 +322,7 @@ function debounce(fn, time) {
322
322
  }
323
323
  function createFileWatcher(root, changeHandler) {
324
324
  const ignoredGlobs = getIgnoredGlobs(root);
325
- const layout = (0, file_utils_1.workspaceLayout)();
325
+ const layout = (0, configuration_1.workspaceLayout)();
326
326
  const watcher = (0, chokidar_1.watch)([
327
327
  (0, path_2.joinPathFragments)(layout.appsDir, '**'),
328
328
  (0, path_2.joinPathFragments)(layout.libsDir, '**'),
@@ -344,7 +344,7 @@ function createDepGraphClientResponse(affected = []) {
344
344
  let graph = (0, operators_1.pruneExternalNodes)(yield (0, project_graph_1.createProjectGraphAsync)());
345
345
  perf_hooks_1.performance.mark('project graph watch calculation:end');
346
346
  perf_hooks_1.performance.mark('project graph response generation:start');
347
- const layout = (0, file_utils_1.workspaceLayout)();
347
+ const layout = (0, configuration_1.workspaceLayout)();
348
348
  const projects = Object.values(graph.nodes).map((project) => ({
349
349
  name: project.name,
350
350
  type: project.type,
package/src/command-line/dep-graph.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dep-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/dep-graph.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dep-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/dep-graph.ts"],"names":[],"mappings":"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"}
package/src/command-line/format.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import * as yargs from 'yargs';
2
2
  import { NxJsonConfiguration } from '../config/nx-json';
3
- import { ProjectConfiguration, WorkspaceJsonConfiguration } from '../config/workspace-json-project-json';
3
+ import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
4
4
  export declare function format(command: 'check' | 'write', args: yargs.Arguments): Promise<void>;
5
- export declare function moveTagsAndImplicitDepsFromNxJsonToWorkspaceJson(workspaceJson: WorkspaceJsonConfiguration, nxJson: NxJsonConfiguration & {
5
+ export declare function moveTagsAndImplicitDepsFromNxJsonToWorkspaceJson(workspaceJson: ProjectsConfigurations, nxJson: NxJsonConfiguration & {
6
6
  projects: Record<string, Pick<ProjectConfiguration, 'tags' | 'implicitDependencies'>>;
7
7
  }): void;
package/src/command-line/format.js CHANGED
@@ -8,23 +8,24 @@ const command_line_utils_1 = require("../utils/command-line-utils");
8
8
  const fileutils_1 = require("../utils/fileutils");
9
9
  const file_utils_1 = require("../project-graph/file-utils");
10
10
  const workspaces_1 = require("../config/workspaces");
11
- const app_root_1 = require("../utils/app-root");
11
+ const workspace_root_1 = require("../utils/workspace-root");
12
12
  const prettier = require("prettier");
13
13
  const object_sort_1 = require("../utils/object-sort");
14
14
  const typescript_1 = require("../utils/typescript");
15
15
  const fileutils_2 = require("../utils/fileutils");
16
16
  const project_graph_1 = require("../project-graph/project-graph");
17
17
  const affected_project_graph_1 = require("../project-graph/affected/affected-project-graph");
18
+ const configuration_1 = require("../config/configuration");
18
19
  const PRETTIER_PATH = require.resolve('prettier/bin-prettier');
19
20
  function format(command, args) {
20
21
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
21
- const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected');
22
+ const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: true }, (0, configuration_1.readNxJson)());
22
23
  const patterns = (yield getPatterns(Object.assign(Object.assign({}, args), nxArgs))).map((p) => `"${p}"`);
23
24
  // Chunkify the patterns array to prevent crashing the windows terminal
24
25
  const chunkList = chunkify(patterns, 50);
25
26
  switch (command) {
26
27
  case 'write':
27
- const workspaceJsonPath = (0, workspaces_1.workspaceConfigName)(app_root_1.workspaceRoot);
28
+ const workspaceJsonPath = (0, workspaces_1.workspaceConfigName)(workspace_root_1.workspaceRoot);
28
29
  if (workspaceJsonPath) {
29
30
  updateWorkspaceJsonToMatchFormatVersion(workspaceJsonPath);
30
31
  sortWorkspaceJson(workspaceJsonPath);
package/src/command-line/format.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":"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"}
package/src/command-line/generate.js CHANGED
@@ -7,8 +7,10 @@ const workspaces_1 = require("../config/workspaces");
7
7
  const tree_1 = require("../generators/tree");
8
8
  const logger_1 = require("../utils/logger");
9
9
  const chalk = require("chalk");
10
- const app_root_1 = require("../utils/app-root");
10
+ const workspace_root_1 = require("../utils/workspace-root");
11
11
  const print_help_1 = require("../utils/print-help");
12
+ const enquirer_1 = require("enquirer");
13
+ const fileutils_1 = require("nx/src/utils/fileutils");
12
14
  function printChanges(fileChanges) {
13
15
  fileChanges.forEach((f) => {
14
16
  if (f.type === 'CREATE') {
@@ -22,51 +24,141 @@ function printChanges(fileChanges) {
22
24
  }
23
25
  });
24
26
  }
25
- function convertToGenerateOptions(generatorOptions, defaultCollectionName, mode) {
26
- let collectionName = null;
27
- let generatorName = null;
28
- if (mode === 'generate') {
29
- const generatorDescriptor = generatorOptions['generator'];
30
- const separatorIndex = generatorDescriptor.lastIndexOf(':');
31
- if (separatorIndex > 0) {
32
- collectionName = generatorDescriptor.slice(0, separatorIndex);
33
- generatorName = generatorDescriptor.slice(separatorIndex + 1);
27
+ function promptForCollection(generatorName, ws, interactive) {
28
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
29
+ const packageJson = (0, fileutils_1.readJsonFile)(`${workspace_root_1.workspaceRoot}/package.json`);
30
+ const collections = Array.from(new Set([
31
+ ...Object.keys(packageJson.dependencies || {}),
32
+ ...Object.keys(packageJson.devDependencies || {}),
33
+ ]));
34
+ const choices = collections
35
+ .map((collectionName) => {
36
+ try {
37
+ const generator = ws.readGenerator(collectionName, generatorName);
38
+ return `${collectionName}:${generator.normalizedGeneratorName}`;
39
+ }
40
+ catch (_a) {
41
+ return null;
42
+ }
43
+ })
44
+ .filter((c) => !!c);
45
+ if (choices.length === 1) {
46
+ return choices[0];
47
+ }
48
+ else if (!interactive && choices.length > 1) {
49
+ throwInvalidInvocation(choices);
50
+ }
51
+ else if (interactive && choices.length > 1) {
52
+ const noneOfTheAbove = `None of the above`;
53
+ choices.push(noneOfTheAbove);
54
+ let { generator, customCollection } = yield (0, enquirer_1.prompt)([
55
+ {
56
+ name: 'generator',
57
+ message: `Which generator would you like to use?`,
58
+ type: 'autocomplete',
59
+ choices,
60
+ },
61
+ {
62
+ name: 'customCollection',
63
+ type: 'input',
64
+ message: `Which collection would you like to use?`,
65
+ skip: function () {
66
+ // Skip this question if the user did not answer None of the above
67
+ return this.state.answers.generator !== noneOfTheAbove;
68
+ },
69
+ validate: function (value) {
70
+ if (this.skipped) {
71
+ return true;
72
+ }
73
+ try {
74
+ ws.readGenerator(value, generatorName);
75
+ return true;
76
+ }
77
+ catch (_a) {
78
+ logger_1.logger.error(`\nCould not find ${value}:${generatorName}`);
79
+ return false;
80
+ }
81
+ },
82
+ },
83
+ ]);
84
+ return customCollection
85
+ ? `${customCollection}:${generatorName}`
86
+ : generator;
34
87
  }
35
88
  else {
36
- collectionName = defaultCollectionName;
37
- generatorName = generatorDescriptor;
89
+ throw new Error(`Could not find any generators named "${generatorName}"`);
38
90
  }
91
+ });
92
+ }
93
+ function parseGeneratorString(value) {
94
+ const separatorIndex = value.lastIndexOf(':');
95
+ if (separatorIndex > 0) {
96
+ return {
97
+ collection: value.slice(0, separatorIndex),
98
+ generator: value.slice(separatorIndex + 1),
99
+ };
39
100
  }
40
101
  else {
41
- collectionName = generatorOptions.collection;
42
- generatorName = 'new';
43
- }
44
- if (!collectionName) {
45
- throwInvalidInvocation();
102
+ return {
103
+ generator: value,
104
+ };
46
105
  }
47
- const res = {
48
- collectionName,
49
- generatorName,
50
- generatorOptions,
51
- help: generatorOptions.help,
52
- dryRun: generatorOptions.dryRun,
53
- interactive: generatorOptions.interactive,
54
- defaults: generatorOptions.defaults,
55
- };
56
- delete generatorOptions.d;
57
- delete generatorOptions.dryRun;
58
- delete generatorOptions['dry-run'];
59
- delete generatorOptions.interactive;
60
- delete generatorOptions.help;
61
- delete generatorOptions.collection;
62
- delete generatorOptions.verbose;
63
- delete generatorOptions.generator;
64
- delete generatorOptions['--'];
65
- delete generatorOptions['$0'];
66
- return res;
67
106
  }
68
- function throwInvalidInvocation() {
69
- throw new Error(`Specify the generator name (e.g., nx generate @nrwl/workspace:library)`);
107
+ function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, mode) {
108
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
109
+ let collectionName = null;
110
+ let generatorName = null;
111
+ const interactive = generatorOptions.interactive;
112
+ if (mode === 'generate') {
113
+ const generatorDescriptor = generatorOptions['generator'];
114
+ const { collection, generator } = parseGeneratorString(generatorDescriptor);
115
+ if (collection) {
116
+ collectionName = collection;
117
+ generatorName = generator;
118
+ }
119
+ else if (!defaultCollectionName) {
120
+ const generatorString = yield promptForCollection(generatorDescriptor, ws, interactive);
121
+ const parsedGeneratorString = parseGeneratorString(generatorString);
122
+ collectionName = parsedGeneratorString.collection;
123
+ generatorName = parsedGeneratorString.generator;
124
+ }
125
+ else {
126
+ collectionName = defaultCollectionName;
127
+ generatorName = generatorDescriptor;
128
+ }
129
+ }
130
+ else {
131
+ collectionName = generatorOptions.collection;
132
+ generatorName = 'new';
133
+ }
134
+ if (!collectionName) {
135
+ throwInvalidInvocation(['@nrwl/workspace:library']);
136
+ }
137
+ logger_1.logger.info(`NX Generating ${collectionName}:${generatorName}`);
138
+ const res = {
139
+ collectionName,
140
+ generatorName,
141
+ generatorOptions,
142
+ help: generatorOptions.help,
143
+ dryRun: generatorOptions.dryRun,
144
+ interactive,
145
+ defaults: generatorOptions.defaults,
146
+ };
147
+ delete generatorOptions.d;
148
+ delete generatorOptions.dryRun;
149
+ delete generatorOptions['dry-run'];
150
+ delete generatorOptions.interactive;
151
+ delete generatorOptions.help;
152
+ delete generatorOptions.collection;
153
+ delete generatorOptions.verbose;
154
+ delete generatorOptions.generator;
155
+ delete generatorOptions['--'];
156
+ delete generatorOptions['$0'];
157
+ return res;
158
+ });
159
+ }
160
+ function throwInvalidInvocation(availableGenerators) {
161
+ throw new Error(`Specify the generator name (e.g., nx generate ${availableGenerators.join(', ')})`);
70
162
  }
71
163
  function readDefaultCollection(nxConfig) {
72
164
  return nxConfig.cli ? nxConfig.cli.defaultCollection : null;
@@ -85,7 +177,7 @@ function newWorkspace(cwd, args) {
85
177
  const ws = new workspaces_1.Workspaces(null);
86
178
  const isVerbose = args['verbose'];
87
179
  return (0, params_1.handleErrors)(isVerbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
88
- const opts = convertToGenerateOptions(args, null, 'new');
180
+ const opts = yield convertToGenerateOptions(args, ws, null, 'new');
89
181
  const { normalizedGeneratorName, schema, implementationFactory } = ws.readGenerator(opts.collectionName, opts.generatorName);
90
182
  const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, null, schema, opts.interactive, null, null, isVerbose);
91
183
  if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {
@@ -113,11 +205,11 @@ function newWorkspace(cwd, args) {
113
205
  exports.newWorkspace = newWorkspace;
114
206
  function generate(cwd, args) {
115
207
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
116
- const ws = new workspaces_1.Workspaces(app_root_1.workspaceRoot);
208
+ const ws = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
117
209
  const isVerbose = args['verbose'];
118
210
  return (0, params_1.handleErrors)(isVerbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
119
211
  const workspaceDefinition = ws.readWorkspaceConfiguration();
120
- const opts = convertToGenerateOptions(args, readDefaultCollection(workspaceDefinition), 'generate');
212
+ const opts = yield convertToGenerateOptions(args, ws, readDefaultCollection(workspaceDefinition), 'generate');
121
213
  const { normalizedGeneratorName, schema, implementationFactory, aliases } = ws.readGenerator(opts.collectionName, opts.generatorName);
122
214
  if (opts.help) {
123
215
  printGenHelp(opts, schema, normalizedGeneratorName, aliases);
@@ -125,13 +217,13 @@ function generate(cwd, args) {
125
217
  }
126
218
  const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, workspaceDefinition, schema, opts.interactive, ws.calculateDefaultProjectName(cwd, workspaceDefinition), ws.relativeCwd(cwd), isVerbose);
127
219
  if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {
128
- const host = new tree_1.FsTree(app_root_1.workspaceRoot, isVerbose);
220
+ const host = new tree_1.FsTree(workspace_root_1.workspaceRoot, isVerbose);
129
221
  const implementation = implementationFactory();
130
222
  const task = yield implementation(host, combinedOpts);
131
223
  const changes = host.listChanges();
132
224
  printChanges(changes);
133
225
  if (!opts.dryRun) {
134
- (0, tree_1.flushChanges)(app_root_1.workspaceRoot, changes);
226
+ (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, changes);
135
227
  if (task) {
136
228
  yield task();
137
229
  }
@@ -142,7 +234,7 @@ function generate(cwd, args) {
142
234
  }
143
235
  else {
144
236
  require('../adapter/compat');
145
- return (yield Promise.resolve().then(() => require('../adapter/ngcli-adapter'))).generate(app_root_1.workspaceRoot, Object.assign(Object.assign({}, opts), { generatorOptions: combinedOpts }), isVerbose);
237
+ return (yield Promise.resolve().then(() => require('../adapter/ngcli-adapter'))).generate(workspace_root_1.workspaceRoot, Object.assign(Object.assign({}, opts), { generatorOptions: combinedOpts }), isVerbose);
146
238
  }
147
239
  }));
148
240
  });
package/src/command-line/generate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":"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"}
package/src/command-line/init.d.ts ADDED
@@ -0,0 +1 @@
1
+ export declare function initHandler(): void;
package/src/command-line/init.js ADDED
@@ -0,0 +1,39 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.initHandler = void 0;
4
+ const child_process_1 = require("child_process");
5
+ const path_1 = require("path");
6
+ const output_1 = require("../utils/output");
7
+ const package_manager_1 = require("../utils/package-manager");
8
+ const workspace_root_1 = require("../utils/workspace-root");
9
+ const fileutils_1 = require("../utils/fileutils");
10
+ function initHandler() {
11
+ const nxIsInstalled = !!(0, child_process_1.execSync)((0, package_manager_1.getPackageManagerCommand)().list)
12
+ .toString()
13
+ .split('\n')
14
+ .find((line) => line.indexOf(' nx@') > -1);
15
+ if (nxIsInstalled) {
16
+ output_1.output.log({
17
+ title: 'Nx is already installed',
18
+ });
19
+ }
20
+ else {
21
+ output_1.output.log({
22
+ title: 'Installing Nx...',
23
+ });
24
+ (0, child_process_1.execSync)(`${(0, package_manager_1.getPackageManagerCommand)().addDev} nx@latest`, {
25
+ stdio: [0, 1, 2],
26
+ });
27
+ output_1.output.success({
28
+ title: 'Nx has been installed',
29
+ });
30
+ }
31
+ if (!(0, workspace_root_1.fileExists)('nx.json')) {
32
+ (0, fileutils_1.writeJsonFile)('nx.json', (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '..', '..', 'presets', 'core.json')));
33
+ output_1.output.success({
34
+ title: 'nx.json has been created',
35
+ });
36
+ }
37
+ }
38
+ exports.initHandler = initHandler;
39
+ //# sourceMappingURL=init.js.map
package/src/command-line/init.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,+BAA4B;AAC5B,4CAAyC;AACzC,8DAAoE;AACpE,4DAAqD;AACrD,kDAAiE;AAEjE,SAAgB,WAAW;IACzB,MAAM,aAAa,GAAG,CAAC,CAAC,IAAA,wBAAQ,EAAC,IAAA,0CAAwB,GAAE,CAAC,IAAI,CAAC;SAC9D,QAAQ,EAAE;SACV,KAAK,CAAC,IAAI,CAAC;SACX,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE7C,IAAI,aAAa,EAAE;QACjB,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,yBAAyB;SACjC,CAAC,CAAC;KACJ;SAAM;QACL,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,kBAAkB;SAC1B,CAAC,CAAC;QACH,IAAA,wBAAQ,EAAC,GAAG,IAAA,0CAAwB,GAAE,CAAC,MAAM,YAAY,EAAE;YACzD,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,eAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,uBAAuB;SAC/B,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,IAAA,2BAAU,EAAC,SAAS,CAAC,EAAE;QAC1B,IAAA,yBAAa,EACX,SAAS,EACT,IAAA,wBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAClE,CAAC;QAEF,eAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,0BAA0B;SAClC,CAAC,CAAC;KACJ;AACH,CAAC;AAhCD,kCAgCC"}
package/src/command-line/lint.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.workspaceLint = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const workspace_integrity_checks_1 = require("./workspace-integrity-checks");
6
- const file_utils_1 = require("../project-graph/file-utils");
6
+ const configuration_1 = require("../config/configuration");
7
7
  const output_1 = require("../utils/output");
8
8
  const path = require("path");
9
9
  const project_graph_1 = require("../project-graph/project-graph");
@@ -24,7 +24,7 @@ function workspaceLint() {
24
24
  }
25
25
  exports.workspaceLint = workspaceLint;
26
26
  function readAllFilesFromAppsAndLibs(allWorkspaceFiles) {
27
- const wl = (0, file_utils_1.workspaceLayout)();
27
+ const wl = (0, configuration_1.workspaceLayout)();
28
28
  return allWorkspaceFiles
29
29
  .map((f) => f.file)
30
30
  .filter((f) => f.startsWith(`${wl.appsDir}/`) || f.startsWith(`${wl.libsDir}/`))
package/src/command-line/lint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/lint.ts"],"names":[],"mappings":";;;;AAAA,6EAAwE;AACxE,4DAAwE;AACxE,4CAAyC;AACzC,6BAA6B;AAC7B,kEAAyE;AACzE,0DAAgE;AAEhE,SAAsB,aAAa;;QACjC,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QAClD,MAAM,YAAY,GAAG,IAAA,8BAAkB,EAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,qBAAqB,GAAG,IAAI,qDAAwB,CACxD,YAAY,EACZ,2BAA2B,CAAC,iBAAiB,CAAC,CAC/C,CAAC,GAAG,EAAE,CAAC;QAER,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,qBAAqB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBAC5C,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAhBD,sCAgBC;AAED,SAAS,2BAA2B,CAAC,iBAA6B;IAChE,MAAM,EAAE,GAAG,IAAA,4BAAe,GAAE,CAAC;IAC7B,OAAO,iBAAiB;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,GAAG,CAAC,CACxE;SACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AACtD,CAAC"}
1
+ {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/lint.ts"],"names":[],"mappings":";;;;AAAA,6EAAwE;AAExE,2DAA0D;AAC1D,4CAAyC;AACzC,6BAA6B;AAC7B,kEAAyE;AACzE,0DAAgE;AAEhE,SAAsB,aAAa;;QACjC,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QAClD,MAAM,YAAY,GAAG,IAAA,8BAAkB,EAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,qBAAqB,GAAG,IAAI,qDAAwB,CACxD,YAAY,EACZ,2BAA2B,CAAC,iBAAiB,CAAC,CAC/C,CAAC,GAAG,EAAE,CAAC;QAER,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,qBAAqB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBAC5C,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAhBD,sCAgBC;AAED,SAAS,2BAA2B,CAAC,iBAA6B;IAChE,MAAM,EAAE,GAAG,IAAA,+BAAe,GAAE,CAAC;IAC7B,OAAO,iBAAiB;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,GAAG,CAAC,CACxE;SACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AACtD,CAAC"}
package/src/command-line/list.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.listHandler = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const app_root_1 = require("../utils/app-root");
5
+ const workspace_root_1 = require("../utils/workspace-root");
6
6
  const output_1 = require("../utils/output");
7
7
  const plugins_1 = require("../utils/plugins");
8
8
  /**
@@ -27,7 +27,7 @@ function listHandler(args) {
27
27
  });
28
28
  return [];
29
29
  });
30
- const installedPlugins = (0, plugins_1.getInstalledPluginsFromPackageJson)(app_root_1.workspaceRoot, corePlugins, communityPlugins);
30
+ const installedPlugins = (0, plugins_1.getInstalledPluginsFromPackageJson)(workspace_root_1.workspaceRoot, corePlugins, communityPlugins);
31
31
  (0, plugins_1.listInstalledPlugins)(installedPlugins);
32
32
  (0, plugins_1.listCorePlugins)(installedPlugins, corePlugins);
33
33
  (0, plugins_1.listCommunityPlugins)(installedPlugins, communityPlugins);
package/src/command-line/list.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/list.ts"],"names":[],"mappings":";;;;AAAA,gDAAkD;AAClD,4CAAyC;AACzC,8CAQ0B;AAO1B;;;;;;;GAOG;AACH,SAAsB,WAAW,CAAC,IAAc;;QAC9C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAA,gCAAsB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,IAAA,0BAAgB,GAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAqB,GAAE,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChE,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,oBAAoB;oBAC3B,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAC;gBAEH,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,IAAA,4CAAkC,EACzD,wBAAa,EACb,WAAW,EACX,gBAAgB,CACjB,CAAC;YACF,IAAA,8BAAoB,EAAC,gBAAgB,CAAC,CAAC;YACvC,IAAA,yBAAe,EAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;YAC/C,IAAA,8BAAoB,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;YAEzD,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,yCAAyC;aACjD,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AA3BD,kCA2BC"}
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/list.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,4CAAyC;AACzC,8CAQ0B;AAO1B;;;;;;;GAOG;AACH,SAAsB,WAAW,CAAC,IAAc;;QAC9C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAA,gCAAsB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,IAAA,0BAAgB,GAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAqB,GAAE,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChE,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,oBAAoB;oBAC3B,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAC;gBAEH,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,IAAA,4CAAkC,EACzD,8BAAa,EACb,WAAW,EACX,gBAAgB,CACjB,CAAC;YACF,IAAA,8BAAoB,EAAC,gBAAgB,CAAC,CAAC;YACvC,IAAA,yBAAe,EAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;YAC/C,IAAA,8BAAoB,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;YAEzD,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,yCAAyC;aACjD,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AA3BD,kCA2BC"}
package/src/command-line/migrate.js CHANGED
@@ -626,6 +626,7 @@ function runMigrations(root, opts, isVerbose, shouldCreateCommits = false, commi
626
626
  }
627
627
  logger_1.logger.info(`NX Running migrations from '${opts.runMigrations}'` +
628
628
  (shouldCreateCommits ? ', with each applied in a dedicated commit' : ''));
629
+ const depsBeforeMigrations = getStringifiedPackageJsonDeps(root);
629
630
  const migrations = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, opts.runMigrations)).migrations;
630
631
  for (const m of migrations) {
631
632
  logger_1.logger.info(`Running migration ${m.name}`);
@@ -658,9 +659,17 @@ function runMigrations(root, opts, isVerbose, shouldCreateCommits = false, commi
658
659
  }
659
660
  logger_1.logger.info(`---------------------------------------------------------`);
660
661
  }
662
+ const depsAfterMigrations = getStringifiedPackageJsonDeps(root);
663
+ if (depsBeforeMigrations !== depsAfterMigrations) {
664
+ runInstall();
665
+ }
661
666
  logger_1.logger.info(`NX Successfully finished running migrations from '${opts.runMigrations}'`);
662
667
  });
663
668
  }
669
+ function getStringifiedPackageJsonDeps(root) {
670
+ const { dependencies, devDependencies } = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
671
+ return JSON.stringify([dependencies, devDependencies]);
672
+ }
664
673
  function commitChangesIfAny(commitMessage) {
665
674
  try {
666
675
  if ((0, child_process_1.execSync)('git ls-files -m -d -o --exclude-standard').toString() === '') {