@nrwl/workspace 15.0.12 → 15.1.0-beta.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/package.json +30 -30
  3. package/src/utilities/generate-globs.js +4 -3
  4. package/src/utilities/generate-globs.js.map +1 -1
  5. package/src/utils/cli-config-utils.js +2 -0
  6. package/src/utils/cli-config-utils.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- ## [15.0.12](https://github.com/nrwl/nx/compare/15.0.11...15.0.12) (2022-11-08)
6
+ # [15.1.0-beta.0](https://github.com/nrwl/nx/compare/15.0.7...15.1.0-beta.0) (2022-11-09)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/workspace
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "15.0.12",
3
+ "version": "15.1.0-beta.0",
4
4
  "private": false,
5
5
  "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
6
6
  "repository": {
@@ -33,31 +33,31 @@
33
33
  "requirements": {},
34
34
  "migrations": "./migrations.json",
35
35
  "packageGroup": {
36
- "@nrwl/angular": "15.0.12",
37
- "@nrwl/cli": "15.0.12",
38
- "@nrwl/cypress": "15.0.12",
39
- "@nrwl/detox": "15.0.12",
40
- "@nrwl/devkit": "15.0.12",
41
- "@nrwl/esbuild": "15.0.12",
42
- "@nrwl/eslint-plugin-nx": "15.0.12",
43
- "@nrwl/expo": "15.0.12",
44
- "@nrwl/express": "15.0.12",
45
- "@nrwl/jest": "15.0.12",
46
- "@nrwl/js": "15.0.12",
47
- "@nrwl/linter": "15.0.12",
48
- "@nrwl/nest": "15.0.12",
49
- "@nrwl/next": "15.0.12",
50
- "@nrwl/node": "15.0.12",
36
+ "@nrwl/angular": "15.1.0-beta.0",
37
+ "@nrwl/cli": "15.1.0-beta.0",
38
+ "@nrwl/cypress": "15.1.0-beta.0",
39
+ "@nrwl/detox": "15.1.0-beta.0",
40
+ "@nrwl/devkit": "15.1.0-beta.0",
41
+ "@nrwl/esbuild": "15.1.0-beta.0",
42
+ "@nrwl/eslint-plugin-nx": "15.1.0-beta.0",
43
+ "@nrwl/expo": "15.1.0-beta.0",
44
+ "@nrwl/express": "15.1.0-beta.0",
45
+ "@nrwl/jest": "15.1.0-beta.0",
46
+ "@nrwl/js": "15.1.0-beta.0",
47
+ "@nrwl/linter": "15.1.0-beta.0",
48
+ "@nrwl/nest": "15.1.0-beta.0",
49
+ "@nrwl/next": "15.1.0-beta.0",
50
+ "@nrwl/node": "15.1.0-beta.0",
51
51
  "@nrwl/nx-cloud": "latest",
52
- "@nrwl/nx-plugin": "15.0.12",
53
- "@nrwl/react": "15.0.12",
54
- "@nrwl/react-native": "15.0.12",
55
- "@nrwl/rollup": "15.0.12",
56
- "@nrwl/storybook": "15.0.12",
57
- "@nrwl/tao": "15.0.12",
58
- "@nrwl/web": "15.0.12",
59
- "@nrwl/webpack": "15.0.12",
60
- "nx": "15.0.12"
52
+ "@nrwl/nx-plugin": "15.1.0-beta.0",
53
+ "@nrwl/react": "15.1.0-beta.0",
54
+ "@nrwl/react-native": "15.1.0-beta.0",
55
+ "@nrwl/rollup": "15.1.0-beta.0",
56
+ "@nrwl/storybook": "15.1.0-beta.0",
57
+ "@nrwl/tao": "15.1.0-beta.0",
58
+ "@nrwl/web": "15.1.0-beta.0",
59
+ "@nrwl/webpack": "15.1.0-beta.0",
60
+ "nx": "15.1.0-beta.0"
61
61
  }
62
62
  },
63
63
  "peerDependencies": {
@@ -69,9 +69,9 @@
69
69
  }
70
70
  },
71
71
  "dependencies": {
72
- "@nrwl/devkit": "15.0.12",
73
- "@nrwl/jest": "15.0.12",
74
- "@nrwl/linter": "15.0.12",
72
+ "@nrwl/devkit": "15.1.0-beta.0",
73
+ "@nrwl/jest": "15.1.0-beta.0",
74
+ "@nrwl/linter": "15.1.0-beta.0",
75
75
  "@parcel/watcher": "2.0.4",
76
76
  "chalk": "4.1.0",
77
77
  "chokidar": "^3.5.1",
@@ -86,7 +86,7 @@
86
86
  "ignore": "^5.0.4",
87
87
  "minimatch": "3.0.5",
88
88
  "npm-run-path": "^4.0.1",
89
- "nx": "15.0.12",
89
+ "nx": "15.1.0-beta.0",
90
90
  "open": "^8.4.0",
91
91
  "rxjs": "^6.5.4",
92
92
  "semver": "7.3.4",
@@ -99,5 +99,5 @@
99
99
  "access": "public"
100
100
  },
101
101
  "types": "./index.d.ts",
102
- "gitHead": "b3541f6e2a0abe85cb7201111b74348670d543d3"
102
+ "gitHead": "6bc3720656de60838d89a8307fff3b41cfee04b3"
103
103
  }
package/src/utilities/generate-globs.js CHANGED
@@ -39,13 +39,14 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPattern) {
39
39
  const [projectDirs, warnings] = (0, project_graph_utils_1.getSourceDirOfDependentProjects)(projectName, projectGraph);
40
40
  const dirsToUse = [];
41
41
  const recursiveScanDirs = (dirPath) => {
42
- const children = (0, fs_1.readdirSync)(dirPath);
42
+ const children = (0, fs_1.readdirSync)((0, path_1.resolve)(workspace_root_1.workspaceRoot, dirPath));
43
43
  for (const child of children) {
44
44
  const childPath = (0, path_1.join)(dirPath, child);
45
- if ((ig === null || ig === void 0 ? void 0 : ig.ignores(childPath)) || !(0, fs_1.lstatSync)(childPath).isDirectory()) {
45
+ if ((ig === null || ig === void 0 ? void 0 : ig.ignores(childPath)) ||
46
+ !(0, fs_1.lstatSync)((0, path_1.resolve)(workspace_root_1.workspaceRoot, childPath)).isDirectory()) {
46
47
  continue;
47
48
  }
48
- if ((0, fs_1.existsSync)((0, path_1.join)(childPath, 'ng-package.json'))) {
49
+ if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, childPath, 'ng-package.json'))) {
49
50
  dirsToUse.push(childPath);
50
51
  }
51
52
  else {
package/src/utilities/generate-globs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/generate-globs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/generate-globs.ts"],"names":[],"mappings":"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"}
package/src/utils/cli-config-utils.js CHANGED
@@ -57,6 +57,8 @@ function replaceAppNameWithPath(node, appName, root) {
57
57
  'defaultConfiguration',
58
58
  'maximumError',
59
59
  'name',
60
+ 'type',
61
+ 'outputHashing',
60
62
  ]; // Some of the properties should not be renamed
61
63
  return Object.keys(node).reduce((m, c) => ((m[c] = !forbiddenPropertyList.includes(c)
62
64
  ? replaceAppNameWithPath(node[c], appName, root)
package/src/utils/cli-config-utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli-config-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/cli-config-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli-config-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/cli-config-utils.ts"],"names":[],"mappings":"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"}