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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.8.0-beta.3",
+  "version": "16.8.0-beta.4",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,9 +39,9 @@
     "@babel/preset-env": "^7.22.9",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nrwl/js": "16.8.0-beta.3",
-    "@nx/devkit": "16.8.0-beta.3",
-    "@nx/workspace": "16.8.0-beta.3",
+    "@nrwl/js": "16.8.0-beta.4",
+    "@nx/devkit": "16.8.0-beta.4",
+    "@nx/workspace": "16.8.0-beta.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -71,5 +71,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
+  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
 }

package/src/executors/node/schema.json

@@ -18,7 +18,7 @@
     },
     "waitUntilTargets": {
       "type": "array",
-      "description": "The targets to run before starting the node app.",
+      "description": "The targets to run before starting the node app. Listed in the form <project>:<target>. The main target will run once all listed targets have output something to the console.",
       "default": [],
       "items": {
         "type": "string"

package/src/generators/library/library.d.ts

@@ -11,7 +11,7 @@ export interface NormalizedSchema extends LibraryGeneratorSchema {
     parsedTags: string[];
     importPath?: string;
 }
-export type AddLintOptions = Pick<NormalizedSchema, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject'>;
+export type AddLintOptions = Pick<NormalizedSchema, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler'>;
 export declare function addLint(tree: Tree, options: AddLintOptions): Promise<GeneratorCallback>;
 export default libraryGenerator;
 export declare const librarySchematic: (generatorOptions: LibraryGeneratorSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/library/library.js

@@ -150,6 +150,7 @@ function addProject(tree, options) {
 function addLint(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
         const task = lintProjectGenerator(tree, {
             project: options.name,
             linter: options.linter,
@@ -164,12 +165,12 @@ function addLint(tree, options) {
             setParserOptionsProject: options.setParserOptionsProject,
             rootProject: options.rootProject,
         });
+        const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig,
+        // nx-ignore-next-line
+         } = require('@nx/linter/src/generators/utils/eslint-file');
         // Also update the root ESLint config. The lintProjectGenerator will not generate it for root projects.
         // But we need to set the package.json checks.
         if (options.rootProject) {
-            const { addOverrideToLintConfig, isEslintConfigSupported,
-            // nx-ignore-next-line
-             } = require('@nx/linter/src/generators/utils/eslint-file');
             if (isEslintConfigSupported(tree)) {
                 addOverrideToLintConfig(tree, '', {
                     files: ['*.json'],
@@ -180,6 +181,48 @@ function addLint(tree, options) {
                 });
             }
         }
+        // If project lints package.json with @nx/dependency-checks, then add ignore files for
+        // build configuration files such as vite.config.ts. These config files need to be
+        // ignored, otherwise we will errors on missing dependencies that are for dev only.
+        if (lintConfigHasOverride(tree, projectConfiguration.root, (o) => {
+            var _a;
+            return Array.isArray(o.files)
+                ? o.files.some((f) => f.match(/\.json$/))
+                : !!((_a = o.files) === null || _a === void 0 ? void 0 : _a.match(/\.json$/));
+        }, true)) {
+            updateOverrideInLintConfig(tree, projectConfiguration.root, (o) => { var _a; return (_a = o.rules) === null || _a === void 0 ? void 0 : _a['@nx/dependency-checks']; }, (o) => {
+                const value = o.rules['@nx/dependency-checks'];
+                let ruleSeverity;
+                let ruleOptions;
+                if (Array.isArray(value)) {
+                    ruleSeverity = value[0];
+                    ruleOptions = value[1];
+                }
+                else {
+                    ruleSeverity = value;
+                    ruleOptions = {};
+                }
+                if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
+                    ruleOptions.ignoredFiles = [
+                        '{projectRoot}/vite.config.{js,ts,mjs,mts}',
+                    ];
+                    o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+                }
+                else if (options.bundler === 'rollup') {
+                    ruleOptions.ignoredFiles = [
+                        '{projectRoot}/rollup.config.{js,ts,mjs,mts}',
+                    ];
+                    o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+                }
+                else if (options.bundler === 'esbuild') {
+                    ruleOptions.ignoredFiles = [
+                        '{projectRoot}/esbuild.config.{js,ts,mjs,mts}',
+                    ];
+                    o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+                }
+                return o;
+            });
+        }
         return task;
     });
 }

package/src/generators/setup-build/generator.js

@@ -7,18 +7,22 @@ const add_swc_config_1 = require("../../utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
 const versions_1 = require("../../utils/versions");
 function setupBuildGenerator(tree, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
         const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
         const buildTarget = (_a = options.buildTarget) !== null && _a !== void 0 ? _a : 'build';
-        (_b = project.targets) !== null && _b !== void 0 ? _b : (project.targets = {});
+        const prevBuildOptions = (_c = (_b = project.targets) === null || _b === void 0 ? void 0 : _b[buildTarget]) === null || _c === void 0 ? void 0 : _c.options;
+        (_d = project.targets) !== null && _d !== void 0 ? _d : (project.targets = {});
         let mainFile;
-        if (options.main) {
+        if (prevBuildOptions === null || prevBuildOptions === void 0 ? void 0 : prevBuildOptions.main) {
+            mainFile = prevBuildOptions.main;
+        }
+        else if (options.main) {
             mainFile = options.main;
         }
         else {
-            const root = (_c = project.sourceRoot) !== null && _c !== void 0 ? _c : project.root;
+            const root = (_e = project.sourceRoot) !== null && _e !== void 0 ? _e : project.root;
             for (const f of [
                 (0, devkit_1.joinPathFragments)(root, 'main.ts'),
                 (0, devkit_1.joinPathFragments)(root, 'main.js'),
@@ -35,7 +39,10 @@ function setupBuildGenerator(tree, options) {
             throw new Error(`Cannot locate a main file for ${options.project}. Please specify one using --main=<file-path>.`);
         }
         let tsConfigFile;
-        if (options.tsConfig) {
+        if (prevBuildOptions === null || prevBuildOptions === void 0 ? void 0 : prevBuildOptions.tsConfig) {
+            tsConfigFile = prevBuildOptions.tsConfig;
+        }
+        else if (options.tsConfig) {
             tsConfigFile = options.tsConfig;
         }
         else {
@@ -76,6 +83,7 @@ function setupBuildGenerator(tree, options) {
                     buildTarget: options.buildTarget,
                     project: options.project,
                     skipFormat: true,
+                    skipValidation: true,
                 });
                 tasks.push(task);
                 break;
@@ -85,9 +93,12 @@ function setupBuildGenerator(tree, options) {
                 const task = yield configurationGenerator(tree, {
                     buildTarget: options.buildTarget,
                     main: mainFile,
+                    tsConfig: tsConfigFile,
                     project: options.project,
-                    skipFormat: true,
                     compiler: 'tsc',
+                    format: ['cjs', 'esm'],
+                    skipFormat: true,
+                    skipValidation: true,
                 });
                 tasks.push(task);
                 break;

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

@@ -20,7 +20,8 @@ function findNpmDependencies(workspaceRoot, sourceProject, projectGraph, project
     function collectAll(currentProject, collectedDeps) {
         if (seen === null || seen === void 0 ? void 0 : seen.has(currentProject.name))
             return;
-        collectDependenciesFromFileMap(workspaceRoot, currentProject, projectGraph, projectFileMap, buildTarget, collectedDeps);
+        seen === null || seen === void 0 ? void 0 : 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 ||
@@ -70,7 +77,12 @@ 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 === null || packageJson === void 0 ? void 0 : 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] = '*';

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

@@ -42,8 +42,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',
         });
     }