@nx/workspace 17.0.0-beta.1 → 17.0.0-beta.2

package/generators.json

@@ -19,12 +19,6 @@
       "schema": "./src/generators/convert-to-monorepo/schema.json",
       "description": "Convert a Nx project to a monorepo."
     },
-    "workspace-generator": {
-      "factory": "./src/generators/workspace-generator/workspace-generator",
-      "schema": "./src/generators/workspace-generator/schema.json",
-      "aliases": ["workspace-schematic"],
-      "description": "Generates a workspace generator."
-    },
     "run-commands": {
       "factory": "./src/generators/run-commands/run-commands#runCommandsSchematic",
       "schema": "./src/generators/run-commands/schema.json",
@@ -69,12 +63,6 @@
       "description": "Create a workspace.",
       "hidden": true
     },
-    "workspace-generator": {
-      "factory": "./src/generators/workspace-generator/workspace-generator",
-      "schema": "./src/generators/workspace-generator/schema.json",
-      "aliases": ["workspace-schematic"],
-      "description": "Generates a workspace generator."
-    },
     "run-commands": {
       "factory": "./src/generators/run-commands/run-commands#runCommandsGenerator",
       "schema": "./src/generators/run-commands/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "17.0.0-beta.1",
+  "version": "17.0.0-beta.2",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -61,15 +61,15 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "17.0.0-beta.1",
+    "@nx/devkit": "17.0.0-beta.2",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "17.0.0-beta.1",
-    "@nrwl/workspace": "17.0.0-beta.1"
+    "nx": "17.0.0-beta.2",
+    "@nrwl/workspace": "17.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/workspace-generator/schema.d.ts

@@ -1 +0,0 @@
-export interface Schema {}

package/src/generators/workspace-generator/schema.json

@@ -1,9 +0,0 @@
-{
-  "cli": "nx",
-  "$id": "SchematicsNxWorkspaceSchematic",
-  "title": "Create a custom generator",
-  "description": "Create a custom generator.",
-  "type": "object",
-  "properties": {},
-  "required": []
-}

package/src/generators/workspace-generator/workspace-generator.d.ts

@@ -1,3 +0,0 @@
-import { Schema } from './schema';
-import { Tree } from '@nx/devkit';
-export default function (host: Tree, schema: Schema): Promise<void>;

package/src/generators/workspace-generator/workspace-generator.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-async function default_1(host, schema) {
-    const message = (0, devkit_1.stripIndents) `Workspace Generators are no longer supported. Instead,
-    Nx now supports executing generators or executors from local plugins. To get 
-    started, install @nx/plugin and run \`nx g plugin\`.
-
-    Afterwards, or if you already have an Nx plugin, you can run 
-    \`nx g generator --project {my-plugin}\` to add a new generator.
-    
-    For more information, see: https://nx.dev/deprecated/workspace-generators`;
-    throw new Error(message);
-}
-exports.default = default_1;

package/src/utilities/buildable-libs-utils.d.ts

@@ -1,41 +0,0 @@
-import type { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
-import { ProjectGraphExternalNode } from '@nx/devkit';
-/**
- * @deprecated This type will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-export type DependentBuildableProjectNode = {
-    name: string;
-    outputs: string[];
-    node: ProjectGraphProjectNode | ProjectGraphExternalNode;
-};
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-export declare function calculateProjectDependencies(projGraph: ProjectGraph, root: string, projectName: string, targetName: string, configurationName: string, shallow?: boolean): {
-    target: ProjectGraphProjectNode;
-    dependencies: DependentBuildableProjectNode[];
-    nonBuildableDependencies: string[];
-    topLevelDependencies: DependentBuildableProjectNode[];
-};
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-export declare function createTmpTsConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, dependencies: DependentBuildableProjectNode[]): string;
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-export declare function checkDependentProjectsHaveBeenBuilt(root: string, projectName: string, targetName: string, projectDependencies: DependentBuildableProjectNode[]): boolean;
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-export declare function findMissingBuildDependencies(root: string, projectName: string, targetName: string, projectDependencies: DependentBuildableProjectNode[]): DependentBuildableProjectNode[];
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-export declare function updatePaths(dependencies: DependentBuildableProjectNode[], paths: Record<string, string[]>): void;
-/**
- * Updates the peerDependencies section in the `dist/lib/xyz/package.json` with
- * the proper dependency and version
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-export declare function updateBuildableProjectPackageJsonDependencies(root: string, projectName: string, targetName: string, configurationName: string, node: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[], typeOfDependency?: 'dependencies' | 'peerDependencies'): void;

package/src/utilities/buildable-libs-utils.js

@@ -1,316 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateBuildableProjectPackageJsonDependencies = exports.updatePaths = exports.findMissingBuildDependencies = exports.checkDependentProjectsHaveBeenBuilt = exports.createTmpTsConfig = exports.calculateProjectDependencies = void 0;
-const path_1 = require("path");
-const fileutils_1 = require("./fileutils");
-const devkit_1 = require("@nx/devkit");
-const fs_1 = require("fs");
-const output_1 = require("./output");
-const operators_1 = require("nx/src/project-graph/operators");
-const typescript_1 = require("./typescript");
-let tsModule;
-function isBuildable(target, node) {
-    return (node.data.targets &&
-        node.data.targets[target] &&
-        node.data.targets[target].executor !== '');
-}
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-function calculateProjectDependencies(projGraph, root, projectName, targetName, configurationName, shallow) {
-    const target = projGraph.nodes[projectName];
-    // gather the library dependencies
-    const nonBuildableDependencies = [];
-    const topLevelDependencies = [];
-    const collectedDeps = collectDependencies(projectName, projGraph, [], shallow);
-    const missing = collectedDeps.reduce((missing, { name: dep }) => {
-        const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
-        if (!depNode) {
-            missing = missing || [];
-            missing.push(dep);
-        }
-        return missing;
-    }, null);
-    if (missing) {
-        throw new Error(`Unable to find ${missing.join(', ')} in project graph.`);
-    }
-    const dependencies = collectedDeps
-        .map(({ name: dep, isTopLevel }) => {
-        let project = null;
-        const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
-        if (depNode.type === 'lib') {
-            if (isBuildable(targetName, depNode)) {
-                const libPackageJsonPath = (0, path_1.join)(root, depNode.data.root, 'package.json');
-                project = {
-                    name: (0, fileutils_1.fileExists)(libPackageJsonPath)
-                        ? (0, devkit_1.readJsonFile)(libPackageJsonPath).name // i.e. @workspace/mylib
-                        : dep,
-                    outputs: (0, devkit_1.getOutputsForTargetAndConfiguration)({
-                        overrides: {},
-                        target: {
-                            project: projectName,
-                            target: targetName,
-                            configuration: configurationName,
-                        },
-                    }, depNode),
-                    node: depNode,
-                };
-            }
-            else {
-                nonBuildableDependencies.push(dep);
-            }
-        }
-        else if (depNode.type === 'npm') {
-            project = {
-                name: depNode.data.packageName,
-                outputs: [],
-                node: depNode,
-            };
-        }
-        if (project && isTopLevel) {
-            topLevelDependencies.push(project);
-        }
-        return project;
-    })
-        .filter((x) => !!x);
-    dependencies.sort((a, b) => (a.name > b.name ? 1 : b.name > a.name ? -1 : 0));
-    return {
-        target,
-        dependencies,
-        nonBuildableDependencies,
-        topLevelDependencies,
-    };
-}
-exports.calculateProjectDependencies = calculateProjectDependencies;
-function collectDependencies(project, projGraph, acc, shallow, areTopLevelDeps = true) {
-    (projGraph.dependencies[project] || []).forEach((dependency) => {
-        const existingEntry = acc.find((dep) => dep.name === dependency.target);
-        if (!existingEntry) {
-            // Temporary skip this. Currently the set of external nodes is built from package.json, not lock file.
-            // As a result, some nodes might be missing. This should not cause any issues, we can just skip them.
-            if (dependency.target.startsWith('npm:') &&
-                !projGraph.externalNodes[dependency.target])
-                return;
-            acc.push({ name: dependency.target, isTopLevel: areTopLevelDeps });
-            const isInternalTarget = projGraph.nodes[dependency.target];
-            if (!shallow && isInternalTarget) {
-                collectDependencies(dependency.target, projGraph, acc, shallow, false);
-            }
-        }
-        else if (areTopLevelDeps && !existingEntry.isTopLevel) {
-            existingEntry.isTopLevel = true;
-        }
-    });
-    return acc;
-}
-function readTsConfigWithRemappedPaths(tsConfig, generatedTsConfigPath, dependencies) {
-    const generatedTsConfig = { compilerOptions: {} };
-    generatedTsConfig.extends = (0, path_1.relative)((0, path_1.dirname)(generatedTsConfigPath), tsConfig);
-    generatedTsConfig.compilerOptions.paths = computeCompilerOptionsPaths(tsConfig, dependencies);
-    if (process.env.NX_VERBOSE_LOGGING_PATH_MAPPINGS === 'true') {
-        output_1.output.log({
-            title: 'TypeScript path mappings have been rewritten.',
-        });
-        console.log(JSON.stringify(generatedTsConfig.compilerOptions.paths, null, 2));
-    }
-    return generatedTsConfig;
-}
-function computeCompilerOptionsPaths(tsConfig, dependencies) {
-    const paths = readPaths(tsConfig) || {};
-    updatePaths(dependencies, paths);
-    return paths;
-}
-function readPaths(tsConfig) {
-    if (!tsModule) {
-        tsModule = (0, typescript_1.ensureTypescript)();
-    }
-    try {
-        let config;
-        if (typeof tsConfig === 'string') {
-            const configFile = tsModule.readConfigFile(tsConfig, tsModule.sys.readFile);
-            config = tsModule.parseJsonConfigFileContent(configFile.config, tsModule.sys, (0, path_1.dirname)(tsConfig));
-        }
-        else {
-            config = tsConfig;
-        }
-        if (config.options?.paths) {
-            return config.options.paths;
-        }
-        else {
-            return null;
-        }
-    }
-    catch (e) {
-        return null;
-    }
-}
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-function createTmpTsConfig(tsconfigPath, workspaceRoot, projectRoot, dependencies) {
-    const tmpTsConfigPath = (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, 'tsconfig.generated.json');
-    const parsedTSConfig = readTsConfigWithRemappedPaths(tsconfigPath, tmpTsConfigPath, dependencies);
-    process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
-    (0, devkit_1.writeJsonFile)(tmpTsConfigPath, parsedTSConfig);
-    return (0, path_1.join)(tmpTsConfigPath);
-}
-exports.createTmpTsConfig = createTmpTsConfig;
-function cleanupTmpTsConfigFile(tmpTsConfigPath) {
-    try {
-        if (tmpTsConfigPath) {
-            (0, fs_1.unlinkSync)(tmpTsConfigPath);
-        }
-    }
-    catch (e) { }
-}
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-function checkDependentProjectsHaveBeenBuilt(root, projectName, targetName, projectDependencies) {
-    const missing = findMissingBuildDependencies(root, projectName, targetName, projectDependencies);
-    if (missing.length > 0) {
-        console.error((0, devkit_1.stripIndents) `
-      It looks like all of ${projectName}'s dependencies have not been built yet:
-      ${missing.map((x) => ` - ${x.node.name}`).join('\n')}
-
-      You might be missing a "targetDefaults" configuration in your root nx.json (https://nx.dev/reference/project-configuration#target-defaults),
-      or "dependsOn" configured in ${projectName}'s project.json (https://nx.dev/reference/project-configuration#dependson) 
-    `);
-        return false;
-    }
-    else {
-        return true;
-    }
-}
-exports.checkDependentProjectsHaveBeenBuilt = checkDependentProjectsHaveBeenBuilt;
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-function findMissingBuildDependencies(root, projectName, targetName, projectDependencies) {
-    const depLibsToBuildFirst = [];
-    // verify whether all dependent libraries have been built
-    projectDependencies.forEach((dep) => {
-        if (dep.node.type !== 'lib') {
-            return;
-        }
-        const paths = dep.outputs.map((p) => (0, path_1.join)(root, p));
-        if (!paths.some(fileutils_1.directoryExists)) {
-            depLibsToBuildFirst.push(dep);
-        }
-    });
-    return depLibsToBuildFirst;
-}
-exports.findMissingBuildDependencies = findMissingBuildDependencies;
-/**
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-function updatePaths(dependencies, paths) {
-    const pathsKeys = Object.keys(paths);
-    // For each registered dependency
-    dependencies.forEach((dep) => {
-        // If there are outputs
-        if (dep.outputs && dep.outputs.length > 0) {
-            // Directly map the dependency name to the output paths (dist/packages/..., etc.)
-            paths[dep.name] = dep.outputs;
-            // check for secondary entrypoints
-            // For each registered path
-            for (const path of pathsKeys) {
-                const nestedName = `${dep.name}/`;
-                // If the path points to the current dependency and is nested (/)
-                if (path.startsWith(nestedName)) {
-                    const nestedPart = path.slice(nestedName.length);
-                    // Bind secondary endpoints for ng-packagr projects
-                    let mappedPaths = dep.outputs.map((output) => `${output}/${nestedPart}`);
-                    // Get the dependency's package name
-                    const { root } = (dep.node?.data || {});
-                    if (root) {
-                        // Update nested mappings to point to the dependency's output paths
-                        mappedPaths = mappedPaths.concat(paths[path].flatMap((path) => dep.outputs.map((output) => path.replace(root, output))));
-                    }
-                    paths[path] = mappedPaths;
-                }
-            }
-        }
-    });
-}
-exports.updatePaths = updatePaths;
-/**
- * Updates the peerDependencies section in the `dist/lib/xyz/package.json` with
- * the proper dependency and version
- * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
- */
-function updateBuildableProjectPackageJsonDependencies(root, projectName, targetName, configurationName, node, dependencies, typeOfDependency = 'dependencies') {
-    const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
-        overrides: {},
-        target: {
-            project: projectName,
-            target: targetName,
-            configuration: configurationName,
-        },
-    }, node);
-    const packageJsonPath = `${outputs[0]}/package.json`;
-    let packageJson;
-    let workspacePackageJson;
-    try {
-        packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
-        workspacePackageJson = (0, devkit_1.readJsonFile)(`${root}/package.json`);
-    }
-    catch (e) {
-        // cannot find or invalid package.json
-        return;
-    }
-    packageJson.dependencies = packageJson.dependencies || {};
-    packageJson.peerDependencies = packageJson.peerDependencies || {};
-    let updatePackageJson = false;
-    dependencies.forEach((entry) => {
-        const packageName = (0, operators_1.isNpmProject)(entry.node)
-            ? entry.node.data.packageName
-            : entry.name;
-        if (!hasDependency(packageJson, 'dependencies', packageName) &&
-            !hasDependency(packageJson, 'devDependencies', packageName) &&
-            !hasDependency(packageJson, 'peerDependencies', packageName)) {
-            try {
-                let depVersion;
-                if (entry.node.type === 'lib') {
-                    const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
-                        overrides: {},
-                        target: {
-                            project: projectName,
-                            target: targetName,
-                            configuration: configurationName,
-                        },
-                    }, entry.node);
-                    const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
-                    depVersion = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
-                    packageJson[typeOfDependency][packageName] = depVersion;
-                }
-                else if ((0, operators_1.isNpmProject)(entry.node)) {
-                    // If an npm dep is part of the workspace devDependencies, do not include it the library
-                    if (!!workspacePackageJson.devDependencies?.[entry.node.data.packageName]) {
-                        return;
-                    }
-                    depVersion = entry.node.data.version;
-                    packageJson[typeOfDependency][entry.node.data.packageName] =
-                        depVersion;
-                }
-                updatePackageJson = true;
-            }
-            catch (e) {
-                // skip if cannot find package.json
-            }
-        }
-    });
-    if (updatePackageJson) {
-        (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
-    }
-}
-exports.updateBuildableProjectPackageJsonDependencies = updateBuildableProjectPackageJsonDependencies;
-// verify whether the package.json already specifies the dep
-function hasDependency(outputJson, depConfigName, packageName) {
-    if (outputJson[depConfigName]) {
-        return outputJson[depConfigName][packageName];
-    }
-    else {
-        return false;
-    }
-}