@nx/js 16.8.0-beta.3 → 16.8.0-beta.5

package/src/utils/find-npm-dependencies.d.ts

@@ -4,4 +4,5 @@ import { type ProjectGraph, type ProjectGraphProjectNode, type ProjectFileMap }
  */
 export declare function findNpmDependencies(workspaceRoot: string, sourceProject: ProjectGraphProjectNode, projectGraph: ProjectGraph, projectFileMap: ProjectFileMap, buildTarget: string, options?: {
     includeTransitiveDependencies?: boolean;
+    ignoredFiles?: string[];
 }): Record<string, string>;

package/src/utils/find-npm-dependencies.js

@@ -18,9 +18,10 @@ function findNpmDependencies(workspaceRoot, sourceProject, projectGraph, project
     }
     const results = {};
     function collectAll(currentProject, collectedDeps) {
-        if (seen === null || seen === void 0 ? void 0 : seen.has(currentProject.name))
+        if (seen?.has(currentProject.name))
             return;
-        collectDependenciesFromFileMap(workspaceRoot, currentProject, projectGraph, projectFileMap, buildTarget, collectedDeps);
+        seen?.add(currentProject.name);
+        collectDependenciesFromFileMap(workspaceRoot, currentProject, projectGraph, projectFileMap, buildTarget, options.ignoredFiles, collectedDeps);
         collectHelperDependencies(workspaceRoot, currentProject, projectGraph, buildTarget, collectedDeps);
         if (options.includeTransitiveDependencies) {
             const projectDeps = projectGraph.dependencies[currentProject.name];
@@ -37,14 +38,20 @@ function findNpmDependencies(workspaceRoot, sourceProject, projectGraph, project
 exports.findNpmDependencies = findNpmDependencies;
 // Keep track of workspace libs we already read package.json for so we don't read from disk again.
 const seenWorkspaceDeps = {};
-function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, npmDeps) {
+function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, ignoredFiles, npmDeps) {
     const rawFiles = projectFileMap[sourceProject.name];
     if (!rawFiles)
         return;
-    // Cannot read inputs if the target does not exist on the project.
-    if (!sourceProject.data.targets[buildTarget])
-        return;
-    const inputs = (0, task_hasher_1.getTargetInputs)((0, configuration_1.readNxJson)(), sourceProject, buildTarget).selfInputs;
+    // If build target does not exist in project, use all files as input.
+    // This is needed for transitive dependencies for apps -- where libs may not be buildable.
+    const inputs = sourceProject.data.targets[buildTarget]
+        ? (0, task_hasher_1.getTargetInputs)((0, configuration_1.readNxJson)(), sourceProject, buildTarget).selfInputs
+        : ['{projectRoot}/**/*'];
+    if (ignoredFiles) {
+        for (const pattern of ignoredFiles) {
+            inputs.push(`!${pattern}`);
+        }
+    }
     const files = (0, task_hasher_1.filterUsingGlobPatterns)(sourceProject.data.root, projectFileMap[sourceProject.name] || [], inputs);
     for (const fileData of files) {
         if (!fileData.deps ||
@@ -56,7 +63,7 @@ function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGra
             const target = (0, project_graph_1.fileDataDepTarget)(dep);
             // If the node is external, then read package info from `data`.
             const externalDep = projectGraph.externalNodes[target];
-            if ((externalDep === null || externalDep === void 0 ? void 0 : externalDep.type) === 'npm') {
+            if (externalDep?.type === 'npm') {
                 npmDeps[externalDep.data.packageName] = externalDep.data.version;
                 continue;
             }
@@ -70,7 +77,11 @@ function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGra
             }
             else {
                 const packageJson = readPackageJson(workspaceDep, workspaceRoot);
-                if (packageJson) {
+                if (
+                // Check that this is a buildable project, otherwise it cannot be a dependency in package.json.
+                workspaceDep.data.targets[buildTarget] &&
+                    // Make sure package.json exists and has a valid name.
+                    packageJson?.name) {
                     // This is a workspace lib so we can't reliably read in a specific version since it depends on how the workspace is set up.
                     // ASSUMPTION: Most users will use '*' for workspace lib versions. Otherwise, they can manually update it.
                     npmDeps[packageJson.name] = '*';
@@ -90,14 +101,13 @@ function readPackageJson(project, workspaceRoot) {
     return null;
 }
 function collectHelperDependencies(workspaceRoot, sourceProject, projectGraph, buildTarget, npmDeps) {
-    var _a, _b, _c, _d;
     const target = sourceProject.data.targets[buildTarget];
     if (!target)
         return;
-    if (target.executor === '@nx/js:tsc' && ((_a = target.options) === null || _a === void 0 ? void 0 : _a.tsConfig)) {
+    if (target.executor === '@nx/js:tsc' && target.options?.tsConfig) {
         const tsConfig = (0, ts_config_1.readTsConfig)((0, path_1.join)(workspaceRoot, target.options.tsConfig));
-        if (tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.options['importHelpers']) {
-            npmDeps['tslib'] = (_b = projectGraph.externalNodes['npm:tslib']) === null || _b === void 0 ? void 0 : _b.data.version;
+        if (tsConfig?.options['importHelpers']) {
+            npmDeps['tslib'] = projectGraph.externalNodes['npm:tslib']?.data.version;
         }
     }
     if (target.executor === '@nx/js:swc') {
@@ -107,9 +117,9 @@ function collectHelperDependencies(workspaceRoot, sourceProject, projectGraph, b
         const swcConfig = (0, fileutils_1.fileExists)(swcConfigPath)
             ? (0, devkit_1.readJsonFile)(swcConfigPath)
             : {};
-        if ((_c = swcConfig === null || swcConfig === void 0 ? void 0 : swcConfig.jsc) === null || _c === void 0 ? void 0 : _c.externalHelpers) {
+        if (swcConfig?.jsc?.externalHelpers) {
             npmDeps['@swc/helpers'] =
-                (_d = projectGraph.externalNodes['npm:@swc/helpers']) === null || _d === void 0 ? void 0 : _d.data.version;
+                projectGraph.externalNodes['npm:@swc/helpers']?.data.version;
         }
     }
 }

package/src/utils/generate-globs.js

@@ -37,7 +37,7 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPattern) {
         }
     }
     catch (e) {
-        throw new Error(`createGlobPatternsForDependencies: Error when trying to determine main project.\n${e === null || e === void 0 ? void 0 : e.message}`);
+        throw new Error(`createGlobPatternsForDependencies: Error when trying to determine main project.\n${e?.message}`);
     }
     // generate the glob
     try {
@@ -47,7 +47,7 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPattern) {
             const children = (0, fs_1.readdirSync)((0, path_1.resolve)(workspace_root_1.workspaceRoot, dirPath));
             for (const child of children) {
                 const childPath = (0, path_1.join)(dirPath, child);
-                if ((ig === null || ig === void 0 ? void 0 : ig.ignores(childPath)) ||
+                if (ig?.ignores(childPath) ||
                     !(0, fs_1.lstatSync)((0, path_1.resolve)(workspace_root_1.workspaceRoot, childPath)).isDirectory()) {
                     continue;
                 }
@@ -74,7 +74,7 @@ due to missing "sourceRoot" in the dependencies' project configuration
         return dirsToUse.map((sourceDir) => (0, path_1.resolve)(workspace_root_1.workspaceRoot, (0, devkit_1.joinPathFragments)(sourceDir, fileGlobPattern)));
     }
     catch (e) {
-        throw new Error(`createGlobPatternsForDependencies: Error when generating globs.\n${e === null || e === void 0 ? void 0 : e.message}`);
+        throw new Error(`createGlobPatternsForDependencies: Error when generating globs.\n${e?.message}`);
     }
 }
 exports.createGlobPatternsForDependencies = createGlobPatternsForDependencies;

package/src/utils/inline.js

@@ -10,9 +10,8 @@ function isInlineGraphEmpty(inlineGraph) {
 }
 exports.isInlineGraphEmpty = isInlineGraphEmpty;
 function handleInliningBuild(context, options, tsConfigPath, projectName = context.projectName) {
-    var _a;
     const tsConfigJson = (0, devkit_1.readJsonFile)(tsConfigPath);
-    const pathAliases = ((_a = tsConfigJson['compilerOptions']) === null || _a === void 0 ? void 0 : _a['paths']) || readBasePathAliases(context);
+    const pathAliases = tsConfigJson['compilerOptions']?.['paths'] || readBasePathAliases(context);
     const inlineGraph = createInlineGraph(context, options, pathAliases, projectName);
     if (isInlineGraphEmpty(inlineGraph)) {
         return inlineGraph;
@@ -56,8 +55,7 @@ function postProcessInlinedDependencies(outputPath, parentOutputPath, inlineGrap
 }
 exports.postProcessInlinedDependencies = postProcessInlinedDependencies;
 function readBasePathAliases(context) {
-    var _a;
-    return (_a = (0, devkit_1.readJsonFile)(getRootTsConfigPath(context))) === null || _a === void 0 ? void 0 : _a['compilerOptions']['paths'];
+    return (0, devkit_1.readJsonFile)(getRootTsConfigPath(context))?.['compilerOptions']['paths'];
 }
 function getRootTsConfigPath(context) {
     for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
@@ -82,8 +80,6 @@ function projectNodeToInlineProjectNode(projectNode, pathAlias = '', buildOutput
     };
 }
 function createInlineGraph(context, options, pathAliases, projectName, inlineGraph = emptyInlineGraph()) {
-    var _a;
-    var _b;
     if (options.external == null)
         return inlineGraph;
     const projectDependencies = context.projectGraph.dependencies[projectName] || [];
@@ -124,7 +120,7 @@ function createInlineGraph(context, options, pathAliases, projectName, inlineGra
                 !options.external.includes(projectDependency.target)) ||
             !buildOutputPath;
         if (shouldInline) {
-            (_a = (_b = inlineGraph.dependencies)[projectName]) !== null && _a !== void 0 ? _a : (_b[projectName] = []);
+            inlineGraph.dependencies[projectName] ??= [];
             inlineGraph.dependencies[projectName].push(projectDependency.target);
         }
         inlineGraph.nodes[projectDependency.target] =
@@ -136,7 +132,7 @@ function createInlineGraph(context, options, pathAliases, projectName, inlineGra
     return inlineGraph;
 }
 function buildInlineGraphExternals(context, inlineProjectGraph, pathAliases) {
-    const allNodes = Object.assign({}, context.projectGraph.nodes);
+    const allNodes = { ...context.projectGraph.nodes };
     for (const [parent, dependencies] of Object.entries(inlineProjectGraph.dependencies)) {
         if (allNodes[parent]) {
             delete allNodes[parent];
@@ -204,8 +200,7 @@ function getPathAliasForPackage(packageNode, pathAliases) {
     return '';
 }
 function getBuildOutputPath(projectName, context, options) {
-    var _a, _b;
-    const projectTargets = (_b = (_a = context.projectGraph.nodes[projectName]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.targets;
+    const projectTargets = context.projectGraph.nodes[projectName]?.data?.targets;
     if (!projectTargets)
         return '';
     const buildTarget = options.externalBuildTargets.find((buildTarget) => projectTargets[buildTarget]);

package/src/utils/package-json/get-npm-scope.js

@@ -8,13 +8,13 @@ const devkit_1 = require("@nx/devkit");
 function getNpmScope(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     // TODO(v17): Remove reading this from nx.json
-    if (nxJson === null || nxJson === void 0 ? void 0 : nxJson.npmScope) {
+    if (nxJson?.npmScope) {
         return nxJson.npmScope;
     }
     const { name } = tree.exists('package.json')
         ? (0, devkit_1.readJson)(tree, 'package.json')
         : { name: null };
-    if (name === null || name === void 0 ? void 0 : name.startsWith('@')) {
+    if (name?.startsWith('@')) {
         return name.split('/')[0].substring(1);
     }
 }

package/src/utils/package-json/index.js

@@ -1,33 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyPackageJson = void 0;
-const tslib_1 = require("tslib");
 const watch_for_single_file_changes_1 = require("../watch-for-single-file-changes");
 const update_package_json_1 = require("./update-package-json");
 const check_dependencies_1 = require("../check-dependencies");
-function copyPackageJson(_options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!context.target.options.tsConfig) {
-            throw new Error(`Could not find tsConfig option for "${context.targetName}" target of "${context.projectName}" project. Check that your project configuration is correct.`);
-        }
-        let { target, dependencies, projectRoot } = (0, check_dependencies_1.checkDependencies)(context, context.target.options.tsConfig);
-        const options = Object.assign(Object.assign({}, _options), { projectRoot });
-        if (options.extraDependencies) {
-            dependencies.push(...options.extraDependencies);
-        }
-        if (options.overrideDependencies) {
-            dependencies = options.overrideDependencies;
-        }
-        if (options.watch) {
-            const dispose = yield (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies));
-            // Copy it once before changes
-            (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
-            return { success: true, stop: dispose };
-        }
-        else {
-            (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
-            return { success: true };
-        }
-    });
+async function copyPackageJson(_options, context) {
+    if (!context.target.options.tsConfig) {
+        throw new Error(`Could not find tsConfig option for "${context.targetName}" target of "${context.projectName}" project. Check that your project configuration is correct.`);
+    }
+    let { target, dependencies, projectRoot } = (0, check_dependencies_1.checkDependencies)(context, context.target.options.tsConfig);
+    const options = { ..._options, projectRoot };
+    if (options.extraDependencies) {
+        dependencies.push(...options.extraDependencies);
+    }
+    if (options.overrideDependencies) {
+        dependencies = options.overrideDependencies;
+    }
+    if (options.watch) {
+        const dispose = await (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies));
+        // Copy it once before changes
+        (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
+        return { success: true, stop: dispose };
+    }
+    else {
+        (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
+        return { success: true };
+    }
 }
 exports.copyPackageJson = copyPackageJson;

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

@@ -14,10 +14,9 @@ const fs_1 = require("fs");
 const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
 const get_main_file_dir_1 = require("../get-main-file-dir");
 function updatePackageJson(options, context, target, dependencies, fileMap = null) {
-    var _a;
     let packageJson;
     if (fileMap == null) {
-        fileMap = ((_a = (0, nx_deps_cache_1.readProjectFileMapCache)()) === null || _a === void 0 ? void 0 : _a.projectFileMap) || {};
+        fileMap = (0, nx_deps_cache_1.readProjectFileMapCache)()?.projectFileMap || {};
     }
     if (options.updateBuildableProjectDepsInPackageJson) {
         packageJson = (0, create_package_json_1.createPackageJson)(context.projectName, context.projectGraph, {
@@ -42,8 +41,9 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
     // save files
     (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
     if (options.generateLockfile) {
-        const lockFile = (0, lock_file_1.createLockFile)(packageJson);
-        (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, lock_file_1.getLockFileName)()}`, lockFile, {
+        const packageManager = (0, devkit_1.detectPackageManager)(context.root);
+        const lockFile = (0, lock_file_1.createLockFile)(packageJson, context.projectGraph, packageManager);
+        (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, lock_file_1.getLockFileName)(packageManager)}`, lockFile, {
             encoding: 'utf-8',
         });
     }
@@ -52,24 +52,23 @@ exports.updatePackageJson = updatePackageJson;
 function addMissingDependencies(packageJson, { projectName, targetName, configurationName, root }, dependencies, propType = 'dependencies') {
     const workspacePackageJson = (0, devkit_1.readJsonFile)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json'));
     dependencies.forEach((entry) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         if ((0, operators_1.isNpmProject)(entry.node)) {
             const { packageName, version } = entry.node.data;
-            if (((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[packageName]) ||
-                ((_b = packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b[packageName]) ||
-                ((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c[packageName])) {
+            if (packageJson.dependencies?.[packageName] ||
+                packageJson.devDependencies?.[packageName] ||
+                packageJson.peerDependencies?.[packageName]) {
                 return;
             }
-            if ((_d = workspacePackageJson.devDependencies) === null || _d === void 0 ? void 0 : _d[packageName]) {
+            if (workspacePackageJson.devDependencies?.[packageName]) {
                 return;
             }
-            (_e = packageJson[propType]) !== null && _e !== void 0 ? _e : (packageJson[propType] = {});
+            packageJson[propType] ??= {};
             packageJson[propType][packageName] = version;
         }
         else {
             const packageName = entry.name;
-            if (!((_f = packageJson.dependencies) === null || _f === void 0 ? void 0 : _f[packageName]) &&
-                !((_g = packageJson.peerDependencies) === null || _g === void 0 ? void 0 : _g[packageName])) {
+            if (!packageJson.dependencies?.[packageName] &&
+                !packageJson.peerDependencies?.[packageName]) {
                 const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
                     overrides: {},
                     target: {
@@ -81,7 +80,7 @@ function addMissingDependencies(packageJson, { projectName, targetName, configur
                 const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
                 if ((0, fs_1.existsSync)(depPackageJsonPath)) {
                     const version = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
-                    (_h = packageJson[propType]) !== null && _h !== void 0 ? _h : (packageJson[propType] = {});
+                    packageJson[propType] ??= {};
                     packageJson[propType][packageName] = version;
                 }
             }
@@ -114,22 +113,23 @@ function getExports(options) {
 }
 exports.getExports = getExports;
 function getUpdatedPackageJsonContent(packageJson, options) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    var _h;
     // Default is CJS unless esm is explicitly passed.
-    const hasCjsFormat = !options.format || ((_a = options.format) === null || _a === void 0 ? void 0 : _a.includes('cjs'));
-    const hasEsmFormat = (_b = options.format) === null || _b === void 0 ? void 0 : _b.includes('esm');
+    const hasCjsFormat = !options.format || options.format?.includes('cjs');
+    const hasEsmFormat = options.format?.includes('esm');
     if (options.generateExportsField) {
         packageJson.exports =
-            typeof packageJson.exports === 'string' ? {} : Object.assign({}, packageJson.exports);
+            typeof packageJson.exports === 'string' ? {} : { ...packageJson.exports };
         packageJson.exports['./package.json'] = './package.json';
     }
     if (hasEsmFormat) {
-        const esmExports = getExports(Object.assign(Object.assign({}, options), { fileExt: (_c = options.outputFileExtensionForEsm) !== null && _c !== void 0 ? _c : '.js' }));
+        const esmExports = getExports({
+            ...options,
+            fileExt: options.outputFileExtensionForEsm ?? '.js',
+        });
         packageJson.module = esmExports['.'];
         if (!hasCjsFormat) {
             packageJson.type = 'module';
-            (_d = packageJson.main) !== null && _d !== void 0 ? _d : (packageJson.main = esmExports['.']);
+            packageJson.main ??= esmExports['.'];
         }
         if (options.generateExportsField) {
             for (const [exportEntry, filePath] of Object.entries(esmExports)) {
@@ -143,7 +143,10 @@ function getUpdatedPackageJsonContent(packageJson, options) {
     // Bundlers like rollup and esbuild supports .cjs for CJS and .js for ESM.
     // Bundlers/Compilers like webpack, tsc, swc do not have different file extensions (unless you use .mts or .cts in source).
     if (hasCjsFormat) {
-        const cjsExports = getExports(Object.assign(Object.assign({}, options), { fileExt: (_e = options.outputFileExtensionForCjs) !== null && _e !== void 0 ? _e : '.js' }));
+        const cjsExports = getExports({
+            ...options,
+            fileExt: options.outputFileExtensionForCjs ?? '.js',
+        });
         packageJson.main = cjsExports['.'];
         if (!hasEsmFormat) {
             packageJson.type = 'commonjs';
@@ -151,7 +154,7 @@ function getUpdatedPackageJsonContent(packageJson, options) {
         if (options.generateExportsField) {
             for (const [exportEntry, filePath] of Object.entries(cjsExports)) {
                 if (hasEsmFormat) {
-                    (_f = (_h = packageJson.exports[exportEntry])['default']) !== null && _f !== void 0 ? _f : (_h['default'] = filePath);
+                    packageJson.exports[exportEntry]['default'] ??= filePath;
                 }
                 else {
                     packageJson.exports[exportEntry] = filePath;
@@ -163,7 +166,7 @@ function getUpdatedPackageJsonContent(packageJson, options) {
         const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
         const relativeMainFileDir = (0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(options.main, options.projectRoot);
         const typingsFile = `${relativeMainFileDir}${mainFile}.d.ts`;
-        packageJson.types = (_g = packageJson.types) !== null && _g !== void 0 ? _g : typingsFile;
+        packageJson.types = packageJson.types ?? typingsFile;
     }
     return packageJson;
 }

package/src/utils/prettier.js

@@ -1,37 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUserExistingPrettierConfig = void 0;
-const tslib_1 = require("tslib");
 let prettier;
 try {
     prettier = require('prettier');
 }
-catch (_a) { }
-function resolveUserExistingPrettierConfig() {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!prettier) {
+catch { }
+async function resolveUserExistingPrettierConfig() {
+    if (!prettier) {
+        return null;
+    }
+    try {
+        const filepath = await prettier.resolveConfigFile();
+        if (!filepath) {
             return null;
         }
-        try {
-            const filepath = yield prettier.resolveConfigFile();
-            if (!filepath) {
-                return null;
-            }
-            const config = yield prettier.resolveConfig(process.cwd(), {
-                useCache: false,
-                config: filepath,
-            });
-            if (!config) {
-                return null;
-            }
-            return {
-                sourceFilepath: filepath,
-                config: config,
-            };
-        }
-        catch (_a) {
+        const config = await prettier.resolveConfig(process.cwd(), {
+            useCache: false,
+            config: filepath,
+        });
+        if (!config) {
             return null;
         }
-    });
+        return {
+            sourceFilepath: filepath,
+            config: config,
+        };
+    }
+    catch {
+        return null;
+    }
 }
 exports.resolveUserExistingPrettierConfig = resolveUserExistingPrettierConfig;