@nx/devkit 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/src/utils/config-utils.js

@@ -5,37 +5,59 @@ exports.loadConfigFile = loadConfigFile;
 exports.getRootTsConfigPath = getRootTsConfigPath;
 exports.getRootTsConfigFileName = getRootTsConfigFileName;
 exports.clearRequireCache = clearRequireCache;
-const path_1 = require("path");
 const fs_1 = require("fs");
 const node_url_1 = require("node:url");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const path_1 = require("path");
 exports.dynamicImport = new Function('modulePath', 'return import(modulePath);');
 async function loadConfigFile(configFilePath) {
-    {
-        let module;
-        if ((0, path_1.extname)(configFilePath) === '.ts') {
-            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.dirname)(configFilePath));
-            const tsConfigPath = siblingFiles.includes('tsconfig.json')
-                ? (0, path_1.join)((0, path_1.dirname)(configFilePath), 'tsconfig.json')
-                : getRootTsConfigPath();
-            if (tsConfigPath) {
-                const unregisterTsProject = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
-                try {
-                    module = await load(configFilePath);
-                }
-                finally {
-                    unregisterTsProject();
-                }
-            }
-            else {
-                module = await load(configFilePath);
-            }
+    const extension = (0, path_1.extname)(configFilePath);
+    const module = await loadModule(configFilePath, extension);
+    return module.default ?? module;
+}
+async function loadModule(path, extension) {
+    if (isTypeScriptFile(extension)) {
+        return await loadTypeScriptModule(path, extension);
+    }
+    return await loadJavaScriptModule(path, extension);
+}
+function isTypeScriptFile(extension) {
+    return extension.endsWith('ts');
+}
+async function loadTypeScriptModule(path, extension) {
+    const tsConfigPath = getTypeScriptConfigPath(path);
+    if (tsConfigPath) {
+        const unregisterTsProject = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
+        try {
+            return await loadModuleByExtension(path, extension);
         }
-        else {
-            module = await load(configFilePath);
+        finally {
+            unregisterTsProject();
         }
-        return module.default ?? module;
+    }
+    return await loadModuleByExtension(path, extension);
+}
+function getTypeScriptConfigPath(path) {
+    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.dirname)(path));
+    return siblingFiles.includes('tsconfig.json')
+        ? (0, path_1.join)((0, path_1.dirname)(path), 'tsconfig.json')
+        : getRootTsConfigPath();
+}
+async function loadJavaScriptModule(path, extension) {
+    return await loadModuleByExtension(path, extension);
+}
+async function loadModuleByExtension(path, extension) {
+    switch (extension) {
+        case '.cts':
+        case '.cjs':
+            return await loadCommonJS(path);
+        case '.mjs':
+            return await loadESM(path);
+        default:
+            // For both .ts and .mts files, try to load them as CommonJS first, then try ESM.
+            // It's possible that the file is written like ESM (e.g. using `import`) but uses CJS features like `__dirname` or `__filename`.
+            return await load(path);
     }
 }
 function getRootTsConfigPath() {
@@ -62,26 +84,32 @@ function clearRequireCache() {
         }
     }
 }
-/**
- * Load the module after ensuring that the require cache is cleared.
- */
 async function load(path) {
-    // Clear cache if the path is in the cache
-    if (require.cache[path]) {
-        clearRequireCache();
-    }
     try {
         // Try using `require` first, which works for CJS modules.
         // Modules are CJS unless it is named `.mjs` or `package.json` sets type to "module".
-        return require(path);
+        return loadCommonJS(path);
     }
     catch (e) {
         if (e.code === 'ERR_REQUIRE_ESM') {
             // If `require` fails to load ESM, try dynamic `import()`. ESM requires file url protocol for handling absolute paths.
-            const pathAsFileUrl = (0, node_url_1.pathToFileURL)(path).pathname;
-            return await (0, exports.dynamicImport)(`${pathAsFileUrl}?t=${Date.now()}`);
+            return loadESM(path);
         }
         // Re-throw all other errors
         throw e;
     }
 }
+/**
+ * Load the module after ensuring that the require cache is cleared.
+ */
+async function loadCommonJS(path) {
+    // Clear cache if the path is in the cache
+    if (require.cache[path]) {
+        clearRequireCache();
+    }
+    return require(path);
+}
+async function loadESM(path) {
+    const pathAsFileUrl = (0, node_url_1.pathToFileURL)(path).pathname;
+    return await (0, exports.dynamicImport)(`${pathAsFileUrl}?t=${Date.now()}`);
+}

package/src/utils/package-json.js

@@ -176,14 +176,18 @@ function removeDependenciesFromPackageJson(tree, dependencies, devDependencies,
     const currentPackageJson = (0, devkit_exports_1.readJson)(tree, packageJsonPath);
     if (requiresRemovingOfPackages(currentPackageJson, dependencies, devDependencies)) {
         (0, devkit_exports_1.updateJson)(tree, packageJsonPath, (json) => {
-            for (const dep of dependencies) {
-                delete json.dependencies[dep];
+            if (json.dependencies) {
+                for (const dep of dependencies) {
+                    delete json.dependencies[dep];
+                }
+                json.dependencies = sortObjectByKeys(json.dependencies);
             }
-            for (const devDep of devDependencies) {
-                delete json.devDependencies[devDep];
+            if (json.devDependencies) {
+                for (const devDep of devDependencies) {
+                    delete json.devDependencies[devDep];
+                }
+                json.devDependencies = sortObjectByKeys(json.devDependencies);
             }
-            json.dependencies = sortObjectByKeys(json.dependencies);
-            json.devDependencies = sortObjectByKeys(json.devDependencies);
             return json;
         });
     }
@@ -305,7 +309,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
         (0, child_process_1.execSync)(preInstallCommand, {
             cwd: tempDir,
             stdio: isVerbose ? 'inherit' : 'ignore',
-            windowsHide: true,
+            windowsHide: false,
         });
     }
     let addCommand = (0, devkit_exports_1.getPackageManagerCommand)(packageManager).addDev;
@@ -315,7 +319,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
     (0, child_process_1.execSync)(`${addCommand} ${pkg}@${requiredVersion}`, {
         cwd: tempDir,
         stdio: isVerbose ? 'inherit' : 'ignore',
-        windowsHide: true,
+        windowsHide: false,
     });
     addToNodePath((0, path_1.join)(devkit_exports_1.workspaceRoot, 'node_modules'));
     addToNodePath((0, path_1.join)(tempDir, 'node_modules'));

package/src/utils/replace-package.js

@@ -102,6 +102,7 @@ function replaceMentions(tree, oldPackageName, newPackageName) {
             'package-lock.json',
             'pnpm-lock.yaml',
             'bun.lockb',
+            'bun.lock',
             'CHANGELOG.md',
         ];
         if (ignoredFiles.includes((0, path_1.basename)(path))) {

package/src/utils/versions.d.ts

@@ -1 +1 @@
-export declare const typescriptVersion = "~5.5.2";
+export declare const typescriptVersion = "~5.7.2";

package/src/utils/versions.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typescriptVersion = void 0;
-exports.typescriptVersion = '~5.5.2';
+exports.typescriptVersion = '~5.7.2';

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import type { Tree } from 'nx/src/devkit-exports';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const format_files_1 = require("../../generators/format-files");
-const replace_package_1 = require("../../utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/devkit', '@nx/devkit');
-    await (0, format_files_1.formatFiles)(tree);
-}

package/src/migrations/update-16-9-0/migrate-mf-util-usage.d.ts

@@ -1,3 +0,0 @@
-import { GeneratorCallback, Tree } from 'nx/src/devkit-exports';
-declare const _default: (tree: Tree) => Promise<GeneratorCallback | void>;
-export default _default;

package/src/migrations/update-16-9-0/migrate-mf-util-usage.js

@@ -1,200 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const visit_not_ignored_files_1 = require("../../generators/visit-not-ignored-files");
-const format_files_1 = require("../../generators/format-files");
-const package_json_1 = require("../../utils/package-json");
-const versions_1 = require("../../utils/versions");
-const devkit_exports_1 = require("nx/src/devkit-exports");
-let tsModule;
-const MODULE_FEDERATION_PUBLIC_TOKENS = [
-    'AdditionalSharedConfig',
-    'ModuleFederationConfig',
-    'SharedLibraryConfig',
-    'SharedWorkspaceLibraryConfig',
-    'WorkspaceLibrary',
-    'SharedFunction',
-    'WorkspaceLibrarySecondaryEntryPoint',
-    'Remotes',
-    'ModuleFederationLibrary',
-    'applySharedFunction',
-    'applyAdditionalShared',
-    'getNpmPackageSharedConfig',
-    'shareWorkspaceLibraries',
-    'sharePackages',
-    'mapRemotes',
-    'mapRemotesForSSR',
-    'getDependentPackagesForProject',
-    'readRootPackageJson',
-];
-exports.default = async (tree) => {
-    let hasFileToMigrate = false;
-    (0, visit_not_ignored_files_1.visitNotIgnoredFiles)(tree, '/', (path) => {
-        if (!path.endsWith('.ts') && !path.endsWith('.js')) {
-            return;
-        }
-        let fileContents = tree.read(path, 'utf-8');
-        if (MODULE_FEDERATION_PUBLIC_TOKENS.every((token) => !fileContents.includes(token))) {
-            return;
-        }
-        hasFileToMigrate = true;
-        fileContents = replaceTSImports(tree, path, fileContents);
-        fileContents = replaceRequireCalls(tree, path, fileContents);
-        fileContents = replaceJSDoc(tree, path, fileContents);
-        tree.write(path, fileContents);
-    });
-    if (hasFileToMigrate) {
-        await (0, format_files_1.formatFiles)(tree);
-        const pkgJson = (0, devkit_exports_1.readJson)(tree, 'package.json');
-        const nxVersion = pkgJson.devDependencies?.['nx'] ??
-            pkgJson.dependencies?.['nx'] ??
-            '17.0.0';
-        return (0, package_json_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': nxVersion });
-    }
-};
-function replaceJSDoc(tree, path, fileContents) {
-    let newFileContents = fileContents;
-    for (const token of MODULE_FEDERATION_PUBLIC_TOKENS) {
-        newFileContents = newFileContents.replaceAll(new RegExp(`(@type)+\\s({)+(\\s)*(import\\(('|")+@nx\/devkit('|")+\\)\.)+(${token})+\\s*(})+`, 'g'), `@type {import('@nx/webpack').${token}}`);
-    }
-    return newFileContents;
-}
-function replaceRequireCalls(tree, path, fileContents) {
-    if (!tsModule) {
-        tsModule = (0, package_json_1.ensurePackage)('typescript', versions_1.typescriptVersion);
-    }
-    const sourceFile = tsModule.createSourceFile(path, fileContents, tsModule.ScriptTarget.Latest, true);
-    const allDevkitRequires = findNodes(sourceFile, tsModule.SyntaxKind.VariableStatement)
-        .filter((node) => [`require("@nx/devkit")`, `require('@nx/devkit')`].some((r) => node.getText().includes(r)))
-        .filter((node) => findNodes(node, tsModule.SyntaxKind.ObjectBindingPattern).length);
-    const mfUtilRequires = allDevkitRequires.filter((node) => MODULE_FEDERATION_PUBLIC_TOKENS.some((token) => node.getText().includes(token)));
-    if (!mfUtilRequires.length) {
-        return fileContents;
-    }
-    const mfUtilTokens = mfUtilRequires.map((node) => {
-        const allTokens = findNodes(node, tsModule.SyntaxKind.BindingElement);
-        const mfTokens = allTokens.filter((node) => MODULE_FEDERATION_PUBLIC_TOKENS.some((token) => node.getText() === token));
-        return {
-            requireNode: node,
-            onlyMf: allTokens.length === mfTokens.length,
-            mfTokens,
-        };
-    });
-    const changes = [];
-    for (const mfUtilRequireData of mfUtilTokens) {
-        if (mfUtilRequireData.onlyMf) {
-            changes.push({
-                startPosition: mfUtilRequireData.requireNode.getStart(),
-                endPosition: mfUtilRequireData.requireNode.getEnd(),
-                content: '',
-            });
-        }
-        else {
-            for (const mfToken of mfUtilRequireData.mfTokens) {
-                const replaceTrailingComma = mfToken.getText().charAt(mfToken.getEnd() + 1) === ',';
-                changes.push({
-                    startPosition: mfToken.getStart(),
-                    endPosition: replaceTrailingComma
-                        ? mfToken.getEnd() + 1
-                        : mfToken.getEnd(),
-                    content: '',
-                });
-            }
-        }
-    }
-    changes.push({
-        startPosition: mfUtilTokens[mfUtilTokens.length - 1].requireNode.getEnd(),
-        content: `\nconst { ${mfUtilTokens
-            .map((mfUtilToken) => mfUtilToken.mfTokens.map((node) => node.getText()))
-            .join(', ')} } = require('@nx/webpack');`,
-    });
-    let newFileContents = fileContents;
-    while (changes.length) {
-        const change = changes.pop();
-        newFileContents = `${newFileContents.substring(0, change.startPosition)}${change.content}${newFileContents.substring(change.endPosition ? change.endPosition : change.startPosition)}`;
-    }
-    return newFileContents;
-}
-function replaceTSImports(tree, path, fileContents) {
-    if (!tsModule) {
-        tsModule = (0, package_json_1.ensurePackage)('typescript', versions_1.typescriptVersion);
-    }
-    const sourceFile = tsModule.createSourceFile(path, fileContents, tsModule.ScriptTarget.Latest, true);
-    const allImports = findNodes(sourceFile, tsModule.SyntaxKind.ImportDeclaration);
-    const devkitImports = allImports.filter((i) => i.getText().includes(`'@nx/devkit';`));
-    const mfUtilsImports = devkitImports.filter((i) => MODULE_FEDERATION_PUBLIC_TOKENS.some((token) => i.getText().includes(token)));
-    if (!mfUtilsImports.length) {
-        return fileContents;
-    }
-    const mfUtilsWithMultipleImports = mfUtilsImports.map((i) => {
-        const importSpecifierNodes = findNodes(i, tsModule.SyntaxKind.ImportSpecifier);
-        const mfImportSpecifierNodes = importSpecifierNodes.filter((node) => MODULE_FEDERATION_PUBLIC_TOKENS.some((token) => node.getText().includes(token)));
-        return {
-            importDeclarationNode: i,
-            onlyMf: mfImportSpecifierNodes.length === importSpecifierNodes.length,
-            mfImportSpecifierNodes,
-        };
-    });
-    const changes = [];
-    for (const importDeclaration of mfUtilsWithMultipleImports) {
-        if (importDeclaration.onlyMf) {
-            changes.push({
-                startPosition: importDeclaration.importDeclarationNode.getStart(),
-                endPosition: importDeclaration.importDeclarationNode.getEnd(),
-                content: '',
-            });
-        }
-        else {
-            for (const mfImportSpecifierNodes of importDeclaration.mfImportSpecifierNodes) {
-                const replaceTrailingComma = importDeclaration.importDeclarationNode
-                    .getText()
-                    .charAt(mfImportSpecifierNodes.getEnd() + 1) === ',';
-                changes.push({
-                    startPosition: mfImportSpecifierNodes.getStart(),
-                    endPosition: replaceTrailingComma
-                        ? mfImportSpecifierNodes.getEnd() + 1
-                        : mfImportSpecifierNodes.getEnd(),
-                    content: '',
-                });
-            }
-        }
-    }
-    changes.push({
-        startPosition: mfUtilsWithMultipleImports[mfUtilsWithMultipleImports.length - 1].importDeclarationNode.getEnd(),
-        content: `\nimport { ${mfUtilsWithMultipleImports
-            .map((importDeclaration) => importDeclaration.mfImportSpecifierNodes.map((node) => node.getText()))
-            .join(', ')} } from '@nx/webpack';`,
-    });
-    let newFileContents = fileContents;
-    while (changes.length) {
-        const change = changes.pop();
-        newFileContents = `${newFileContents.substring(0, change.startPosition)}${change.content}${newFileContents.substring(change.endPosition ? change.endPosition : change.startPosition)}`;
-    }
-    return newFileContents;
-}
-function findNodes(node, kind, max = Infinity) {
-    if (!node || max == 0) {
-        return [];
-    }
-    const arr = [];
-    const hasMatch = Array.isArray(kind)
-        ? kind.includes(node.kind)
-        : node.kind === kind;
-    if (hasMatch) {
-        arr.push(node);
-        max--;
-    }
-    if (max > 0) {
-        for (const child of node.getChildren()) {
-            findNodes(child, kind, max).forEach((node) => {
-                if (max > 0) {
-                    arr.push(node);
-                }
-                max--;
-            });
-            if (max <= 0) {
-                break;
-            }
-        }
-    }
-    return arr;
-}