@nx/js 22.6.0-rc.1 → 22.6.0

package/generators.json

@@ -43,12 +43,6 @@
       "alias": ["sync"],
       "hidden": true
     },
-    "deps-sync": {
-      "factory": "./src/generators/deps-sync/deps-sync",
-      "schema": "./src/generators/deps-sync/schema.json",
-      "description": "Synchronize package.json dependencies for internal packages based on the project graph.",
-      "hidden": true
-    },
     "setup-prettier": {
       "factory": "./src/generators/setup-prettier/generator",
       "schema": "./src/generators/setup-prettier/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.6.0-rc.1",
+  "version": "22.6.0",
   "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": "22.6.0-rc.1",
-    "@nx/workspace": "22.6.0-rc.1",
+    "@nx/devkit": "22.6.0",
+    "@nx/workspace": "22.6.0",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,7 +60,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.6.0-rc.1"
+    "nx": "22.6.0"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/plugins/typescript/plugin.js

@@ -286,7 +286,7 @@ function buildTscTargets(config, options, context, configFiles, cache) {
                 inputs: getInputs(namedInputs, config, tsConfig, internalProjectReferences, context.workspaceRoot, cache),
                 outputs: getOutputs(config, tsConfig, internalProjectReferences, context.workspaceRoot, 
                 /* emitDeclarationOnly */ true),
-                syncGenerators: ['@nx/js:typescript-sync', '@nx/js:deps-sync'],
+                syncGenerators: ['@nx/js:typescript-sync'],
                 metadata: {
                     technologies: ['typescript'],
                     description: 'Runs type-checking for the project.',
@@ -317,7 +317,7 @@ function buildTscTargets(config, options, context, configFiles, cache) {
             outputs: getOutputs(config, tsConfig, internalProjectReferences, context.workspaceRoot, 
             // should be false for build target, but providing it just in case is set to true
             tsConfig.options.emitDeclarationOnly),
-            syncGenerators: ['@nx/js:typescript-sync', '@nx/js:deps-sync'],
+            syncGenerators: ['@nx/js:typescript-sync'],
             metadata: {
                 technologies: ['typescript'],
                 description: 'Builds the project with `tsc`.',

package/src/generators/deps-sync/deps-sync.d.ts

@@ -1,5 +0,0 @@
-import { type Tree } from '@nx/devkit';
-import type { SyncGeneratorResult } from 'nx/src/utils/sync-generators';
-export declare function syncGenerator(tree: Tree): Promise<SyncGeneratorResult>;
-export default syncGenerator;
-//# sourceMappingURL=deps-sync.d.ts.map

package/src/generators/deps-sync/deps-sync.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deps-sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/deps-sync/deps-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAaxE,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAoJ5E;AAED,eAAe,aAAa,CAAC"}

package/src/generators/deps-sync/deps-sync.js

@@ -1,124 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.syncGenerator = syncGenerator;
-const devkit_1 = require("@nx/devkit");
-const jsonc_parser_1 = require("jsonc-parser");
-async function syncGenerator(tree) {
-    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    const pm = (0, devkit_1.detectPackageManager)(tree.root);
-    const versionString = pm === 'npm' ? '*' : 'workspace:*';
-    // Build a set of all internal package names
-    const internalPackageNames = new Set();
-    const projectToPackageName = new Map();
-    for (const node of Object.values(projectGraph.nodes)) {
-        const packageName = node.data.metadata?.js?.packageName;
-        if (packageName) {
-            internalPackageNames.add(packageName);
-            projectToPackageName.set(node.name, packageName);
-        }
-    }
-    const changedFiles = new Map();
-    for (const projectName of Object.keys(projectGraph.nodes)) {
-        const sourceNode = projectGraph.nodes[projectName];
-        if (sourceNode.data.root === '.') {
-            continue;
-        }
-        // The consumer must itself have a package name (i.e. a package.json with name)
-        const sourcePackageName = projectToPackageName.get(projectName);
-        if (!sourcePackageName) {
-            continue;
-        }
-        const packageJsonPath = (0, devkit_1.joinPathFragments)(sourceNode.data.root, 'package.json');
-        if (!tree.exists(packageJsonPath)) {
-            continue;
-        }
-        // Collect the expected set of internal dependency package names
-        const expectedInternalDeps = new Set();
-        for (const dep of projectGraph.dependencies[projectName] || []) {
-            const targetNode = projectGraph.nodes[dep.target];
-            if (!targetNode || dep.type === 'implicit') {
-                continue;
-            }
-            const depPackageName = projectToPackageName.get(dep.target);
-            if (depPackageName) {
-                expectedInternalDeps.add(depPackageName);
-            }
-        }
-        // Read current package.json
-        const rawContents = tree.read(packageJsonPath, 'utf-8');
-        const packageJson = (0, devkit_1.parseJson)(rawContents);
-        const currentDevDeps = packageJson.devDependencies ?? {};
-        let hasChanges = false;
-        let updatedContents = rawContents;
-        // Add missing internal devDependencies
-        for (const depName of expectedInternalDeps) {
-            if (currentDevDeps[depName] === versionString ||
-                packageJson.dependencies?.[depName]) {
-                continue;
-            }
-            if (currentDevDeps[depName] !== undefined) {
-                // Present but wrong version string — update it
-                if (process.env.NX_VERBOSE_LOGGING === 'true') {
-                    devkit_1.logger.info(`Updating devDependency "${depName}" version to "${versionString}" in ${packageJsonPath}.`);
-                }
-            }
-            const edits = (0, jsonc_parser_1.modify)(updatedContents, ['devDependencies', depName], versionString, {
-                formattingOptions: {
-                    keepLines: true,
-                    insertSpaces: true,
-                    tabSize: 2,
-                },
-            });
-            updatedContents = (0, jsonc_parser_1.applyEdits)(updatedContents, edits);
-            hasChanges = true;
-            addChange(changedFiles, packageJsonPath, depName, 'added');
-        }
-        // Remove stale internal devDependencies (internal packages no longer
-        // depended on according to the project graph)
-        for (const depName of Object.keys(currentDevDeps)) {
-            if (internalPackageNames.has(depName) &&
-                !expectedInternalDeps.has(depName)) {
-                const edits = (0, jsonc_parser_1.modify)(updatedContents, ['devDependencies', depName], undefined, {
-                    formattingOptions: {
-                        keepLines: true,
-                        insertSpaces: true,
-                        tabSize: 2,
-                    },
-                });
-                updatedContents = (0, jsonc_parser_1.applyEdits)(updatedContents, edits);
-                hasChanges = true;
-                addChange(changedFiles, packageJsonPath, depName, 'removed');
-            }
-        }
-        if (hasChanges) {
-            tree.write(packageJsonPath, updatedContents);
-        }
-    }
-    if (changedFiles.size > 0) {
-        await (0, devkit_1.formatFiles)(tree);
-        const outOfSyncDetails = [];
-        for (const [filePath, details] of changedFiles) {
-            outOfSyncDetails.push(`${filePath}:`);
-            if (details.added.size > 0) {
-                outOfSyncDetails.push(`  - Missing devDependencies: ${Array.from(details.added).join(', ')}`);
-            }
-            if (details.removed.size > 0) {
-                outOfSyncDetails.push(`  - Stale devDependencies: ${Array.from(details.removed).join(', ')}`);
-            }
-        }
-        return {
-            outOfSyncMessage: 'Some package.json files are missing devDependencies to internal packages they depend on or contain stale devDependencies to internal packages they no longer depend on.',
-            outOfSyncDetails,
-        };
-    }
-}
-exports.default = syncGenerator;
-function addChange(changedFiles, filePath, depName, type) {
-    if (!changedFiles.has(filePath)) {
-        changedFiles.set(filePath, {
-            added: new Set(),
-            removed: new Set(),
-        });
-    }
-    changedFiles.get(filePath)[type].add(depName);
-}

package/src/generators/deps-sync/schema.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "https://json-schema.org/schema",
-  "$id": "action",
-  "type": "object",
-  "description": "Synchronize package.json dependencies for internal packages based on the project graph.",
-  "properties": {},
-  "required": []
-}