@nrwl/workspace 14.2.4 → 14.3.0-beta.2
Sign up to get free protection for your applications and to get access to all the features.
- package/.eslintrc.json +17 -0
- package/CHANGELOG.md +1 -1
- package/index.d.ts +0 -1
- package/index.js +2 -4
- package/index.js.map +1 -1
- package/package.json +26 -26
- package/src/executors/run-commands/schema.json +11 -1
- package/src/executors/run-script/schema.json +11 -1
- package/src/generators/preset/preset.js +9 -3
- package/src/generators/preset/preset.js.map +1 -1
package/.eslintrc.json
CHANGED
@@ -18,6 +18,23 @@
|
|
18
18
|
"@angular-devkit/schematics"
|
19
19
|
]
|
20
20
|
}
|
21
|
+
},
|
22
|
+
{
|
23
|
+
"files": [
|
24
|
+
"./package.json",
|
25
|
+
"./generators.json",
|
26
|
+
"./executors.json",
|
27
|
+
"./migrations.json"
|
28
|
+
],
|
29
|
+
"parser": "jsonc-eslint-parser",
|
30
|
+
"rules": {
|
31
|
+
"@nrwl/nx/nx-plugin-checks": [
|
32
|
+
"error",
|
33
|
+
{
|
34
|
+
"allowedVersionStrings": ["latest", "*"]
|
35
|
+
}
|
36
|
+
]
|
37
|
+
}
|
21
38
|
}
|
22
39
|
],
|
23
40
|
"ignorePatterns": ["!**/*"]
|
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
|
-
|
6
|
+
# [14.3.0-beta.2](https://github.com/nrwl/nx/compare/14.2.2...14.3.0-beta.2) (2022-06-11)
|
7
7
|
|
8
8
|
**Note:** Version bump only for package @nrwl/workspace
|
package/index.d.ts
CHANGED
@@ -8,7 +8,6 @@ export { readWorkspaceConfig, readPackageJson, } from 'nx/src/project-graph/file
|
|
8
8
|
export { ProjectGraphCache } from 'nx/src/project-graph/nx-deps-cache';
|
9
9
|
export { readJsonInTree, updateJsonInTree, updateWorkspaceInTree, insert, replaceNodeValue, addDepsToPackageJson, addMethod, addIncludeToTsConfig, addGlobal, getProjectConfig, addParameterToConstructor, createOrUpdate, findNodes, updatePackageJsonDependencies, readWorkspace, renameSyncInTree, renameDirSyncInTree, updateNxJsonInTree, readNxJsonInTree, InsertChange, ReplaceChange, RemoveChange, } from './src/utils/ast-utils';
|
10
10
|
export { getNpmScope, getWorkspacePath, replaceAppNameWithPath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
|
11
|
-
export { unparse } from 'nx/src/tasks-runner/utils';
|
12
11
|
export { getWorkspace, updateWorkspace, updateBuilderConfig, } from './src/utils/workspace';
|
13
12
|
export { addUpdateTask } from './src/utils/update-task';
|
14
13
|
export { addLintFiles, generateProjectLint, Linter } from './src/utils/lint';
|
package/index.js
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.generateProjectLint = exports.addLintFiles = exports.addUpdateTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.
|
4
|
-
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.renameNpmPackages = exports.renamePackageImports = exports.visitNotIgnoredFiles =
|
3
|
+
exports.updateKarmaConf = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.generateProjectLint = exports.addLintFiles = exports.addUpdateTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.replaceAppNameWithPath = exports.getWorkspacePath = exports.getNpmScope = exports.RemoveChange = exports.ReplaceChange = exports.InsertChange = exports.readNxJsonInTree = exports.updateNxJsonInTree = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.readWorkspace = exports.updatePackageJsonDependencies = exports.findNodes = exports.createOrUpdate = exports.addParameterToConstructor = exports.getProjectConfig = exports.addGlobal = exports.addIncludeToTsConfig = exports.addMethod = exports.addDepsToPackageJson = exports.replaceNodeValue = exports.insert = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.readJsonInTree = exports.readPackageJson = exports.readWorkspaceConfig = exports.output = exports.resolveUserExistingPrettierConfig = exports.names = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
|
4
|
+
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.renameNpmPackages = exports.renamePackageImports = exports.visitNotIgnoredFiles = void 0;
|
5
5
|
const tslib_1 = require("tslib");
|
6
6
|
var typescript_1 = require("./src/utilities/typescript");
|
7
7
|
Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return typescript_1.readTsConfig; } });
|
@@ -52,8 +52,6 @@ Object.defineProperty(exports, "replaceAppNameWithPath", { enumerable: true, get
|
|
52
52
|
Object.defineProperty(exports, "editTarget", { enumerable: true, get: function () { return cli_config_utils_1.editTarget; } });
|
53
53
|
Object.defineProperty(exports, "parseTarget", { enumerable: true, get: function () { return cli_config_utils_1.parseTarget; } });
|
54
54
|
Object.defineProperty(exports, "serializeTarget", { enumerable: true, get: function () { return cli_config_utils_1.serializeTarget; } });
|
55
|
-
var utils_1 = require("nx/src/tasks-runner/utils");
|
56
|
-
Object.defineProperty(exports, "unparse", { enumerable: true, get: function () { return utils_1.unparse; } });
|
57
55
|
var workspace_1 = require("./src/utils/workspace");
|
58
56
|
Object.defineProperty(exports, "getWorkspace", { enumerable: true, get: function () { return workspace_1.getWorkspace; } });
|
59
57
|
Object.defineProperty(exports, "updateWorkspace", { enumerable: true, get: function () { return workspace_1.updateWorkspace; } });
|
package/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA0D;AAAjD,0GAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAKmC;AAJjC,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,uCAAqC;AAA5B,+FAAA,KAAK,OAAA;AAEd,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,8DAGyC;AAFvC,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAuB+B;AAtB7B,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAChB,kHAAA,qBAAqB,OAAA;AACrB,mGAAA,MAAM,OAAA;AACN,6GAAA,gBAAgB,OAAA;AAChB,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,6GAAA,gBAAgB,OAAA;AAChB,sHAAA,yBAAyB,OAAA;AACzB,2GAAA,cAAc,OAAA;AACd,sGAAA,SAAS,OAAA;AACT,0HAAA,6BAA6B,OAAA;AAC7B,0GAAA,aAAa,OAAA;AACb,6GAAA,gBAAgB,OAAA;AAChB,gHAAA,mBAAmB,OAAA;AACnB,+GAAA,kBAAkB,OAAA;AAClB,6GAAA,gBAAgB,OAAA;AAChB,yGAAA,YAAY,OAAA;AACZ,0GAAA,aAAa,OAAA;AACb,yGAAA,YAAY,OAAA;AAGd,iEAOsC;AANpC,+GAAA,WAAW,OAAA;AACX,oHAAA,gBAAgB,OAAA;AAChB,0HAAA,sBAAsB,OAAA;AACtB,8GAAA,UAAU,OAAA;AACV,+GAAA,WAAW,OAAA;AACX,mHAAA,eAAe,OAAA;AAGjB,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA0D;AAAjD,0GAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAKmC;AAJjC,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,uCAAqC;AAA5B,+FAAA,KAAK,OAAA;AAEd,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,8DAGyC;AAFvC,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAuB+B;AAtB7B,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAChB,kHAAA,qBAAqB,OAAA;AACrB,mGAAA,MAAM,OAAA;AACN,6GAAA,gBAAgB,OAAA;AAChB,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,6GAAA,gBAAgB,OAAA;AAChB,sHAAA,yBAAyB,OAAA;AACzB,2GAAA,cAAc,OAAA;AACd,sGAAA,SAAS,OAAA;AACT,0HAAA,6BAA6B,OAAA;AAC7B,0GAAA,aAAa,OAAA;AACb,6GAAA,gBAAgB,OAAA;AAChB,gHAAA,mBAAmB,OAAA;AACnB,+GAAA,kBAAkB,OAAA;AAClB,6GAAA,gBAAgB,OAAA;AAChB,yGAAA,YAAY,OAAA;AACZ,0GAAA,aAAa,OAAA;AACb,yGAAA,YAAY,OAAA;AAGd,iEAOsC;AANpC,+GAAA,WAAW,OAAA;AACX,oHAAA,gBAAgB,OAAA;AAChB,0HAAA,sBAAsB,OAAA;AACtB,8GAAA,UAAU,OAAA;AACV,+GAAA,WAAW,OAAA;AACX,mHAAA,eAAe,OAAA;AAGjB,mDAI+B;AAH7B,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AACf,gHAAA,mBAAmB,OAAA;AAErB,uDAAwD;AAA/C,4GAAA,aAAa,OAAA;AACtB,yCAA6E;AAApE,oGAAA,YAAY,OAAA;AAAE,2GAAA,mBAAmB,OAAA;AAE1C,uEAAoE;AAA3D,kHAAA,cAAc,OAAA;AACvB,+DAA6D;AAApD,2GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,mEAAyC;AACzC,yEAAsE;AAA7D,oHAAA,eAAe,OAAA;AACxB,qFAAiF;AAAxE,+HAAA,oBAAoB,OAAA;AAC7B,mFAAgF;AAAvE,8HAAA,oBAAoB,OAAA;AAC7B,6EAA0E;AAAjE,wHAAA,iBAAiB,OAAA;AAC1B,+CAA+C;AAC/C,2DAAoE;AAA3D,wHAAA,uBAAuB,OAAA;AAChC,+FAA0F;AAAjF,8IAAA,2BAA2B,OAAA;AAEpC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,sGAGsE;AAFpE,oIAAA,2BAA2B,OAAA;AAC3B,oIAAA,2BAA2B,OAAA;AAGhB,QAAA,WAAW,GAAG,OAAO,CAAC"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nrwl/workspace",
|
3
|
-
"version": "14.2
|
3
|
+
"version": "14.3.0-beta.2",
|
4
4
|
"description": "Smart, Fast and Extensible Build System.",
|
5
5
|
"repository": {
|
6
6
|
"type": "git",
|
@@ -32,27 +32,27 @@
|
|
32
32
|
"requirements": {},
|
33
33
|
"migrations": "./migrations.json",
|
34
34
|
"packageGroup": {
|
35
|
-
"@nrwl/angular": "14.2
|
36
|
-
"@nrwl/cypress": "14.2
|
37
|
-
"@nrwl/devkit": "14.2
|
38
|
-
"@nrwl/eslint-plugin-nx": "14.2
|
39
|
-
"@nrwl/express": "14.2
|
40
|
-
"@nrwl/jest": "14.2
|
41
|
-
"@nrwl/linter": "14.2
|
42
|
-
"@nrwl/nest": "14.2
|
43
|
-
"@nrwl/next": "14.2
|
44
|
-
"@nrwl/node": "14.2
|
45
|
-
"@nrwl/nx-plugin": "14.2
|
46
|
-
"@nrwl/react": "14.2
|
47
|
-
"@nrwl/storybook": "14.2
|
48
|
-
"@nrwl/web": "14.2
|
49
|
-
"@nrwl/js": "14.2
|
50
|
-
"@nrwl/cli": "14.2
|
51
|
-
"@nrwl/tao": "14.2
|
35
|
+
"@nrwl/angular": "14.3.0-beta.2",
|
36
|
+
"@nrwl/cypress": "14.3.0-beta.2",
|
37
|
+
"@nrwl/devkit": "14.3.0-beta.2",
|
38
|
+
"@nrwl/eslint-plugin-nx": "14.3.0-beta.2",
|
39
|
+
"@nrwl/express": "14.3.0-beta.2",
|
40
|
+
"@nrwl/jest": "14.3.0-beta.2",
|
41
|
+
"@nrwl/linter": "14.3.0-beta.2",
|
42
|
+
"@nrwl/nest": "14.3.0-beta.2",
|
43
|
+
"@nrwl/next": "14.3.0-beta.2",
|
44
|
+
"@nrwl/node": "14.3.0-beta.2",
|
45
|
+
"@nrwl/nx-plugin": "14.3.0-beta.2",
|
46
|
+
"@nrwl/react": "14.3.0-beta.2",
|
47
|
+
"@nrwl/storybook": "14.3.0-beta.2",
|
48
|
+
"@nrwl/web": "14.3.0-beta.2",
|
49
|
+
"@nrwl/js": "14.3.0-beta.2",
|
50
|
+
"@nrwl/cli": "14.3.0-beta.2",
|
51
|
+
"@nrwl/tao": "14.3.0-beta.2",
|
52
52
|
"@nrwl/nx-cloud": "latest",
|
53
|
-
"@nrwl/react-native": "14.2
|
54
|
-
"@nrwl/detox": "14.2
|
55
|
-
"nx": "14.2
|
53
|
+
"@nrwl/react-native": "14.3.0-beta.2",
|
54
|
+
"@nrwl/detox": "14.3.0-beta.2",
|
55
|
+
"nx": "14.3.0-beta.2"
|
56
56
|
}
|
57
57
|
},
|
58
58
|
"peerDependencies": {
|
@@ -64,9 +64,9 @@
|
|
64
64
|
}
|
65
65
|
},
|
66
66
|
"dependencies": {
|
67
|
-
"@nrwl/devkit": "14.2
|
68
|
-
"@nrwl/jest": "14.2
|
69
|
-
"@nrwl/linter": "14.2
|
67
|
+
"@nrwl/devkit": "14.3.0-beta.2",
|
68
|
+
"@nrwl/jest": "14.3.0-beta.2",
|
69
|
+
"@nrwl/linter": "14.3.0-beta.2",
|
70
70
|
"@parcel/watcher": "2.0.4",
|
71
71
|
"chalk": "4.1.0",
|
72
72
|
"chokidar": "^3.5.1",
|
@@ -81,7 +81,7 @@
|
|
81
81
|
"ignore": "^5.0.4",
|
82
82
|
"minimatch": "3.0.5",
|
83
83
|
"npm-run-path": "^4.0.1",
|
84
|
-
"nx": "14.2
|
84
|
+
"nx": "14.3.0-beta.2",
|
85
85
|
"open": "^8.4.0",
|
86
86
|
"rxjs": "^6.5.4",
|
87
87
|
"semver": "7.3.4",
|
@@ -90,5 +90,5 @@
|
|
90
90
|
"yargs": "^17.4.0",
|
91
91
|
"yargs-parser": "21.0.1"
|
92
92
|
},
|
93
|
-
"gitHead": "
|
93
|
+
"gitHead": "0fd3281d3c7dc7c086adfe754ce1be85b0f890bb"
|
94
94
|
}
|
@@ -124,9 +124,19 @@
|
|
124
124
|
"cwd": {
|
125
125
|
"type": "string",
|
126
126
|
"description": "Current working directory of the commands. If it's not specified the commands will run in the workspace root, if a relative path is specified the commands will run in that path relative to the workspace root and if it's an absolute path the commands will run in that path."
|
127
|
+
},
|
128
|
+
"__unparsed__": {
|
129
|
+
"hidden": true,
|
130
|
+
"type": "array",
|
131
|
+
"items": {
|
132
|
+
"type": "string"
|
133
|
+
},
|
134
|
+
"$default": {
|
135
|
+
"$source": "unparsed"
|
136
|
+
}
|
127
137
|
}
|
128
138
|
},
|
129
139
|
"additionalProperties": true,
|
130
|
-
"required": [],
|
140
|
+
"required": ["__unparsed__"],
|
131
141
|
"examplesFile": "../../../docs/run-commands-examples.md"
|
132
142
|
}
|
@@ -8,9 +8,19 @@
|
|
8
8
|
"script": {
|
9
9
|
"type": "string",
|
10
10
|
"description": "An npm script name in the `package.json` file of the project (e.g., `build`)."
|
11
|
+
},
|
12
|
+
"__unparsed__": {
|
13
|
+
"hidden": true,
|
14
|
+
"type": "array",
|
15
|
+
"items": {
|
16
|
+
"type": "string"
|
17
|
+
},
|
18
|
+
"$default": {
|
19
|
+
"$source": "unparsed"
|
20
|
+
}
|
11
21
|
}
|
12
22
|
},
|
13
23
|
"additionalProperties": true,
|
14
|
-
"required": ["script"],
|
24
|
+
"required": ["script", "__unparsed__"],
|
15
25
|
"examplesFile": "../../../docs/run-script-examples.md"
|
16
26
|
}
|
@@ -23,9 +23,7 @@ exports.presetSchematic = (0, devkit_1.convertNxGenerator)(presetGenerator);
|
|
23
23
|
exports.default = presetGenerator;
|
24
24
|
function createPreset(tree, options) {
|
25
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
26
|
-
if (options.preset === presets_1.Preset.Empty ||
|
27
|
-
options.preset === presets_1.Preset.Apps ||
|
28
|
-
options.preset === presets_1.Preset.TS) {
|
26
|
+
if (options.preset === presets_1.Preset.Empty || options.preset === presets_1.Preset.Apps) {
|
29
27
|
return;
|
30
28
|
}
|
31
29
|
else if (options.preset === presets_1.Preset.Angular) {
|
@@ -150,6 +148,14 @@ function createPreset(tree, options) {
|
|
150
148
|
tree.delete('workspace.json');
|
151
149
|
}
|
152
150
|
}
|
151
|
+
else if (options.preset === presets_1.Preset.TS) {
|
152
|
+
const c = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
153
|
+
c.workspaceLayout = {
|
154
|
+
appsDir: 'packages',
|
155
|
+
libsDir: 'packages',
|
156
|
+
};
|
157
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, c);
|
158
|
+
}
|
153
159
|
else {
|
154
160
|
throw new Error(`Invalid preset ${options.preset}`);
|
155
161
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCAYsB;AAGtB,gDAAsD;AAEtD,0DAAsD;AACtD,gEAA4D;AAC5D,8CAA0C;AAC1C,+BAA4B;AAE5B,SAAsB,eAAe,CAAC,IAAU,EAAE,OAAe;;QAC/D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAPD,0CAOC;AAEY,QAAA,eAAe,GAAG,IAAA,2BAAkB,EAAC,eAAe,CAAC,CAAC;AACnE,kBAAe,eAAe,CAAC;AAE/B,SAAe,YAAY,CAAC,IAAU,EAAE,OAAe;;QACrD,
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|