@nx/workspace 23.1.0 → 23.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -1
- package/dist/index.js +2 -2
- package/dist/src/core/file-utils.d.ts +2 -1
- package/dist/src/core/file-utils.js +12 -2
- package/dist/src/core/project-graph.d.ts +2 -1
- package/dist/src/core/project-graph.js +11 -2
- package/dist/src/generators/ci-workflow/ci-workflow.js +3 -3
- package/dist/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__ +1 -1
- package/dist/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__ +3 -3
- package/dist/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ +1 -1
- package/dist/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +6 -6
- package/dist/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__ +2 -2
- package/dist/src/generators/convert-to-nx-project/convert-to-nx-project.js +3 -3
- package/dist/src/generators/infer-targets/infer-targets.js +2 -4
- package/dist/src/generators/new/generate-preset.js +38 -8
- package/dist/src/generators/new/generate-workspace-files.js +4 -6
- package/dist/src/generators/new/new.d.ts +1 -1
- package/dist/src/generators/remove/lib/update-tsconfig.js +3 -3
- package/dist/src/tasks-runner/cache.d.ts +1 -1
- package/dist/src/tasks-runner/cache.js +2 -2
- package/dist/src/tasks-runner/default-tasks-runner.d.ts +2 -1
- package/dist/src/tasks-runner/default-tasks-runner.js +5 -2
- package/dist/src/tasks-runner/life-cycle.d.ts +2 -1
- package/dist/src/tasks-runner/life-cycle.js +2 -2
- package/dist/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.d.ts +1 -1
- package/dist/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +3 -2
- package/dist/src/tasks-runner/tasks-runner.d.ts +1 -1
- package/dist/src/tasks-runner/tasks-runner.js +0 -2
- package/dist/src/tasks-runner/utils.d.ts +2 -1
- package/dist/src/tasks-runner/utils.js +30 -2
- package/dist/src/utilities/app-root.d.ts +2 -1
- package/dist/src/utilities/app-root.js +6 -2
- package/dist/src/utilities/fileutils.d.ts +1 -1
- package/dist/src/utilities/fileutils.js +9 -8
- package/dist/src/utilities/get-import-path.d.ts +1 -1
- package/dist/src/utilities/get-import-path.js +2 -2
- package/dist/src/utilities/output.d.ts +2 -1
- package/dist/src/utilities/output.js +5 -2
- package/dist/src/utilities/package-manager-workspaces.js +2 -2
- package/dist/src/utilities/typescript/ts-solution-setup.js +2 -2
- package/package.json +4 -4
package/dist/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ export { ProjectType, projectRootDir } from './src/utils/project-type';
|
|
|
3
3
|
export { renameSync, updateJsonFile, copyFile, createDirectory, } from './src/utilities/fileutils';
|
|
4
4
|
export { names } from '@nx/devkit';
|
|
5
5
|
export { output } from './src/utilities/output';
|
|
6
|
-
export { readPackageJson } from 'nx/
|
|
6
|
+
export { readPackageJson } from '@nx/devkit/internal';
|
|
7
7
|
export { getWorkspacePath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
|
|
8
8
|
export { Linter } from './src/utils/lint';
|
|
9
9
|
export { moveGenerator } from './src/generators/move/move';
|
package/dist/index.js
CHANGED
|
@@ -15,8 +15,8 @@ var devkit_1 = require("@nx/devkit");
|
|
|
15
15
|
Object.defineProperty(exports, "names", { enumerable: true, get: function () { return devkit_1.names; } });
|
|
16
16
|
var output_1 = require("./src/utilities/output");
|
|
17
17
|
Object.defineProperty(exports, "output", { enumerable: true, get: function () { return output_1.output; } });
|
|
18
|
-
var
|
|
19
|
-
Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return
|
|
18
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
19
|
+
Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return internal_1.readPackageJson; } });
|
|
20
20
|
var cli_config_utils_1 = require("./src/utils/cli-config-utils");
|
|
21
21
|
Object.defineProperty(exports, "getWorkspacePath", { enumerable: true, get: function () { return cli_config_utils_1.getWorkspacePath; } });
|
|
22
22
|
Object.defineProperty(exports, "editTarget", { enumerable: true, get: function () { return cli_config_utils_1.editTarget; } });
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export type { FileData } from '@nx/devkit';
|
|
2
|
+
export { Change, DeletedFileChange, FileChange, LockFileChange, TEN_MEGABYTES, WholeFileChange, calculateFileChanges, defaultFileRead, isDeletedFileChange, isLockFileChange, isWholeFileChange, readPackageJson, } from '@nx/devkit/internal';
|
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
exports.readPackageJson = exports.isWholeFileChange = exports.isLockFileChange = exports.isDeletedFileChange = exports.defaultFileRead = exports.calculateFileChanges = exports.WholeFileChange = exports.TEN_MEGABYTES = exports.LockFileChange = exports.DeletedFileChange = void 0;
|
|
4
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
5
|
+
Object.defineProperty(exports, "DeletedFileChange", { enumerable: true, get: function () { return internal_1.DeletedFileChange; } });
|
|
6
|
+
Object.defineProperty(exports, "LockFileChange", { enumerable: true, get: function () { return internal_1.LockFileChange; } });
|
|
7
|
+
Object.defineProperty(exports, "TEN_MEGABYTES", { enumerable: true, get: function () { return internal_1.TEN_MEGABYTES; } });
|
|
8
|
+
Object.defineProperty(exports, "WholeFileChange", { enumerable: true, get: function () { return internal_1.WholeFileChange; } });
|
|
9
|
+
Object.defineProperty(exports, "calculateFileChanges", { enumerable: true, get: function () { return internal_1.calculateFileChanges; } });
|
|
10
|
+
Object.defineProperty(exports, "defaultFileRead", { enumerable: true, get: function () { return internal_1.defaultFileRead; } });
|
|
11
|
+
Object.defineProperty(exports, "isDeletedFileChange", { enumerable: true, get: function () { return internal_1.isDeletedFileChange; } });
|
|
12
|
+
Object.defineProperty(exports, "isLockFileChange", { enumerable: true, get: function () { return internal_1.isLockFileChange; } });
|
|
13
|
+
Object.defineProperty(exports, "isWholeFileChange", { enumerable: true, get: function () { return internal_1.isWholeFileChange; } });
|
|
14
|
+
Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return internal_1.readPackageJson; } });
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { createProjectGraphAsync, readCachedProjectGraph, readProjectsConfigurationFromProjectGraph, } from '@nx/devkit';
|
|
2
|
+
export { buildProjectGraphAndSourceMapsWithoutDaemon, createProjectGraphAndSourceMapsAsync, handleProjectGraphError, preventRecursionInGraphConstruction, readCachedProjectConfiguration, } from '@nx/devkit/internal';
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
exports.readCachedProjectConfiguration = exports.preventRecursionInGraphConstruction = exports.handleProjectGraphError = exports.createProjectGraphAndSourceMapsAsync = exports.buildProjectGraphAndSourceMapsWithoutDaemon = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = void 0;
|
|
4
|
+
var devkit_1 = require("@nx/devkit");
|
|
5
|
+
Object.defineProperty(exports, "createProjectGraphAsync", { enumerable: true, get: function () { return devkit_1.createProjectGraphAsync; } });
|
|
6
|
+
Object.defineProperty(exports, "readCachedProjectGraph", { enumerable: true, get: function () { return devkit_1.readCachedProjectGraph; } });
|
|
7
|
+
Object.defineProperty(exports, "readProjectsConfigurationFromProjectGraph", { enumerable: true, get: function () { return devkit_1.readProjectsConfigurationFromProjectGraph; } });
|
|
8
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
9
|
+
Object.defineProperty(exports, "buildProjectGraphAndSourceMapsWithoutDaemon", { enumerable: true, get: function () { return internal_1.buildProjectGraphAndSourceMapsWithoutDaemon; } });
|
|
10
|
+
Object.defineProperty(exports, "createProjectGraphAndSourceMapsAsync", { enumerable: true, get: function () { return internal_1.createProjectGraphAndSourceMapsAsync; } });
|
|
11
|
+
Object.defineProperty(exports, "handleProjectGraphError", { enumerable: true, get: function () { return internal_1.handleProjectGraphError; } });
|
|
12
|
+
Object.defineProperty(exports, "preventRecursionInGraphConstruction", { enumerable: true, get: function () { return internal_1.preventRecursionInGraphConstruction; } });
|
|
13
|
+
Object.defineProperty(exports, "readCachedProjectConfiguration", { enumerable: true, get: function () { return internal_1.readCachedProjectConfiguration; } });
|
|
@@ -4,8 +4,8 @@ exports.ciWorkflowGenerator = ciWorkflowGenerator;
|
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const default_base_1 = require("../../utilities/default-base");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
|
|
8
7
|
const ts_solution_setup_1 = require("../../utilities/typescript/ts-solution-setup");
|
|
8
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
9
9
|
function getNxCloudRecordCommand(ci, packageManagerPrefix) {
|
|
10
10
|
const baseCommand = `${packageManagerPrefix} nx record -- echo Hello World`;
|
|
11
11
|
const prefix = getCiPrefix(ci);
|
|
@@ -110,7 +110,7 @@ function normalizeOptions(options, tree) {
|
|
|
110
110
|
const { exec: packageManagerPrefix, ciInstall: packageManagerInstall, dlx: packageManagerPreInstallPrefix, } = (0, devkit_1.getPackageManagerCommand)(packageManager);
|
|
111
111
|
let nxCloudHost = 'nx.app';
|
|
112
112
|
try {
|
|
113
|
-
const nxCloudUrl = (0,
|
|
113
|
+
const nxCloudUrl = (0, internal_1.getNxCloudUrl)((0, devkit_1.readJson)(tree, 'nx.json'));
|
|
114
114
|
nxCloudHost = new URL(nxCloudUrl).host;
|
|
115
115
|
}
|
|
116
116
|
catch { }
|
|
@@ -123,7 +123,7 @@ function normalizeOptions(options, tree) {
|
|
|
123
123
|
const hasPlaywright = allDependencies['@nx/playwright'];
|
|
124
124
|
const hasE2E = hasCypress || hasPlaywright;
|
|
125
125
|
const hasTypecheck = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
|
|
126
|
-
const connectedToCloud = (0,
|
|
126
|
+
const connectedToCloud = (0, internal_1.isNxCloudUsed)((0, devkit_1.readJson)(tree, 'nx.json'));
|
|
127
127
|
const mainBranch = (0, default_base_1.deduceDefaultBase)();
|
|
128
128
|
const commands = getCiCommands(options.ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, options.useRunMany ?? false);
|
|
129
129
|
const branchCommands = options.ci === 'bitbucket-pipelines'
|
package/dist/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
image: node:
|
|
1
|
+
image: node:24
|
|
2
2
|
|
|
3
3
|
clone:
|
|
4
4
|
depth: full
|
|
@@ -12,7 +12,7 @@ pipelines:
|
|
|
12
12
|
- export NX_BRANCH=$BITBUCKET_PR_ID
|
|
13
13
|
|
|
14
14
|
<% if(packageManager == 'pnpm'){ %>
|
|
15
|
-
- npm install --prefix=$HOME/.local -g pnpm@
|
|
15
|
+
- npm install --prefix=$HOME/.local -g pnpm@11
|
|
16
16
|
|
|
17
17
|
<% } %>
|
|
18
18
|
<% if(packageManager == 'bun'){ %>
|
|
@@ -54,7 +54,7 @@ pipelines:
|
|
|
54
54
|
# - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
|
|
55
55
|
<% } %>
|
|
56
56
|
<% if(packageManager == 'pnpm'){ %>
|
|
57
|
-
- npm install --prefix=$HOME/.local -g pnpm@
|
|
57
|
+
- npm install --prefix=$HOME/.local -g pnpm@11
|
|
58
58
|
<% } %>
|
|
59
59
|
<% if(packageManager == 'bun'){ %>
|
|
60
60
|
- npm install --prefix=$HOME/.local -g bun
|
|
@@ -14,22 +14,22 @@ jobs:
|
|
|
14
14
|
main:
|
|
15
15
|
runs-on: ubuntu-latest
|
|
16
16
|
steps:
|
|
17
|
-
- uses: actions/checkout@
|
|
17
|
+
- uses: actions/checkout@v7
|
|
18
18
|
with:
|
|
19
19
|
filter: tree:0
|
|
20
20
|
fetch-depth: 0
|
|
21
21
|
|
|
22
22
|
<% if(packageManager === 'bun'){ %>
|
|
23
|
-
- uses: oven-sh/setup-bun@
|
|
23
|
+
- uses: oven-sh/setup-bun@v2
|
|
24
24
|
with:
|
|
25
25
|
bun-version: latest
|
|
26
26
|
<% } else if (packageManager === 'yarn' && packageManagerVersion) { %>
|
|
27
27
|
- run: corepack enable
|
|
28
28
|
<% } else if(packageManager ==='pnpm'){ %>
|
|
29
|
-
- uses: pnpm/action-setup@
|
|
29
|
+
- uses: pnpm/action-setup@v6
|
|
30
30
|
name: Install pnpm
|
|
31
31
|
with:<% if (!packageManagerVersion) { %>
|
|
32
|
-
version:
|
|
32
|
+
version: 11.13.0<% } %>
|
|
33
33
|
run_install: false
|
|
34
34
|
<% } %>
|
|
35
35
|
# This enables task distribution via Nx Cloud
|
|
@@ -40,9 +40,9 @@ jobs:
|
|
|
40
40
|
|
|
41
41
|
<% if(packageManager !== 'bun'){ %>
|
|
42
42
|
# Cache node_modules
|
|
43
|
-
- uses: actions/setup-node@
|
|
43
|
+
- uses: actions/setup-node@v6
|
|
44
44
|
with:
|
|
45
|
-
node-version:
|
|
45
|
+
node-version: 24
|
|
46
46
|
cache: '<%= packageManager %>'
|
|
47
47
|
<% } %>
|
|
48
48
|
- run: <%= packageManagerInstall %><% if(hasCypress){ %>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
image: node:
|
|
1
|
+
image: node:24
|
|
2
2
|
variables:
|
|
3
3
|
CI: 'true'
|
|
4
4
|
GIT_DEPTH: 0
|
|
@@ -11,7 +11,7 @@ variables:
|
|
|
11
11
|
- merge_requests
|
|
12
12
|
script:
|
|
13
13
|
<% if(packageManager == 'pnpm'){ %>
|
|
14
|
-
- npm install --prefix=$HOME/.local -g pnpm@
|
|
14
|
+
- npm install --prefix=$HOME/.local -g pnpm@11
|
|
15
15
|
<% } %>
|
|
16
16
|
<% if(packageManager == 'bun'){ %>
|
|
17
17
|
- npm install --prefix=$HOME/.local -g bun
|
|
@@ -4,8 +4,8 @@ exports.validateSchema = validateSchema;
|
|
|
4
4
|
exports.convertToNxProjectGenerator = convertToNxProjectGenerator;
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const angular_json_1 = require("nx/src/adapter/angular-json");
|
|
8
7
|
const output_1 = require("../../utils/output");
|
|
8
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
9
9
|
async function validateSchema(schema, configName) {
|
|
10
10
|
if (schema.project && schema.all) {
|
|
11
11
|
throw new Error('--project and --all are mutually exclusive');
|
|
@@ -31,7 +31,7 @@ async function convertToNxProjectGenerator(host, schema) {
|
|
|
31
31
|
if (!host.exists(configName))
|
|
32
32
|
return;
|
|
33
33
|
await validateSchema(schema, configName);
|
|
34
|
-
const projects = (0,
|
|
34
|
+
const projects = (0, internal_1.toNewFormat)((0, devkit_1.readJson)(host, configName)).projects;
|
|
35
35
|
const leftOverProjects = {};
|
|
36
36
|
for (const projectName of Object.keys(projects)) {
|
|
37
37
|
const config = projects[projectName];
|
|
@@ -60,7 +60,7 @@ async function convertToNxProjectGenerator(host, schema) {
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
if (Object.keys(leftOverProjects).length > 0) {
|
|
63
|
-
(0, devkit_1.writeJson)(host, 'angular.json', (0,
|
|
63
|
+
(0, devkit_1.writeJson)(host, 'angular.json', (0, internal_1.toOldFormat)({ version: 1, projects: leftOverProjects }));
|
|
64
64
|
}
|
|
65
65
|
else {
|
|
66
66
|
host.delete(configName);
|
|
@@ -4,8 +4,6 @@ exports.convertToInferredGenerator = convertToInferredGenerator;
|
|
|
4
4
|
const internal_1 = require("@nx/devkit/internal");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const enquirer_1 = require("enquirer");
|
|
7
|
-
const generator_utils_1 = require("nx/src/command-line/generate/generator-utils");
|
|
8
|
-
const installed_plugins_1 = require("nx/src/utils/plugins/installed-plugins");
|
|
9
7
|
async function convertToInferredGenerator(tree, options) {
|
|
10
8
|
const generatorCollectionChoices = await getPossibleConvertToInferredGenerators();
|
|
11
9
|
if (generatorCollectionChoices.size === 0) {
|
|
@@ -85,13 +83,13 @@ async function convertToInferredGenerator(tree, options) {
|
|
|
85
83
|
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
86
84
|
}
|
|
87
85
|
async function getPossibleConvertToInferredGenerators() {
|
|
88
|
-
const installedCollections = Array.from(new Set((0,
|
|
86
|
+
const installedCollections = Array.from(new Set((0, internal_1.findInstalledPlugins)().map((x) => x.name)));
|
|
89
87
|
const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
|
|
90
88
|
const projectsConfigurations = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
|
|
91
89
|
const choices = new Map();
|
|
92
90
|
for (const collectionName of installedCollections) {
|
|
93
91
|
try {
|
|
94
|
-
const generator = (0,
|
|
92
|
+
const generator = (0, internal_1.getGeneratorInformation)(collectionName, 'convert-to-inferred', devkit_1.workspaceRoot, projectsConfigurations.projects);
|
|
95
93
|
if (generator.generatorConfiguration.hidden ||
|
|
96
94
|
generator.generatorConfiguration['x-deprecated']) {
|
|
97
95
|
continue;
|
|
@@ -10,7 +10,7 @@ const get_npm_package_version_1 = require("../utils/get-npm-package-version");
|
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const yargs_parser_1 = tslib_1.__importDefault(require("yargs-parser"));
|
|
12
12
|
const child_process_1 = require("child_process");
|
|
13
|
-
const
|
|
13
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
14
14
|
function addPresetDependencies(host, options) {
|
|
15
15
|
const { dependencies, dev } = getPresetDependencies(options);
|
|
16
16
|
return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'), true);
|
|
@@ -28,7 +28,7 @@ function generatePreset(host, opts) {
|
|
|
28
28
|
cwd: newWorkspaceRoot,
|
|
29
29
|
};
|
|
30
30
|
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
31
|
-
const nxInstallationPaths = (0,
|
|
31
|
+
const nxInstallationPaths = (0, internal_1.getNxRequirePaths)(newWorkspaceRoot);
|
|
32
32
|
const nxBinForNewWorkspaceRoot = require.resolve('nx/bin/nx', {
|
|
33
33
|
paths: nxInstallationPaths,
|
|
34
34
|
});
|
|
@@ -94,13 +94,27 @@ function generatePreset(host, opts) {
|
|
|
94
94
|
].filter((e) => !!e);
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
|
-
|
|
97
|
+
// `typescript` is pinned here rather than left to `@nx/js:init` so it lands in
|
|
98
|
+
// package.json before the first install. Otherwise npm resolves tsquery's
|
|
99
|
+
// `typescript: >3.0.0` peer to 7.x, whose entry point dropped the compiler API.
|
|
100
|
+
function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner, js, }) {
|
|
98
101
|
switch (preset) {
|
|
102
|
+
// Empty workspaces — no preset generator runs, so `@nx/js:init` never adds
|
|
103
|
+
// typescript and pinning it here would be net-new.
|
|
99
104
|
case presets_1.Preset.Apps:
|
|
100
105
|
case presets_1.Preset.NPM:
|
|
106
|
+
return { dependencies: {}, dev: { '@nx/js': versions_1.nxVersion } };
|
|
101
107
|
case presets_1.Preset.TS:
|
|
102
108
|
case presets_1.Preset.TsStandalone:
|
|
103
|
-
return {
|
|
109
|
+
return {
|
|
110
|
+
dependencies: {},
|
|
111
|
+
dev: {
|
|
112
|
+
'@nx/js': versions_1.nxVersion,
|
|
113
|
+
// ts-standalone prompts for JS vs TS; mirror `@nx/js:init`, which
|
|
114
|
+
// skips typescript when `js` is set.
|
|
115
|
+
typescript: js ? undefined : versions_1.typescriptVersion,
|
|
116
|
+
},
|
|
117
|
+
};
|
|
104
118
|
case presets_1.Preset.AngularMonorepo:
|
|
105
119
|
case presets_1.Preset.AngularStandalone:
|
|
106
120
|
return {
|
|
@@ -114,7 +128,10 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
|
|
|
114
128
|
},
|
|
115
129
|
};
|
|
116
130
|
case presets_1.Preset.Express:
|
|
117
|
-
return {
|
|
131
|
+
return {
|
|
132
|
+
dependencies: {},
|
|
133
|
+
dev: { '@nx/express': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
|
|
134
|
+
};
|
|
118
135
|
case presets_1.Preset.Nest:
|
|
119
136
|
return {
|
|
120
137
|
dependencies: {},
|
|
@@ -122,7 +139,10 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
|
|
|
122
139
|
};
|
|
123
140
|
case presets_1.Preset.NextJs:
|
|
124
141
|
case presets_1.Preset.NextJsStandalone:
|
|
125
|
-
return {
|
|
142
|
+
return {
|
|
143
|
+
dependencies: { '@nx/next': versions_1.nxVersion },
|
|
144
|
+
dev: { typescript: versions_1.typescriptVersion },
|
|
145
|
+
};
|
|
126
146
|
case presets_1.Preset.VueMonorepo:
|
|
127
147
|
case presets_1.Preset.VueStandalone:
|
|
128
148
|
return {
|
|
@@ -132,6 +152,7 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
|
|
|
132
152
|
'@nx/cypress': e2eTestRunner === 'cypress' ? versions_1.nxVersion : undefined,
|
|
133
153
|
'@nx/playwright': e2eTestRunner === 'playwright' ? versions_1.nxVersion : undefined,
|
|
134
154
|
'@nx/vite': versions_1.nxVersion,
|
|
155
|
+
typescript: versions_1.typescriptVersion,
|
|
135
156
|
},
|
|
136
157
|
};
|
|
137
158
|
case presets_1.Preset.Nuxt:
|
|
@@ -142,6 +163,7 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
|
|
|
142
163
|
'@nx/nuxt': versions_1.nxVersion,
|
|
143
164
|
'@nx/cypress': e2eTestRunner === 'cypress' ? versions_1.nxVersion : undefined,
|
|
144
165
|
'@nx/playwright': e2eTestRunner === 'playwright' ? versions_1.nxVersion : undefined,
|
|
166
|
+
typescript: versions_1.typescriptVersion,
|
|
145
167
|
},
|
|
146
168
|
};
|
|
147
169
|
case presets_1.Preset.ReactMonorepo:
|
|
@@ -155,12 +177,19 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
|
|
|
155
177
|
'@nx/jest': bundler !== 'vite' ? versions_1.nxVersion : undefined,
|
|
156
178
|
'@nx/vite': bundler === 'vite' ? versions_1.nxVersion : undefined,
|
|
157
179
|
'@nx/webpack': bundler === 'webpack' ? versions_1.nxVersion : undefined,
|
|
180
|
+
typescript: versions_1.typescriptVersion,
|
|
158
181
|
},
|
|
159
182
|
};
|
|
160
183
|
case presets_1.Preset.ReactNative:
|
|
161
|
-
return {
|
|
184
|
+
return {
|
|
185
|
+
dependencies: {},
|
|
186
|
+
dev: { '@nx/react-native': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
|
|
187
|
+
};
|
|
162
188
|
case presets_1.Preset.Expo:
|
|
163
|
-
return {
|
|
189
|
+
return {
|
|
190
|
+
dependencies: {},
|
|
191
|
+
dev: { '@nx/expo': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
|
|
192
|
+
};
|
|
164
193
|
case presets_1.Preset.WebComponents:
|
|
165
194
|
return {
|
|
166
195
|
dependencies: {},
|
|
@@ -173,6 +202,7 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
|
|
|
173
202
|
dev: {
|
|
174
203
|
'@nx/node': versions_1.nxVersion,
|
|
175
204
|
'@nx/webpack': bundler === 'webpack' ? versions_1.nxVersion : undefined,
|
|
205
|
+
typescript: versions_1.typescriptVersion,
|
|
176
206
|
},
|
|
177
207
|
};
|
|
178
208
|
default: {
|
|
@@ -2,14 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateWorkspaceFiles = generateWorkspaceFiles;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
6
|
-
const url_shorten_1 = require("nx/src/nx-cloud/utilities/url-shorten");
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
7
6
|
const path_1 = require("path");
|
|
8
7
|
const semver_1 = require("semver");
|
|
9
8
|
const default_base_1 = require("../../utilities/default-base");
|
|
10
9
|
const versions_1 = require("../../utils/versions");
|
|
11
10
|
const presets_1 = require("../utils/presets");
|
|
12
|
-
const set_up_ai_agents_1 = require("nx/src/ai/set-up-ai-agents/set-up-ai-agents");
|
|
13
11
|
// map from the preset to the name of the plugin s.t. the README can have a more
|
|
14
12
|
// meaningful generator command.
|
|
15
13
|
const presetToPluginMap = {
|
|
@@ -127,7 +125,7 @@ async function generateWorkspaceFiles(tree, options) {
|
|
|
127
125
|
createFiles(tree, options);
|
|
128
126
|
const nxJson = createNxJson(tree, options);
|
|
129
127
|
const token = options.nxCloud !== 'skip'
|
|
130
|
-
? await (0,
|
|
128
|
+
? await (0, internal_1.connectToNxCloud)(tree, {
|
|
131
129
|
installationSource: 'create-nx-workspace',
|
|
132
130
|
directory: options.directory,
|
|
133
131
|
github: options.useGitHub,
|
|
@@ -136,7 +134,7 @@ async function generateWorkspaceFiles(tree, options) {
|
|
|
136
134
|
await createReadme(tree, options, token);
|
|
137
135
|
let aiAgentsCallback = undefined;
|
|
138
136
|
if (options.aiAgents && options.aiAgents.length > 0) {
|
|
139
|
-
aiAgentsCallback = await (0,
|
|
137
|
+
aiAgentsCallback = await (0, internal_1.setupAiAgentsGenerator)(tree, {
|
|
140
138
|
directory: options.directory,
|
|
141
139
|
writeNxCloudRules: options.nxCloud !== 'skip',
|
|
142
140
|
packageVersion: 'latest',
|
|
@@ -239,7 +237,7 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud, w
|
|
|
239
237
|
generateLibCmd: null,
|
|
240
238
|
};
|
|
241
239
|
const nxCloudOnboardingUrl = nxCloudToken
|
|
242
|
-
? await (0,
|
|
240
|
+
? await (0, internal_1.createNxCloudOnboardingURL)('readme', nxCloudToken, undefined, false)
|
|
243
241
|
: null;
|
|
244
242
|
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
|
|
245
243
|
formattedNames,
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateTsconfig = updateTsconfig;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const ts_config_1 = require("../../../utilities/ts-config");
|
|
6
|
-
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
7
6
|
const ts_solution_setup_1 = require("../../../utilities/typescript/ts-solution-setup");
|
|
8
7
|
const path_1 = require("path");
|
|
8
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
9
9
|
/**
|
|
10
10
|
* Updates the tsconfig paths to remove the project.
|
|
11
11
|
*
|
|
@@ -18,7 +18,7 @@ async function updateTsconfig(tree, schema) {
|
|
|
18
18
|
: (0, ts_config_1.getRootTsConfigPathInTree)(tree);
|
|
19
19
|
if (tree.exists(tsConfigPath)) {
|
|
20
20
|
const graph = await (0, devkit_1.createProjectGraphAsync)();
|
|
21
|
-
const projectMapping = (0,
|
|
21
|
+
const projectMapping = (0, internal_1.createProjectRootMappings)(graph.nodes);
|
|
22
22
|
(0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
|
|
23
23
|
if (isUsingTsSolution) {
|
|
24
24
|
const projectConfigs = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(graph);
|
|
@@ -32,7 +32,7 @@ async function updateTsconfig(tree, schema) {
|
|
|
32
32
|
for (const importPath in json.compilerOptions.paths) {
|
|
33
33
|
for (const path of json.compilerOptions.paths[importPath]) {
|
|
34
34
|
const normalized = (0, devkit_1.normalizePath)(path).replace(/^\.\//, '');
|
|
35
|
-
const project = (0,
|
|
35
|
+
const project = (0, internal_1.findProjectForPath)(normalized, projectMapping);
|
|
36
36
|
if (project === schema.projectName) {
|
|
37
37
|
delete json.compilerOptions.paths[importPath];
|
|
38
38
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { CachedResult, TaskWithCachedResult, Cache
|
|
1
|
+
export { CachedResult, TaskWithCachedResult, Cache } from '@nx/devkit/internal';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Cache = void 0;
|
|
4
|
-
var
|
|
5
|
-
Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { return
|
|
4
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
5
|
+
Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { return internal_1.Cache; } });
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { DefaultTasksRunnerOptions, RemoteCache, defaultTasksRunner, } from '@nx/devkit';
|
|
2
|
+
export { RemoteCacheV2 } from '@nx/devkit/internal';
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
exports.RemoteCacheV2 = exports.defaultTasksRunner = void 0;
|
|
4
|
+
var devkit_1 = require("@nx/devkit");
|
|
5
|
+
Object.defineProperty(exports, "defaultTasksRunner", { enumerable: true, get: function () { return devkit_1.defaultTasksRunner; } });
|
|
6
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
7
|
+
Object.defineProperty(exports, "RemoteCacheV2", { enumerable: true, get: function () { return internal_1.RemoteCacheV2; } });
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export { CompositeLifeCycle, TaskMetadata,
|
|
1
|
+
export { CompositeLifeCycle, TaskMetadata, LifeCycle, } from '@nx/devkit/internal';
|
|
2
|
+
export { TaskResult } from '@nx/devkit';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CompositeLifeCycle = void 0;
|
|
4
|
-
var
|
|
5
|
-
Object.defineProperty(exports, "CompositeLifeCycle", { enumerable: true, get: function () { return
|
|
4
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
5
|
+
Object.defineProperty(exports, "CompositeLifeCycle", { enumerable: true, get: function () { return internal_1.CompositeLifeCycle; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { createRunManyDynamicOutputRenderer } from '@nx/devkit/internal';
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
exports.createRunManyDynamicOutputRenderer = void 0;
|
|
4
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
5
|
+
Object.defineProperty(exports, "createRunManyDynamicOutputRenderer", { enumerable: true, get: function () { return internal_1.createRunManyDynamicOutputRenderer; } });
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { TaskStatus, TasksRunner } from '@nx/devkit/internal';
|
|
2
2
|
export { Task } from '@nx/devkit';
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { getOutputsForTargetAndConfiguration } from '@nx/devkit';
|
|
2
|
+
export { DependsOnEntryLocation, NormalizedTargetDependencyConfig, calculateReverseDeps, createTaskId, expandDependencyConfigSyntaxSugar, expandInitiatingTasksThroughNoop, expandWildcardTargetConfiguration, getCliPath, getCustomHasher, getDependencyConfigs, getExecutorForTask, getExecutorNameForTask, getOutputs, getPrintableCommandArgsForTask, getSerializedArgsForTask, getTargetConfigurationForTask, getUnparsedOverrideArgs, interpolate, isCacheableTask, normalizeDependencyConfigDefinition, normalizeDependencyConfigProjects, normalizeTargetDependencyWithStringProjects, readProjectAndTargetFromTargetString, removeTasksFromTaskGraph, shouldStreamOutput, transformLegacyOutputs, unparse, validateOutputs, } from '@nx/devkit/internal';
|
|
@@ -1,4 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
exports.validateOutputs = exports.unparse = exports.transformLegacyOutputs = exports.shouldStreamOutput = exports.removeTasksFromTaskGraph = exports.readProjectAndTargetFromTargetString = exports.normalizeTargetDependencyWithStringProjects = exports.normalizeDependencyConfigProjects = exports.normalizeDependencyConfigDefinition = exports.isCacheableTask = exports.interpolate = exports.getUnparsedOverrideArgs = exports.getTargetConfigurationForTask = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getOutputs = exports.getExecutorNameForTask = exports.getExecutorForTask = exports.getDependencyConfigs = exports.getCustomHasher = exports.getCliPath = exports.expandWildcardTargetConfiguration = exports.expandInitiatingTasksThroughNoop = exports.expandDependencyConfigSyntaxSugar = exports.createTaskId = exports.calculateReverseDeps = exports.getOutputsForTargetAndConfiguration = void 0;
|
|
4
|
+
var devkit_1 = require("@nx/devkit");
|
|
5
|
+
Object.defineProperty(exports, "getOutputsForTargetAndConfiguration", { enumerable: true, get: function () { return devkit_1.getOutputsForTargetAndConfiguration; } });
|
|
6
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
7
|
+
Object.defineProperty(exports, "calculateReverseDeps", { enumerable: true, get: function () { return internal_1.calculateReverseDeps; } });
|
|
8
|
+
Object.defineProperty(exports, "createTaskId", { enumerable: true, get: function () { return internal_1.createTaskId; } });
|
|
9
|
+
Object.defineProperty(exports, "expandDependencyConfigSyntaxSugar", { enumerable: true, get: function () { return internal_1.expandDependencyConfigSyntaxSugar; } });
|
|
10
|
+
Object.defineProperty(exports, "expandInitiatingTasksThroughNoop", { enumerable: true, get: function () { return internal_1.expandInitiatingTasksThroughNoop; } });
|
|
11
|
+
Object.defineProperty(exports, "expandWildcardTargetConfiguration", { enumerable: true, get: function () { return internal_1.expandWildcardTargetConfiguration; } });
|
|
12
|
+
Object.defineProperty(exports, "getCliPath", { enumerable: true, get: function () { return internal_1.getCliPath; } });
|
|
13
|
+
Object.defineProperty(exports, "getCustomHasher", { enumerable: true, get: function () { return internal_1.getCustomHasher; } });
|
|
14
|
+
Object.defineProperty(exports, "getDependencyConfigs", { enumerable: true, get: function () { return internal_1.getDependencyConfigs; } });
|
|
15
|
+
Object.defineProperty(exports, "getExecutorForTask", { enumerable: true, get: function () { return internal_1.getExecutorForTask; } });
|
|
16
|
+
Object.defineProperty(exports, "getExecutorNameForTask", { enumerable: true, get: function () { return internal_1.getExecutorNameForTask; } });
|
|
17
|
+
Object.defineProperty(exports, "getOutputs", { enumerable: true, get: function () { return internal_1.getOutputs; } });
|
|
18
|
+
Object.defineProperty(exports, "getPrintableCommandArgsForTask", { enumerable: true, get: function () { return internal_1.getPrintableCommandArgsForTask; } });
|
|
19
|
+
Object.defineProperty(exports, "getSerializedArgsForTask", { enumerable: true, get: function () { return internal_1.getSerializedArgsForTask; } });
|
|
20
|
+
Object.defineProperty(exports, "getTargetConfigurationForTask", { enumerable: true, get: function () { return internal_1.getTargetConfigurationForTask; } });
|
|
21
|
+
Object.defineProperty(exports, "getUnparsedOverrideArgs", { enumerable: true, get: function () { return internal_1.getUnparsedOverrideArgs; } });
|
|
22
|
+
Object.defineProperty(exports, "interpolate", { enumerable: true, get: function () { return internal_1.interpolate; } });
|
|
23
|
+
Object.defineProperty(exports, "isCacheableTask", { enumerable: true, get: function () { return internal_1.isCacheableTask; } });
|
|
24
|
+
Object.defineProperty(exports, "normalizeDependencyConfigDefinition", { enumerable: true, get: function () { return internal_1.normalizeDependencyConfigDefinition; } });
|
|
25
|
+
Object.defineProperty(exports, "normalizeDependencyConfigProjects", { enumerable: true, get: function () { return internal_1.normalizeDependencyConfigProjects; } });
|
|
26
|
+
Object.defineProperty(exports, "normalizeTargetDependencyWithStringProjects", { enumerable: true, get: function () { return internal_1.normalizeTargetDependencyWithStringProjects; } });
|
|
27
|
+
Object.defineProperty(exports, "readProjectAndTargetFromTargetString", { enumerable: true, get: function () { return internal_1.readProjectAndTargetFromTargetString; } });
|
|
28
|
+
Object.defineProperty(exports, "removeTasksFromTaskGraph", { enumerable: true, get: function () { return internal_1.removeTasksFromTaskGraph; } });
|
|
29
|
+
Object.defineProperty(exports, "shouldStreamOutput", { enumerable: true, get: function () { return internal_1.shouldStreamOutput; } });
|
|
30
|
+
Object.defineProperty(exports, "transformLegacyOutputs", { enumerable: true, get: function () { return internal_1.transformLegacyOutputs; } });
|
|
31
|
+
Object.defineProperty(exports, "unparse", { enumerable: true, get: function () { return internal_1.unparse; } });
|
|
32
|
+
Object.defineProperty(exports, "validateOutputs", { enumerable: true, get: function () { return internal_1.validateOutputs; } });
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { workspaceRoot } from '@nx/devkit';
|
|
2
|
+
export { setWorkspaceRoot, workspaceRootInner } from '@nx/devkit/internal';
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
exports.workspaceRootInner = exports.setWorkspaceRoot = exports.workspaceRoot = void 0;
|
|
4
|
+
var devkit_1 = require("@nx/devkit");
|
|
5
|
+
Object.defineProperty(exports, "workspaceRoot", { enumerable: true, get: function () { return devkit_1.workspaceRoot; } });
|
|
6
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
7
|
+
Object.defineProperty(exports, "setWorkspaceRoot", { enumerable: true, get: function () { return internal_1.setWorkspaceRoot; } });
|
|
8
|
+
Object.defineProperty(exports, "workspaceRootInner", { enumerable: true, get: function () { return internal_1.workspaceRootInner; } });
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { fileExists, directoryExists, isRelativePath, createDirectory } from 'nx/
|
|
1
|
+
import { fileExists, directoryExists, isRelativePath, createDirectory } from '@nx/devkit/internal';
|
|
2
2
|
export { fileExists, directoryExists, isRelativePath, createDirectory };
|
|
3
3
|
/**
|
|
4
4
|
* This method is specifically for updating a JSON file using the filesystem
|
|
@@ -6,11 +6,12 @@ exports.copyFile = copyFile;
|
|
|
6
6
|
exports.renameSync = renameSync;
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
Object.defineProperty(exports, "
|
|
12
|
-
Object.defineProperty(exports, "
|
|
13
|
-
Object.defineProperty(exports, "
|
|
9
|
+
const devkit_1 = require("@nx/devkit");
|
|
10
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
11
|
+
Object.defineProperty(exports, "fileExists", { enumerable: true, get: function () { return internal_1.fileExists; } });
|
|
12
|
+
Object.defineProperty(exports, "directoryExists", { enumerable: true, get: function () { return internal_1.directoryExists; } });
|
|
13
|
+
Object.defineProperty(exports, "isRelativePath", { enumerable: true, get: function () { return internal_1.isRelativePath; } });
|
|
14
|
+
Object.defineProperty(exports, "createDirectory", { enumerable: true, get: function () { return internal_1.createDirectory; } });
|
|
14
15
|
/**
|
|
15
16
|
* This method is specifically for updating a JSON file using the filesystem
|
|
16
17
|
*
|
|
@@ -20,9 +21,9 @@ Object.defineProperty(exports, "createDirectory", { enumerable: true, get: funct
|
|
|
20
21
|
* @param callback Manipulation of the JSON data
|
|
21
22
|
*/
|
|
22
23
|
function updateJsonFile(path, callback) {
|
|
23
|
-
const json = (0,
|
|
24
|
+
const json = (0, devkit_1.readJsonFile)(path);
|
|
24
25
|
callback(json);
|
|
25
|
-
(0,
|
|
26
|
+
(0, devkit_1.writeJsonFile)(path, json);
|
|
26
27
|
}
|
|
27
28
|
function copyFile(file, target) {
|
|
28
29
|
const f = (0, path_1.basename)(file);
|
|
@@ -41,7 +42,7 @@ function renameSync(from, to, cb) {
|
|
|
41
42
|
}
|
|
42
43
|
// Make sure parent path exists
|
|
43
44
|
const parentPath = (0, path_1.resolve)(to, '..');
|
|
44
|
-
(0,
|
|
45
|
+
(0, internal_1.createDirectory)(parentPath);
|
|
45
46
|
(0, fs_1.renameSync)(from, to);
|
|
46
47
|
cb(null);
|
|
47
48
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getImportPath = getImportPath;
|
|
4
4
|
exports.getNpmScope = getNpmScope;
|
|
5
|
-
const
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
function getImportPath(tree, projectDirectory) {
|
|
7
7
|
const npmScope = getNpmScope(tree);
|
|
8
8
|
return npmScope
|
|
@@ -11,7 +11,7 @@ function getImportPath(tree, projectDirectory) {
|
|
|
11
11
|
}
|
|
12
12
|
function getNpmScope(tree) {
|
|
13
13
|
const { name } = tree.exists('package.json')
|
|
14
|
-
? (0,
|
|
14
|
+
? (0, devkit_1.readJson)(tree, 'package.json')
|
|
15
15
|
: { name: null };
|
|
16
16
|
if (name?.startsWith('@')) {
|
|
17
17
|
return name.split('/')[0].substring(1);
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { output } from '@nx/devkit';
|
|
2
|
+
export { CLIErrorMessageConfig, CLINoteMessageConfig, CLISuccessMessageConfig, CLIWarnMessageConfig, orange, } from '@nx/devkit/internal';
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
exports.orange = exports.output = void 0;
|
|
4
|
+
var devkit_1 = require("@nx/devkit");
|
|
5
|
+
Object.defineProperty(exports, "output", { enumerable: true, get: function () { return devkit_1.output; } });
|
|
6
|
+
var internal_1 = require("@nx/devkit/internal");
|
|
7
|
+
Object.defineProperty(exports, "orange", { enumerable: true, get: function () { return internal_1.orange; } });
|
|
@@ -6,7 +6,7 @@ exports.isUsingPackageManagerWorkspaces = isUsingPackageManagerWorkspaces;
|
|
|
6
6
|
exports.isWorkspacesEnabled = isWorkspacesEnabled;
|
|
7
7
|
const devkit_1 = require("@nx/devkit");
|
|
8
8
|
const posix_1 = require("node:path/posix");
|
|
9
|
-
const
|
|
9
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
10
10
|
const picomatch = require("picomatch");
|
|
11
11
|
function isProjectIncludedInPackageManagerWorkspaces(tree, projectRoot) {
|
|
12
12
|
if (!isUsingPackageManagerWorkspaces(tree)) {
|
|
@@ -16,7 +16,7 @@ function isProjectIncludedInPackageManagerWorkspaces(tree, projectRoot) {
|
|
|
16
16
|
return patterns.some((p) => picomatch(p)((0, posix_1.join)(projectRoot, 'package.json')));
|
|
17
17
|
}
|
|
18
18
|
function getPackageManagerWorkspacesPatterns(tree) {
|
|
19
|
-
return (0,
|
|
19
|
+
return (0, internal_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }), (path) => {
|
|
20
20
|
const content = tree.read(path, 'utf-8');
|
|
21
21
|
const { load } = require('@zkochan/js-yaml');
|
|
22
22
|
return load(content, { filename: path });
|
|
@@ -4,8 +4,8 @@ exports.isUsingTsSolutionSetup = isUsingTsSolutionSetup;
|
|
|
4
4
|
exports.addProjectToTsSolutionWorkspace = addProjectToTsSolutionWorkspace;
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const posix_1 = require("node:path/posix");
|
|
7
|
-
const tree_1 = require("nx/src/generators/tree");
|
|
8
7
|
const package_manager_workspaces_1 = require("../package-manager-workspaces");
|
|
8
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
9
9
|
/**
|
|
10
10
|
* The TS solution setup requires:
|
|
11
11
|
* - `tsconfig.base.json`: TS config with common compiler options needed by the
|
|
@@ -51,7 +51,7 @@ function isWorkspaceSetupWithTsSolution(tree) {
|
|
|
51
51
|
return true;
|
|
52
52
|
}
|
|
53
53
|
function isUsingTsSolutionSetup(tree) {
|
|
54
|
-
tree ??= new
|
|
54
|
+
tree ??= new internal_1.FsTree(devkit_1.workspaceRoot, false);
|
|
55
55
|
return ((0, package_manager_workspaces_1.isUsingPackageManagerWorkspaces)(tree) &&
|
|
56
56
|
isWorkspaceSetupWithTsSolution(tree));
|
|
57
57
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/workspace",
|
|
3
|
-
"version": "23.1.
|
|
3
|
+
"version": "23.1.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"files": [
|
|
@@ -85,11 +85,11 @@
|
|
|
85
85
|
"semver": "^7.6.3",
|
|
86
86
|
"tslib": "^2.3.0",
|
|
87
87
|
"yargs-parser": "21.1.1",
|
|
88
|
-
"nx": "23.1.
|
|
89
|
-
"@nx/devkit": "23.1.
|
|
88
|
+
"nx": "23.1.2",
|
|
89
|
+
"@nx/devkit": "23.1.2"
|
|
90
90
|
},
|
|
91
91
|
"devDependencies": {
|
|
92
|
-
"nx": "23.1.
|
|
92
|
+
"nx": "23.1.2"
|
|
93
93
|
},
|
|
94
94
|
"publishConfig": {
|
|
95
95
|
"access": "public"
|