@nx/devkit 16.2.0-beta.3 → 16.3.0-beta.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/nx-reexports-pre16.d.ts +1 -1
- package/nx-reexports-pre16.js +1 -6
- package/nx-reexports-pre16.js.map +1 -1
- package/package.json +3 -3
- package/src/executors/parse-target-string.js +9 -1
- package/src/executors/parse-target-string.js.map +1 -1
- package/src/executors/read-target-options.js +2 -2
- package/src/executors/read-target-options.js.map +1 -1
- package/src/utils/convert-nx-executor.js +0 -1
- package/src/utils/convert-nx-executor.js.map +1 -1
package/nx-reexports-pre16.d.ts
CHANGED
|
@@ -120,7 +120,7 @@ export { defaultTasksRunner, DefaultTasksRunnerOptions, RemoteCache, } from 'nx/
|
|
|
120
120
|
/**
|
|
121
121
|
* @category Utils
|
|
122
122
|
*/
|
|
123
|
-
export { Hash, Hasher } from 'nx/src/hasher/hasher';
|
|
123
|
+
export { Hash, TaskHasher, Hasher } from 'nx/src/hasher/task-hasher';
|
|
124
124
|
/**
|
|
125
125
|
* @category Utils
|
|
126
126
|
*/
|
package/nx-reexports-pre16.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* If you need to export something from nx, it should go into nx/src/devkit-exports
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
-
exports.cacheDir = exports.
|
|
8
|
+
exports.cacheDir = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.ProjectGraphBuilder = exports.DependencyType = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.updateNxJson = exports.readNxJson = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.readAllWorkspaceConfiguration = exports.Workspaces = void 0;
|
|
9
9
|
/**
|
|
10
10
|
* @category Workspace
|
|
11
11
|
*/
|
|
@@ -125,11 +125,6 @@ Object.defineProperty(exports, "getOutputsForTargetAndConfiguration", { enumerab
|
|
|
125
125
|
*/
|
|
126
126
|
var default_tasks_runner_1 = require("nx/src/tasks-runner/default-tasks-runner");
|
|
127
127
|
Object.defineProperty(exports, "defaultTasksRunner", { enumerable: true, get: function () { return default_tasks_runner_1.defaultTasksRunner; } });
|
|
128
|
-
/**
|
|
129
|
-
* @category Utils
|
|
130
|
-
*/
|
|
131
|
-
var hasher_1 = require("nx/src/hasher/hasher");
|
|
132
|
-
Object.defineProperty(exports, "Hasher", { enumerable: true, get: function () { return hasher_1.Hasher; } });
|
|
133
128
|
/**
|
|
134
129
|
* @category Utils
|
|
135
130
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-reexports-pre16.js","sourceRoot":"","sources":["../../../packages/devkit/nx-reexports-pre16.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAwCH;;GAEG;AACH,uDAAsD;AAA7C,wGAAA,UAAU,OAAA;AAEnB,uEAAuE;AACvE,8DAGyC;AAFvC,2HAAA,6BAA6B,OAAA;AAC7B,6GAAA,eAAe,OAAA;AAuBjB;;GAEG;AACH,8CAA6C;AAApC,gGAAA,MAAM,OAAA;AAEf;;GAEG;AACH,8CAA6C;AAApC,gGAAA,MAAM,OAAA;AAOf;;GAEG;AACH,gEAIsC;AAHpC,2HAAA,wBAAwB,OAAA;AACxB,uHAAA,oBAAoB,OAAA;AACpB,2HAAA,wBAAwB,OAAA;AAO1B;;GAEG;AACH,+CAAsD;AAA7C,kGAAA,WAAW,OAAA;AAEpB;;GAEG;AACH,uFAMuD;AALrD,gIAAA,uBAAuB,OAAA;AACvB,iIAAA,wBAAwB,OAAA;AACxB,mIAAA,0BAA0B,OAAA;AAC1B,mIAAA,0BAA0B,OAAA;AAC1B,oHAAA,WAAW,OAAA;AAGb;;GAEG;AACH,uFAQuD;AAPrD,mHAAA,UAAU,OAAA;AACV,qHAAA,YAAY,OAAA;AACZ,mIAAA,0BAA0B,OAAA;AAC1B,qIAAA,4BAA4B,OAAA;AAC5B,4HAAA,mBAAmB,OAAA;AAEnB,yHAAA,gBAAgB,OAAA;AAiBlB;;GAEG;AACH,6DAA6D;AAApD,+GAAA,cAAc,OAAA;AAEvB;;GAEG;AACH,oFAAiF;AAAxE,4HAAA,mBAAmB,OAAA;AAE5B;;GAEG;AACH,qDAA+E;AAAtE,gGAAA,QAAQ,OAAA;AAAE,iGAAA,SAAS,OAAA;AAAE,kGAAA,UAAU,OAAA;AAExC;;GAEG;AACH,0CAAgF;AAAvE,iGAAA,SAAS,OAAA;AAAE,qGAAA,aAAa,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAOpD;;GAEG;AACH,oDAAqE;AAA5D,yGAAA,YAAY,OAAA;AAAE,0GAAA,aAAa,OAAA;AAEpC;;GAEG;AACH,4DAA0D;AAAjD,6GAAA,YAAY,OAAA;AAErB;;GAEG;AACH,0CAAqE;AAA5D,yGAAA,iBAAiB,OAAA;AAAE,qGAAA,aAAa,OAAA;AAEzC,sEAAsE;AACtE;;GAEG;AACH,kDAAmE;AAA1D,yGAAA,aAAa,OAAA;AAAE,uGAAA,WAAW,OAAA;AAEnC;;GAEG;AACH,4DAAyD;AAAhD,oGAAA,OAAO,OAAA;AAChB;;GAEG;AACH,oEAG4C;AAF1C,wHAAA,uBAAuB,OAAA;AACvB,uHAAA,sBAAsB,OAAA;AAGxB;;GAEG;AACH,mDAAgF;AAAvE,4HAAA,mCAAmC,OAAA;AAE5C;;GAEG;AACH,iFAIkD;AAHhD,0HAAA,kBAAkB,OAAA;
|
|
1
|
+
{"version":3,"file":"nx-reexports-pre16.js","sourceRoot":"","sources":["../../../packages/devkit/nx-reexports-pre16.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAwCH;;GAEG;AACH,uDAAsD;AAA7C,wGAAA,UAAU,OAAA;AAEnB,uEAAuE;AACvE,8DAGyC;AAFvC,2HAAA,6BAA6B,OAAA;AAC7B,6GAAA,eAAe,OAAA;AAuBjB;;GAEG;AACH,8CAA6C;AAApC,gGAAA,MAAM,OAAA;AAEf;;GAEG;AACH,8CAA6C;AAApC,gGAAA,MAAM,OAAA;AAOf;;GAEG;AACH,gEAIsC;AAHpC,2HAAA,wBAAwB,OAAA;AACxB,uHAAA,oBAAoB,OAAA;AACpB,2HAAA,wBAAwB,OAAA;AAO1B;;GAEG;AACH,+CAAsD;AAA7C,kGAAA,WAAW,OAAA;AAEpB;;GAEG;AACH,uFAMuD;AALrD,gIAAA,uBAAuB,OAAA;AACvB,iIAAA,wBAAwB,OAAA;AACxB,mIAAA,0BAA0B,OAAA;AAC1B,mIAAA,0BAA0B,OAAA;AAC1B,oHAAA,WAAW,OAAA;AAGb;;GAEG;AACH,uFAQuD;AAPrD,mHAAA,UAAU,OAAA;AACV,qHAAA,YAAY,OAAA;AACZ,mIAAA,0BAA0B,OAAA;AAC1B,qIAAA,4BAA4B,OAAA;AAC5B,4HAAA,mBAAmB,OAAA;AAEnB,yHAAA,gBAAgB,OAAA;AAiBlB;;GAEG;AACH,6DAA6D;AAApD,+GAAA,cAAc,OAAA;AAEvB;;GAEG;AACH,oFAAiF;AAAxE,4HAAA,mBAAmB,OAAA;AAE5B;;GAEG;AACH,qDAA+E;AAAtE,gGAAA,QAAQ,OAAA;AAAE,iGAAA,SAAS,OAAA;AAAE,kGAAA,UAAU,OAAA;AAExC;;GAEG;AACH,0CAAgF;AAAvE,iGAAA,SAAS,OAAA;AAAE,qGAAA,aAAa,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAOpD;;GAEG;AACH,oDAAqE;AAA5D,yGAAA,YAAY,OAAA;AAAE,0GAAA,aAAa,OAAA;AAEpC;;GAEG;AACH,4DAA0D;AAAjD,6GAAA,YAAY,OAAA;AAErB;;GAEG;AACH,0CAAqE;AAA5D,yGAAA,iBAAiB,OAAA;AAAE,qGAAA,aAAa,OAAA;AAEzC,sEAAsE;AACtE;;GAEG;AACH,kDAAmE;AAA1D,yGAAA,aAAa,OAAA;AAAE,uGAAA,WAAW,OAAA;AAEnC;;GAEG;AACH,4DAAyD;AAAhD,oGAAA,OAAO,OAAA;AAChB;;GAEG;AACH,oEAG4C;AAF1C,wHAAA,uBAAuB,OAAA;AACvB,uHAAA,sBAAsB,OAAA;AAGxB;;GAEG;AACH,mDAAgF;AAAvE,4HAAA,mCAAmC,OAAA;AAE5C;;GAEG;AACH,iFAIkD;AAHhD,0HAAA,kBAAkB,OAAA;AAUpB;;GAEG;AACH,gEAAwD;AAA/C,2GAAA,QAAQ,OAAA;AAEjB,yDAAyD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/devkit",
|
|
3
|
-
"version": "16.
|
|
3
|
+
"version": "16.3.0-beta.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more.",
|
|
6
6
|
"repository": {
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"homepage": "https://nx.dev",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@nrwl/devkit": "16.
|
|
31
|
+
"@nrwl/devkit": "16.3.0-beta.0",
|
|
32
32
|
"ejs": "^3.1.7",
|
|
33
33
|
"ignore": "^5.0.4",
|
|
34
34
|
"semver": "7.3.4",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"migrations": "./migrations.json"
|
|
46
46
|
},
|
|
47
47
|
"types": "./index.d.ts",
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "74c5ad330622238c7f80df55454e9dbdc792cb22"
|
|
49
49
|
}
|
|
@@ -5,7 +5,15 @@ exports.targetToTargetString = exports.parseTargetString = void 0;
|
|
|
5
5
|
const split_target_1 = require("nx/src/utils/split-target");
|
|
6
6
|
const nx_1 = require("../../nx");
|
|
7
7
|
const { readCachedProjectGraph } = (0, nx_1.requireNx)();
|
|
8
|
-
function parseTargetString(targetString, projectGraph
|
|
8
|
+
function parseTargetString(targetString, projectGraph) {
|
|
9
|
+
if (!projectGraph) {
|
|
10
|
+
try {
|
|
11
|
+
projectGraph = readCachedProjectGraph();
|
|
12
|
+
}
|
|
13
|
+
catch (e) {
|
|
14
|
+
projectGraph = { nodes: {} };
|
|
15
|
+
}
|
|
16
|
+
}
|
|
9
17
|
const [project, target, configuration] = (0, split_target_1.splitTarget)(targetString, projectGraph);
|
|
10
18
|
if (!project || !target) {
|
|
11
19
|
throw new Error(`Invalid Target String: ${targetString}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-target-string.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/executors/parse-target-string.ts"],"names":[],"mappings":";;;AAEA,oEAAoE;AACpE,4DAAwD;AACxD,iCAAqC;AAErC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,cAAS,GAAE,CAAC;AAqB/C,SAAgB,iBAAiB,CAC/B,YAAoB,EACpB,YAAY,GAAG,sBAAsB,EAAE;
|
|
1
|
+
{"version":3,"file":"parse-target-string.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/executors/parse-target-string.ts"],"names":[],"mappings":";;;AAEA,oEAAoE;AACpE,4DAAwD;AACxD,iCAAqC;AAErC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,cAAS,GAAE,CAAC;AAqB/C,SAAgB,iBAAiB,CAC/B,YAAoB,EACpB,YAA2B;IAE3B,IAAI,CAAC,YAAY,EAAE;QACjB,IAAI;YACF,YAAY,GAAG,sBAAsB,EAAE,CAAC;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,YAAY,GAAG,EAAE,KAAK,EAAE,EAAE,EAAS,CAAC;SACrC;KACF;IACD,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,IAAA,0BAAW,EAClD,YAAY,EACZ,YAAY,CACb,CAAC;IACF,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAC;KAC3D;IACD,OAAO;QACL,OAAO;QACP,MAAM;QACN,aAAa;KACd,CAAC;AACJ,CAAC;AAvBD,8CAuBC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,MAAM,EACN,aAAa,GACN;IACP,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,GACpE,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,EACtD,EAAE,CAAC;AACL,CAAC;AARD,oDAQC"}
|
|
@@ -12,12 +12,12 @@ const { Workspaces } = (0, nx_1.requireNx)();
|
|
|
12
12
|
*/
|
|
13
13
|
function readTargetOptions({ project, target, configuration }, context) {
|
|
14
14
|
var _a;
|
|
15
|
-
const projectConfiguration = context.workspace.projects[project];
|
|
15
|
+
const projectConfiguration = (context.workspace || context.projectsConfigurations).projects[project];
|
|
16
16
|
const targetConfiguration = projectConfiguration.targets[target];
|
|
17
17
|
const ws = new Workspaces(context.root);
|
|
18
18
|
const [nodeModule, executorName] = targetConfiguration.executor.split(':');
|
|
19
19
|
const { schema } = ws.readExecutor(nodeModule, executorName);
|
|
20
|
-
const defaultProject = ws.calculateDefaultProjectName(context.cwd, { version: 2, projects: context.
|
|
20
|
+
const defaultProject = ws.calculateDefaultProjectName(context.cwd, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
|
|
21
21
|
return (0, params_1.combineOptionsForExecutor)({}, (_a = configuration !== null && configuration !== void 0 ? configuration : targetConfiguration.defaultConfiguration) !== null && _a !== void 0 ? _a : '', targetConfiguration, schema, defaultProject, ws.relativeCwd(context.cwd));
|
|
22
22
|
}
|
|
23
23
|
exports.readTargetOptions = readTargetOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-target-options.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/executors/read-target-options.ts"],"names":[],"mappings":";;;AAEA,oEAAoE;AACpE,gDAAgE;AAChE,iCAAqC;AAErC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAS,GAAE,CAAC;AAEnC;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAU,EAC1C,OAAwB;;IAExB,MAAM,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"read-target-options.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/executors/read-target-options.ts"],"names":[],"mappings":";;;AAEA,oEAAoE;AACpE,gDAAgE;AAChE,iCAAqC;AAErC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAS,GAAE,CAAC;AAEnC;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAU,EAC1C,OAAwB;;IAExB,MAAM,oBAAoB,GAAG,CAC3B,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,sBAAsB,CACpD,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACpB,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjE,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3E,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAE7D,MAAM,cAAc,GAAG,EAAE,CAAC,2BAA2B,CACnD,OAAO,CAAC,GAAG,EACX,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,sBAAsB,CAAC,QAAQ,EAAE,EACjE,OAAO,CAAC,mBAAmB,CAC5B,CAAC;IAEF,OAAO,IAAA,kCAAyB,EAC9B,EAAE,EACF,MAAA,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,mBAAmB,CAAC,oBAAoB,mCAAI,EAAE,EAC/D,mBAAmB,EACnB,MAAM,EACN,cAAc,EACd,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CACvB,CAAC;AACT,CAAC;AA3BD,8CA2BC"}
|
|
@@ -33,7 +33,6 @@ function convertNxExecutor(executor) {
|
|
|
33
33
|
configurationName: builderContext.target.configuration,
|
|
34
34
|
projectsConfigurations,
|
|
35
35
|
nxJsonConfiguration,
|
|
36
|
-
workspace: Object.assign(Object.assign({}, projectsConfigurations), nxJsonConfiguration),
|
|
37
36
|
cwd: process.cwd(),
|
|
38
37
|
projectGraph,
|
|
39
38
|
isVerbose: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-nx-executor.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/convert-nx-executor.ts"],"names":[],"mappings":";;;;AAGA,iCAAqC;AAErC,MAAM,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,UAAU,EAAE,GACnE,IAAA,cAAS,GAAE,CAAC;AAEd;;;;GAIG;AACH,6EAA6E;AAC7E,SAAgB,iBAAiB,CAAC,QAAkB;IAClD,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE;QAClD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAChE,MAAM,mBAAmB,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,sBAAsB,GAAG,UAAU,CAAC,0BAA0B,CAAC;YACnE,+BAA+B,EAAE,IAAI;SACtC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,IAAI,YAA0B,CAAC;YAC/B,IAAI;gBACF,YAAY,GAAG,sBAAsB,EAAE,CAAC;aACzC;YAAC,WAAM;gBACN,YAAY,GAAG,MAAM,uBAAuB,EAAE,CAAC;aAChD;YACD,MAAM,OAAO,GAAoB;gBAC/B,IAAI,EAAE,cAAc,CAAC,aAAa;gBAClC,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO;gBAC1C,UAAU,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM;gBACxC,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM;gBACpC,iBAAiB,EAAE,cAAc,CAAC,MAAM,CAAC,aAAa;gBACtD,sBAAsB;gBACtB,mBAAmB;gBACnB,
|
|
1
|
+
{"version":3,"file":"convert-nx-executor.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/convert-nx-executor.ts"],"names":[],"mappings":"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"}
|