@nx/js 23.1.1 → 23.1.2

package/dist/src/utils/npm-config.d.ts

@@ -1,4 +1,4 @@
-import { PackageJson } from 'nx/src/utils/package-json';
+import { PackageJson } from '@nx/devkit/internal';
 export declare function parseRegistryOptions(cwd: string, pkg: {
     packageRoot: string;
     packageJson: PackageJson;

package/dist/src/utils/package-json/update-package-json.d.ts

@@ -1,6 +1,6 @@
 import { ExecutorContext, ProjectFileMap, ProjectGraphProjectNode } from '@nx/devkit';
 import { DependentBuildableProjectNode } from '../buildable-libs-utils';
-import type { PackageJson } from 'nx/src/utils/package-json';
+import type { PackageJson } from '@nx/devkit/internal';
 export type SupportedFormat = 'cjs' | 'esm';
 export interface UpdatePackageJsonOption {
     rootDir?: string;

package/dist/src/utils/package-json/update-package-json.js

@@ -4,24 +4,19 @@ exports.updatePackageJson = updatePackageJson;
 exports.getExports = getExports;
 exports.getUpdatedPackageJsonContent = getUpdatedPackageJsonContent;
 exports.getOutputDir = getOutputDir;
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const create_package_json_1 = require("nx/src/plugins/js/package-json/create-package-json");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
-const fileutils_1 = require("nx/src/utils/fileutils");
-const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
 const get_main_file_dir_1 = require("../get-main-file-dir");
 const strip_glob_to_base_dir_1 = require("../strip-glob-to-base-dir");
 function updatePackageJson(options, context, target, dependencies, fileMap = null) {
     let packageJson;
     if (fileMap == null) {
-        fileMap = (0, nx_deps_cache_1.readFileMapCache)()?.fileMap?.projectFileMap || {};
+        fileMap = (0, internal_1.readFileMapCache)()?.fileMap?.projectFileMap || {};
     }
     if (options.updateBuildableProjectDepsInPackageJson) {
-        packageJson = (0, create_package_json_1.createPackageJson)(context.projectName, context.projectGraph, {
+        packageJson = (0, internal_1.createPackageJson)(context.projectName, context.projectGraph, {
             target: context.targetName,
             root: context.root,
             // By default we remove devDependencies since this is a production build.
@@ -34,7 +29,7 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
     }
     else {
         const pathToPackageJson = (0, path_1.join)(context.root, options.projectRoot, 'package.json');
-        packageJson = (0, fileutils_1.fileExists)(pathToPackageJson)
+        packageJson = (0, internal_1.fileExists)(pathToPackageJson)
             ? (0, devkit_1.readJsonFile)(pathToPackageJson)
             : { name: context.projectName, version: '0.0.1' };
     }
@@ -60,8 +55,8 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
             devkit_1.logger.warn(`Bun lockfile generation is unsupported. Remove "generateLockfile" option or set it to false.`);
         }
         else {
-            const lockFile = (0, lock_file_1.createLockFile)(packageJson, context.projectGraph, packageManager);
-            (0, node_fs_1.writeFileSync)(`${options.outputPath}/${(0, lock_file_1.getLockFileName)(packageManager)}`, lockFile, {
+            const lockFile = (0, internal_1.createLockFile)(packageJson, context.projectGraph, packageManager);
+            (0, node_fs_1.writeFileSync)(`${options.outputPath}/${(0, internal_1.getLockFileName)(packageManager)}`, lockFile, {
                 encoding: 'utf-8',
             });
         }

package/dist/src/utils/package-manager-workspaces.js

@@ -8,8 +8,8 @@ exports.getProjectPackageManagerWorkspaceStateWarningTask = getProjectPackageMan
 const devkit_1 = require("@nx/devkit");
 const picomatch = require("picomatch");
 const posix_1 = require("node:path/posix");
-const package_json_1 = require("nx/src/plugins/package-json");
 const semver_1 = require("semver");
+const internal_1 = require("@nx/devkit/internal");
 function getProjectPackageManagerWorkspaceState(tree, projectRoot) {
     if (!isUsingPackageManagerWorkspaces(tree)) {
         return 'no-workspaces';
@@ -19,7 +19,7 @@ function getProjectPackageManagerWorkspaceState(tree, projectRoot) {
     return isIncluded ? 'included' : 'excluded';
 }
 function getPackageManagerWorkspacesPatterns(tree) {
-    return (0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }), (path) => {
+    return (0, internal_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }), (path) => {
         const content = tree.read(path, 'utf-8');
         const { load } = require('@zkochan/js-yaml');
         return load(content, { filename: path });

package/dist/src/utils/typescript/create-ts-config.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from 'nx/src/generators/tree';
+import { Tree } from '@nx/devkit';
 export declare const tsConfigBaseOptions: {
     rootDir: string;
     sourceMap: boolean;

package/dist/src/utils/typescript/create-ts-config.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsConfigBaseOptions = void 0;
 exports.getTsConfigBaseOptions = getTsConfigBaseOptions;
 exports.extractTsConfigBase = extractTsConfigBase;
-const json_1 = require("nx/src/generators/utils/json");
 const is_typescript_version_at_least_1 = require("../is-typescript-version-at-least");
+const devkit_1 = require("@nx/devkit");
 exports.tsConfigBaseOptions = {
     rootDir: '.',
     sourceMap: true,
@@ -32,7 +32,7 @@ function getTsConfigBaseOptions(tree) {
 function extractTsConfigBase(host) {
     if (host.exists('tsconfig.base.json'))
         return;
-    const tsconfig = (0, json_1.readJson)(host, 'tsconfig.json');
+    const tsconfig = (0, devkit_1.readJson)(host, 'tsconfig.json');
     const baseCompilerOptions = {};
     if (tsconfig.compilerOptions) {
         for (let compilerOption of Object.keys(exports.tsConfigBaseOptions)) {
@@ -41,7 +41,7 @@ function extractTsConfigBase(host) {
             delete tsconfig.compilerOptions[compilerOption];
         }
     }
-    (0, json_1.writeJson)(host, 'tsconfig.base.json', {
+    (0, devkit_1.writeJson)(host, 'tsconfig.base.json', {
         compileOnSave: false,
         compilerOptions: baseCompilerOptions,
         exclude: tsconfig.exclude,
@@ -49,10 +49,10 @@ function extractTsConfigBase(host) {
     tsconfig.extends = './tsconfig.base.json';
     delete tsconfig.compileOnSave;
     delete tsconfig.exclude;
-    (0, json_1.writeJson)(host, 'tsconfig.json', tsconfig);
+    (0, devkit_1.writeJson)(host, 'tsconfig.json', tsconfig);
     // special case for updating e2e tests.
     if (host.exists('e2e/tsconfig.json')) {
-        (0, json_1.updateJson)(host, 'e2e/tsconfig.json', (json) => {
+        (0, devkit_1.updateJson)(host, 'e2e/tsconfig.json', (json) => {
             json.extends = '../tsconfig.base.json';
             return json;
         });

package/dist/src/utils/typescript/plugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureProjectIsIncludedInPluginRegistrations = ensureProjectIsIncludedInPluginRegistrations;
-const devkit_internals_1 = require("nx/src/devkit-internals");
 const picomatch = require("picomatch");
+const internal_1 = require("@nx/devkit/internal");
 function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, buildTargetName) {
     nxJson.plugins ??= [];
     let isIncluded = false;
@@ -32,7 +32,7 @@ function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, build
             // before the registration's include/exclude filters are applied.
             const tsconfigPath = `${projectRoot}/tsconfig.json`;
             const matchingConfigFiles = picomatch('**/tsconfig.json', { dot: true })(tsconfigPath)
-                ? (0, devkit_internals_1.findMatchingConfigFiles)([tsconfigPath], registration.include, registration.exclude)
+                ? (0, internal_1.findMatchingConfigFiles)([tsconfigPath], registration.include, registration.exclude)
                 : [];
             if (matchingConfigFiles.length) {
                 // it's included by the plugin registration, check if the user-specified options would result

package/dist/src/utils/typescript/run-type-check.js

@@ -6,9 +6,9 @@ exports.getFormattedDiagnostic = getFormattedDiagnostic;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const path = tslib_1.__importStar(require("path"));
-const code_frames_1 = require("nx/src/utils/code-frames");
 const highlight_1 = require("../code-frames/highlight");
 const ts_config_1 = require("../../utils/typescript/ts-config");
+const internal_1 = require("@nx/devkit/internal");
 async function runTypeCheckWatch(options, callback) {
     const { ts, workspaceRoot, config, compilerOptions } = await setupTypeScript(options);
     const host = ts.createWatchCompilerHost(config.fileNames, compilerOptions, ts.sys, ts.createEmitAndSemanticDiagnosticsBuilderProgram);
@@ -133,7 +133,7 @@ function getFormattedDiagnostic(ts, workspaceRoot, diagnostic) {
         const code = diagnostic.file.getFullText(diagnostic.file.getSourceFile());
         message +=
             '\n' +
-                (0, code_frames_1.codeFrameColumns)(code, {
+                (0, internal_1.codeFrameColumns)(code, {
                     start: { line: line, column },
                 }, { highlight: highlight_1.highlight });
     }

package/dist/src/utils/typescript/ts-solution-setup.d.ts

@@ -1,5 +1,5 @@
 import { type ProjectConfiguration, type Tree } from '@nx/devkit';
-import type { JsonInput } from 'nx/src/native';
+import type { JsonInput } from '@nx/devkit/internal';
 export declare const TS_SOLUTION_SETUP_TSCONFIG_INPUT: JsonInput;
 export declare function isUsingTypeScriptPlugin(tree: Tree): boolean;
 export declare function shouldConfigureTsSolutionSetup(tree: Tree, addPlugins: boolean, addTsPlugin?: boolean): boolean;

package/dist/src/utils/typescript/ts-solution-setup.js

@@ -15,7 +15,7 @@ exports.getDefinedCustomConditionName = getDefinedCustomConditionName;
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const posix_1 = require("node:path/posix");
-const tree_1 = require("nx/src/generators/tree");
+const internal_1 = require("@nx/devkit/internal");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
 const configuration_1 = require("./configuration");
 exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = {
@@ -48,7 +48,7 @@ function shouldConfigureTsSolutionSetup(tree, addPlugins, addTsPlugin) {
     return !tree.exists('tsconfig.base.json') && !tree.exists('tsconfig.json');
 }
 function isUsingTsSolutionSetup(tree) {
-    tree ??= new tree_1.FsTree(devkit_1.workspaceRoot, false);
+    tree ??= new internal_1.FsTree(devkit_1.workspaceRoot, false);
     return ((0, package_manager_workspaces_1.isUsingPackageManagerWorkspaces)(tree) &&
         isWorkspaceSetupWithTsSolution(tree));
 }
@@ -113,7 +113,7 @@ function assertNotUsingTsSolutionSetup(tree, pluginName, generatorName) {
     throw new Error(`The ${artifactString} doesn't yet support the existing TypeScript setup. See the error above.`);
 }
 function findRuntimeTsConfigName(projectRoot, tree) {
-    tree ??= new tree_1.FsTree(devkit_1.workspaceRoot, false);
+    tree ??= new internal_1.FsTree(devkit_1.workspaceRoot, false);
     if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.app.json')))
         return 'tsconfig.app.json';
     if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.lib.json')))

package/dist/src/utils/watch-for-single-file-changes.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watchForSingleFileChanges = watchForSingleFileChanges;
 const devkit_1 = require("@nx/devkit");
-const client_1 = require("nx/src/daemon/client/client");
 const path_1 = require("path");
+const internal_1 = require("@nx/devkit/internal");
 async function watchForSingleFileChanges(projectName, projectRoot, relativeFilePath, callback) {
-    const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({ watchProjects: [projectName] }, (err, data) => {
+    const unregisterFileWatcher = await internal_1.daemonClient.registerFileWatcher({ watchProjects: [projectName] }, (err, data) => {
         if (err === 'reconnecting') {
             // Silent - daemon restarts automatically on lockfile changes
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.1.1",
+  "version": "23.1.2",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -120,7 +120,7 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.29.6",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-class-static-block": "^7.22.5",
@@ -147,11 +147,11 @@
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.1.1",
-    "@nx/workspace": "23.1.1"
+    "@nx/devkit": "23.1.2",
+    "@nx/workspace": "23.1.2"
   },
   "devDependencies": {
-    "nx": "23.1.1"
+    "nx": "23.1.2"
   },
   "peerDependencies": {
     "@swc/cli": ">=0.6.0 <0.9.0",