@nx/devkit 16.0.2 → 16.1.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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/devkit",
|
|
3
|
-
"version": "16.0.
|
|
3
|
+
"version": "16.1.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.0.
|
|
31
|
+
"@nrwl/devkit": "16.1.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": "6c221eae40054e6b104f1d53a7baea632a28d28e"
|
|
49
49
|
}
|
|
@@ -22,19 +22,13 @@ function formatFiles(tree) {
|
|
|
22
22
|
if (!prettier)
|
|
23
23
|
return;
|
|
24
24
|
const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
|
|
25
|
+
const changedPrettierInTree = getChangedPrettierConfigInTree(tree);
|
|
25
26
|
yield Promise.all(Array.from(files).map((file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
27
|
const systemPath = path.join(tree.root, file.path);
|
|
27
28
|
const resolvedOptions = yield prettier.resolveConfig(systemPath, {
|
|
28
29
|
editorconfig: true,
|
|
29
30
|
});
|
|
30
|
-
|
|
31
|
-
if (!resolvedOptions) {
|
|
32
|
-
try {
|
|
33
|
-
optionsFromTree = readJson(tree, '.prettierrc');
|
|
34
|
-
}
|
|
35
|
-
catch (_b) { }
|
|
36
|
-
}
|
|
37
|
-
const options = Object.assign({ filepath: systemPath }, (resolvedOptions !== null && resolvedOptions !== void 0 ? resolvedOptions : optionsFromTree));
|
|
31
|
+
const options = Object.assign(Object.assign(Object.assign({}, resolvedOptions), changedPrettierInTree), { filepath: systemPath });
|
|
38
32
|
if (file.path.endsWith('.swcrc')) {
|
|
39
33
|
options.parser = 'json';
|
|
40
34
|
}
|
|
@@ -72,4 +66,17 @@ function getRootTsConfigPath(tree) {
|
|
|
72
66
|
}
|
|
73
67
|
return null;
|
|
74
68
|
}
|
|
69
|
+
function getChangedPrettierConfigInTree(tree) {
|
|
70
|
+
if (tree.listChanges().find((file) => file.path === '.prettierrc')) {
|
|
71
|
+
try {
|
|
72
|
+
return readJson(tree, '.prettierrc');
|
|
73
|
+
}
|
|
74
|
+
catch (_a) {
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
return null;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
75
82
|
//# sourceMappingURL=format-files.js.map
|
|
@@ -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,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;YAEnD,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE;gBAC/D,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YAEH,
|
|
1
|
+
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/generators/format-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.replaceNrwlPackageWithNxPackage = void 0;
|
|
4
4
|
const nx_1 = require("../../nx");
|
|
5
|
-
const package_json_1 = require("./package-json");
|
|
6
5
|
const visit_not_ignored_files_1 = require("../generators/visit-not-ignored-files");
|
|
7
6
|
const path_1 = require("path");
|
|
8
7
|
const binary_extensions_1 = require("./binary-extensions");
|
|
@@ -28,7 +27,7 @@ function replacePackageInDependencies(tree, oldPackageName, newPackageName) {
|
|
|
28
27
|
(_d = packageJson.optionalDependencies) !== null && _d !== void 0 ? _d : {},
|
|
29
28
|
]) {
|
|
30
29
|
if (oldPackageName in deps) {
|
|
31
|
-
deps[newPackageName] =
|
|
30
|
+
deps[newPackageName] = deps[oldPackageName];
|
|
32
31
|
delete deps[oldPackageName];
|
|
33
32
|
}
|
|
34
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-package.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/replace-package.ts"],"names":[],"mappings":";;;AAEA,iCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"replace-package.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/replace-package.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const typescriptVersion = "~
|
|
1
|
+
export declare const typescriptVersion = "~5.0.2";
|
package/src/utils/versions.js
CHANGED