@nx/devkit 21.6.0-canary.20250912-cfc03a2 → 21.6.0-canary.20250916-a429972
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 +2 -3
- package/public-api.d.ts +1 -1
- package/public-api.d.ts.map +1 -1
- package/public-api.js +2 -2
- package/src/utils/package-json.d.ts.map +1 -1
- package/src/utils/package-json.js +4 -46
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nx/devkit",
|
3
|
-
"version": "21.6.0-canary.
|
3
|
+
"version": "21.6.0-canary.20250916-a429972",
|
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. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
|
6
6
|
"repository": {
|
@@ -30,7 +30,6 @@
|
|
30
30
|
"dependencies": {
|
31
31
|
"ejs": "^3.1.7",
|
32
32
|
"ignore": "^5.0.4",
|
33
|
-
"tmp": "~0.2.1",
|
34
33
|
"tslib": "^2.3.0",
|
35
34
|
"semver": "^7.5.3",
|
36
35
|
"yargs-parser": "21.1.1",
|
@@ -39,7 +38,7 @@
|
|
39
38
|
},
|
40
39
|
"devDependencies": {
|
41
40
|
"jest": "^29.4.1",
|
42
|
-
"nx": "21.6.0-canary.
|
41
|
+
"nx": "21.6.0-canary.20250916-a429972"
|
43
42
|
},
|
44
43
|
"peerDependencies": {
|
45
44
|
"nx": ">= 20 <= 22"
|
package/public-api.d.ts
CHANGED
@@ -39,7 +39,7 @@ export { readTargetOptions } from './src/executors/read-target-options';
|
|
39
39
|
/**
|
40
40
|
* @category Utils
|
41
41
|
*/
|
42
|
-
export { addDependenciesToPackageJson,
|
42
|
+
export { addDependenciesToPackageJson, removeDependenciesFromPackageJson, ensurePackage, NX_VERSION, } from './src/utils/package-json';
|
43
43
|
/**
|
44
44
|
* @category Utils
|
45
45
|
*/
|
package/public-api.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"public-api.d.ts","sourceRoot":"","sources":["../../../packages/devkit/public-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D;;GAEG;AACH,OAAO,EACL,aAAa,EACb,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEhF,OAAO,EACL,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAE7C;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE;;GAEG;AACH,OAAO,EACL,4BAA4B,EAC5B,aAAa,EACb,
|
1
|
+
{"version":3,"file":"public-api.d.ts","sourceRoot":"","sources":["../../../packages/devkit/public-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D;;GAEG;AACH,OAAO,EACL,aAAa,EACb,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEhF,OAAO,EACL,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAE7C;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE;;GAEG;AACH,OAAO,EACL,4BAA4B,EAC5B,iCAAiC,EACjC,aAAa,EACb,UAAU,GACX,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C;;GAEG;AACH,OAAO,EACL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAE1C;;GAEG;AACH,YAAY,EACV,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,2BAA2B,CAAC;AAEnC;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE7E;;GAEG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE;;GAEG;AACH,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC"}
|
package/public-api.js
CHANGED
@@ -9,7 +9,7 @@
|
|
9
9
|
* a. We might need to duplicate code instead of importing from nx until all supported versions of nx contain the file.
|
10
10
|
*/
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
|
-
exports.moveFilesToNewDirectory = exports.convertNxExecutor = exports.convertNxGenerator = exports.offsetFromRoot = exports.ChangeType = exports.applyChangesToString = exports.extractLayoutDirectory = exports.getWorkspaceLayout = exports.names = exports.installPackagesTask = exports.NX_VERSION = exports.
|
12
|
+
exports.moveFilesToNewDirectory = exports.convertNxExecutor = exports.convertNxGenerator = exports.offsetFromRoot = exports.ChangeType = exports.applyChangesToString = exports.extractLayoutDirectory = exports.getWorkspaceLayout = exports.names = exports.installPackagesTask = exports.NX_VERSION = exports.ensurePackage = exports.removeDependenciesFromPackageJson = exports.addDependenciesToPackageJson = exports.readTargetOptions = exports.targetToTargetString = exports.parseTargetString = exports.visitNotIgnoredFiles = exports.runTasksInSerial = exports.updateTsConfigsToJs = exports.toJS = exports.OverwriteStrategy = exports.generateFiles = exports.formatFiles = void 0;
|
13
13
|
/**
|
14
14
|
* @category Generators
|
15
15
|
*/
|
@@ -54,8 +54,8 @@ Object.defineProperty(exports, "readTargetOptions", { enumerable: true, get: fun
|
|
54
54
|
*/
|
55
55
|
var package_json_1 = require("./src/utils/package-json");
|
56
56
|
Object.defineProperty(exports, "addDependenciesToPackageJson", { enumerable: true, get: function () { return package_json_1.addDependenciesToPackageJson; } });
|
57
|
-
Object.defineProperty(exports, "ensurePackage", { enumerable: true, get: function () { return package_json_1.ensurePackage; } });
|
58
57
|
Object.defineProperty(exports, "removeDependenciesFromPackageJson", { enumerable: true, get: function () { return package_json_1.removeDependenciesFromPackageJson; } });
|
58
|
+
Object.defineProperty(exports, "ensurePackage", { enumerable: true, get: function () { return package_json_1.ensurePackage; } });
|
59
59
|
Object.defineProperty(exports, "NX_VERSION", { enumerable: true, get: function () { return package_json_1.NX_VERSION; } });
|
60
60
|
/**
|
61
61
|
* @category Utils
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/package-json.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/package-json.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,IAAI,EAGL,MAAM,uBAAuB,CAAC;AAsG/B;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,eAAe,GAAE,MAAuB,EACxC,oBAAoB,CAAC,EAAE,OAAO,GAC7B,iBAAiB,CAyFnB;AAgCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,MAAM,EAAE,EACzB,eAAe,GAAE,MAAuB,GACvC,iBAAiB,CA6BnB;AA8FD;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACpD,IAAI,CAAC;AAER;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,EAC/C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,CAAC,CAAC;AA4FL;;GAEG;AACH,eAAO,MAAM,UAAU,QAA0B,CAAC"}
|
@@ -4,15 +4,12 @@ exports.NX_VERSION = void 0;
|
|
4
4
|
exports.addDependenciesToPackageJson = addDependenciesToPackageJson;
|
5
5
|
exports.removeDependenciesFromPackageJson = removeDependenciesFromPackageJson;
|
6
6
|
exports.ensurePackage = ensurePackage;
|
7
|
-
const child_process_1 = require("child_process");
|
8
|
-
const module_1 = require("module");
|
9
7
|
const semver_1 = require("semver");
|
10
|
-
const install_packages_task_1 = require("../tasks/install-packages-task");
|
11
|
-
const tmp_1 = require("tmp");
|
12
|
-
const path_1 = require("path");
|
13
8
|
const devkit_exports_1 = require("nx/src/devkit-exports");
|
14
9
|
const devkit_internals_1 = require("nx/src/devkit-internals");
|
15
|
-
const
|
10
|
+
const path_1 = require("path");
|
11
|
+
const install_packages_task_1 = require("../tasks/install-packages-task");
|
12
|
+
const module_1 = require("module");
|
16
13
|
const UNIDENTIFIED_VERSION = 'UNIDENTIFIED_VERSION';
|
17
14
|
const NON_SEMVER_TAGS = {
|
18
15
|
'*': 2,
|
@@ -296,32 +293,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
|
|
296
293
|
if (process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== 'false') {
|
297
294
|
throw new Error('NOTE: This generator does not support --dry-run. If you are running this in Nx Console, it should execute fine once you hit the "Generate" button.\n');
|
298
295
|
}
|
299
|
-
const {
|
300
|
-
dir: (0, tmp_1.dirSync)().name,
|
301
|
-
};
|
302
|
-
console.log(`Fetching ${pkg}...`);
|
303
|
-
const packageManager = (0, devkit_exports_1.detectPackageManager)();
|
304
|
-
const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
|
305
|
-
generatePackageManagerFiles(tempDir, packageManager);
|
306
|
-
const preInstallCommand = (0, devkit_exports_1.getPackageManagerCommand)(packageManager).preInstall;
|
307
|
-
if (preInstallCommand) {
|
308
|
-
// ensure package.json and repo in tmp folder is set to a proper package manager state
|
309
|
-
(0, child_process_1.execSync)(preInstallCommand, {
|
310
|
-
cwd: tempDir,
|
311
|
-
stdio: isVerbose ? 'inherit' : 'ignore',
|
312
|
-
windowsHide: false,
|
313
|
-
});
|
314
|
-
}
|
315
|
-
const pmCommands = (0, devkit_exports_1.getPackageManagerCommand)(packageManager);
|
316
|
-
let addCommand = pmCommands.addDev;
|
317
|
-
if (packageManager === 'pnpm') {
|
318
|
-
addCommand = 'pnpm add -D'; // we need to ensure that we are not using workspace command
|
319
|
-
}
|
320
|
-
(0, child_process_1.execSync)(`${addCommand} ${pkg}@${requiredVersion} ${pmCommands.ignoreScriptsFlag ?? ''}`, {
|
321
|
-
cwd: tempDir,
|
322
|
-
stdio: isVerbose ? 'inherit' : 'ignore',
|
323
|
-
windowsHide: false,
|
324
|
-
});
|
296
|
+
const { tempDir } = (0, devkit_internals_1.installPackageToTmp)(pkg, requiredVersion);
|
325
297
|
addToNodePath((0, path_1.join)(devkit_exports_1.workspaceRoot, 'node_modules'));
|
326
298
|
addToNodePath((0, path_1.join)(tempDir, 'node_modules'));
|
327
299
|
// Re-initialize the added paths into require
|
@@ -343,20 +315,6 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
|
|
343
315
|
throw e;
|
344
316
|
}
|
345
317
|
}
|
346
|
-
/**
|
347
|
-
* Generates necessary files needed for the package manager to work
|
348
|
-
* and for the node_modules to be accessible.
|
349
|
-
*/
|
350
|
-
function generatePackageManagerFiles(root, packageManager = (0, devkit_exports_1.detectPackageManager)()) {
|
351
|
-
const [pmMajor] = (0, devkit_exports_1.getPackageManagerVersion)(packageManager).split('.');
|
352
|
-
switch (packageManager) {
|
353
|
-
case 'yarn':
|
354
|
-
if (+pmMajor >= 2) {
|
355
|
-
(0, fs_1.writeFileSync)((0, path_1.join)(root, '.yarnrc.yml'), 'nodeLinker: node-modules\nenableScripts: false');
|
356
|
-
}
|
357
|
-
break;
|
358
|
-
}
|
359
|
-
}
|
360
318
|
function addToNodePath(dir) {
|
361
319
|
// NODE_PATH is a delimited list of paths.
|
362
320
|
// The delimiter is different for windows.
|