@nx/js 19.4.3 → 19.5.0-beta.1
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/migrations.json +13 -0
- package/package.json +4 -4
- package/src/executors/node/lib/kill-tree.d.ts +0 -1
- package/src/executors/node/lib/kill-tree.js +1 -2
- package/src/executors/node/node.impl.js +22 -18
- package/src/executors/release-publish/extract-npm-publish-json-data.js +1 -2
- package/src/executors/release-publish/release-publish.impl.js +1 -1
- package/src/executors/swc/swc.impl.js +1 -2
- package/src/executors/tsc/lib/batch/build-task-info-per-tsconfig-map.js +1 -2
- package/src/executors/tsc/lib/batch/normalize-tasks-options.js +1 -2
- package/src/executors/tsc/lib/batch/watch.js +2 -3
- package/src/executors/tsc/lib/get-custom-transformers-factory.js +1 -2
- package/src/executors/tsc/lib/get-task-options.js +1 -2
- package/src/executors/tsc/lib/get-tsconfig.js +1 -2
- package/src/executors/tsc/lib/normalize-options.js +1 -2
- package/src/executors/tsc/lib/typescript-compilation.js +7 -4
- package/src/executors/tsc/lib/typescript-diagnostic-reporters.js +2 -3
- package/src/executors/tsc/tsc.batch-impl.js +7 -3
- package/src/executors/tsc/tsc.impl.js +10 -5
- package/src/executors/verdaccio/verdaccio.impl.js +1 -2
- package/src/generators/convert-to-swc/convert-to-swc.js +1 -2
- package/src/generators/init/init.js +1 -2
- package/src/generators/library/library.js +3 -4
- package/src/generators/release-version/release-version.js +1 -2
- package/src/generators/release-version/test-utils/create-workspace-with-package-dependencies.js +1 -2
- package/src/generators/release-version/utils/resolve-local-package-dependencies.js +1 -2
- package/src/generators/release-version/utils/resolve-version-spec.js +1 -2
- package/src/generators/release-version/utils/sort-projects-topologically.js +1 -2
- package/src/generators/release-version/utils/update-lock-file.js +1 -2
- package/src/generators/setup-build/generator.js +1 -2
- package/src/generators/setup-verdaccio/generator.js +1 -2
- package/src/generators/sync/sync.js +1 -2
- package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js +1 -1
- package/src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps.js +1 -1
- package/src/migrations/update-16-8-2/update-swcrc.js +1 -1
- package/src/migrations/update-17-0-0/remove-deprecated-build-options.js +1 -1
- package/src/plugins/jest/start-local-registry.js +1 -2
- package/src/plugins/rollup/type-definitions.js +1 -2
- package/src/utils/add-babel-inputs.js +1 -2
- package/src/utils/add-local-registry-scripts.js +1 -2
- package/src/utils/assets/assets.js +1 -2
- package/src/utils/assets/index.js +8 -3
- package/src/utils/buildable-libs-utils.js +9 -10
- package/src/utils/check-dependencies.js +1 -2
- package/src/utils/code-frames/highlight.js +1 -2
- package/src/utils/code-frames/identifiers.js +2 -3
- package/src/utils/compiler-helper-dependency.js +3 -3
- package/src/utils/find-npm-dependencies.js +1 -2
- package/src/utils/generate-globs.js +1 -2
- package/src/utils/get-import-path.js +1 -2
- package/src/utils/get-main-file-dir.js +1 -2
- package/src/utils/inline.js +4 -5
- package/src/utils/is-valid-variable.js +1 -2
- package/src/utils/npm-config.js +3 -4
- package/src/utils/package-json/create-entry-points.js +1 -2
- package/src/utils/package-json/get-npm-scope.js +1 -2
- package/src/utils/package-json/index.js +1 -2
- package/src/utils/package-json/update-package-json.js +3 -4
- package/src/utils/prettier.js +1 -2
- package/src/utils/swc/add-swc-config.js +2 -2
- package/src/utils/swc/add-swc-dependencies.js +2 -3
- package/src/utils/swc/compile-swc.js +2 -3
- package/src/utils/swc/get-swcrc-path.js +1 -2
- package/src/utils/swc/inline.js +1 -2
- package/src/utils/typescript/add-tslib-dependencies.js +1 -2
- package/src/utils/typescript/ast-utils.js +12 -13
- package/src/utils/typescript/compile-typescript-files.js +1 -2
- package/src/utils/typescript/create-ts-config.js +2 -2
- package/src/utils/typescript/ensure-typescript.js +1 -2
- package/src/utils/typescript/get-source-nodes.js +1 -2
- package/src/utils/typescript/load-ts-transformers.js +1 -2
- package/src/utils/typescript/print-diagnostics.js +1 -2
- package/src/utils/typescript/run-type-check.js +3 -4
- package/src/utils/typescript/ts-config.js +7 -8
- package/src/utils/typescript/tsnode-register.js +1 -2
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +2 -2
- package/src/utils/watch-for-single-file-changes.js +1 -2
package/migrations.json
CHANGED
|
@@ -175,6 +175,19 @@
|
|
|
175
175
|
"alwaysAddToPackageJson": false
|
|
176
176
|
}
|
|
177
177
|
}
|
|
178
|
+
},
|
|
179
|
+
"19.5.1": {
|
|
180
|
+
"version": "19.5.0-beta.1",
|
|
181
|
+
"x-prompt": "Do you want to update to TypeScript v5.5?",
|
|
182
|
+
"requires": {
|
|
183
|
+
"typescript": ">=5.4.0 <5.5.0"
|
|
184
|
+
},
|
|
185
|
+
"packages": {
|
|
186
|
+
"typescript": {
|
|
187
|
+
"version": "~5.5.2",
|
|
188
|
+
"alwaysAddToPackageJson": false
|
|
189
|
+
}
|
|
190
|
+
}
|
|
178
191
|
}
|
|
179
192
|
}
|
|
180
193
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/js",
|
|
3
|
-
"version": "19.
|
|
3
|
+
"version": "19.5.0-beta.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
|
|
6
6
|
"repository": {
|
|
@@ -58,9 +58,9 @@
|
|
|
58
58
|
"semver": "^7.5.3",
|
|
59
59
|
"source-map-support": "0.5.19",
|
|
60
60
|
"tslib": "^2.3.0",
|
|
61
|
-
"@nx/devkit": "19.
|
|
62
|
-
"@nx/workspace": "19.
|
|
63
|
-
"@nrwl/js": "19.
|
|
61
|
+
"@nx/devkit": "19.5.0-beta.1",
|
|
62
|
+
"@nx/workspace": "19.5.0-beta.1",
|
|
63
|
+
"@nrwl/js": "19.5.0-beta.1"
|
|
64
64
|
},
|
|
65
65
|
"peerDependencies": {
|
|
66
66
|
"verdaccio": "^5.0.4"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.killTree =
|
|
3
|
+
exports.killTree = killTree;
|
|
4
4
|
// Adapted from https://raw.githubusercontent.com/pkrumins/node-tree-kill/deee138/index.js
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
async function killTree(pid, signal) {
|
|
@@ -48,7 +48,6 @@ async function killTree(pid, signal) {
|
|
|
48
48
|
}
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
|
-
exports.killTree = killTree;
|
|
52
51
|
function killAll(tree, signal, callback) {
|
|
53
52
|
const killed = {};
|
|
54
53
|
try {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.nodeExecutor =
|
|
3
|
+
exports.nodeExecutor = nodeExecutor;
|
|
4
4
|
const chalk = require("chalk");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const devkit_1 = require("@nx/devkit");
|
|
@@ -188,22 +188,27 @@ async function* nodeExecutor(options, context) {
|
|
|
188
188
|
await addToQueue(childProcess, whenReady);
|
|
189
189
|
await debouncedProcessQueue();
|
|
190
190
|
};
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
191
|
+
if ((0, devkit_1.isDaemonEnabled)()) {
|
|
192
|
+
additionalExitHandler = await client_1.daemonClient.registerFileWatcher({
|
|
193
|
+
watchProjects: [context.projectName],
|
|
194
|
+
includeDependentProjects: true,
|
|
195
|
+
}, async (err, data) => {
|
|
196
|
+
if (err === 'closed') {
|
|
197
|
+
devkit_1.logger.error(`Watch error: Daemon closed the connection`);
|
|
198
|
+
process.exit(1);
|
|
199
|
+
}
|
|
200
|
+
else if (err) {
|
|
201
|
+
devkit_1.logger.error(`Watch error: ${err?.message ?? 'Unknown'}`);
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
devkit_1.logger.info(`NX File change detected. Restarting...`);
|
|
205
|
+
await runBuild();
|
|
206
|
+
}
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
else {
|
|
210
|
+
devkit_1.logger.warn(`NX Daemon is not running. Node process will not restart automatically after file changes.`);
|
|
211
|
+
}
|
|
207
212
|
await runBuild(); // run first build
|
|
208
213
|
}
|
|
209
214
|
else {
|
|
@@ -225,7 +230,6 @@ async function* nodeExecutor(options, context) {
|
|
|
225
230
|
}
|
|
226
231
|
});
|
|
227
232
|
}
|
|
228
|
-
exports.nodeExecutor = nodeExecutor;
|
|
229
233
|
function getExecArgv(options) {
|
|
230
234
|
const args = (options.runtimeArgs ??= []);
|
|
231
235
|
args.push('-r', require.resolve('source-map-support/register'));
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.extractNpmPublishJsonData =
|
|
3
|
+
exports.extractNpmPublishJsonData = extractNpmPublishJsonData;
|
|
4
4
|
const expectedNpmPublishJsonKeys = [
|
|
5
5
|
'id',
|
|
6
6
|
'name',
|
|
@@ -52,4 +52,3 @@ function extractNpmPublishJsonData(str) {
|
|
|
52
52
|
afterJsonData: '',
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
|
-
exports.extractNpmPublishJsonData = extractNpmPublishJsonData;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = runExecutor;
|
|
3
4
|
const devkit_1 = require("@nx/devkit");
|
|
4
5
|
const child_process_1 = require("child_process");
|
|
5
6
|
const npm_run_path_1 = require("npm-run-path");
|
|
@@ -240,4 +241,3 @@ async function runExecutor(options, context) {
|
|
|
240
241
|
}
|
|
241
242
|
}
|
|
242
243
|
}
|
|
243
|
-
exports.default = runExecutor;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.swcExecutor =
|
|
3
|
+
exports.swcExecutor = swcExecutor;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const assets_1 = require("../../utils/assets/assets");
|
|
6
6
|
const fs_extra_1 = require("fs-extra");
|
|
@@ -132,7 +132,6 @@ async function* swcExecutor(_options, context) {
|
|
|
132
132
|
});
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
|
-
exports.swcExecutor = swcExecutor;
|
|
136
135
|
function removeTmpSwcrc(swcrcPath) {
|
|
137
136
|
if (swcrcPath.includes((0, path_1.normalize)('tmp/')) &&
|
|
138
137
|
swcrcPath.includes('.generated.swcrc')) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createTaskInfoPerTsConfigMap =
|
|
3
|
+
exports.createTaskInfoPerTsConfigMap = createTaskInfoPerTsConfigMap;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const copy_assets_handler_1 = require("../../../../utils/assets/copy-assets-handler");
|
|
@@ -12,7 +12,6 @@ function createTaskInfoPerTsConfigMap(tasksOptions, context, tasks, taskInMemory
|
|
|
12
12
|
processTasksAndPopulateTsConfigTaskInfoMap(tsConfigTaskInfoMap, tasksOptions, context, tasks, taskInMemoryTsConfigMap);
|
|
13
13
|
return tsConfigTaskInfoMap;
|
|
14
14
|
}
|
|
15
|
-
exports.createTaskInfoPerTsConfigMap = createTaskInfoPerTsConfigMap;
|
|
16
15
|
function processTasksAndPopulateTsConfigTaskInfoMap(tsConfigTaskInfoMap, tasksOptions, context, tasks, taskInMemoryTsConfigMap) {
|
|
17
16
|
for (const taskName of tasks) {
|
|
18
17
|
if (taskTsConfigCache.has(taskName)) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeTasksOptions =
|
|
3
|
+
exports.normalizeTasksOptions = normalizeTasksOptions;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const normalize_options_1 = require("../normalize-options");
|
|
6
6
|
function normalizeTasksOptions(inputs, context) {
|
|
@@ -11,4 +11,3 @@ function normalizeTasksOptions(inputs, context) {
|
|
|
11
11
|
return tasksOptions;
|
|
12
12
|
}, {});
|
|
13
13
|
}
|
|
14
|
-
exports.normalizeTasksOptions = normalizeTasksOptions;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.watchTaskProjectsPackageJsonFileChanges = watchTaskProjectsPackageJsonFileChanges;
|
|
4
|
+
exports.watchTaskProjectsFileChangesForAssets = watchTaskProjectsFileChangesForAssets;
|
|
4
5
|
const devkit_1 = require("@nx/devkit");
|
|
5
6
|
const client_1 = require("nx/src/daemon/client/client");
|
|
6
7
|
const path_1 = require("path");
|
|
@@ -33,7 +34,6 @@ async function watchTaskProjectsPackageJsonFileChanges(taskInfos, callback) {
|
|
|
33
34
|
});
|
|
34
35
|
return () => unregisterFileWatcher();
|
|
35
36
|
}
|
|
36
|
-
exports.watchTaskProjectsPackageJsonFileChanges = watchTaskProjectsPackageJsonFileChanges;
|
|
37
37
|
async function watchTaskProjectsFileChangesForAssets(taskInfos) {
|
|
38
38
|
const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({
|
|
39
39
|
watchProjects: taskInfos.map((t) => t.context.projectName),
|
|
@@ -53,4 +53,3 @@ async function watchTaskProjectsFileChangesForAssets(taskInfos) {
|
|
|
53
53
|
});
|
|
54
54
|
return () => unregisterFileWatcher();
|
|
55
55
|
}
|
|
56
|
-
exports.watchTaskProjectsFileChangesForAssets = watchTaskProjectsFileChangesForAssets;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getCustomTrasformersFactory =
|
|
3
|
+
exports.getCustomTrasformersFactory = getCustomTrasformersFactory;
|
|
4
4
|
const load_ts_transformers_1 = require("../../../utils/typescript/load-ts-transformers");
|
|
5
5
|
function getCustomTrasformersFactory(transformers) {
|
|
6
6
|
const { compilerPluginHooks } = (0, load_ts_transformers_1.loadTsTransformers)(transformers);
|
|
@@ -10,4 +10,3 @@ function getCustomTrasformersFactory(transformers) {
|
|
|
10
10
|
afterDeclarations: compilerPluginHooks.afterDeclarationsHooks.map((hook) => hook(program)),
|
|
11
11
|
});
|
|
12
12
|
}
|
|
13
|
-
exports.getCustomTrasformersFactory = getCustomTrasformersFactory;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getTaskOptions =
|
|
3
|
+
exports.getTaskOptions = getTaskOptions;
|
|
4
4
|
const normalize_options_1 = require("./normalize-options");
|
|
5
5
|
const tasksOptionsCache = new Map();
|
|
6
6
|
function getTaskOptions(taskName, context) {
|
|
@@ -18,7 +18,6 @@ function getTaskOptions(taskName, context) {
|
|
|
18
18
|
return null;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
exports.getTaskOptions = getTaskOptions;
|
|
22
21
|
function parseTaskInfo(taskName, context) {
|
|
23
22
|
const target = context.taskGraph.tasks[taskName].target;
|
|
24
23
|
const projectNode = context.projectGraph.nodes[target.project];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getProcessedTaskTsConfigs =
|
|
3
|
+
exports.getProcessedTaskTsConfigs = getProcessedTaskTsConfigs;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const get_task_options_1 = require("./get-task-options");
|
|
@@ -11,7 +11,6 @@ function getProcessedTaskTsConfigs(tasks, tasksOptions, context) {
|
|
|
11
11
|
}
|
|
12
12
|
return taskInMemoryTsConfigMap;
|
|
13
13
|
}
|
|
14
|
-
exports.getProcessedTaskTsConfigs = getProcessedTaskTsConfigs;
|
|
15
14
|
const projectTsConfigCache = new Map();
|
|
16
15
|
function generateTaskProjectTsConfig(task, tasksOptions, context, taskInMemoryTsConfigMap) {
|
|
17
16
|
const { project } = (0, devkit_1.parseTargetString)(task, context);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeOptions =
|
|
3
|
+
exports.normalizeOptions = normalizeOptions;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const assets_1 = require("../../../utils/assets/assets");
|
|
6
6
|
function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
@@ -36,4 +36,3 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
|
36
36
|
mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')),
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
|
-
exports.normalizeOptions = normalizeOptions;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.compileTypescriptSolution =
|
|
3
|
+
exports.compileTypescriptSolution = compileTypescriptSolution;
|
|
4
4
|
const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
|
|
5
5
|
const ts = require("typescript");
|
|
6
6
|
const get_custom_transformers_factory_1 = require("./get-custom-transformers-factory");
|
|
@@ -37,7 +37,6 @@ function compileTypescriptSolution(context, watch, logger, hooks, reporters) {
|
|
|
37
37
|
},
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
-
exports.compileTypescriptSolution = compileTypescriptSolution;
|
|
41
40
|
function* compileTS(context, logger, hooks, reporters) {
|
|
42
41
|
let project;
|
|
43
42
|
const formatDiagnosticsHost = {
|
|
@@ -71,9 +70,11 @@ function* compileTS(context, logger, hooks, reporters) {
|
|
|
71
70
|
const projectName = projectContext?.project;
|
|
72
71
|
/**
|
|
73
72
|
* This only applies when the deprecated `prepend` option is set to `true`.
|
|
73
|
+
* This was completely dropped in TS 5.5.
|
|
74
74
|
* Skip support.
|
|
75
75
|
*/
|
|
76
|
-
if (project.kind
|
|
76
|
+
if (project.kind !== ts.InvalidatedProjectKind.Build &&
|
|
77
|
+
project.kind !== ts.InvalidatedProjectKind.UpdateOutputFileStamps) {
|
|
77
78
|
logger.warn(`The project ${projectName} ` +
|
|
78
79
|
`is using the deprecated "prepend" Typescript compiler option. ` +
|
|
79
80
|
`This option is not supported by the batch executor and it's ignored.\n`, project.project);
|
|
@@ -146,9 +147,11 @@ function compileTSWithWatch(context, logger, hooks, reporters) {
|
|
|
146
147
|
const projectName = projectContext.project;
|
|
147
148
|
/**
|
|
148
149
|
* This only applies when the deprecated `prepend` option is set to `true`.
|
|
150
|
+
* This was completely dropped in TS 5.5.
|
|
149
151
|
* Skip support.
|
|
150
152
|
*/
|
|
151
|
-
if (project.kind
|
|
153
|
+
if (project.kind !== ts.InvalidatedProjectKind.Build &&
|
|
154
|
+
project.kind !== ts.InvalidatedProjectKind.UpdateOutputFileStamps) {
|
|
152
155
|
logger.warn(`The project ${projectName} ` +
|
|
153
156
|
`is using the deprecated "prepend" Typescript compiler option. ` +
|
|
154
157
|
`This option is not supported by the batch executor and it's ignored.`);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.formatDiagnosticReport = formatDiagnosticReport;
|
|
4
|
+
exports.formatSolutionBuilderStatusReport = formatSolutionBuilderStatusReport;
|
|
4
5
|
const ts = require("typescript");
|
|
5
6
|
// adapted from TS default diagnostic reporter
|
|
6
7
|
function formatDiagnosticReport(diagnostic, host) {
|
|
@@ -12,14 +13,12 @@ function formatDiagnosticReport(diagnostic, host) {
|
|
|
12
13
|
diagnostics[0] = undefined;
|
|
13
14
|
return formattedDiagnostic;
|
|
14
15
|
}
|
|
15
|
-
exports.formatDiagnosticReport = formatDiagnosticReport;
|
|
16
16
|
// adapted from TS default solution builder status reporter
|
|
17
17
|
function formatSolutionBuilderStatusReport(diagnostic) {
|
|
18
18
|
let formattedDiagnostic = `[${formatColorAndReset(getLocaleTimeString(), ForegroundColorEscapeSequences.Grey)}] `;
|
|
19
19
|
formattedDiagnostic += `${ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine)}${ts.sys.newLine + ts.sys.newLine}`;
|
|
20
20
|
return formattedDiagnostic;
|
|
21
21
|
}
|
|
22
|
-
exports.formatSolutionBuilderStatusReport = formatSolutionBuilderStatusReport;
|
|
23
22
|
function formatColorAndReset(text, formatStyle) {
|
|
24
23
|
const resetEscapeSequence = '\u001b[0m';
|
|
25
24
|
return formatStyle + text + resetEscapeSequence;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.tscBatchExecutor =
|
|
3
|
+
exports.tscBatchExecutor = tscBatchExecutor;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
6
|
const async_iterator_1 = require("nx/src/utils/async-iterator");
|
|
@@ -66,7 +66,12 @@ async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
|
|
|
66
66
|
},
|
|
67
67
|
afterProjectCompilationCallback: processTaskPostCompilation,
|
|
68
68
|
});
|
|
69
|
-
if (shouldWatch) {
|
|
69
|
+
if (shouldWatch && !(0, devkit_1.isDaemonEnabled)()) {
|
|
70
|
+
devkit_1.output.warn({
|
|
71
|
+
title: 'Nx Daemon is not enabled. Assets and package.json files will not be updated on file changes.',
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
if (shouldWatch && (0, devkit_1.isDaemonEnabled)()) {
|
|
70
75
|
const taskInfos = Object.values(tsConfigTaskInfoMap);
|
|
71
76
|
const watchAssetsChangesDisposer = await (0, batch_1.watchTaskProjectsFileChangesForAssets)(taskInfos);
|
|
72
77
|
const watchProjectsChangesDisposer = await (0, batch_1.watchTaskProjectsPackageJsonFileChanges)(taskInfos, (changedTaskInfos) => {
|
|
@@ -144,7 +149,6 @@ async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
|
|
|
144
149
|
};
|
|
145
150
|
});
|
|
146
151
|
}
|
|
147
|
-
exports.tscBatchExecutor = tscBatchExecutor;
|
|
148
152
|
exports.default = tscBatchExecutor;
|
|
149
153
|
async function* mapAsyncIterable(iterable, nextFn) {
|
|
150
154
|
return yield* {
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.determineModuleFormatFromTsConfig = determineModuleFormatFromTsConfig;
|
|
4
|
+
exports.createTypeScriptCompilationOptions = createTypeScriptCompilationOptions;
|
|
5
|
+
exports.tscExecutor = tscExecutor;
|
|
4
6
|
const ts = require("typescript");
|
|
7
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
8
|
const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
|
|
6
9
|
const check_dependencies_1 = require("../../utils/check-dependencies");
|
|
7
10
|
const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
|
|
@@ -24,7 +27,6 @@ function determineModuleFormatFromTsConfig(absolutePathToTsConfig) {
|
|
|
24
27
|
return 'cjs';
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
|
-
exports.determineModuleFormatFromTsConfig = determineModuleFormatFromTsConfig;
|
|
28
30
|
function createTypeScriptCompilationOptions(normalizedOptions, context) {
|
|
29
31
|
return {
|
|
30
32
|
outputPath: normalizedOptions.outputPath,
|
|
@@ -37,7 +39,6 @@ function createTypeScriptCompilationOptions(normalizedOptions, context) {
|
|
|
37
39
|
getCustomTransformers: (0, lib_1.getCustomTrasformersFactory)(normalizedOptions.transformers),
|
|
38
40
|
};
|
|
39
41
|
}
|
|
40
|
-
exports.createTypeScriptCompilationOptions = createTypeScriptCompilationOptions;
|
|
41
42
|
async function* tscExecutor(_options, context) {
|
|
42
43
|
const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
|
|
43
44
|
const options = (0, lib_1.normalizeOptions)(_options, context.root, sourceRoot, root);
|
|
@@ -72,7 +73,12 @@ async function* tscExecutor(_options, context) {
|
|
|
72
73
|
}, context, target, dependencies);
|
|
73
74
|
(0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
|
|
74
75
|
});
|
|
75
|
-
if (options.watch) {
|
|
76
|
+
if (!(0, devkit_1.isDaemonEnabled)() && options.watch) {
|
|
77
|
+
devkit_1.output.warn({
|
|
78
|
+
title: 'Nx Daemon is not enabled. Assets and package.json files will not be updated when files change.',
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
if ((0, devkit_1.isDaemonEnabled)() && options.watch) {
|
|
76
82
|
const disposeWatchAssetChanges = await assetHandler.watchAndProcessOnAssetChange();
|
|
77
83
|
const disposePackageJsonChanges = await (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)({
|
|
78
84
|
...options,
|
|
@@ -93,5 +99,4 @@ async function* tscExecutor(_options, context) {
|
|
|
93
99
|
}
|
|
94
100
|
return yield* typescriptCompilation.iterator;
|
|
95
101
|
}
|
|
96
|
-
exports.tscExecutor = tscExecutor;
|
|
97
102
|
exports.default = tscExecutor;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.verdaccioExecutor =
|
|
3
|
+
exports.verdaccioExecutor = verdaccioExecutor;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const fs_extra_1 = require("fs-extra");
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
@@ -64,7 +64,6 @@ async function verdaccioExecutor(options, context) {
|
|
|
64
64
|
port: options.port,
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
|
-
exports.verdaccioExecutor = verdaccioExecutor;
|
|
68
67
|
/**
|
|
69
68
|
* Fork the verdaccio process: https://verdaccio.org/docs/verdaccio-programmatically/#using-fork-from-child_process-module
|
|
70
69
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.convertToSwcGenerator =
|
|
3
|
+
exports.convertToSwcGenerator = convertToSwcGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const add_swc_config_1 = require("../../utils/swc/add-swc-config");
|
|
@@ -12,7 +12,6 @@ async function convertToSwcGenerator(tree, schema) {
|
|
|
12
12
|
updateProjectBuildTargets(tree, projectConfiguration, options.project, options.targets);
|
|
13
13
|
return checkSwcDependencies(tree, projectConfiguration);
|
|
14
14
|
}
|
|
15
|
-
exports.convertToSwcGenerator = convertToSwcGenerator;
|
|
16
15
|
function normalizeOptions(schema) {
|
|
17
16
|
const options = { ...schema };
|
|
18
17
|
if (!options.targets) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.initGenerator =
|
|
3
|
+
exports.initGenerator = initGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const semver_1 = require("@nx/devkit/src/utils/semver");
|
|
6
6
|
const package_json_1 = require("nx/src/utils/package-json");
|
|
@@ -113,5 +113,4 @@ async function initGenerator(tree, schema) {
|
|
|
113
113
|
}
|
|
114
114
|
};
|
|
115
115
|
}
|
|
116
|
-
exports.initGenerator = initGenerator;
|
|
117
116
|
exports.default = initGenerator;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.libraryGenerator = libraryGenerator;
|
|
4
|
+
exports.libraryGeneratorInternal = libraryGeneratorInternal;
|
|
5
|
+
exports.addLint = addLint;
|
|
4
6
|
const devkit_1 = require("@nx/devkit");
|
|
5
7
|
const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
|
|
6
8
|
const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
|
|
@@ -24,7 +26,6 @@ async function libraryGenerator(tree, schema) {
|
|
|
24
26
|
...schema,
|
|
25
27
|
});
|
|
26
28
|
}
|
|
27
|
-
exports.libraryGenerator = libraryGenerator;
|
|
28
29
|
async function libraryGeneratorInternal(tree, schema) {
|
|
29
30
|
const tasks = [];
|
|
30
31
|
tasks.push(await (0, init_1.default)(tree, {
|
|
@@ -120,7 +121,6 @@ async function libraryGeneratorInternal(tree, schema) {
|
|
|
120
121
|
});
|
|
121
122
|
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
122
123
|
}
|
|
123
|
-
exports.libraryGeneratorInternal = libraryGeneratorInternal;
|
|
124
124
|
async function addProject(tree, options) {
|
|
125
125
|
const projectConfiguration = {
|
|
126
126
|
root: options.projectRoot,
|
|
@@ -266,7 +266,6 @@ async function addLint(tree, options) {
|
|
|
266
266
|
}
|
|
267
267
|
return task;
|
|
268
268
|
}
|
|
269
|
-
exports.addLint = addLint;
|
|
270
269
|
function addBundlerDependencies(tree, options) {
|
|
271
270
|
(0, devkit_1.updateJson)(tree, `${options.projectRoot}/package.json`, (json) => {
|
|
272
271
|
if (options.bundler === 'tsc') {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.releaseVersionGenerator =
|
|
3
|
+
exports.releaseVersionGenerator = releaseVersionGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const chalk = require("chalk");
|
|
6
6
|
const fs_extra_1 = require("fs-extra");
|
|
@@ -592,7 +592,6 @@ To fix this you will either need to add a package.json file at that location, or
|
|
|
592
592
|
process.exit(1);
|
|
593
593
|
}
|
|
594
594
|
}
|
|
595
|
-
exports.releaseVersionGenerator = releaseVersionGenerator;
|
|
596
595
|
exports.default = releaseVersionGenerator;
|
|
597
596
|
function createResolvePackageRoot(customPackageRoot) {
|
|
598
597
|
return (projectNode) => {
|
package/src/generators/release-version/test-utils/create-workspace-with-package-dependencies.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createWorkspaceWithPackageDependencies =
|
|
3
|
+
exports.createWorkspaceWithPackageDependencies = createWorkspaceWithPackageDependencies;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
function createWorkspaceWithPackageDependencies(tree, projectAndPackageData) {
|
|
6
6
|
const projectGraph = {
|
|
@@ -37,4 +37,3 @@ function createWorkspaceWithPackageDependencies(tree, projectAndPackageData) {
|
|
|
37
37
|
}
|
|
38
38
|
return projectGraph;
|
|
39
39
|
}
|
|
40
|
-
exports.createWorkspaceWithPackageDependencies = createWorkspaceWithPackageDependencies;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveLocalPackageDependencies =
|
|
3
|
+
exports.resolveLocalPackageDependencies = resolveLocalPackageDependencies;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const semver_1 = require("semver");
|
|
6
6
|
const package_1 = require("./package");
|
|
@@ -72,7 +72,6 @@ function resolveLocalPackageDependencies(tree, projectGraph, filteredProjects, p
|
|
|
72
72
|
}
|
|
73
73
|
return localPackageDependencies;
|
|
74
74
|
}
|
|
75
|
-
exports.resolveLocalPackageDependencies = resolveLocalPackageDependencies;
|
|
76
75
|
function isExternalNpmDependency(dep) {
|
|
77
76
|
return dep.startsWith('npm:');
|
|
78
77
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveVersionSpec =
|
|
3
|
+
exports.resolveVersionSpec = resolveVersionSpec;
|
|
4
4
|
const npa = require("npm-package-arg");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
function resolveVersionSpec(name, version, spec, location) {
|
|
@@ -26,4 +26,3 @@ function resolveVersionSpec(name, version, spec, location) {
|
|
|
26
26
|
? (0, devkit_1.normalizePath)(npaResult.fetchSpec)
|
|
27
27
|
: npaResult.fetchSpec;
|
|
28
28
|
}
|
|
29
|
-
exports.resolveVersionSpec = resolveVersionSpec;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sortProjectsTopologically =
|
|
3
|
+
exports.sortProjectsTopologically = sortProjectsTopologically;
|
|
4
4
|
function sortProjectsTopologically(projectGraph, projectNodes) {
|
|
5
5
|
const edges = new Map(projectNodes.map((node) => [node, 0]));
|
|
6
6
|
const filteredDependencies = [];
|
|
@@ -45,4 +45,3 @@ function sortProjectsTopologically(projectGraph, projectNodes) {
|
|
|
45
45
|
}
|
|
46
46
|
return sortedProjects;
|
|
47
47
|
}
|
|
48
|
-
exports.sortProjectsTopologically = sortProjectsTopologically;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updateLockFile =
|
|
3
|
+
exports.updateLockFile = updateLockFile;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const client_1 = require("nx/src/daemon/client/client");
|
|
@@ -79,7 +79,6 @@ async function updateLockFile(cwd, { dryRun, verbose, generatorOptions, }) {
|
|
|
79
79
|
}
|
|
80
80
|
return [lockFile];
|
|
81
81
|
}
|
|
82
|
-
exports.updateLockFile = updateLockFile;
|
|
83
82
|
function execLockFileUpdate(command, cwd, env = {}) {
|
|
84
83
|
try {
|
|
85
84
|
const LARGE_BUFFER = 1024 * 1000000;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setupBuildGenerator =
|
|
3
|
+
exports.setupBuildGenerator = setupBuildGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const add_swc_config_1 = require("../../utils/swc/add-swc-config");
|
|
6
6
|
const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
|
|
@@ -138,5 +138,4 @@ async function setupBuildGenerator(tree, options) {
|
|
|
138
138
|
await (0, devkit_1.formatFiles)(tree);
|
|
139
139
|
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
140
140
|
}
|
|
141
|
-
exports.setupBuildGenerator = setupBuildGenerator;
|
|
142
141
|
exports.default = setupBuildGenerator;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setupVerdaccio =
|
|
3
|
+
exports.setupVerdaccio = setupVerdaccio;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const versions_1 = require("../../utils/versions");
|
|
@@ -52,5 +52,4 @@ async function setupVerdaccio(tree, options) {
|
|
|
52
52
|
}
|
|
53
53
|
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { verdaccio: versions_1.verdaccioVersion });
|
|
54
54
|
}
|
|
55
|
-
exports.setupVerdaccio = setupVerdaccio;
|
|
56
55
|
exports.default = setupVerdaccio;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.syncGenerator =
|
|
3
|
+
exports.syncGenerator = syncGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
6
|
const plugin_1 = require("../../plugins/typescript/plugin");
|
|
@@ -69,7 +69,6 @@ async function syncGenerator(tree, options) {
|
|
|
69
69
|
}
|
|
70
70
|
await (0, devkit_1.formatFiles)(tree);
|
|
71
71
|
}
|
|
72
|
-
exports.syncGenerator = syncGenerator;
|
|
73
72
|
// Normalize the paths to strip leading `./` and trailing `/tsconfig.json`
|
|
74
73
|
function normalizeReferencePath(path) {
|
|
75
74
|
return path.replace(/\/tsconfig.json$/, '').replace(/^\.\//, '');
|