nx 22.6.1 → 22.6.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/bin/nx.js +8 -5
- package/package.json +11 -11
- package/release/changelog-renderer/index.d.ts +2 -1
- package/release/changelog-renderer/index.d.ts.map +1 -1
- package/schemas/nx-schema.json +102 -0
- package/src/adapter/ngcli-adapter.js +4 -4
- package/src/command-line/migrate/migrate.d.ts.map +1 -1
- package/src/command-line/migrate/migrate.js +25 -9
- package/src/command-line/release/utils/remote-release-clients/github.d.ts +1 -0
- package/src/command-line/release/utils/remote-release-clients/github.d.ts.map +1 -1
- package/src/command-line/release/utils/remote-release-clients/github.js +37 -1
- package/src/command-line/run/run-one.d.ts.map +1 -1
- package/src/command-line/run/run-one.js +1 -1
- package/src/command-line/show/target.js +5 -2
- package/src/core/graph/main.js +1 -1
- package/src/daemon/client/client.d.ts +1 -1
- package/src/daemon/client/client.d.ts.map +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.d.ts +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.d.ts.map +1 -1
- package/src/daemon/server/project-graph-listener-sockets.d.ts +1 -1
- package/src/daemon/server/project-graph-listener-sockets.d.ts.map +1 -1
- package/src/devkit-internals.d.ts +3 -2
- package/src/devkit-internals.d.ts.map +1 -1
- package/src/devkit-internals.js +5 -4
- package/src/executors/utils/convert-nx-executor.js +2 -2
- package/src/generators/utils/project-configuration.js +4 -4
- package/src/hasher/hash-plan-inspector.d.ts.map +1 -1
- package/src/hasher/hash-plan-inspector.js +1 -1
- package/src/native/index.d.ts +1 -1
- package/src/native/nx.wasm32-wasi.debug.wasm +0 -0
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/project-graph/build-project-graph.d.ts +1 -1
- package/src/project-graph/build-project-graph.d.ts.map +1 -1
- package/src/project-graph/build-project-graph.js +2 -2
- package/src/project-graph/error-types.d.ts +2 -1
- package/src/project-graph/error-types.d.ts.map +1 -1
- package/src/project-graph/nx-deps-cache.d.ts +1 -1
- package/src/project-graph/nx-deps-cache.d.ts.map +1 -1
- package/src/project-graph/plugins/isolation/isolated-plugin.js +5 -5
- package/src/project-graph/project-graph.d.ts +2 -2
- package/src/project-graph/utils/project-configuration/name-substitution-manager.d.ts +23 -18
- package/src/project-graph/utils/project-configuration/name-substitution-manager.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration/name-substitution-manager.js +129 -87
- package/src/project-graph/utils/project-configuration/project-nodes-manager.d.ts +40 -0
- package/src/project-graph/utils/project-configuration/project-nodes-manager.d.ts.map +1 -0
- package/src/project-graph/utils/project-configuration/project-nodes-manager.js +264 -0
- package/src/project-graph/utils/project-configuration/target-merging.d.ts +32 -0
- package/src/project-graph/utils/project-configuration/target-merging.d.ts.map +1 -0
- package/src/project-graph/utils/project-configuration/target-merging.js +332 -0
- package/src/project-graph/utils/project-configuration/target-normalization.d.ts +13 -0
- package/src/project-graph/utils/project-configuration/target-normalization.d.ts.map +1 -0
- package/src/project-graph/utils/project-configuration/target-normalization.js +177 -0
- package/src/project-graph/utils/project-configuration-utils.d.ts +16 -41
- package/src/project-graph/utils/project-configuration-utils.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration-utils.js +56 -734
- package/src/tasks-runner/default-tasks-runner.js +1 -1
- package/src/tasks-runner/life-cycle.d.ts +4 -0
- package/src/tasks-runner/life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.js +4 -0
- package/src/tasks-runner/task-orchestrator.d.ts +8 -2
- package/src/tasks-runner/task-orchestrator.d.ts.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +64 -36
- package/src/tasks-runner/tasks-schedule.d.ts +1 -1
- package/src/tasks-runner/tasks-schedule.d.ts.map +1 -1
- package/src/tasks-runner/tasks-schedule.js +14 -3
- package/src/tasks-runner/utils.d.ts +2 -2
- package/src/tasks-runner/utils.d.ts.map +1 -1
- package/src/tasks-runner/utils.js +5 -7
- package/src/utils/package-json.js +2 -2
- package/src/utils/provenance.d.ts.map +1 -1
- package/src/utils/provenance.js +2 -2
- package/src/utils/split-target.d.ts +13 -2
- package/src/utils/split-target.d.ts.map +1 -1
- package/src/utils/split-target.js +180 -31
package/bin/nx.js
CHANGED
|
@@ -50,9 +50,6 @@ async function main() {
|
|
|
50
50
|
require('nx/src/command-line/nx-commands').commandsObject.argv;
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
|
-
if (!client_1.daemonClient.enabled() && workspace !== null) {
|
|
54
|
-
(0, workspace_context_1.setupWorkspaceContext)(workspace.dir);
|
|
55
|
-
}
|
|
56
53
|
// polyfill rxjs observable to avoid issues with multiple version of Observable installed in node_modules
|
|
57
54
|
// https://twitter.com/BenLesh/status/1192478226385428483?s=20
|
|
58
55
|
if (!Symbol.observable)
|
|
@@ -78,19 +75,25 @@ async function main() {
|
|
|
78
75
|
}
|
|
79
76
|
// this file is already in the local workspace
|
|
80
77
|
if (isNxCloudCommand(process.argv[2])) {
|
|
78
|
+
if (!client_1.daemonClient.enabled() && workspace !== null) {
|
|
79
|
+
(0, workspace_context_1.setupWorkspaceContext)(workspace.dir);
|
|
80
|
+
}
|
|
81
81
|
await initAnalytics();
|
|
82
82
|
// nx-cloud commands can run without local Nx installation
|
|
83
83
|
process.env.NX_DAEMON = 'false';
|
|
84
84
|
require('nx/src/command-line/nx-commands').commandsObject.argv;
|
|
85
85
|
}
|
|
86
86
|
else if (isLocalInstall) {
|
|
87
|
+
if (!client_1.daemonClient.enabled() && workspace !== null) {
|
|
88
|
+
(0, workspace_context_1.setupWorkspaceContext)(workspace.dir);
|
|
89
|
+
}
|
|
87
90
|
await initAnalytics();
|
|
88
91
|
await (0, init_local_1.initLocal)(workspace);
|
|
89
92
|
}
|
|
90
93
|
else if (localNx) {
|
|
91
94
|
// Nx is being run from globally installed CLI - hand off to the local
|
|
92
|
-
// Don't start analytics
|
|
93
|
-
// will handle it when it runs its own bin/nx.ts
|
|
95
|
+
// Don't start analytics, connect to the DB, or set up the workspace
|
|
96
|
+
// context here — the local Nx will handle it when it runs its own bin/nx.ts
|
|
94
97
|
warnIfUsingOutdatedGlobalInstall(GLOBAL_NX_VERSION, LOCAL_NX_VERSION);
|
|
95
98
|
if (localNx.includes('.nx')) {
|
|
96
99
|
const nxWrapperPath = localNx.replace(/\.nx.*/, '.nx/') + 'nxw.js';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "22.6.
|
|
3
|
+
"version": "22.6.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -84,16 +84,16 @@
|
|
|
84
84
|
}
|
|
85
85
|
},
|
|
86
86
|
"optionalDependencies": {
|
|
87
|
-
"@nx/nx-darwin-arm64": "22.6.
|
|
88
|
-
"@nx/nx-darwin-x64": "22.6.
|
|
89
|
-
"@nx/nx-freebsd-x64": "22.6.
|
|
90
|
-
"@nx/nx-linux-arm-gnueabihf": "22.6.
|
|
91
|
-
"@nx/nx-linux-arm64-gnu": "22.6.
|
|
92
|
-
"@nx/nx-linux-arm64-musl": "22.6.
|
|
93
|
-
"@nx/nx-linux-x64-gnu": "22.6.
|
|
94
|
-
"@nx/nx-linux-x64-musl": "22.6.
|
|
95
|
-
"@nx/nx-win32-arm64-msvc": "22.6.
|
|
96
|
-
"@nx/nx-win32-x64-msvc": "22.6.
|
|
87
|
+
"@nx/nx-darwin-arm64": "22.6.2",
|
|
88
|
+
"@nx/nx-darwin-x64": "22.6.2",
|
|
89
|
+
"@nx/nx-freebsd-x64": "22.6.2",
|
|
90
|
+
"@nx/nx-linux-arm-gnueabihf": "22.6.2",
|
|
91
|
+
"@nx/nx-linux-arm64-gnu": "22.6.2",
|
|
92
|
+
"@nx/nx-linux-arm64-musl": "22.6.2",
|
|
93
|
+
"@nx/nx-linux-x64-gnu": "22.6.2",
|
|
94
|
+
"@nx/nx-linux-x64-musl": "22.6.2",
|
|
95
|
+
"@nx/nx-win32-arm64-msvc": "22.6.2",
|
|
96
|
+
"@nx/nx-win32-x64-msvc": "22.6.2"
|
|
97
97
|
},
|
|
98
98
|
"nx-migrations": {
|
|
99
99
|
"migrations": "./migrations.json",
|
|
@@ -31,7 +31,8 @@ export interface DefaultChangelogRenderOptions extends ChangelogRenderOptions {
|
|
|
31
31
|
authors?: boolean;
|
|
32
32
|
/**
|
|
33
33
|
* If authors is enabled, controls whether or not to try to map the authors to their GitHub usernames
|
|
34
|
-
* using https://ungh.cc (from https://github.com/unjs/ungh) and
|
|
34
|
+
* using https://ungh.cc (from https://github.com/unjs/ungh) and, if needed, the GitHub search API via
|
|
35
|
+
* the gh CLI and the email addresses found in the commits.
|
|
35
36
|
* Defaults to true.
|
|
36
37
|
*/
|
|
37
38
|
applyUsernameToAuthors?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/release/changelog-renderer/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mFAAmF,CAAC;AAE7H;;GAEG;AACH,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,6BAA8B,SAAQ,sBAAsB;IAC3E;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/release/changelog-renderer/index.ts"],"names":[],"mappings":"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"}
|
package/schemas/nx-schema.json
CHANGED
|
@@ -548,9 +548,111 @@
|
|
|
548
548
|
},
|
|
549
549
|
"required": ["rules"],
|
|
550
550
|
"additionalProperties": false
|
|
551
|
+
},
|
|
552
|
+
"owners": {
|
|
553
|
+
"description": "Configuration for Nx Owners (CODEOWNERS generation). Set to true to enable with all defaults.",
|
|
554
|
+
"oneOf": [
|
|
555
|
+
{
|
|
556
|
+
"type": "boolean",
|
|
557
|
+
"enum": [true],
|
|
558
|
+
"description": "Enable owners with all default settings."
|
|
559
|
+
},
|
|
560
|
+
{
|
|
561
|
+
"type": "object",
|
|
562
|
+
"properties": {
|
|
563
|
+
"format": {
|
|
564
|
+
"type": "string",
|
|
565
|
+
"description": "The format to use for the generated owners file. Defaults to 'github'.",
|
|
566
|
+
"enum": ["github", "gitlab", "bitbucket"],
|
|
567
|
+
"default": "github"
|
|
568
|
+
},
|
|
569
|
+
"outputPath": {
|
|
570
|
+
"type": "string",
|
|
571
|
+
"description": "The path to write the generated owners file to. Defaults based on format (e.g. '.github/CODEOWNERS')."
|
|
572
|
+
},
|
|
573
|
+
"patterns": {
|
|
574
|
+
"type": "array",
|
|
575
|
+
"description": "List of ownership patterns to apply.",
|
|
576
|
+
"items": {
|
|
577
|
+
"$ref": "#/definitions/ownersPattern"
|
|
578
|
+
}
|
|
579
|
+
},
|
|
580
|
+
"sections": {
|
|
581
|
+
"type": "array",
|
|
582
|
+
"description": "List of ownership sections (GitLab only). Sections allow grouping patterns with approval requirements.",
|
|
583
|
+
"items": {
|
|
584
|
+
"type": "object",
|
|
585
|
+
"properties": {
|
|
586
|
+
"name": {
|
|
587
|
+
"type": "string",
|
|
588
|
+
"description": "The section label."
|
|
589
|
+
},
|
|
590
|
+
"defaultOwners": {
|
|
591
|
+
"type": "array",
|
|
592
|
+
"description": "Default owners for all patterns in this section.",
|
|
593
|
+
"items": {
|
|
594
|
+
"type": "string"
|
|
595
|
+
}
|
|
596
|
+
},
|
|
597
|
+
"numberOfRequiredApprovals": {
|
|
598
|
+
"type": "number",
|
|
599
|
+
"description": "Number of required approvals for this section. Mutually exclusive with 'optional'."
|
|
600
|
+
},
|
|
601
|
+
"optional": {
|
|
602
|
+
"type": "boolean",
|
|
603
|
+
"description": "Whether this section is optional. Mutually exclusive with 'numberOfRequiredApprovals'."
|
|
604
|
+
},
|
|
605
|
+
"patterns": {
|
|
606
|
+
"type": "array",
|
|
607
|
+
"description": "List of ownership patterns within this section.",
|
|
608
|
+
"items": {
|
|
609
|
+
"$ref": "#/definitions/ownersPattern"
|
|
610
|
+
}
|
|
611
|
+
}
|
|
612
|
+
},
|
|
613
|
+
"required": ["name"],
|
|
614
|
+
"additionalProperties": false
|
|
615
|
+
}
|
|
616
|
+
}
|
|
617
|
+
},
|
|
618
|
+
"additionalProperties": false
|
|
619
|
+
}
|
|
620
|
+
]
|
|
551
621
|
}
|
|
552
622
|
},
|
|
553
623
|
"definitions": {
|
|
624
|
+
"ownersPattern": {
|
|
625
|
+
"type": "object",
|
|
626
|
+
"properties": {
|
|
627
|
+
"description": {
|
|
628
|
+
"type": "string",
|
|
629
|
+
"description": "A human-readable description of this ownership pattern."
|
|
630
|
+
},
|
|
631
|
+
"projects": {
|
|
632
|
+
"type": "array",
|
|
633
|
+
"description": "The projects this pattern applies to. Accepts project names, glob patterns, tag references, or any other valid project filter supported by the --projects flag.",
|
|
634
|
+
"items": {
|
|
635
|
+
"type": "string"
|
|
636
|
+
}
|
|
637
|
+
},
|
|
638
|
+
"files": {
|
|
639
|
+
"type": "array",
|
|
640
|
+
"description": "File glob patterns this ownership pattern applies to (for non-project-based ownership).",
|
|
641
|
+
"items": {
|
|
642
|
+
"type": "string"
|
|
643
|
+
}
|
|
644
|
+
},
|
|
645
|
+
"owners": {
|
|
646
|
+
"type": "array",
|
|
647
|
+
"description": "List of owners (e.g. GitHub usernames or team handles) for the matched projects or files.",
|
|
648
|
+
"items": {
|
|
649
|
+
"type": "string"
|
|
650
|
+
}
|
|
651
|
+
}
|
|
652
|
+
},
|
|
653
|
+
"required": ["owners"],
|
|
654
|
+
"additionalProperties": false
|
|
655
|
+
},
|
|
554
656
|
"inputs": {
|
|
555
657
|
"type": "array",
|
|
556
658
|
"items": {
|
|
@@ -29,7 +29,7 @@ const angular_json_1 = require("./angular-json");
|
|
|
29
29
|
const executor_utils_1 = require("../command-line/run/executor-utils");
|
|
30
30
|
const plugins_1 = require("../project-graph/plugins");
|
|
31
31
|
const schema_utils_1 = require("../config/schema-utils");
|
|
32
|
-
const
|
|
32
|
+
const target_merging_1 = require("../project-graph/utils/project-configuration/target-merging");
|
|
33
33
|
function getProjectGraph() {
|
|
34
34
|
try {
|
|
35
35
|
return Promise.resolve((0, project_graph_1.readCachedProjectGraph)());
|
|
@@ -499,11 +499,11 @@ class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
|
|
|
499
499
|
if (project.targets) {
|
|
500
500
|
for (const [targetName, target] of Object.entries(project.targets)) {
|
|
501
501
|
if (target.options) {
|
|
502
|
-
target.options = (0,
|
|
502
|
+
target.options = (0, target_merging_1.resolveNxTokensInOptions)(target.options, { ...project, name: projectName }, `${projectName}:${targetName}`);
|
|
503
503
|
}
|
|
504
504
|
if (target.configurations) {
|
|
505
505
|
for (const [configName, config] of Object.entries(target.configurations)) {
|
|
506
|
-
target.configurations[configName] = (0,
|
|
506
|
+
target.configurations[configName] = (0, target_merging_1.resolveNxTokensInOptions)(config, { ...project, name: projectName }, `${projectName}:${targetName}:${configName}`);
|
|
507
507
|
}
|
|
508
508
|
}
|
|
509
509
|
}
|
|
@@ -946,7 +946,7 @@ function restoreNxTokensInOptions(newOptions, previousOptions, project) {
|
|
|
946
946
|
const result = Array.isArray(newOptions)
|
|
947
947
|
? [...newOptions]
|
|
948
948
|
: { ...newOptions };
|
|
949
|
-
const resolvedPreviousOptions = (0,
|
|
949
|
+
const resolvedPreviousOptions = (0, target_merging_1.resolveNxTokensInOptions)(previousOptions, project, '');
|
|
950
950
|
for (const key of Object.keys(newOptions)) {
|
|
951
951
|
const newValue = newOptions[key];
|
|
952
952
|
const previousValue = previousOptions[key];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const pc = require("picocolors");
|
|
|
14
14
|
const child_process_1 = require("child_process");
|
|
15
15
|
const enquirer_1 = require("enquirer");
|
|
16
16
|
const path_1 = require("path");
|
|
17
|
+
const module_1 = require("module");
|
|
17
18
|
const path_2 = require("../../utils/path");
|
|
18
19
|
const semver_1 = require("semver");
|
|
19
20
|
const node_url_1 = require("node:url");
|
|
@@ -537,13 +538,33 @@ async function parseMigrationsOptions(options) {
|
|
|
537
538
|
}
|
|
538
539
|
function createInstalledPackageVersionsResolver(root) {
|
|
539
540
|
const cache = {};
|
|
541
|
+
const nxRequires = (0, installation_directory_1.getNxRequirePaths)(root).map((path) => (0, module_1.createRequire)((0, path_1.join)(path, 'package.json')));
|
|
540
542
|
function getInstalledPackageVersion(packageName, overrides) {
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
543
|
+
if (overrides?.[packageName]) {
|
|
544
|
+
return overrides[packageName];
|
|
545
|
+
}
|
|
546
|
+
if (packageName === 'nx') {
|
|
547
|
+
const nxVersion = cache[packageName] ??
|
|
548
|
+
(() => {
|
|
549
|
+
for (const req of nxRequires) {
|
|
550
|
+
try {
|
|
551
|
+
const packageJsonPath = req.resolve('nx/package.json');
|
|
552
|
+
if (packageJsonPath.startsWith(workspace_root_1.workspaceRoot)) {
|
|
553
|
+
return (0, fileutils_1.readJsonFile)(packageJsonPath).version;
|
|
554
|
+
}
|
|
555
|
+
}
|
|
556
|
+
catch { }
|
|
557
|
+
}
|
|
558
|
+
return getInstalledPackageVersion('@nrwl/workspace', overrides);
|
|
559
|
+
})();
|
|
560
|
+
if (nxVersion) {
|
|
561
|
+
cache[packageName] = nxVersion;
|
|
544
562
|
}
|
|
563
|
+
return nxVersion;
|
|
564
|
+
}
|
|
565
|
+
try {
|
|
545
566
|
if (!cache[packageName]) {
|
|
546
|
-
const { packageJson, path } = (0, package_json_1.readModulePackageJson)(packageName, (0, installation_directory_1.getNxRequirePaths)());
|
|
567
|
+
const { packageJson, path } = (0, package_json_1.readModulePackageJson)(packageName, (0, installation_directory_1.getNxRequirePaths)(root));
|
|
547
568
|
// old workspaces would have the temp installation of nx in the cache,
|
|
548
569
|
// so the resolved package is not the one we need
|
|
549
570
|
if (!path.startsWith(workspace_root_1.workspaceRoot)) {
|
|
@@ -554,11 +575,6 @@ function createInstalledPackageVersionsResolver(root) {
|
|
|
554
575
|
return cache[packageName];
|
|
555
576
|
}
|
|
556
577
|
catch {
|
|
557
|
-
// Support migrating old workspaces without nx package
|
|
558
|
-
if (packageName === 'nx') {
|
|
559
|
-
cache[packageName] = getInstalledPackageVersion('@nrwl/workspace', overrides);
|
|
560
|
-
return cache[packageName];
|
|
561
|
-
}
|
|
562
578
|
return null;
|
|
563
579
|
}
|
|
564
580
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/release/utils/remote-release-clients/github.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,KAAK,mCAAmC,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACf,MAAM,yBAAyB,CAAC;AAOjC,MAAM,WAAW,cAAe,SAAQ,cAAc;CAAG;AAGzD,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAClC;
|
|
1
|
+
{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/release/utils/remote-release-clients/github.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,KAAK,mCAAmC,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACf,MAAM,yBAAyB,CAAC;AAOjC,MAAM,WAAW,cAAe,SAAQ,cAAc;CAAG;AAGzD,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAClC;AAcD,eAAO,MAAM,4BAA4B,EAAE,mCAKxC,CAAC;AAEJ,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,mBAAmB,CAAC;IACrF,yBAAyB,SAAY;IAErC;;OAEG;IACH,MAAM,CAAC,eAAe,CACpB,mBAAmB,EAAE,KAAK,GAAG,mCAAmC,EAChE,UAAU,SAAW,GACpB,cAAc,GAAG,IAAI;IAmCxB;;OAEG;WACU,gBAAgB,CAC3B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IA4CxD,iBAAiB,CACf,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,OAAO,GACd,WAAW;IAYR,sBAAsB,CAC1B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,GAC9D,OAAO,CAAC,IAAI,CAAC;IAkChB,OAAO,CAAC,wBAAwB;IAuChC;;OAEG;cACa,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAO1E;;OAEG;cACa,aAAa,CAC3B,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,GAAG,CAAC;cAQC,aAAa,CAC3B,EAAE,EAAE,MAAM,EACV,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,GAAG,CAAC;IAWf,SAAS,CAAC,yBAAyB,CACjC,oBAAoB,EAAE,oBAAoB,GACzC,MAAM;IAgBT,SAAS,CAAC,eAAe,IAAI,IAAI;IAUjC,SAAS,CAAC,gBAAgB,CACxB,eAAe,EAAE,mBAAmB,GAAG,SAAS,EAChD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,IAAI;cAcS,WAAW,CACzB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,IAAI,CAAC;YAgDF,yBAAyB;IA6BvC;;OAEG;IACH,gBAAgB,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM;cAmCjC,WAAW,CACzB,oBAAoB,EAAE,oBAAoB,EAC1C,eAAe,CAAC,EAAE,mBAAmB,GACpC,OAAO,CAAC,mBAAmB,CAAC;IAiC/B,OAAO,CAAC,yBAAyB;CASlC"}
|
|
@@ -114,13 +114,49 @@ class GithubRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
|
|
|
114
114
|
const { data } = await axios
|
|
115
115
|
.get(`https://ungh.cc/users/find/${email}`)
|
|
116
116
|
.catch(() => ({ data: { user: null } }));
|
|
117
|
-
if (data?.user) {
|
|
117
|
+
if (data?.user?.username) {
|
|
118
118
|
meta.username = data.user.username;
|
|
119
119
|
break;
|
|
120
120
|
}
|
|
121
|
+
const usernameFromGhCli = this.resolveUsernameFromGhCli(email);
|
|
122
|
+
if (usernameFromGhCli) {
|
|
123
|
+
meta.username = usernameFromGhCli;
|
|
124
|
+
break;
|
|
125
|
+
}
|
|
121
126
|
}
|
|
122
127
|
}));
|
|
123
128
|
}
|
|
129
|
+
resolveUsernameFromGhCli(email) {
|
|
130
|
+
const hostname = this.getRemoteRepoData()?.hostname ??
|
|
131
|
+
exports.defaultCreateReleaseProvider.hostname;
|
|
132
|
+
try {
|
|
133
|
+
const stdout = (0, node_child_process_1.execFileSync)('gh', [
|
|
134
|
+
'api',
|
|
135
|
+
'--hostname',
|
|
136
|
+
hostname,
|
|
137
|
+
'--method',
|
|
138
|
+
'GET',
|
|
139
|
+
'search/users',
|
|
140
|
+
'-f',
|
|
141
|
+
`q=${email} in:email`,
|
|
142
|
+
], {
|
|
143
|
+
encoding: 'utf8',
|
|
144
|
+
stdio: 'pipe',
|
|
145
|
+
windowsHide: true,
|
|
146
|
+
}).trim();
|
|
147
|
+
if (!stdout) {
|
|
148
|
+
return null;
|
|
149
|
+
}
|
|
150
|
+
const data = JSON.parse(stdout);
|
|
151
|
+
return data.items?.[0]?.login ?? null;
|
|
152
|
+
}
|
|
153
|
+
catch (error) {
|
|
154
|
+
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
155
|
+
console.error(error);
|
|
156
|
+
}
|
|
157
|
+
return null;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
124
160
|
/**
|
|
125
161
|
* Get a release by tag
|
|
126
162
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-one.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/run/run-one.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,YAAY,EAEb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAiBlF,wBAAsB,MAAM,CAC1B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,uBAAuB,GAAE,MAAM,CAC7B,MAAM,EACN,CAAC,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAC/B,EACN,YAAY,GAGP;IACH,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CAAC,IAAI,CAAC,CAiEf;AAwDD,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,mBAAmB,GAC1B;IAAE,OAAO,MAAC;IAAC,MAAM,MAAC;IAAC,aAAa,MAAC;IAAC,UAAU,MAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"run-one.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/run/run-one.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,YAAY,EAEb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAiBlF,wBAAsB,MAAM,CAC1B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,uBAAuB,GAAE,MAAM,CAC7B,MAAM,EACN,CAAC,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAC/B,EACN,YAAY,GAGP;IACH,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CAAC,IAAI,CAAC,CAiEf;AAwDD,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,mBAAmB,GAC1B;IAAE,OAAO,MAAC;IAAC,MAAM,MAAC;IAAC,aAAa,MAAC;IAAC,UAAU,MAAA;CAAE,CAgEhD"}
|
|
@@ -104,7 +104,7 @@ function parseRunOneOptions(cwd, parsedArgs, projectGraph, nxJson) {
|
|
|
104
104
|
let configuration;
|
|
105
105
|
if (parsedArgs[PROJECT_TARGET_CONFIG]?.lastIndexOf(':') > 0) {
|
|
106
106
|
// run case
|
|
107
|
-
[project, target, configuration] = (0, split_target_1.splitTarget)(parsedArgs[PROJECT_TARGET_CONFIG], projectGraph);
|
|
107
|
+
[project, target, configuration] = (0, split_target_1.splitTarget)(parsedArgs[PROJECT_TARGET_CONFIG], projectGraph, { currentProject: defaultProjectName });
|
|
108
108
|
// this is to account for "nx npmscript:dev"
|
|
109
109
|
if (project && !target && defaultProjectName) {
|
|
110
110
|
target = project;
|
|
@@ -117,7 +117,10 @@ function resolveTargetIdentifier(args, graph, nxJson) {
|
|
|
117
117
|
});
|
|
118
118
|
process.exit(1);
|
|
119
119
|
}
|
|
120
|
-
const
|
|
120
|
+
const defaultProjectName = (0, calculate_default_project_name_1.calculateDefaultProjectName)(process.cwd(), workspace_root_1.workspaceRoot, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph), nxJson);
|
|
121
|
+
const [project, target, config] = (0, split_target_1.splitTarget)(args.target, graph, {
|
|
122
|
+
currentProject: defaultProjectName,
|
|
123
|
+
});
|
|
121
124
|
if (project && target) {
|
|
122
125
|
return {
|
|
123
126
|
projectName: project,
|
|
@@ -126,7 +129,7 @@ function resolveTargetIdentifier(args, graph, nxJson) {
|
|
|
126
129
|
};
|
|
127
130
|
}
|
|
128
131
|
const targetName = project; // splitTarget returns the string as the first element
|
|
129
|
-
const projectName =
|
|
132
|
+
const projectName = defaultProjectName;
|
|
130
133
|
if (!projectName) {
|
|
131
134
|
output_1.output.error({
|
|
132
135
|
title: `Could not infer project from the current working directory.`,
|