@nrwl/workspace 13.4.0-beta.1 → 13.4.1-beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (128) hide show
  1. package/README.md +3 -3
  2. package/index.d.ts +1 -2
  3. package/index.js +2 -6
  4. package/index.js.map +1 -1
  5. package/package.json +6 -10
  6. package/presets/core.json +21 -0
  7. package/presets/npm.json +0 -1
  8. package/src/command-line/dep-graph.js +2 -2
  9. package/src/command-line/dep-graph.js.map +1 -1
  10. package/src/command-line/format.js +18 -20
  11. package/src/command-line/format.js.map +1 -1
  12. package/src/command-line/nx-commands.js +1 -1
  13. package/src/command-line/nx-commands.js.map +1 -1
  14. package/src/command-line/utils.js +1 -1
  15. package/src/command-line/utils.js.map +1 -1
  16. package/src/core/dep-graph/3rdpartylicenses.txt +196 -216
  17. package/src/core/dep-graph/index.html +15 -187
  18. package/src/core/dep-graph/main.esm.js +1 -1
  19. package/src/core/dep-graph/main.esm.js.LICENSE.txt +51 -0
  20. package/src/core/dep-graph/styles.css +1 -1
  21. package/src/core/file-utils.js +3 -3
  22. package/src/core/file-utils.js.map +1 -1
  23. package/src/core/nx-deps/nx-deps-cache.js +13 -4
  24. package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
  25. package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +4 -1
  26. package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +11 -4
  27. package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -1
  28. package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +2 -1
  29. package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
  30. package/src/core/project-graph/build-dependencies/implicit-project-dependencies.js +6 -1
  31. package/src/core/project-graph/build-dependencies/implicit-project-dependencies.js.map +1 -1
  32. package/src/core/project-graph/build-nodes/workspace-projects.js +6 -2
  33. package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
  34. package/src/core/project-graph/build-project-graph.js +26 -19
  35. package/src/core/project-graph/build-project-graph.js.map +1 -1
  36. package/src/core/project-graph/daemon/server/server.js +1 -1
  37. package/src/core/project-graph/daemon/server/server.js.map +1 -1
  38. package/src/core/project-graph/daemon/server/watcher.d.ts +3 -1
  39. package/src/core/project-graph/daemon/server/watcher.js +24 -25
  40. package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
  41. package/src/core/project-graph/project-graph-worker.js +3 -1
  42. package/src/core/project-graph/project-graph-worker.js.map +1 -1
  43. package/src/core/project-graph/project-graph.js +1 -1
  44. package/src/generators/init/init.js +4 -5
  45. package/src/generators/init/init.js.map +1 -1
  46. package/src/generators/new/new.d.ts +1 -1
  47. package/src/generators/new/new.js +25 -10
  48. package/src/generators/new/new.js.map +1 -1
  49. package/src/generators/preset/preset.js +7 -6
  50. package/src/generators/preset/preset.js.map +1 -1
  51. package/src/generators/utils/presets.d.ts +5 -2
  52. package/src/generators/utils/presets.js +4 -1
  53. package/src/generators/utils/presets.js.map +1 -1
  54. package/src/generators/workspace/files/README.md__tmpl__ +2 -2
  55. package/src/generators/workspace/workspace.js +10 -4
  56. package/src/generators/workspace/workspace.js.map +1 -1
  57. package/src/migrations/update-10-3-0/add-vscode-extensions.js +4 -6
  58. package/src/migrations/update-10-3-0/add-vscode-extensions.js.map +1 -1
  59. package/src/migrations/update-13-2-0/set-parallel-default.js +12 -8
  60. package/src/migrations/update-13-2-0/set-parallel-default.js.map +1 -1
  61. package/src/tasks-runner/forked-process-task-runner.js +1 -0
  62. package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
  63. package/src/tasks-runner/life-cycle.d.ts +15 -11
  64. package/src/tasks-runner/life-cycle.js +4 -4
  65. package/src/tasks-runner/life-cycle.js.map +1 -1
  66. package/src/tasks-runner/{run-command/index.d.ts → run-command.d.ts} +7 -4
  67. package/src/tasks-runner/{run-command/index.js → run-command.js} +19 -35
  68. package/src/tasks-runner/run-command.js.map +1 -0
  69. package/src/tasks-runner/task-orchestrator.d.ts +3 -0
  70. package/src/tasks-runner/task-orchestrator.js +29 -13
  71. package/src/tasks-runner/task-orchestrator.js.map +1 -1
  72. package/src/tasks-runner/task-timings-life-cycle.d.ts +10 -3
  73. package/src/tasks-runner/task-timings-life-cycle.js +56 -3
  74. package/src/tasks-runner/task-timings-life-cycle.js.map +1 -1
  75. package/src/tasks-runner/tasks-runner.d.ts +1 -1
  76. package/src/tasks-runner/tasks-runner.js.map +1 -1
  77. package/src/tasks-runner/utils.js +4 -1
  78. package/src/tasks-runner/utils.js.map +1 -1
  79. package/src/utilities/buildable-libs-utils.d.ts +1 -0
  80. package/src/utilities/buildable-libs-utils.js +26 -21
  81. package/src/utilities/buildable-libs-utils.js.map +1 -1
  82. package/src/utilities/cache-directory.d.ts +1 -1
  83. package/src/utilities/cache-directory.js +3 -3
  84. package/src/utilities/cache-directory.js.map +1 -1
  85. package/src/utilities/create-package-json.js +3 -3
  86. package/src/utilities/create-package-json.js.map +1 -1
  87. package/src/utilities/fileutils.d.ts +0 -2
  88. package/src/utilities/fileutils.js +1 -4
  89. package/src/utilities/fileutils.js.map +1 -1
  90. package/src/utilities/plugins/installed-plugins.js +2 -2
  91. package/src/utilities/plugins/installed-plugins.js.map +1 -1
  92. package/src/utilities/project-graph-utils.d.ts +2 -2
  93. package/src/utilities/project-graph-utils.js.map +1 -1
  94. package/src/utilities/typescript/compilation.d.ts +1 -1
  95. package/src/utilities/typescript/compilation.js +11 -12
  96. package/src/utilities/typescript/compilation.js.map +1 -1
  97. package/src/utils/fileutils.d.ts +0 -2
  98. package/src/utils/fileutils.js +1 -4
  99. package/src/utils/fileutils.js.map +1 -1
  100. package/src/utils/runtime-lint-utils.js +1 -1
  101. package/src/utils/runtime-lint-utils.js.map +1 -1
  102. package/src/utils/versions.d.ts +1 -1
  103. package/src/utils/versions.js +2 -2
  104. package/src/devkit-reexport.d.ts +0 -4
  105. package/src/devkit-reexport.js +0 -20
  106. package/src/devkit-reexport.js.map +0 -1
  107. package/src/tasks-runner/run-command/components/no-targets-run.d.ts +0 -7
  108. package/src/tasks-runner/run-command/components/no-targets-run.js +0 -20
  109. package/src/tasks-runner/run-command/components/no-targets-run.js.map +0 -1
  110. package/src/tasks-runner/run-command/components/nx-output-row-title.d.ts +0 -7
  111. package/src/tasks-runner/run-command/components/nx-output-row-title.js +0 -17
  112. package/src/tasks-runner/run-command/components/nx-output-row-title.js.map +0 -1
  113. package/src/tasks-runner/run-command/components/run-command.d.ts +0 -16
  114. package/src/tasks-runner/run-command/components/run-command.js +0 -55
  115. package/src/tasks-runner/run-command/components/run-command.js.map +0 -1
  116. package/src/tasks-runner/run-command/components/run-many.d.ts +0 -15
  117. package/src/tasks-runner/run-command/components/run-many.js +0 -123
  118. package/src/tasks-runner/run-command/components/run-many.js.map +0 -1
  119. package/src/tasks-runner/run-command/components/task-list.d.ts +0 -7
  120. package/src/tasks-runner/run-command/components/task-list.js +0 -29
  121. package/src/tasks-runner/run-command/components/task-list.js.map +0 -1
  122. package/src/tasks-runner/run-command/components/task-row.d.ts +0 -12
  123. package/src/tasks-runner/run-command/components/task-row.js +0 -52
  124. package/src/tasks-runner/run-command/components/task-row.js.map +0 -1
  125. package/src/tasks-runner/run-command/index.js.map +0 -1
  126. package/src/tasks-runner/run-command/ink-run-many-life-cycle.d.ts +0 -30
  127. package/src/tasks-runner/run-command/ink-run-many-life-cycle.js +0 -34
  128. package/src/tasks-runner/run-command/ink-run-many-life-cycle.js.map +0 -1
@@ -1,7 +1,9 @@
1
+ /// <reference types="node" />
1
2
  import type { AsyncSubscription, Event } from '@parcel/watcher';
3
+ import { Server } from 'net';
2
4
  export declare type WatcherSubscription = AsyncSubscription;
3
5
  export declare type SubscribeToWorkspaceChangesCallback = (err: Error | null, changeEvents: Event[] | null) => Promise<void>;
4
- export declare function subscribeToWorkspaceChanges(cb: SubscribeToWorkspaceChangesCallback): Promise<AsyncSubscription>;
6
+ export declare function subscribeToWorkspaceChanges(server: Server, cb: SubscribeToWorkspaceChangesCallback): Promise<AsyncSubscription>;
5
7
  /**
6
8
  * NOTE: An event type of "create" will also apply to the case where the user has restored
7
9
  * an original version of a file after modifying/deleting it by using git, so we adjust
@@ -12,9 +12,9 @@ const tslib_1 = require("tslib");
12
12
  const devkit_1 = require("@nrwl/devkit");
13
13
  const app_root_1 = require("@nrwl/tao/src/utils/app-root");
14
14
  const fs_1 = require("fs");
15
- const ignore_1 = require("ignore");
16
15
  const path_1 = require("path");
17
16
  const socket_utils_1 = require("../socket-utils");
17
+ const shutdown_utils_1 = require("@nrwl/workspace/src/core/project-graph/daemon/server/shutdown-utils");
18
18
  /**
19
19
  * This configures the files and directories which we always want to ignore as part of file watching
20
20
  * and which we know the location of statically (meaning irrespective of user configuration files).
@@ -29,27 +29,29 @@ const socket_utils_1 = require("../socket-utils");
29
29
  */
30
30
  const ALWAYS_IGNORE = [
31
31
  (0, path_1.join)(app_root_1.appRootPath, 'node_modules'),
32
- (0, path_1.join)(app_root_1.appRootPath, 'dist'),
33
32
  (0, path_1.join)(app_root_1.appRootPath, '.git'),
34
33
  socket_utils_1.FULL_OS_SOCKET_PATH,
35
34
  ];
36
- /**
37
- * TODO: This utility has been implemented multiple times across the Nx codebase,
38
- * discuss whether it should be moved to a shared location.
39
- */
40
- function getIgnoredGlobs(root) {
41
- const ig = (0, ignore_1.default)();
35
+ function getIgnoredGlobs() {
36
+ return [
37
+ ...ALWAYS_IGNORE,
38
+ ...getIgnoredGlobsFromFile((0, path_1.join)(app_root_1.appRootPath, '.nxignore')),
39
+ ...getIgnoredGlobsFromFile((0, path_1.join)(app_root_1.appRootPath, '.gitignore')),
40
+ ];
41
+ }
42
+ function getIgnoredGlobsFromFile(file) {
42
43
  try {
43
- ig.add((0, fs_1.readFileSync)(`${root}/.gitignore`, 'utf-8'));
44
+ return (0, fs_1.readFileSync)(file, 'utf-8')
45
+ .split('\n')
46
+ .map((i) => i.trim())
47
+ .filter((i) => !!i && !i.startsWith('#'))
48
+ .map((i) => (i.startsWith('/') ? (0, path_1.join)(app_root_1.appRootPath, i) : i));
44
49
  }
45
- catch (_a) { }
46
- try {
47
- ig.add((0, fs_1.readFileSync)(`${root}/.nxignore`, 'utf-8'));
50
+ catch (e) {
51
+ return [];
48
52
  }
49
- catch (_b) { }
50
- return ig;
51
53
  }
52
- function subscribeToWorkspaceChanges(cb) {
54
+ function subscribeToWorkspaceChanges(server, cb) {
53
55
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
54
56
  /**
55
57
  * The imports and exports of @nrwl/workspace are somewhat messy and far reaching across the repo (and beyond),
@@ -57,7 +59,6 @@ function subscribeToWorkspaceChanges(cb) {
57
59
  * executed by packages which do not have its necessary native binaries available.
58
60
  */
59
61
  const watcher = yield Promise.resolve().then(() => require('@parcel/watcher'));
60
- let cachedIgnoreGlobs = getIgnoredGlobs(app_root_1.appRootPath);
61
62
  const subscription = yield watcher.subscribe(app_root_1.appRootPath, (err, events) => {
62
63
  // Let the consumer handle any errors
63
64
  if (err) {
@@ -79,17 +80,15 @@ function subscribeToWorkspaceChanges(cb) {
79
80
  }
80
81
  // If the ignore files themselves have changed we need to dynamically update our cached ignoreGlobs
81
82
  if (hasIgnoreFileUpdate) {
82
- cachedIgnoreGlobs = getIgnoredGlobs(app_root_1.appRootPath);
83
- }
84
- const nonIgnoredEvents = workspaceRelativeEvents
85
- .filter(({ path }) => !!path)
86
- .filter(({ path }) => !cachedIgnoreGlobs.ignores(path));
87
- if (!nonIgnoredEvents || !nonIgnoredEvents.length) {
88
- return;
83
+ (0, shutdown_utils_1.handleServerProcessTermination)({
84
+ server,
85
+ reason: 'Stopping the daemon the set of ignored files changed.',
86
+ watcherSubscription: subscription,
87
+ });
89
88
  }
90
- cb(null, nonIgnoredEvents);
89
+ cb(null, workspaceRelativeEvents);
91
90
  }, {
92
- ignore: ALWAYS_IGNORE,
91
+ ignore: getIgnoredGlobs(),
93
92
  });
94
93
  return subscription;
95
94
  });
@@ -1 +1 @@
1
- {"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/watcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/watcher.ts"],"names":[],"mappings":"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"}
@@ -4,13 +4,15 @@ const worker_threads_1 = require("worker_threads");
4
4
  const build_explicit_typescript_and_package_json_dependencies_1 = require("./build-dependencies/build-explicit-typescript-and-package-json-dependencies");
5
5
  let workspace;
6
6
  let projectGraph;
7
+ let jsPluginConfig;
7
8
  worker_threads_1.parentPort.on('message', (message) => {
8
9
  if (message.workspace) {
9
10
  workspace = message.workspace;
10
11
  projectGraph = message.projectGraph;
12
+ jsPluginConfig = message.jsPluginConfig;
11
13
  }
12
14
  else {
13
- const res = (0, build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies)(workspace, projectGraph, message.filesToProcess);
15
+ const res = (0, build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies)(jsPluginConfig, workspace, projectGraph, message.filesToProcess);
14
16
  worker_threads_1.parentPort.postMessage(res);
15
17
  }
16
18
  });
@@ -1 +1 @@
1
- {"version":3,"file":"project-graph-worker.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph-worker.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAE5C,0JAAiJ;AAEjJ,IAAI,SAA2B,CAAC;AAChC,IAAI,YAAiC,CAAC;AAEtC,2BAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;IACnC,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAC9B,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;KACrC;SAAM;QACL,MAAM,GAAG,GAAG,IAAA,2GAAiD,EAC3D,SAAS,EACT,YAAY,EACZ,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,2BAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;KAC7B;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"project-graph-worker.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph-worker.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAE5C,0JAAiJ;AAEjJ,IAAI,SAA2B,CAAC;AAChC,IAAI,YAAiC,CAAC;AACtC,IAAI,cAGI,CAAC;AAET,2BAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;IACnC,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAC9B,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACpC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;KACzC;SAAM;QACL,MAAM,GAAG,GAAG,IAAA,2GAAiD,EAC3D,cAAc,EACd,SAAS,EACT,YAAY,EACZ,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,2BAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;KAC7B;AACH,CAAC,CAAC,CAAC"}
@@ -17,7 +17,7 @@ function readCachedProjectGraph(projectGraphVersion = '5.0') {
17
17
  ? (0, devkit_1.stripIndents) `
18
18
  Make sure invoke 'node ./decorate-angular-cli.js' in your postinstall script.
19
19
  The decorated CLI will compute the project graph.
20
- 'ng --help' should say 'Smart, Extensible Build Framework'.
20
+ 'ng --help' should say 'Smart, Fast and Extensible Build System'.
21
21
  `
22
22
  : '';
23
23
  if (!projectGraphCache) {
@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
6
  const fs_1 = require("fs");
7
7
  const path_1 = require("path");
8
- const fileutils_1 = require("../../utilities/fileutils");
9
8
  const prettier_1 = require("../../utilities/prettier");
10
9
  const default_base_1 = require("../../utilities/default-base");
11
10
  const versions_1 = require("../../utils/versions");
@@ -323,7 +322,7 @@ function createAdditionalFiles(host, options) {
323
322
  'nx.json': '*',
324
323
  },
325
324
  };
326
- host.write('nx.json', (0, fileutils_1.serializeJson)(nxJson));
325
+ (0, devkit_1.writeJson)(host, 'nx.json', nxJson);
327
326
  host.write('libs/.gitkeep', '');
328
327
  const recommendations = [
329
328
  'nrwl.angular-console',
@@ -351,7 +350,7 @@ function createAdditionalFiles(host, options) {
351
350
  // of any kind, create one
352
351
  const existingPrettierConfig = yield (0, prettier_1.resolveUserExistingPrettierConfig)();
353
352
  if (!existingPrettierConfig) {
354
- host.write('.prettierrc', (0, fileutils_1.serializeJson)(workspace_1.DEFAULT_NRWL_PRETTIER_CONFIG));
353
+ (0, devkit_1.writeJson)(host, '.prettierrc', workspace_1.DEFAULT_NRWL_PRETTIER_CONFIG);
355
354
  }
356
355
  });
357
356
  }
@@ -394,7 +393,7 @@ function createNxJson(host) {
394
393
  }
395
394
  const name = Object.keys(projects)[0];
396
395
  const tsConfigPath = getRootTsConfigPath(host);
397
- host.write('nx.json', (0, fileutils_1.serializeJson)({
396
+ (0, devkit_1.writeJson)(host, 'nx.json', {
398
397
  npmScope: name,
399
398
  implicitDependencies: {
400
399
  'angular.json': '*',
@@ -412,7 +411,7 @@ function createNxJson(host) {
412
411
  },
413
412
  },
414
413
  },
415
- }));
414
+ });
416
415
  }
417
416
  function decorateAngularClI(host) {
418
417
  const decorateCli = (0, fs_1.readFileSync)((0, devkit_1.joinPathFragments)(__dirname, '..', 'utils', 'decorate-angular-cli.js__tmpl__')).toString();
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/init/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAuBsB;AACtB,2BAAkC;AAClC,+BAAgC;AAChC,uDAA6E;AAC7E,+DAAiE;AACjE,mDAI8B;AAC9B,sDAAsE;AAGtE,SAAS,iBAAiB,CAAC,IAAI;IAC7B,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;QAC/C,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC;QAChD,WAAW,CAAC,OAAO,mCACd,WAAW,CAAC,OAAO,KACtB,EAAE,EAAE,IAAI,EACR,eAAe,EAAE,kBAAkB,EACnC,eAAe,EAAE,kBAAkB,EACnC,gBAAgB,EAAE,mBAAmB,EACrC,cAAc,EAAE,iBAAiB,EACjC,eAAe,EAAE,kBAAkB,EACnC,eAAe,EAAE,kBAAkB,EACnC,oBAAoB,EAAE,uBAAuB,EAC7C,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,iBAAiB,EACzB,cAAc,EAAE,iBAAiB,EACjC,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,2BAA2B,EACnC,cAAc,EAAE,WAAW,EAC3B,IAAI,EAAE,8BAA8B,EACpC,WAAW,EAAE,cAAc,EAC3B,qBAAqB,EAAE,wBAAwB,EAC/C,IAAI,EAAE,SAAS,GAChB,CAAC;QACF,WAAW,CAAC,eAAe,GAAG,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;QAChE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE;YAC7B,WAAW,CAAC,YAAY,GAAG,EAAE,CAAC;SAC/B;QACD,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;YAC9C,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,oBAAS,CAAC;SACvD;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE;YACnD,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,oBAAS,CAAC;SAC5D;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE;YAChD,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,4BAAiB,CAAC;SACjE;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;YAC5C,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,0BAAe,CAAC;SAC3D;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU;IACrC,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;QACtC,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,eAAe,CAAC;AACtB,CAAC;AAED,SAAS,WAAW,CAAC,IAAY,EAAE,YAAoB;IACrD,OAAO,QAAQ,IAAI,IAAI,YAAY,EAAE,CAAC;AACxC,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAAe;IACvD,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,eAAe,CAAC,cAAc,CAAC;IAC/C,MAAM,OAAO,GAAG,GAAG,OAAO,MAAM,CAAC;IACjC,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,OAAQ,eAAuB,CAAC,cAAc,CAAC;IAE/C,MAAM,cAAc,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE/D,MAAM,aAAa,GAAG,cAAc,CAAC,UAAU,CAAC;IAChD,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,cAAc,CAAC,IAAI,GAAG,OAAO,CAAC;IAC9B,cAAc,CAAC,UAAU,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAE9D,SAAS,mBAAmB,CAAC,YAAY;QACvC,YAAY,CAAC,UAAU;YACrB,YAAY,CAAC,UAAU;gBACvB,IAAA,0BAAiB,EAAC,IAAA,sBAAa,EAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5D,YAAY,CAAC,KAAK;YAChB,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,YAAY,CAAC,KAAe,CAAC,CAAC;QACnE,YAAY,CAAC,IAAI;YACf,YAAY,CAAC,IAAI,IAAI,YAAY,CAAC,YAAY,CAAC,IAAc,CAAC,CAAC;QACjE,YAAY,CAAC,SAAS;YACpB,YAAY,CAAC,SAAS,IAAI,YAAY,CAAC,YAAY,CAAC,SAAmB,CAAC,CAAC;QAC3E,YAAY,CAAC,QAAQ;YACnB,YAAY,CAAC,QAAQ,IAAI,IAAA,0BAAiB,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAC3E,YAAY,CAAC,MAAM;YACjB,YAAY,CAAC,MAAM,IAAK,YAAY,CAAC,MAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxE,YAAY,CAAC,MAAM;YACjB,YAAY,CAAC,MAAM,IAAK,YAAY,CAAC,MAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxE,YAAY,CAAC,OAAO;YAClB,YAAY,CAAC,OAAO,IAAK,YAAY,CAAC,OAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC1E,YAAY,CAAC,gBAAgB;YAC3B,YAAY,CAAC,gBAAgB;gBAC7B,YAAY,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;oBAClD,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC;oBAC1C,IAAI,EAAE,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC;iBACrC,CAAC,CAAC,CAAC;IACR,CAAC;IACD,mBAAmB,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAC5E,mBAAmB,CAAC,MAAM,CAAC,CAC5B,CAAC;IAEF,IAAI,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE;QAC/B,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QACxD,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,IAAI,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtE,WAAW,CAAC,SAAS;YACnB,WAAW,CAAC,SAAS,IAAI,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC/D,WAAW,CAAC,QAAQ,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QACxE,WAAW,CAAC,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACtE,WAAW,CAAC,MAAM;YAChB,WAAW,CAAC,MAAM,IAAK,WAAW,CAAC,MAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACtE,WAAW,CAAC,MAAM;YAChB,WAAW,CAAC,MAAM,IAAK,WAAW,CAAC,MAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACtE,WAAW,CAAC,OAAO;YACjB,WAAW,CAAC,OAAO,IAAK,WAAW,CAAC,OAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;KACzE;IAED,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;IAE/C,IAAI,UAAU,EAAE;QACd,UAAU,CAAC,OAAO,CAAC,QAAQ,GAAG;YAC5B,IAAA,0BAAiB,EAAC,OAAO,EAAE,mBAAmB,CAAC;YAC/C,IAAA,0BAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC;SACjD,CAAC;KACH;IAED,SAAS,oBAAoB,CAAC,aAAa;QACzC,aAAa,CAAC,UAAU;YACtB,aAAa,CAAC,UAAU;gBACxB,IAAA,0BAAiB,EACf,IAAA,sBAAa,EAAC,MAAM,CAAC,EACrB,MAAM,EACN,GAAG,OAAO,CAAC,IAAI,SAAS,CACzB,CAAC;QACJ,aAAa,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,IAAI,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5E,aAAa,CAAC,QAAQ;YACpB,aAAa,CAAC,QAAQ;gBACtB,IAAA,0BAAiB,EAAC,IAAA,sBAAa,EAAC,MAAM,CAAC,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;QAC5E,aAAa,CAAC,gBAAgB;YAC5B,aAAa,CAAC,gBAAgB;gBAC9B,aAAa,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;oBACnD,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC;oBAC1C,IAAI,EAAE,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC;iBACrC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE;QACjC,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QAC5D,oBAAoB,CAAC,aAAa,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CACjE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,CACzC,CAAC;KACH;IAED,IAAI,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE;QAC9B,MAAM,iBAAiB,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,EAAE;YACrC,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,aAAa;YAC1B,OAAO,EAAE;gBACP,GAAG,kCACE,cAAc,CAAC,OAAO,CAAC,GAAG,KAC7B,OAAO,kCACF,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,KACrC,gBAAgB,EAAE,IAAA,0BAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC,MAErE;gBACD,IAAI,EAAE;oBACJ,QAAQ,EAAE,sCAAsC;oBAChD,OAAO,kCACF,iBAAiB,KACpB,QAAQ,EAAE,IAAA,0BAAiB,EAAC,OAAO,EAAE,eAAe,CAAC,GACtD;iBACF;aACF;YACD,oBAAoB,EAAE,CAAC,OAAO,CAAC;YAC/B,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QACH,OAAO,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC;KACnC;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAE1D,eAAe,CAAC,GAAG,GAAG,eAAe,CAAC,GAAG,IAAK,EAAU,CAAC;IACzD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE;QAC1C,eAAe,CAAC,GAAG,CAAC,iBAAiB,GAAG,eAAe,CAAC;KACzD;IACD,IAAA,qCAA4B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAEpD,SAAS,YAAY,CAAC,KAAmB;QACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,OAAO,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC;gBACpC,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;gBAC3D,CAAC,CAAC,KAAK,CAAC;SACX;aAAM;YACL,uCACK,KAAK,KACR,KAAK,EACH,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC;oBAClD,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;oBACjE,CAAC,CAAC,KAAK,CAAC,KAAK,IACjB;SACH;IACH,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,IAAA,mBAAU,EAAC,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;QACnC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,GAAG,GAAG,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,IAAA,kBAAS,EACP,IAAI,EACJ,oBAAoB,EACpB,oBAAoB,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAChE,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAe;IACtD,MAAM,GAAG,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,uBAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5D,IAAI,CAAC,OAAO,GAAG,GAAG,SAAS,GAAG,YAAY,EAAE,CAAC;QAC7C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;QAClD,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,GAAG,SAAS,cAAc,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QACpB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;YAC3D,IAAI,CAAC,OAAO,GAAG,GAAG,SAAS,GAAG,YAAY,EAAE,CAAC;YAC7C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAClD,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,GAAG,SAAS,cAAc,CAAC;YACzD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE;QACtB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;YAC7D,IAAI,CAAC,OAAO,GAAG,GAAG,SAAS,GAAG,YAAY,EAAE,CAAC;YAC7C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAClD,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,GAAG,SAAS,cAAc,CAAC;YACzD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,CAAC,UAAU,EAAE;QAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;YAClE,IAAI,CAAC,OAAO,GAAG,GAAG,IAAA,uBAAc,EAAC,UAAU,CAAC,IAAI,CAAC,GAAG,YAAY,EAAE,CAAC;YACnE,IAAI,CAAC,eAAe,mCACf,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,UAAU,CAAC,IAAI,CAAC,cAAc,GACzD,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC9B,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,UAAU,EAAE,EAAE;YAC7C;gBACE,wBAAwB;gBACxB,UAAU;gBACV,WAAW;gBACX,oBAAoB;gBACpB,YAAY;aACb,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChB,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;YAC9B,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,cAAc,GAAG,UAAU,CAAC,cAAc,IAAI,EAAE,CAAC;YAC5D,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;YAC1E,UAAU,CAAC,KAAK,CAAC,8BAA8B,CAAC,GAAG;gBACjD,IAAI;gBACJ;oBACE,KAAK,EAAE,EAAE;oBACT,cAAc,EAAE,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;iBACtE;aACF,CAAC;YACF,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAe;IACtD,MAAM,aAAa,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,QAAQ,CAAC;IAExB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,cAAc,CAAC,EAAE;QAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACnD,IAAI,CAAC,OAAO,GAAG,GAAG,MAAM,aAAa,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAa;IACzC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE;QACnC,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;KACrC;IACD,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;IACvC,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;IAEvC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,YAAY,CACnB,IAAU,EACV,OAAe,EACf,QAAgB,EAChB,QAAQ,GAAG,IAAI;IAEf,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IACD,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,QAAQ,CAAC;IACtB,MAAM,EAAE,GAAG,QAAQ;QACjB,CAAC,CAAC,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;QAC9C,CAAC,CAAC,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,SAAS,CAAC,IAAU;IAC3B,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAC7C,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;YACvB,OAAO,WAAW,CAAC;SACpB;KACF;AACH,CAAC;AAED,SAAS,aAAa,CAAC,IAAU;IAC/B,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,GAAG,EAAE;QACP,OAAO,IAAA,iCAAwB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAC5C;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,OAAe;IACpD,MAAM,GAAG,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEnC,4CAA4C;IAC5C,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IACxD,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;IAC3D,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErE,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QACpB,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACvE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;KACrE;SAAM;QACL,wDAAwD;QACxD,0BAA0B;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAExE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;SACnD;KACF;IAED,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE;QACtB,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;KACvE;IACD,MAAM,gBAAgB,GAAG,GAAG,CAAC,UAAU,CAAC;IACxC,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxE,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;IAC9D,IAAI,MAAM,EAAE;QACV,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvE,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;KACnD;SAAM;QACL,OAAO,CAAC,IAAI,CACV,6EAA6E,CAC9E,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAe,qBAAqB,CAAC,IAAU,EAAE,OAAe;;QAC9D,MAAM,MAAM,GAAwB;YAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE;gBACR,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,IAAI,IAAA,gCAAiB,GAAE;aAC7D;YACD,oBAAoB,EAAE;gBACpB,cAAc,EAAE,GAAG;gBACnB,cAAc,EAAE,GAAG;gBACnB,aAAa,EAAE,GAAG;gBAClB,gBAAgB,EAAE,GAAG;gBACrB,SAAS,EAAE,GAAG;aACf;SACF,CAAC;QACF,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QAEhC,MAAM,eAAe,GAAG;YACtB,sBAAsB;YACtB,qBAAqB;YACrB,wBAAwB;YACxB,wBAAwB;SACzB,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;YAC1C,IAAA,mBAAU,EACR,IAAI,EACJ,yBAAyB,EACzB,CAAC,IAAoC,EAAE,EAAE;gBACvC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;gBAClD,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;oBACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;wBAC7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;qBACtC;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;YACd,CAAC,CACF,CAAC;SACH;aAAM;YACL,IAAA,kBAAS,EAAC,IAAI,EAAE,yBAAyB,EAAE;gBACzC,eAAe;aAChB,CAAC,CAAC;SACJ;QAED,6DAA6D;QAC7D,0BAA0B;QAC1B,MAAM,sBAAsB,GAAG,MAAM,IAAA,4CAAiC,GAAE,CAAC;QACzE,IAAI,CAAC,sBAAsB,EAAE;YAC3B,IAAA,kBAAS,EAAC,IAAI,EAAE,aAAa,EAAE,wCAA4B,CAAC,CAAC;SAC9D;IACH,CAAC;CAAA;AAED,SAAS,0BAA0B,CAAC,IAAU;IAC5C,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,yCAAyC;QACzC,MAAM,aAAa,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC3D,CAAC,OAAO,EAAE,EAAE,CACV,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW;YAC3C,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,KAAK,aAAa,CAChE,CAAC;QAEF,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,EAAE;YAClE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;YACvE,OAAO,CAAC,IAAI,CACV,iBAAiB,MAAM,2DAA2D,MAAM,wCAAwC,CACjI,CAAC;YACF,MAAM,IAAI,KAAK,CACb,oCAAoC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,sBAAsB,CACtG,CAAC;SACH;QAED,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACzB,OAAO,CAAC,KAAK,CACX,wFAAwF,CACzF,CAAC;QACF,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;IACrC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC7C,CAAC,OAAO,EAAE,EAAE,CACV,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW;QAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,KAAK,aAAa,CAClD,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,EAAE;QACtD,MAAM,IAAI,KAAK,CACb,uFAAuF,CACxF,CAAC;KACH;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,YAAY,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,kBAAS,EAAsB,IAAI,EAAE,SAAS,EAAE;QAC9C,QAAQ,EAAE,IAAI;QACd,oBAAoB,EAAE;YACpB,cAAc,EAAE,GAAG;YACnB,cAAc,EAAE,GAAG;YACnB,CAAC,YAAY,CAAC,EAAE,GAAG;YACnB,aAAa,EAAE,GAAG;YAClB,gBAAgB,EAAE,GAAG;YACrB,SAAS,EAAE,GAAG;SACf;QACD,kBAAkB,EAAE;YAClB,OAAO,EAAE;gBACP,MAAM,EAAE,uCAAuC;gBAC/C,OAAO,EAAE;oBACP,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;iBACtD;aACF;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,MAAM,WAAW,GAAG,IAAA,iBAAY,EAC9B,IAAA,0BAAiB,EACf,SAAgB,EAChB,IAAI,EACJ,OAAO,EACP,iCAAiC,CAClC,CACF,CAAC,QAAQ,EAAE,CAAC;IACb,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC;IACnD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IACE,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,OAAO,CAAC,WAAW;YACxB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAC7D;YACA,0CAA0C;YAC1C,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,oCAAoC,CAAC;SAClE;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACrC,+CAA+C;YAC/C,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,gCAAgC,CAAC;SAC7D;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;SACxB;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU;IAC1B,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,cAAc,CAAC,EAAE,GAAG,EAAE;QACrE,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QACnC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,kBAAkB,CAAC,EAAE,GAAG,EAAE;YACzE,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAU,EACV,IAAY,EACZ,EAAU,EACV,QAAiB;IAEjB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,IAAI,QAAQ,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,iBAAiB,CAAC,CAAC;SAC9C;KACF;SAAM,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QAC1B,IAAI,QAAQ,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;SAC5C;KACF;SAAM;QACL,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,IAAY,EAAE,EAAU;IAC/D,IAAA,6BAAoB,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,MAAc;;QAC5D,IAAI,MAAM,CAAC,wBAAwB,EAAE;YACnC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,oBAAS,EAAE,CAAC,CAAC;YACzE,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,kBAAkB,CAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,MAAM,OAAO,mCACR,MAAM,KACT,QAAQ,EAAE,IAAA,cAAK,EAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,GACzD,CAAC;YAEF,0BAA0B,CAAC,IAAI,CAAC,CAAC;YACjC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACf,MAAM,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC3C,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACxB,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACpC,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnC,cAAc,CAAC,IAAI,CAAC,CAAC;YACrB,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YACzB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QACD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AA7BD,sCA6BC;AAEY,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC;AAE/D,kBAAe,aAAa,CAAC"}
@@ -1,4 +1,4 @@
1
- import { Tree, PackageManager } from '@nrwl/devkit';
1
+ import { PackageManager, Tree } from '@nrwl/devkit';
2
2
  export interface Schema {
3
3
  cli: 'nx' | 'angular';
4
4
  directory: string;
@@ -63,8 +63,10 @@ function generatePreset(host, opts) {
63
63
  }
64
64
  else if (value === false) {
65
65
  acc.push(`--no-${key}`);
66
+ // nxWorkspaceRoot breaks Tao CLI if incorrectly set, so need to exclude it.
67
+ // TODO(jack): Should read in the preset schema and only pass the options specified.
66
68
  }
67
- else {
69
+ else if (key !== 'nxWorkspaceRoot') {
68
70
  // string, number (don't handle arrays or nested objects)
69
71
  acc.push(`--${key}=${value}`);
70
72
  }
@@ -133,6 +135,9 @@ function initializeGitRepo(host, rootDirectory, options) {
133
135
  function newGenerator(host, options) {
134
136
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
135
137
  if (options.skipInstall &&
138
+ options.preset !== presets_1.Preset.Apps &&
139
+ options.preset !== presets_1.Preset.Core &&
140
+ options.preset !== presets_1.Preset.TS &&
136
141
  options.preset !== presets_1.Preset.Empty &&
137
142
  options.preset !== presets_1.Preset.NPM) {
138
143
  throw new Error(`Cannot select a preset when skipInstall is set to true.`);
@@ -158,7 +163,12 @@ function newGenerator(host, options) {
158
163
  (0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
159
164
  yield generatePreset(host, options);
160
165
  if (!options.skipGit) {
161
- yield initializeGitRepo(host, options.directory, options);
166
+ try {
167
+ yield initializeGitRepo(host, options.directory, options);
168
+ }
169
+ catch (e) {
170
+ console.error(`Could not initialize git repository. Error: ${e.message}`);
171
+ }
162
172
  }
163
173
  });
164
174
  });
@@ -173,6 +183,8 @@ function addCloudDependencies(host, options) {
173
183
  }
174
184
  function getPresetDependencies(preset, version) {
175
185
  switch (preset) {
186
+ case presets_1.Preset.TS:
187
+ return { dependencies: {}, dev: { '@nrwl/js': versions_1.nxVersion } };
176
188
  case presets_1.Preset.Angular:
177
189
  return { dependencies: { '@nrwl/angular': versions_1.nxVersion }, dev: {} };
178
190
  case presets_1.Preset.AngularWithNest:
@@ -211,7 +223,10 @@ function getPresetDependencies(preset, version) {
211
223
  }
212
224
  }
213
225
  function addPresetDependencies(host, options) {
214
- if (options.preset === presets_1.Preset.Empty || options.preset === presets_1.Preset.NPM) {
226
+ if (options.preset === presets_1.Preset.Apps ||
227
+ options.preset === presets_1.Preset.Core ||
228
+ options.preset === presets_1.Preset.Empty ||
229
+ options.preset === presets_1.Preset.NPM) {
215
230
  return;
216
231
  }
217
232
  const { dependencies, dev } = getPresetDependencies(options.preset, options.presetVersion);
@@ -222,13 +237,13 @@ function normalizeOptions(options) {
222
237
  if (!options.directory) {
223
238
  options.directory = options.name;
224
239
  }
225
- const { preset } = options;
226
- if (preset.match(/.+@/)) {
227
- // If the preset already contains a version in the name
228
- // -- my-package@2.0.1
229
- // -- @scope/package@version
230
- options.preset = preset[0] + preset.substring(1).split('@')[0];
231
- options.presetVersion = preset.substring(1).split('@')[1];
240
+ // If the preset already contains a version in the name
241
+ // -- my-package@2.0.1
242
+ // -- @scope/package@version
243
+ const match = options.preset.match(/^(?<package>(@.+\/)?[^@]+)(@(?<version>\d+\.\d+\.\d+))?$/);
244
+ if (match) {
245
+ options.preset = match.groups.package;
246
+ options.presetVersion = match.groups.version;
232
247
  }
233
248
  return options;
234
249
  }
@@ -1 +1 @@
1
- {"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
@@ -22,10 +22,11 @@ exports.presetSchematic = (0, devkit_1.convertNxGenerator)(presetGenerator);
22
22
  exports.default = presetGenerator;
23
23
  function createPreset(tree, options) {
24
24
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
25
- if (options.preset === presets_1.Preset.Empty) {
26
- return;
27
- }
28
- else if (options.preset === presets_1.Preset.NPM) {
25
+ if (options.preset === presets_1.Preset.Empty ||
26
+ options.preset === presets_1.Preset.Apps ||
27
+ options.preset === presets_1.Preset.NPM ||
28
+ options.preset === presets_1.Preset.Core ||
29
+ options.preset === presets_1.Preset.TS) {
29
30
  return;
30
31
  }
31
32
  else if (options.preset === presets_1.Preset.Angular) {
@@ -217,7 +218,7 @@ describe('AppComponent', () => {
217
218
  <img
218
219
  width="450"
219
220
  src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png"
220
- alt="Nx - Smart, Extensible Build Framework"
221
+ alt="Nx - Smart, Fast and Extensible Build System"
221
222
  />
222
223
  </div>
223
224
  <div>Message: {{ (hello$|async)|json }}</div>
@@ -271,7 +272,7 @@ export const App = () => {
271
272
  <img
272
273
  width="450"
273
274
  src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png"
274
- alt="Nx - Smart, Extensible Build Framework"
275
+ alt="Nx - Smart, Fast and Extensible Build System"
275
276
  />
276
277
  </div>
277
278
  <div>{m.message}</div>
@@ -1 +1 @@
1
- {"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,17 @@
1
1
  export declare enum Preset {
2
+ Apps = "apps",
2
3
  Empty = "empty",
4
+ Core = "core",
3
5
  NPM = "npm",
6
+ TS = "ts",
4
7
  WebComponents = "web-components",
5
8
  Angular = "angular",
6
9
  AngularWithNest = "angular-nest",
7
10
  React = "react",
8
11
  ReactWithExpress = "react-express",
12
+ ReactNative = "react-native",
9
13
  NextJs = "next",
10
14
  Gatsby = "gatsby",
11
15
  Nest = "nest",
12
- Express = "express",
13
- ReactNative = "react-native"
16
+ Express = "express"
14
17
  }
@@ -3,17 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Preset = void 0;
4
4
  var Preset;
5
5
  (function (Preset) {
6
+ Preset["Apps"] = "apps";
6
7
  Preset["Empty"] = "empty";
8
+ Preset["Core"] = "core";
7
9
  Preset["NPM"] = "npm";
10
+ Preset["TS"] = "ts";
8
11
  Preset["WebComponents"] = "web-components";
9
12
  Preset["Angular"] = "angular";
10
13
  Preset["AngularWithNest"] = "angular-nest";
11
14
  Preset["React"] = "react";
12
15
  Preset["ReactWithExpress"] = "react-express";
16
+ Preset["ReactNative"] = "react-native";
13
17
  Preset["NextJs"] = "next";
14
18
  Preset["Gatsby"] = "gatsby";
15
19
  Preset["Nest"] = "nest";
16
20
  Preset["Express"] = "express";
17
- Preset["ReactNative"] = "react-native";
18
21
  })(Preset = exports.Preset || (exports.Preset = {}));
19
22
  //# sourceMappingURL=presets.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAaX;AAbD,WAAY,MAAM;IAChB,yBAAe,CAAA;IACf,qBAAW,CAAA;IACX,0CAAgC,CAAA;IAChC,6BAAmB,CAAA;IACnB,0CAAgC,CAAA;IAChC,yBAAe,CAAA;IACf,4CAAkC,CAAA;IAClC,yBAAe,CAAA;IACf,2BAAiB,CAAA;IACjB,uBAAa,CAAA;IACb,6BAAmB,CAAA;IACnB,sCAA4B,CAAA;AAC9B,CAAC,EAbW,MAAM,GAAN,cAAM,KAAN,cAAM,QAajB"}
1
+ {"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAgBX;AAhBD,WAAY,MAAM;IAChB,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,qBAAW,CAAA;IACX,mBAAS,CAAA;IACT,0CAAgC,CAAA;IAChC,6BAAmB,CAAA;IACnB,0CAAgC,CAAA;IAChC,yBAAe,CAAA;IACf,4CAAkC,CAAA;IAClC,sCAA4B,CAAA;IAC5B,yBAAe,CAAA;IACf,2BAAiB,CAAA;IACjB,uBAAa,CAAA;IACb,6BAAmB,CAAA;AACrB,CAAC,EAhBW,MAAM,GAAN,cAAM,KAAN,cAAM,QAgBjB"}
@@ -6,7 +6,7 @@ This project was generated using [Nx](https://nx.dev).
6
6
 
7
7
  <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="450"></p>
8
8
 
9
- 🔎 **Smart, Extensible Build Framework**
9
+ 🔎 **Smart, Fast and Extensible Build System**
10
10
 
11
11
  ## Quick Start & Documentation
12
12
 
@@ -98,7 +98,7 @@ This project was generated using [Nx](https://nx.dev).
98
98
 
99
99
  <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="450"></p>
100
100
 
101
- 🔎 **Smart, Extensible Build Framework**
101
+ 🔎 **Smart, Fast and Extensible Build System**
102
102
 
103
103
  ## Adding capabilities to your workspace
104
104
 
@@ -18,8 +18,10 @@ function decorateAngularClI(host, options) {
18
18
  }
19
19
  function setPresetProperty(tree, options) {
20
20
  (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
21
- if (options.preset === presets_1.Preset.NPM) {
22
- addPropertyWithStableKeys(json, 'extends', '@nrwl/workspace/presets/npm.json');
21
+ if (options.preset === presets_1.Preset.Core ||
22
+ options.preset === presets_1.Preset.TS ||
23
+ options.preset === presets_1.Preset.NPM) {
24
+ addPropertyWithStableKeys(json, 'extends', '@nrwl/workspace/presets/core.json');
23
25
  delete json.implicitDependencies;
24
26
  delete json.targetDependencies;
25
27
  delete json.workspaceLayout;
@@ -28,7 +30,9 @@ function setPresetProperty(tree, options) {
28
30
  });
29
31
  }
30
32
  function createAppsAndLibsFolders(host, options) {
31
- if (options.preset === presets_1.Preset.NPM) {
33
+ if (options.preset === presets_1.Preset.Core ||
34
+ options.preset === presets_1.Preset.TS ||
35
+ options.preset === presets_1.Preset.NPM) {
32
36
  host.write((0, path_1.join)(options.directory, 'packages/.gitkeep'), '');
33
37
  }
34
38
  else {
@@ -75,7 +79,9 @@ function addNpmScripts(host, options) {
75
79
  return json;
76
80
  });
77
81
  }
78
- if (options.preset !== presets_1.Preset.NPM) {
82
+ if (options.preset !== presets_1.Preset.TS &&
83
+ options.preset !== presets_1.Preset.Core &&
84
+ options.preset !== presets_1.Preset.NPM) {
79
85
  (0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'package.json'), (json) => {
80
86
  Object.assign(json.scripts, {
81
87
  start: 'nx serve',