@nrwl/workspace 13.2.0-rc.1 → 13.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "13.2.0-rc.1",
3
+ "version": "13.2.0",
4
4
  "description": "Smart, Extensible Build Framework",
5
5
  "repository": {
6
6
  "type": "git",
@@ -62,10 +62,10 @@
62
62
  },
63
63
  "dependencies": {
64
64
  "@parcel/watcher": "2.0.0-alpha.11",
65
- "@nrwl/cli": "13.2.0-rc.1",
66
- "@nrwl/devkit": "13.2.0-rc.1",
67
- "@nrwl/jest": "13.2.0-rc.1",
68
- "@nrwl/linter": "13.2.0-rc.1",
65
+ "@nrwl/cli": "13.2.0",
66
+ "@nrwl/devkit": "13.2.0",
67
+ "@nrwl/jest": "13.2.0",
68
+ "@nrwl/linter": "13.2.0",
69
69
  "chokidar": "^3.5.1",
70
70
  "cosmiconfig": "^4.0.0",
71
71
  "fs-extra": "^9.1.0",
@@ -19,7 +19,6 @@ const PRETTIER_PATH = require.resolve('prettier/bin-prettier');
19
19
  function format(command, args) {
20
20
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
21
21
  const { nxArgs } = (0, utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected');
22
- const workspaceJsonPath = (0, workspace_1.workspaceConfigName)(app_root_1.appRootPath);
23
22
  const patterns = (yield getPatterns(Object.assign(Object.assign({}, args), nxArgs))).map((p) => `"${p}"`);
24
23
  // Chunkify the patterns array to prevent crashing the windows terminal
25
24
  const chunkList = chunkify(patterns, 50);
@@ -29,7 +28,7 @@ function format(command, args) {
29
28
  sortWorkspaceJson();
30
29
  sortTsConfig();
31
30
  movePropertiesToNewLocations();
32
- chunkList.push([workspaceJsonPath, 'nx.json', 'tsconfig.base.json']);
31
+ addRootConfigFiles(chunkList, nxArgs);
33
32
  chunkList.forEach((chunk) => write(chunk));
34
33
  break;
35
34
  case 'check':
@@ -72,6 +71,21 @@ function getPatternsFromApps(affectedFiles, matchAllPattern) {
72
71
  return getPatternsFromProjects(Object.keys(affectedGraph.nodes), matchAllPattern);
73
72
  });
74
73
  }
74
+ function addRootConfigFiles(chunkList, nxArgs) {
75
+ if (nxArgs.all) {
76
+ return;
77
+ }
78
+ const chunk = [];
79
+ const workspaceJsonPath = (0, workspace_1.workspaceConfigName)(app_root_1.appRootPath);
80
+ [workspaceJsonPath, 'nx.json', 'tsconfig.base.json'].forEach((file) => {
81
+ if (chunkList.every((c) => !c.includes(`"${file}"`))) {
82
+ chunk.push(file);
83
+ }
84
+ });
85
+ if (chunk.length > 0) {
86
+ chunkList.push(chunk);
87
+ }
88
+ }
75
89
  function getPatternsFromProjects(projects, matchAllPattern) {
76
90
  const roots = (0, shared_1.getProjectRoots)(projects);
77
91
  return roots.map((root) => `${root}/${matchAllPattern}`);
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/format.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/format.ts"],"names":[],"mappings":"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"}
@@ -42,7 +42,12 @@ function compileTools() {
42
42
  return generatorsOutDir;
43
43
  }
44
44
  function getToolsOutDir() {
45
- return path.resolve(toolsDir, toolsTsConfig().compilerOptions.outDir);
45
+ const outDir = toolsTsConfig().compilerOptions.outDir;
46
+ if (!outDir) {
47
+ devkit_1.logger.error(`${toolsTsConfigPath} must specify an outDir`);
48
+ process.exit(1);
49
+ }
50
+ return path.resolve(toolsDir, outDir);
46
51
  }
47
52
  function compileToolsDir(outDir) {
48
53
  (0, fs_extra_1.copySync)(generatorsDir, path.join(outDir, 'generators'));
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-generators.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/workspace-generators.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspace-generators.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/workspace-generators.ts"],"names":[],"mappings":"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"}