@nx/devkit 17.0.0-beta.2 → 17.0.0-beta.4

package/index.d.ts

@@ -10,10 +10,5 @@
  *
  * @module @nx/devkit
  */
-
-// TODO(v17): remove this file, we can use the normally generated index.d.ts from index.ts
-
-/* eslint-disable @typescript-eslint/no-restricted-imports */
 export * from 'nx/src/devkit-exports';
-
 export * from './public-api';

package/index.js

@@ -1,3 +1,4 @@
+"use strict";
 /**
  * The Nx Devkit is the underlying technology used to customize Nx to support
  * different technologies and custom use-cases. It contains many utility
@@ -10,18 +11,8 @@
  *
  * @module @nx/devkit
  */
-
-try {
-  // TODO(v17): We will not need to maintain this file anymore, change this to a regular export statement
-  // This file was introduced in the nx package in v15.7 but devkit is compatible down to v14.1 which doesn't have this file.
-  module.exports = require('nx/src/devkit-exports');
-} catch {
-  // These are the nx-reexports from before v16
-  // TODO(v17): This can be removed once the above is done.
-  module.exports = require('./nx-reexports-pre16');
-}
-
-module.exports = {
-  ...module.exports,
-  ...require('./public-api'),
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+tslib_1.__exportStar(require("nx/src/devkit-exports"), exports);
+tslib_1.__exportStar(require("./public-api"), exports);

package/ngcli-adapter.d.ts

@@ -1,4 +1,4 @@
 /**
  * @category Ng CLI Adapter
  */
-export { wrapAngularDevkitSchematic, overrideCollectionResolutionForTesting, mockSchematicsForTesting, NxScopedHost, } from 'nx/src/adapter/ngcli-adapter';
+export { wrapAngularDevkitSchematic, mockSchematicsForTesting, NxScopedHost, } from 'nx/src/adapter/ngcli-adapter';

package/ngcli-adapter.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NxScopedHost = exports.mockSchematicsForTesting = exports.overrideCollectionResolutionForTesting = exports.wrapAngularDevkitSchematic = void 0;
+exports.NxScopedHost = exports.mockSchematicsForTesting = exports.wrapAngularDevkitSchematic = void 0;
 /**
  * @category Ng CLI Adapter
  */
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 var ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 Object.defineProperty(exports, "wrapAngularDevkitSchematic", { enumerable: true, get: function () { return ngcli_adapter_1.wrapAngularDevkitSchematic; } });
-Object.defineProperty(exports, "overrideCollectionResolutionForTesting", { enumerable: true, get: function () { return ngcli_adapter_1.overrideCollectionResolutionForTesting; } });
 Object.defineProperty(exports, "mockSchematicsForTesting", { enumerable: true, get: function () { return ngcli_adapter_1.mockSchematicsForTesting; } });
 Object.defineProperty(exports, "NxScopedHost", { enumerable: true, get: function () { return ngcli_adapter_1.NxScopedHost; } });

package/nx.js

@@ -5,21 +5,15 @@ exports.requireNx = void 0;
 // - import {} from 'nx/src/devkit-exports'
 // - import {} from 'nx/src/devkit-internals'
 function requireNx() {
+    let result = { ...require('nx/src/devkit-exports') };
     try {
-        let result = { ...require('nx/src/devkit-exports') };
-        try {
-            result = {
-                ...result,
-                // Remove in Nx v18, devkit should not support Nx v16.0.2 at that point.
-                ...require('nx/src/devkit-internals'),
-            };
-        }
-        catch { }
-        return result;
-    }
-    catch {
-        // Remove in Nx V17, devkit should not support Nx < 16 at that point.
-        return require('./nx-reexports-pre16');
+        result = {
+            ...result,
+            // Remove in Nx v18, devkit should not support Nx v16.0.2 at that point.
+            ...require('nx/src/devkit-internals'),
+        };
     }
+    catch { }
+    return result;
 }
 exports.requireNx = requireNx;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "17.0.0-beta.2",
+  "version": "17.0.0-beta.4",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more.",
   "repository": {
@@ -34,10 +34,10 @@
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
     "semver": "7.5.3",
-    "@nrwl/devkit": "17.0.0-beta.2"
+    "@nrwl/devkit": "17.0.0-beta.4"
   },
   "peerDependencies": {
-    "nx": ">= 15 <= 17"
+    "nx": ">= 16 <= 18"
   },
   "publishConfig": {
     "access": "public"

package/testing.d.ts

@@ -1,2 +1 @@
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
 export * from 'nx/src/devkit-testing-exports';

package/testing.js

@@ -1,9 +1,5 @@
-try {
-  // TODO(v17): We will not need to maintain this file anymore, change this to a regular export statement
-  // This file was introduced in the nx package in v15.7 but devkit is compatible down to v14.1 which doesn't have this file.
-  module.exports = require('nx/src/devkit-testing-exports');
-} catch {
-  // These are the nx-reexports from before v16
-  // TODO(v17): This can be removed once the above is done.
-  module.exports = require('./testing-pre16');
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+tslib_1.__exportStar(require("nx/src/devkit-testing-exports"), exports);

package/nx-reexports-pre16.d.ts

@@ -1,127 +0,0 @@
-/**
- * STOP! Do not change this file!
- *
- * If you need to export something from nx, it should go into nx/src/devkit-exports
- */
-/**
- * @category Tree
- */
-export type { Tree, FileChange } from 'nx/src/generators/tree';
-/**
- * @category Workspace
- */
-export type { WorkspaceJsonConfiguration, ProjectsConfigurations, TargetDependencyConfig, TargetConfiguration, ProjectConfiguration, ProjectType, Workspace, } from 'nx/src/config/workspace-json-project-json';
-/**
- * @category Workspace
- */
-export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraphExecutor, GeneratorsJson, ExecutorsJson, MigrationsJson, CustomHasher, HasherContext, } from 'nx/src/config/misc-interfaces';
-/**
- * @category Workspace
- */
-export { Workspaces } from 'nx/src/config/workspaces';
-export { workspaceLayout } from 'nx/src/config/configuration';
-export type { NxPlugin, ProjectTargetConfigurator, } from 'nx/src/utils/nx-plugin';
-/**
- * @category Workspace
- */
-export type { Task, TaskGraph } from 'nx/src/config/task-graph';
-/**
- * @category Workspace
- */
-export type { ImplicitDependencyEntry, ImplicitJsonSubsetDependency, NxJsonConfiguration, NxAffectedConfig, } from 'nx/src/config/nx-json';
-/**
- * @category Logger
- */
-export { logger } from 'nx/src/utils/logger';
-/**
- * @category Utils
- */
-export { output } from 'nx/src/utils/output';
-/**
- * @category Package Manager
- */
-export type { PackageManager } from 'nx/src/utils/package-manager';
-/**
- * @category Package Manager
- */
-export { getPackageManagerCommand, detectPackageManager, getPackageManagerVersion, } from 'nx/src/utils/package-manager';
-/**
- * @category Commands
- */
-export type { Target } from 'nx/src/command-line/run';
-/**
- * @category Commands
- */
-export { runExecutor } from 'nx/src/command-line/run';
-/**
- * @category Generators
- */
-export { addProjectConfiguration, readProjectConfiguration, removeProjectConfiguration, updateProjectConfiguration, getProjects, } from 'nx/src/generators/utils/project-configuration';
-/**
- * @category Generators
- */
-export { readNxJson, updateNxJson, readWorkspaceConfiguration, updateWorkspaceConfiguration, isStandaloneProject, WorkspaceConfiguration, getWorkspacePath, } from 'nx/src/generators/utils/project-configuration';
-/**
- * @category Project Graph
- */
-export type { ProjectFileMap, FileData, ProjectGraph, ProjectGraphDependency, ProjectGraphNode, ProjectGraphProjectNode, ProjectGraphExternalNode, ProjectGraphProcessorContext, } from 'nx/src/config/project-graph';
-/**
- * @category Project Graph
- */
-export { DependencyType } from 'nx/src/config/project-graph';
-/**
- * @category Project Graph
- */
-export { ProjectGraphBuilder } from 'nx/src/project-graph/project-graph-builder';
-/**
- * @category Utils
- */
-export { readJson, writeJson, updateJson } from 'nx/src/generators/utils/json';
-/**
- * @category Utils
- */
-export { parseJson, serializeJson, stripJsonComments } from 'nx/src/utils/json';
-/**
- * @category Utils
- */
-export type { JsonParseOptions, JsonSerializeOptions } from 'nx/src/utils/json';
-/**
- * @category Utils
- */
-export { readJsonFile, writeJsonFile } from 'nx/src/utils/fileutils';
-/**
- * @category Utils
- */
-export { stripIndents } from 'nx/src/utils/strip-indents';
-/**
- * @category Utils
- */
-export { joinPathFragments, normalizePath } from 'nx/src/utils/path';
-/**
- * @category Utils
- */
-export { workspaceRoot, appRootPath } from 'nx/src/utils/app-root';
-/**
- * @category Utils
- */
-export { reverse } from 'nx/src/project-graph/operators';
-/**
- * @category Utils
- */
-export { createProjectGraphAsync, readCachedProjectGraph, } from 'nx/src/project-graph/project-graph';
-/**
- * @category Utils
- */
-export { getOutputsForTargetAndConfiguration } from 'nx/src/tasks-runner/utils';
-/**
- * @category Utils
- */
-export { defaultTasksRunner, DefaultTasksRunnerOptions, RemoteCache, } from 'nx/src/tasks-runner/default-tasks-runner';
-/**
- * @category Utils
- */
-export { Hash, TaskHasher, Hasher } from 'nx/src/hasher/task-hasher';
-/**
- * @category Utils
- */
-export { cacheDir } from 'nx/src/utils/cache-directory';

package/nx-reexports-pre16.js

@@ -1,131 +0,0 @@
-"use strict";
-/**
- * STOP! Do not change this file!
- *
- * If you need to export something from nx, it should go into nx/src/devkit-exports
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cacheDir = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.ProjectGraphBuilder = exports.DependencyType = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.updateNxJson = exports.readNxJson = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.Workspaces = void 0;
-/**
- * @category Workspace
- */
-var workspaces_1 = require("nx/src/config/workspaces");
-Object.defineProperty(exports, "Workspaces", { enumerable: true, get: function () { return workspaces_1.Workspaces; } });
-var configuration_1 = require("nx/src/config/configuration");
-Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_1.workspaceLayout; } });
-/**
- * @category Logger
- */
-var logger_1 = require("nx/src/utils/logger");
-Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return logger_1.logger; } });
-/**
- * @category Utils
- */
-var output_1 = require("nx/src/utils/output");
-Object.defineProperty(exports, "output", { enumerable: true, get: function () { return output_1.output; } });
-/**
- * @category Package Manager
- */
-var package_manager_1 = require("nx/src/utils/package-manager");
-Object.defineProperty(exports, "getPackageManagerCommand", { enumerable: true, get: function () { return package_manager_1.getPackageManagerCommand; } });
-Object.defineProperty(exports, "detectPackageManager", { enumerable: true, get: function () { return package_manager_1.detectPackageManager; } });
-Object.defineProperty(exports, "getPackageManagerVersion", { enumerable: true, get: function () { return package_manager_1.getPackageManagerVersion; } });
-/**
- * @category Commands
- */
-var run_1 = require("nx/src/command-line/run");
-Object.defineProperty(exports, "runExecutor", { enumerable: true, get: function () { return run_1.runExecutor; } });
-/**
- * @category Generators
- */
-var project_configuration_1 = require("nx/src/generators/utils/project-configuration");
-Object.defineProperty(exports, "addProjectConfiguration", { enumerable: true, get: function () { return project_configuration_1.addProjectConfiguration; } });
-Object.defineProperty(exports, "readProjectConfiguration", { enumerable: true, get: function () { return project_configuration_1.readProjectConfiguration; } });
-Object.defineProperty(exports, "removeProjectConfiguration", { enumerable: true, get: function () { return project_configuration_1.removeProjectConfiguration; } });
-Object.defineProperty(exports, "updateProjectConfiguration", { enumerable: true, get: function () { return project_configuration_1.updateProjectConfiguration; } });
-Object.defineProperty(exports, "getProjects", { enumerable: true, get: function () { return project_configuration_1.getProjects; } });
-/**
- * @category Generators
- */
-var project_configuration_2 = require("nx/src/generators/utils/project-configuration");
-Object.defineProperty(exports, "readNxJson", { enumerable: true, get: function () { return project_configuration_2.readNxJson; } });
-Object.defineProperty(exports, "updateNxJson", { enumerable: true, get: function () { return project_configuration_2.updateNxJson; } });
-Object.defineProperty(exports, "readWorkspaceConfiguration", { enumerable: true, get: function () { return project_configuration_2.readWorkspaceConfiguration; } });
-Object.defineProperty(exports, "updateWorkspaceConfiguration", { enumerable: true, get: function () { return project_configuration_2.updateWorkspaceConfiguration; } });
-Object.defineProperty(exports, "isStandaloneProject", { enumerable: true, get: function () { return project_configuration_2.isStandaloneProject; } });
-Object.defineProperty(exports, "getWorkspacePath", { enumerable: true, get: function () { return project_configuration_2.getWorkspacePath; } });
-/**
- * @category Project Graph
- */
-var project_graph_1 = require("nx/src/config/project-graph");
-Object.defineProperty(exports, "DependencyType", { enumerable: true, get: function () { return project_graph_1.DependencyType; } });
-/**
- * @category Project Graph
- */
-var project_graph_builder_1 = require("nx/src/project-graph/project-graph-builder");
-Object.defineProperty(exports, "ProjectGraphBuilder", { enumerable: true, get: function () { return project_graph_builder_1.ProjectGraphBuilder; } });
-/**
- * @category Utils
- */
-var json_1 = require("nx/src/generators/utils/json");
-Object.defineProperty(exports, "readJson", { enumerable: true, get: function () { return json_1.readJson; } });
-Object.defineProperty(exports, "writeJson", { enumerable: true, get: function () { return json_1.writeJson; } });
-Object.defineProperty(exports, "updateJson", { enumerable: true, get: function () { return json_1.updateJson; } });
-/**
- * @category Utils
- */
-var json_2 = require("nx/src/utils/json");
-Object.defineProperty(exports, "parseJson", { enumerable: true, get: function () { return json_2.parseJson; } });
-Object.defineProperty(exports, "serializeJson", { enumerable: true, get: function () { return json_2.serializeJson; } });
-Object.defineProperty(exports, "stripJsonComments", { enumerable: true, get: function () { return json_2.stripJsonComments; } });
-/**
- * @category Utils
- */
-var fileutils_1 = require("nx/src/utils/fileutils");
-Object.defineProperty(exports, "readJsonFile", { enumerable: true, get: function () { return fileutils_1.readJsonFile; } });
-Object.defineProperty(exports, "writeJsonFile", { enumerable: true, get: function () { return fileutils_1.writeJsonFile; } });
-/**
- * @category Utils
- */
-var strip_indents_1 = require("nx/src/utils/strip-indents");
-Object.defineProperty(exports, "stripIndents", { enumerable: true, get: function () { return strip_indents_1.stripIndents; } });
-/**
- * @category Utils
- */
-var path_1 = require("nx/src/utils/path");
-Object.defineProperty(exports, "joinPathFragments", { enumerable: true, get: function () { return path_1.joinPathFragments; } });
-Object.defineProperty(exports, "normalizePath", { enumerable: true, get: function () { return path_1.normalizePath; } });
-// TODO(v16): Change this to export from 'nx/src/utils/workspace-root'
-/**
- * @category Utils
- */
-var app_root_1 = require("nx/src/utils/app-root");
-Object.defineProperty(exports, "workspaceRoot", { enumerable: true, get: function () { return app_root_1.workspaceRoot; } });
-Object.defineProperty(exports, "appRootPath", { enumerable: true, get: function () { return app_root_1.appRootPath; } });
-/**
- * @category Utils
- */
-var operators_1 = require("nx/src/project-graph/operators");
-Object.defineProperty(exports, "reverse", { enumerable: true, get: function () { return operators_1.reverse; } });
-/**
- * @category Utils
- */
-var project_graph_2 = require("nx/src/project-graph/project-graph");
-Object.defineProperty(exports, "createProjectGraphAsync", { enumerable: true, get: function () { return project_graph_2.createProjectGraphAsync; } });
-Object.defineProperty(exports, "readCachedProjectGraph", { enumerable: true, get: function () { return project_graph_2.readCachedProjectGraph; } });
-/**
- * @category Utils
- */
-var utils_1 = require("nx/src/tasks-runner/utils");
-Object.defineProperty(exports, "getOutputsForTargetAndConfiguration", { enumerable: true, get: function () { return utils_1.getOutputsForTargetAndConfiguration; } });
-/**
- * @category Utils
- */
-var default_tasks_runner_1 = require("nx/src/tasks-runner/default-tasks-runner");
-Object.defineProperty(exports, "defaultTasksRunner", { enumerable: true, get: function () { return default_tasks_runner_1.defaultTasksRunner; } });
-/**
- * @category Utils
- */
-var cache_directory_1 = require("nx/src/utils/cache-directory");
-Object.defineProperty(exports, "cacheDir", { enumerable: true, get: function () { return cache_directory_1.cacheDir; } });
-// STOP! Do not export any new things from the nx package

package/testing-pre16.d.ts

@@ -1,2 +0,0 @@
-export { createTreeWithEmptyWorkspace, createTreeWithEmptyV1Workspace, } from 'nx/src/generators/testing-utils/create-tree-with-empty-workspace';
-export { createTree } from 'nx/src/generators/testing-utils/create-tree';

package/testing-pre16.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTree = exports.createTreeWithEmptyV1Workspace = exports.createTreeWithEmptyWorkspace = void 0;
-/* eslint-disable @typescript-eslint/no-restricted-imports */
-var create_tree_with_empty_workspace_1 = require("nx/src/generators/testing-utils/create-tree-with-empty-workspace");
-Object.defineProperty(exports, "createTreeWithEmptyWorkspace", { enumerable: true, get: function () { return create_tree_with_empty_workspace_1.createTreeWithEmptyWorkspace; } });
-Object.defineProperty(exports, "createTreeWithEmptyV1Workspace", { enumerable: true, get: function () { return create_tree_with_empty_workspace_1.createTreeWithEmptyV1Workspace; } });
-var create_tree_1 = require("nx/src/generators/testing-utils/create-tree");
-Object.defineProperty(exports, "createTree", { enumerable: true, get: function () { return create_tree_1.createTree; } });