@nx/js 20.3.2 → 20.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.3.2",
+  "version": "20.3.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,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "20.3.2",
-    "@nx/workspace": "20.3.2",
+    "@nx/devkit": "20.3.4",
+    "@nx/workspace": "20.3.4",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

package/src/generators/library/library.js

@@ -23,6 +23,7 @@ const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const generator_1 = require("../setup-verdaccio/generator");
+const sort_fields_1 = require("../../utils/package-json/sort-fields");
 const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
@@ -133,6 +134,7 @@ async function libraryGeneratorInternal(tree, schema) {
     if (options.isUsingTsSolutionConfig) {
         (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
+    (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -305,19 +307,21 @@ async function addLint(tree, options) {
                 ruleSeverity = value;
                 ruleOptions = {};
             }
-            if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
-                ruleOptions.ignoredFiles ??= [];
-                ruleOptions.ignoredFiles.push('{projectRoot}/vite.config.{js,ts,mjs,mts}');
-                o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+            const ignoredFiles = new Set(ruleOptions.ignoredFiles ?? []);
+            if (options.bundler === 'vite') {
+                ignoredFiles.add('{projectRoot}/vite.config.{js,ts,mjs,mts}');
             }
             else if (options.bundler === 'rollup') {
-                ruleOptions.ignoredFiles ??= [];
-                ruleOptions.ignoredFiles.push('{projectRoot}/rollup.config.{js,ts,mjs,mts,cjs,cts}');
-                o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+                ignoredFiles.add('{projectRoot}/rollup.config.{js,ts,mjs,mts,cjs,cts}');
             }
             else if (options.bundler === 'esbuild') {
-                ruleOptions.ignoredFiles ??= [];
-                ruleOptions.ignoredFiles.push('{projectRoot}/esbuild.config.{js,ts,mjs,mts}');
+                ignoredFiles.add('{projectRoot}/esbuild.config.{js,ts,mjs,mts}');
+            }
+            if (options.unitTestRunner === 'vitest') {
+                ignoredFiles.add('{projectRoot}/vite.config.{js,ts,mjs,mts}');
+            }
+            if (ignoredFiles.size) {
+                ruleOptions.ignoredFiles = Array.from(ignoredFiles);
                 o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
             }
             return o;
@@ -478,6 +482,12 @@ function createFiles(tree, options) {
             return json;
         });
     }
+    else if (!options.isUsingTsSolutionConfig &&
+        options.useProjectJson &&
+        (!options.bundler || options.bundler === 'none') &&
+        !(options.projectRoot === '.')) {
+        tree.delete(packageJsonPath);
+    }
     if (options.minimal && !(options.projectRoot === '.')) {
         tree.delete((0, path_1.join)(options.projectRoot, 'README.md'));
     }

package/src/utils/package-json/sort-fields.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function sortPackageJsonFields(tree: Tree, projectRoot: string): void;

package/src/utils/package-json/sort-fields.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortPackageJsonFields = sortPackageJsonFields;
+const devkit_1 = require("@nx/devkit");
+function sortPackageJsonFields(tree, projectRoot) {
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
+    if (!tree.exists(packageJsonPath))
+        return;
+    (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
+        // Note that these are fields that our generators may use, so it's not exhaustive.
+        const orderedTopFields = new Set([
+            'name',
+            'version',
+            'private',
+            'description',
+            'type',
+            'main',
+            'module',
+            'types',
+            'exports',
+        ]);
+        const orderedBottomFields = new Set([
+            'dependencies',
+            'devDependencies',
+            'peerDependencies',
+            'optionalDependencies',
+        ]);
+        const otherFields = new Set(Object.keys(json).filter((k) => !orderedTopFields.has(k) && !orderedBottomFields.has(k)));
+        const allFields = [
+            ...orderedTopFields,
+            ...otherFields,
+            ...orderedBottomFields,
+        ];
+        const sortedJson = {};
+        for (const k of allFields) {
+            sortedJson[k] = json[k];
+        }
+        return sortedJson;
+    });
+}