nx 14.0.1 → 14.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/migrations.json +8 -1
  2. package/package.json +6 -4
  3. package/src/adapter/ngcli-adapter.d.ts +1 -1
  4. package/src/adapter/ngcli-adapter.js +4 -2
  5. package/src/adapter/ngcli-adapter.js.map +1 -1
  6. package/src/command-line/generate.js +2 -1
  7. package/src/command-line/generate.js.map +1 -1
  8. package/src/command-line/migrate.js +12 -18
  9. package/src/command-line/migrate.js.map +1 -1
  10. package/src/command-line/nx-commands.d.ts +1 -0
  11. package/src/command-line/nx-commands.js +7 -12
  12. package/src/command-line/nx-commands.js.map +1 -1
  13. package/src/command-line/workspace-generators.js +2 -0
  14. package/src/command-line/workspace-generators.js.map +1 -1
  15. package/src/config/nx-json.d.ts +1 -8
  16. package/src/config/project-graph.d.ts +1 -1
  17. package/src/config/workspaces.js +20 -7
  18. package/src/config/workspaces.js.map +1 -1
  19. package/src/core/dep-graph/main.esm.js +1 -1
  20. package/src/daemon/client/client.js +3 -0
  21. package/src/daemon/client/client.js.map +1 -1
  22. package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts +6 -0
  23. package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js +46 -0
  24. package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js.map +1 -0
  25. package/src/generators/testing-utils/create-tree-with-empty-workspace.d.ts +5 -0
  26. package/src/generators/testing-utils/create-tree-with-empty-workspace.js +35 -0
  27. package/src/generators/testing-utils/create-tree-with-empty-workspace.js.map +1 -0
  28. package/src/generators/testing-utils/create-tree.d.ts +5 -0
  29. package/src/generators/testing-utils/create-tree.js +12 -0
  30. package/src/generators/testing-utils/create-tree.js.map +1 -0
  31. package/src/{config → generators}/tree.d.ts +0 -0
  32. package/src/{config → generators}/tree.js +0 -0
  33. package/src/generators/tree.js.map +1 -0
  34. package/src/generators/utils/json.d.ts +28 -0
  35. package/src/generators/utils/json.js +49 -0
  36. package/src/generators/utils/json.js.map +1 -0
  37. package/src/generators/utils/project-configuration.d.ts +77 -0
  38. package/src/generators/utils/project-configuration.js +383 -0
  39. package/src/generators/utils/project-configuration.js.map +1 -0
  40. package/src/hasher/hasher.js +1 -1
  41. package/src/hasher/hasher.js.map +1 -1
  42. package/src/migrations/update-14-0-4/remove-roots.d.ts +2 -0
  43. package/src/migrations/update-14-0-4/remove-roots.js +16 -0
  44. package/src/migrations/update-14-0-4/remove-roots.js.map +1 -0
  45. package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js +2 -1
  46. package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
  47. package/src/project-graph/build-project-graph.js +20 -17
  48. package/src/project-graph/build-project-graph.js.map +1 -1
  49. package/src/project-graph/file-utils.js +0 -3
  50. package/src/project-graph/file-utils.js.map +1 -1
  51. package/src/project-graph/operators.d.ts +0 -8
  52. package/src/project-graph/operators.js +1 -12
  53. package/src/project-graph/operators.js.map +1 -1
  54. package/src/project-graph/project-graph.js +2 -8
  55. package/src/project-graph/project-graph.js.map +1 -1
  56. package/src/tasks-runner/run-command.js +5 -24
  57. package/src/tasks-runner/run-command.js.map +1 -1
  58. package/src/utils/nx-plugin.js +45 -35
  59. package/src/utils/nx-plugin.js.map +1 -1
  60. package/src/utils/package-manager.d.ts +4 -1
  61. package/src/utils/package-manager.js +14 -10
  62. package/src/utils/package-manager.js.map +1 -1
  63. package/src/utils/versions.js +1 -1
  64. package/src/config/tree.js.map +0 -1
@@ -13,6 +13,7 @@ const output_1 = require("../../utils/output");
13
13
  const cache_1 = require("../cache");
14
14
  const socket_utils_1 = require("../socket-utils");
15
15
  const tmp_dir_1 = require("../tmp-dir");
16
+ const DAEMON_ENV_SETTINGS = Object.assign(Object.assign({}, process.env), { NX_PROJECT_GLOB_CACHE: 'false' });
16
17
  function startInBackground() {
17
18
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
18
19
  yield (0, cache_1.safelyCleanUpExistingProcess)();
@@ -26,6 +27,7 @@ function startInBackground() {
26
27
  detached: true,
27
28
  windowsHide: true,
28
29
  shell: false,
30
+ env: DAEMON_ENV_SETTINGS,
29
31
  });
30
32
  backgroundProcess.unref();
31
33
  // Persist metadata about the background process so that it can be cleaned up later if needed
@@ -80,6 +82,7 @@ function startInCurrentProcess() {
80
82
  (0, child_process_1.spawnSync)(process.execPath, [(0, path_1.join)(__dirname, '../server/start.js')], {
81
83
  cwd: app_root_1.workspaceRoot,
82
84
  stdio: 'inherit',
85
+ env: DAEMON_ENV_SETTINGS,
83
86
  });
84
87
  }
85
88
  exports.startInCurrentProcess = startInCurrentProcess;
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ import type { Tree } from '../tree';
2
+ /**
3
+ * Formats all the created or updated files using Prettier
4
+ * @param tree - the file system tree
5
+ */
6
+ export declare function formatChangedFilesWithPrettierIfAvailable(tree: Tree): Promise<void>;
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.formatChangedFilesWithPrettierIfAvailable = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const path = require("path");
6
+ /**
7
+ * Formats all the created or updated files using Prettier
8
+ * @param tree - the file system tree
9
+ */
10
+ function formatChangedFilesWithPrettierIfAvailable(tree) {
11
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
12
+ let prettier;
13
+ try {
14
+ prettier = yield Promise.resolve().then(() => require('prettier'));
15
+ }
16
+ catch (_a) { }
17
+ if (!prettier)
18
+ return;
19
+ const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
20
+ yield Promise.all(Array.from(files).map((file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
21
+ const systemPath = path.join(tree.root, file.path);
22
+ let options = {
23
+ filepath: systemPath,
24
+ };
25
+ const resolvedOptions = yield prettier.resolveConfig(systemPath, {
26
+ editorconfig: true,
27
+ });
28
+ if (!resolvedOptions) {
29
+ return;
30
+ }
31
+ options = Object.assign(Object.assign({}, options), resolvedOptions);
32
+ const support = yield prettier.getFileInfo(systemPath, options);
33
+ if (support.ignored || !support.inferredParser) {
34
+ return;
35
+ }
36
+ try {
37
+ tree.write(file.path, prettier.format(file.content.toString('utf-8'), options));
38
+ }
39
+ catch (e) {
40
+ console.warn(`Could not format ${file.path}. Error: "${e.message}"`);
41
+ }
42
+ })));
43
+ });
44
+ }
45
+ exports.formatChangedFilesWithPrettierIfAvailable = formatChangedFilesWithPrettierIfAvailable;
46
+ //# sourceMappingURL=format-changed-files-with-prettier-if-available.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"format-changed-files-with-prettier-if-available.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/internal-utils/format-changed-files-with-prettier-if-available.ts"],"names":[],"mappings":";;;;AACA,6BAA6B;AAG7B;;;GAGG;AACH,SAAsB,yCAAyC,CAC7D,IAAU;;QAEV,IAAI,QAAyB,CAAC;QAC9B,IAAI;YACF,QAAQ,GAAG,2CAAa,UAAU,EAAC,CAAC;SACrC;QAAC,WAAM,GAAE;QAEV,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAC5D,CAAC;QACF,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACnD,IAAI,OAAO,GAAQ;gBACjB,QAAQ,EAAE,UAAU;aACrB,CAAC;YAEF,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE;gBAC/D,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,EAAE;gBACpB,OAAO;aACR;YACD,OAAO,mCACF,OAAO,GACP,eAAe,CACnB,CAAC;YAEF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAChE,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAC9C,OAAO;aACR;YAED,IAAI;gBACF,IAAI,CAAC,KAAK,CACR,IAAI,CAAC,IAAI,EACT,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CACzD,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,aAAa,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;aACtE;QACH,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AA9CD,8FA8CC"}
@@ -0,0 +1,5 @@
1
+ import type { Tree } from 'nx/src/generators/tree';
2
+ /**
3
+ * Creates a host for testing.
4
+ */
5
+ export declare function createTreeWithEmptyWorkspace(version?: number): Tree;
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createTreeWithEmptyWorkspace = void 0;
4
+ const tree_1 = require("nx/src/generators/tree");
5
+ /**
6
+ * Creates a host for testing.
7
+ */
8
+ function createTreeWithEmptyWorkspace(version = 1) {
9
+ const tree = new tree_1.FsTree('/virtual', false);
10
+ tree.write('/workspace.json', JSON.stringify({ version, projects: {} }));
11
+ tree.write('./.prettierrc', JSON.stringify({ singleQuote: true }));
12
+ tree.write('/package.json', JSON.stringify({
13
+ name: 'test-name',
14
+ dependencies: {},
15
+ devDependencies: {},
16
+ }));
17
+ tree.write('/nx.json', JSON.stringify({
18
+ npmScope: 'proj',
19
+ affected: {
20
+ defaultBase: 'main',
21
+ },
22
+ tasksRunnerOptions: {
23
+ default: {
24
+ runner: 'nx/tasks-runners/default',
25
+ options: {
26
+ cacheableOperations: ['build', 'lint', 'test', 'e2e'],
27
+ },
28
+ },
29
+ },
30
+ }));
31
+ tree.write('/tsconfig.base.json', JSON.stringify({ compilerOptions: { paths: {} } }));
32
+ return tree;
33
+ }
34
+ exports.createTreeWithEmptyWorkspace = createTreeWithEmptyWorkspace;
35
+ //# sourceMappingURL=create-tree-with-empty-workspace.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"create-tree-with-empty-workspace.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/testing-utils/create-tree-with-empty-workspace.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAGhD;;GAEG;AACH,SAAgB,4BAA4B,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,IAAI,GAAG,IAAI,aAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAE3C,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,KAAK,CACR,eAAe,EACf,IAAI,CAAC,SAAS,CAAC;QACb,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;KACpB,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,UAAU,EACV,IAAI,CAAC,SAAS,CAAC;QACb,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE;YACR,WAAW,EAAE,MAAM;SACpB;QACD,kBAAkB,EAAE;YAClB,OAAO,EAAE;gBACP,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE;oBACP,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;iBACtD;aACF;SACF;KACF,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,qBAAqB,EACrB,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CACnD,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC;AApCD,oEAoCC"}
@@ -0,0 +1,5 @@
1
+ import type { Tree } from 'nx/src/generators/tree';
2
+ /**
3
+ * Creates a host for testing.
4
+ */
5
+ export declare function createTree(): Tree;
@@ -0,0 +1,12 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createTree = void 0;
4
+ const tree_1 = require("nx/src/generators/tree");
5
+ /**
6
+ * Creates a host for testing.
7
+ */
8
+ function createTree() {
9
+ return new tree_1.FsTree('/virtual', false);
10
+ }
11
+ exports.createTree = createTree;
12
+ //# sourceMappingURL=create-tree.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"create-tree.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/testing-utils/create-tree.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAGhD;;GAEG;AACH,SAAgB,UAAU;IACxB,OAAO,IAAI,aAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AACvC,CAAC;AAFD,gCAEC"}
File without changes
File without changes
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../../packages/nx/src/generators/tree.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,28 @@
1
+ import type { Tree } from '../tree';
2
+ import type { JsonParseOptions, JsonSerializeOptions } from '../../utils/json';
3
+ /**
4
+ * Reads a json file, removes all comments and parses JSON.
5
+ *
6
+ * @param tree - file system tree
7
+ * @param path - file path
8
+ * @param options - Optional JSON Parse Options
9
+ */
10
+ export declare function readJson<T extends object = any>(tree: Tree, path: string, options?: JsonParseOptions): T;
11
+ /**
12
+ * Writes a JSON value to the file system tree
13
+
14
+ * @param tree File system tree
15
+ * @param path Path of JSON file in the Tree
16
+ * @param value Serializable value to write
17
+ * @param options Optional JSON Serialize Options
18
+ */
19
+ export declare function writeJson<T extends object = object>(tree: Tree, path: string, value: T, options?: JsonSerializeOptions): void;
20
+ /**
21
+ * Updates a JSON value to the file system tree
22
+ *
23
+ * @param tree File system tree
24
+ * @param path Path of JSON file in the Tree
25
+ * @param updater Function that maps the current value of a JSON document to a new value to be written to the document
26
+ * @param options Optional JSON Parse and Serialize Options
27
+ */
28
+ export declare function updateJson<T extends object = any, U extends object = T>(tree: Tree, path: string, updater: (value: T) => U, options?: JsonParseOptions & JsonSerializeOptions): void;
@@ -0,0 +1,49 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.updateJson = exports.writeJson = exports.readJson = void 0;
4
+ const json_1 = require("../../utils/json");
5
+ /**
6
+ * Reads a json file, removes all comments and parses JSON.
7
+ *
8
+ * @param tree - file system tree
9
+ * @param path - file path
10
+ * @param options - Optional JSON Parse Options
11
+ */
12
+ function readJson(tree, path, options) {
13
+ if (!tree.exists(path)) {
14
+ throw new Error(`Cannot find ${path}`);
15
+ }
16
+ try {
17
+ return (0, json_1.parseJson)(tree.read(path, 'utf-8'), options);
18
+ }
19
+ catch (e) {
20
+ throw new Error(`Cannot parse ${path}: ${e.message}`);
21
+ }
22
+ }
23
+ exports.readJson = readJson;
24
+ /**
25
+ * Writes a JSON value to the file system tree
26
+
27
+ * @param tree File system tree
28
+ * @param path Path of JSON file in the Tree
29
+ * @param value Serializable value to write
30
+ * @param options Optional JSON Serialize Options
31
+ */
32
+ function writeJson(tree, path, value, options) {
33
+ tree.write(path, (0, json_1.serializeJson)(value, options));
34
+ }
35
+ exports.writeJson = writeJson;
36
+ /**
37
+ * Updates a JSON value to the file system tree
38
+ *
39
+ * @param tree File system tree
40
+ * @param path Path of JSON file in the Tree
41
+ * @param updater Function that maps the current value of a JSON document to a new value to be written to the document
42
+ * @param options Optional JSON Parse and Serialize Options
43
+ */
44
+ function updateJson(tree, path, updater, options) {
45
+ const updatedValue = updater(readJson(tree, path, options));
46
+ writeJson(tree, path, updatedValue, options);
47
+ }
48
+ exports.updateJson = updateJson;
49
+ //# sourceMappingURL=json.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"json.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/utils/json.ts"],"names":[],"mappings":";;;AACA,2CAA4D;AAG5D;;;;;;GAMG;AACH,SAAgB,QAAQ,CACtB,IAAU,EACV,IAAY,EACZ,OAA0B;IAE1B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;KACxC;IACD,IAAI;QACF,OAAO,IAAA,gBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;KACrD;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KACvD;AACH,CAAC;AAbD,4BAaC;AAED;;;;;;;GAOG;AACH,SAAgB,SAAS,CACvB,IAAU,EACV,IAAY,EACZ,KAAQ,EACR,OAA8B;IAE9B,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAA,oBAAa,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AAClD,CAAC;AAPD,8BAOC;AAED;;;;;;;GAOG;AACH,SAAgB,UAAU,CACxB,IAAU,EACV,IAAY,EACZ,OAAwB,EACxB,OAAiD;IAEjD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AARD,gCAQC"}
@@ -0,0 +1,77 @@
1
+ import type { Tree } from '../tree';
2
+ import type { NxJsonConfiguration } from '../../config/nx-json';
3
+ import { ProjectConfiguration, WorkspaceJsonConfiguration } from '../../config/workspace-json-project-json';
4
+ export declare type WorkspaceConfiguration = Omit<WorkspaceJsonConfiguration, 'projects'> & Partial<NxJsonConfiguration>;
5
+ /**
6
+ * Adds project configuration to the Nx workspace.
7
+ *
8
+ * The project configuration is stored in workspace.json or the associated project.json file.
9
+ * The utility will update either files.
10
+ *
11
+ * @param tree - the file system tree
12
+ * @param projectName - unique name. Often directories are part of the name (e.g., mydir-mylib)
13
+ * @param projectConfiguration - project configuration
14
+ * @param standalone - should the project use package.json? If false, the project config is inside workspace.json
15
+ */
16
+ export declare function addProjectConfiguration(tree: Tree, projectName: string, projectConfiguration: ProjectConfiguration, standalone?: boolean): void;
17
+ /**
18
+ * Updates the configuration of an existing project.
19
+ *
20
+ * The project configuration is stored in workspace.json or the associated project.json file.
21
+ * The utility will update either files.
22
+ *
23
+ * @param tree - the file system tree
24
+ * @param projectName - unique name. Often directories are part of the name (e.g., mydir-mylib)
25
+ * @param projectConfiguration - project configuration
26
+ */
27
+ export declare function updateProjectConfiguration(tree: Tree, projectName: string, projectConfiguration: ProjectConfiguration): void;
28
+ /**
29
+ * Removes the configuration of an existing project.
30
+ *
31
+ * The project configuration is stored in workspace.json or the associated project.json file.
32
+ * The utility will update either file.
33
+ */
34
+ export declare function removeProjectConfiguration(tree: Tree, projectName: string): void;
35
+ /**
36
+ * Get a map of all projects in a workspace.
37
+ *
38
+ * Use {@link readProjectConfiguration} if only one project is needed.
39
+ */
40
+ export declare function getProjects(tree: Tree): Map<string, ProjectConfiguration>;
41
+ /**
42
+ * Read general workspace configuration such as the default project or cli settings
43
+ *
44
+ * This does _not_ provide projects configuration, use {@link readProjectConfiguration} instead.
45
+ */
46
+ export declare function readWorkspaceConfiguration(tree: Tree): WorkspaceConfiguration;
47
+ /**
48
+ * Update general workspace configuration such as the default project or cli settings.
49
+ *
50
+ * This does _not_ update projects configuration, use {@link updateProjectConfiguration} or {@link addProjectConfiguration} instead.
51
+ */
52
+ export declare function updateWorkspaceConfiguration(tree: Tree, workspaceConfig: WorkspaceConfiguration): void;
53
+ /**
54
+ * Reads a project configuration.
55
+ *
56
+ * The project configuration is stored in workspace.json or the associated project.json file.
57
+ * The utility will read from either file.
58
+ *
59
+ * @param tree - the file system tree
60
+ * @param projectName - unique name. Often directories are part of the name (e.g., mydir-mylib)
61
+ * @throws If supplied projectName cannot be found
62
+ */
63
+ export declare function readProjectConfiguration(tree: Tree, projectName: string): ProjectConfiguration;
64
+ export declare function readNxJson(tree: Tree): NxJsonConfiguration | null;
65
+ /**
66
+ * Returns if a project has a standalone configuration (project.json).
67
+ *
68
+ * @param tree - the file system tree
69
+ * @param project - the project name
70
+ */
71
+ export declare function isStandaloneProject(tree: Tree, project: string): boolean;
72
+ /**
73
+ * Read the workspace configuration, including projects.
74
+ */
75
+ export declare function readWorkspace(tree: Tree): WorkspaceJsonConfiguration;
76
+ export declare function shouldDefaultToUsingStandaloneConfigs(tree: Tree): boolean;
77
+ export declare function getWorkspacePath(tree: Tree): '/angular.json' | '/workspace.json' | null;