@nx/devkit 16.1.3 → 16.2.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 -3
- package/nx-reexports-pre16.js.map +1 -1
- package/package.json +3 -3
- package/src/executors/parse-target-string.d.ts +1 -1
- package/src/executors/read-target-options.d.ts +1 -1
- package/src/generators/format-files.js +12 -12
- package/src/generators/format-files.js.map +1 -1
- package/src/utils/get-workspace-layout.d.ts +3 -0
- package/src/utils/get-workspace-layout.js.map +1 -1
package/nx-reexports-pre16.d.ts
CHANGED
|
@@ -96,7 +96,7 @@ export { stripIndents } from 'nx/src/utils/strip-indents';
|
|
|
96
96
|
/**
|
|
97
97
|
* @category Utils
|
|
98
98
|
*/
|
|
99
|
-
export { joinPathFragments, normalizePath
|
|
99
|
+
export { joinPathFragments, normalizePath } from 'nx/src/utils/path';
|
|
100
100
|
/**
|
|
101
101
|
* @category Utils
|
|
102
102
|
*/
|
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.Hasher = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.
|
|
8
|
+
exports.cacheDir = exports.Hasher = 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
|
*/
|
|
@@ -97,8 +97,6 @@ Object.defineProperty(exports, "stripIndents", { enumerable: true, get: function
|
|
|
97
97
|
var path_1 = require("nx/src/utils/path");
|
|
98
98
|
Object.defineProperty(exports, "joinPathFragments", { enumerable: true, get: function () { return path_1.joinPathFragments; } });
|
|
99
99
|
Object.defineProperty(exports, "normalizePath", { enumerable: true, get: function () { return path_1.normalizePath; } });
|
|
100
|
-
Object.defineProperty(exports, "getImportPath", { enumerable: true, get: function () { return path_1.getImportPath; } });
|
|
101
|
-
Object.defineProperty(exports, "detectWorkspaceScope", { enumerable: true, get: function () { return path_1.detectWorkspaceScope; } });
|
|
102
100
|
// TODO(v16): Change this to export from 'nx/src/utils/workspace-root'
|
|
103
101
|
/**
|
|
104
102
|
* @category Utils
|
|
@@ -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,
|
|
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;AAKpB;;GAEG;AACH,+CAAoD;AAArC,gGAAA,MAAM,OAAA;AAErB;;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.2.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.2.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": "f7ba85e8ec9c074eaee81731a20aee7ea6dbc8aa"
|
|
49
49
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Target } from 'nx/src/command-line/run';
|
|
1
|
+
import type { Target } from 'nx/src/command-line/run/run';
|
|
2
2
|
import type { ProjectGraph } from 'nx/src/config/project-graph';
|
|
3
3
|
/**
|
|
4
4
|
* @deprecated(v17) A project graph should be passed to parseTargetString for best accuracy.
|
|
@@ -24,19 +24,19 @@ function formatFiles(tree) {
|
|
|
24
24
|
const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
|
|
25
25
|
const changedPrettierInTree = getChangedPrettierConfigInTree(tree);
|
|
26
26
|
yield Promise.all(Array.from(files).map((file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
const systemPath = path.join(tree.root, file.path);
|
|
28
|
-
const resolvedOptions = yield prettier.resolveConfig(systemPath, {
|
|
29
|
-
editorconfig: true,
|
|
30
|
-
});
|
|
31
|
-
const options = Object.assign(Object.assign(Object.assign({}, resolvedOptions), changedPrettierInTree), { filepath: systemPath });
|
|
32
|
-
if (file.path.endsWith('.swcrc')) {
|
|
33
|
-
options.parser = 'json';
|
|
34
|
-
}
|
|
35
|
-
const support = yield prettier.getFileInfo(systemPath, options);
|
|
36
|
-
if (support.ignored || !support.inferredParser) {
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
27
|
try {
|
|
28
|
+
const systemPath = path.join(tree.root, file.path);
|
|
29
|
+
const resolvedOptions = yield prettier.resolveConfig(systemPath, {
|
|
30
|
+
editorconfig: true,
|
|
31
|
+
});
|
|
32
|
+
const options = Object.assign(Object.assign(Object.assign({}, resolvedOptions), changedPrettierInTree), { filepath: systemPath });
|
|
33
|
+
if (file.path.endsWith('.swcrc')) {
|
|
34
|
+
options.parser = 'json';
|
|
35
|
+
}
|
|
36
|
+
const support = yield prettier.getFileInfo(systemPath, options);
|
|
37
|
+
if (support.ignored || !support.inferredParser) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
40
|
tree.write(file.path, prettier.format(file.content.toString('utf-8'), options));
|
|
41
41
|
}
|
|
42
42
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/generators/format-files.ts"],"names":[],"mappings":";;;;AACA,6BAA6B;AAE7B,oEAAoE;AACpE,0DAA4D;AAC5D,iCAAqC;AAErC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAS,GAAE,CAAC;AAE7C;;;GAGG;AACH,SAAsB,WAAW,CAAC,IAAU;;QAC1C,IAAI,QAAyB,CAAC;QAC9B,IAAI;YACF,QAAQ,GAAG,2CAAa,UAAU,EAAC,CAAC;SACrC;QAAC,WAAM,GAAE;QAEV,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnB,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;QAEF,MAAM,qBAAqB,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;QAEnE,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;
|
|
1
|
+
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/generators/format-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,9 @@ export declare function getWorkspaceLayout(tree: Tree): {
|
|
|
14
14
|
appsDir: string;
|
|
15
15
|
libsDir: string;
|
|
16
16
|
standaloneAsDefault: boolean;
|
|
17
|
+
/**
|
|
18
|
+
* @deprecated This will be removed in Nx 17. Use {@link getNpmScope} instead.
|
|
19
|
+
*/
|
|
17
20
|
npmScope: string;
|
|
18
21
|
};
|
|
19
22
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-workspace-layout.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/get-workspace-layout.ts"],"names":[],"mappings":";;;AACA,iCAAqC;AAErC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAS,GAAE,CAAC;AAEnC;;;;;;;;;;GAUG;AACH,SAAgB,kBAAkB,CAAC,IAAU;;
|
|
1
|
+
{"version":3,"file":"get-workspace-layout.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/get-workspace-layout.ts"],"names":[],"mappings":";;;AACA,iCAAqC;AAErC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAS,GAAE,CAAC;AAEnC;;;;;;;;;;GAUG;AACH,SAAgB,kBAAkB,CAAC,IAAU;;IAS3C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO;QACL,OAAO,EACL,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe,0CAAE,OAAO,mCAChC,mBAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC;QACtD,OAAO,EACL,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe,0CAAE,OAAO,mCAChC,mBAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC;QACtD,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ;QAC1B,mBAAmB,EAAE,IAAI;KAC1B,CAAC;AACJ,CAAC;AApBD,gDAoBC;AAED;;GAEG;AACH,SAAgB,sBAAsB,CAAC,SAAiB;IAItD,IAAI,SAAS,EAAE;QACb,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3E,KAAK,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE;YAC5C,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,SAAS,KAAK,GAAG,EAAE;gBACxD,OAAO;oBACL,eAAe,EAAE,GAAG;oBACpB,gBAAgB,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;iBACtD,CAAC;aACH;SACF;KACF;IACD,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC;AAChE,CAAC;AAhBD,wDAgBC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,eAAyB,EACzB,aAAqB;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;KAChE;IACD,OAAO,aAAa,CAAC;AACvB,CAAC"}
|