@toolsplus/nx-forge 6.1.1 → 6.1.4
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/package.json +7 -2
- package/src/executors/build/executor.js +3 -0
- package/src/executors/build/executor.js.map +1 -1
- package/src/executors/build/lib/generate-package-json.js +8 -9
- package/src/executors/build/lib/generate-package-json.js.map +1 -1
- package/src/executors/build/lib/process-resource-dependencies.js +13 -6
- package/src/executors/build/lib/process-resource-dependencies.js.map +1 -1
- package/src/executors/deploy/executor.js +2 -2
- package/src/executors/deploy/executor.js.map +1 -1
- package/src/executors/deploy/lib/transform-manifest-yml.d.ts +3 -1
- package/src/executors/deploy/lib/transform-manifest-yml.js +1 -2
- package/src/executors/deploy/lib/transform-manifest-yml.js.map +1 -1
- package/src/executors/package/executor.js +3 -0
- package/src/executors/package/executor.js.map +1 -1
- package/src/executors/package/lib/create-package-json.d.ts +3 -3
- package/src/executors/package/lib/create-package-json.js +26 -19
- package/src/executors/package/lib/create-package-json.js.map +1 -1
- package/src/executors/register/executor.js +7 -0
- package/src/executors/register/executor.js.map +1 -1
- package/src/executors/register/schema.d.ts +2 -1
- package/src/executors/register/schema.json +10 -0
- package/src/executors/tunnel/executor.js +4 -1
- package/src/executors/tunnel/executor.js.map +1 -1
- package/src/executors/tunnel/lib/extract-custom-ui-projects.js +5 -1
- package/src/executors/tunnel/lib/extract-custom-ui-projects.js.map +1 -1
- package/src/executors/tunnel/lib/wait-until-server-is-listening.js +3 -2
- package/src/executors/tunnel/lib/wait-until-server-is-listening.js.map +1 -1
- package/src/generators/application/generator.js +1 -1
- package/src/generators/application/generator.js.map +1 -1
- package/src/generators/application/lib/add-app-files.js +2 -1
- package/src/generators/application/lib/add-app-files.js.map +1 -1
- package/src/generators/application/lib/add-project-dependencies.js +10 -3
- package/src/generators/application/lib/add-project-dependencies.js.map +1 -1
- package/src/generators/application/lib/add-project.js +12 -7
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +2 -4
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/schema.d.ts +4 -3
- package/src/generators/init/generator.js +2 -1
- package/src/generators/init/generator.js.map +1 -1
- package/src/graph/create-dependencies.js +3 -2
- package/src/graph/create-dependencies.js.map +1 -1
- package/src/graph/create-nodes.js.map +1 -1
- package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js +2 -2
- package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js.map +1 -1
- package/src/migrations/update-2-3-0/utils/manifest.js +2 -1
- package/src/migrations/update-2-3-0/utils/manifest.js.map +1 -1
- package/src/migrations/update-2-3-0/utils/yml.js +3 -2
- package/src/migrations/update-2-3-0/utils/yml.js.map +1 -1
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js +3 -1
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js.map +1 -1
- package/src/shared/manifest/util-manifest.d.ts +4 -4
- package/src/shared/manifest/util-manifest.js +103 -29
- package/src/shared/manifest/util-manifest.js.map +1 -1
- package/src/utils/forge/yaml-validator.js +1 -1
- package/src/utils/forge/yaml-validator.js.map +1 -1
- package/src/utils/has-webpack-plugin.js +1 -1
- package/src/utils/has-webpack-plugin.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@toolsplus/nx-forge",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.4",
|
|
4
4
|
"description": "Atlassian Forge plugin for Nx",
|
|
5
|
+
"license": "MIT",
|
|
6
|
+
"repository": {
|
|
7
|
+
"type": "git",
|
|
8
|
+
"url": "https://github.com/toolsplus/nx-forge"
|
|
9
|
+
},
|
|
5
10
|
"main": "./src/index.js",
|
|
6
11
|
"typings": "./src/index.d.ts",
|
|
7
12
|
"generators": "./generators.json",
|
|
8
13
|
"executors": "./executors.json",
|
|
9
14
|
"dependencies": {
|
|
10
|
-
"@forge/manifest": "^
|
|
15
|
+
"@forge/manifest": "^11.3.1",
|
|
11
16
|
"@nx/devkit": "20.3.1",
|
|
12
17
|
"@nx/eslint": "20.3.1",
|
|
13
18
|
"@nx/jest": "20.3.1",
|
|
@@ -29,6 +29,9 @@ async function runExecutor(rawOptions, context) {
|
|
|
29
29
|
devkit_1.logger.warn(`The build executor is deprecated and will be removed in the next major nx-forge plugin release.
|
|
30
30
|
|
|
31
31
|
Use a default Nx 'webpack' or 'esbuild' executor to build, and the 'package' executor to assemble the Forge app.`);
|
|
32
|
+
if (context.projectName === undefined) {
|
|
33
|
+
throw new Error('No project name provided in executor context.');
|
|
34
|
+
}
|
|
32
35
|
const { root, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
|
|
33
36
|
if (!sourceRoot) {
|
|
34
37
|
throw new Error(`${context.projectName} does not have a sourceRoot.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;AA2BA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;AA2BA,8BAwDC;AAnFD,qCAA6C;AAE7C,uCAAoC;AAEpC,+DAA2D;AAC3D,uFAAkF;AAClF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAAS,UAAU,CAAC,IAAc;IAChC,IAAI,CAAC;QACH,OAAO,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACY,KAAK,UAAU,WAAW,CACvC,UAAgC,EAChC,OAAwB;IAExB,eAAM,CAAC,IAAI,CACT;;qHAEiH,CAClH,CAAC;IAEF,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAE7E,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,EAAE,CAAC;QACtD,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,EACjD,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,EAClD,OAAO,CACR,CAAC;IACF,MAAM,IAAA,qCAAgB,EAAC,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC3E,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,YAAY,EACpB,SAAS,EACT,OAAO,CACR,CAAC;IAEF,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACtC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -30,9 +30,7 @@ function generatePackageJson(projectName, graph, customUIResources, options) {
|
|
|
30
30
|
*
|
|
31
31
|
* @see https://github.com/nrwl/nx/blob/15.2.4/packages/workspace/src/utilities/create-package-json.ts
|
|
32
32
|
*/
|
|
33
|
-
function createPackageJson(projectName, graph, customUIResources, options
|
|
34
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
35
|
-
) {
|
|
33
|
+
function createPackageJson(projectName, graph, customUIResources, options) {
|
|
36
34
|
const customUIProjectNames = customUIResources.map((r) => r.path);
|
|
37
35
|
const npmDeps = findAllNpmDeps(projectName, graph, customUIProjectNames);
|
|
38
36
|
// default package.json if one does not exist
|
|
@@ -70,19 +68,19 @@ function createPackageJson(projectName, graph, customUIResources, options
|
|
|
70
68
|
return packageJson;
|
|
71
69
|
}
|
|
72
70
|
function findAllNpmDeps(projectName, graph, customUIProjectNames, list = {}, seen = new Set()) {
|
|
73
|
-
var _a;
|
|
71
|
+
var _a, _b;
|
|
74
72
|
if (seen.has(projectName)) {
|
|
75
73
|
return list;
|
|
76
74
|
}
|
|
77
75
|
seen.add(projectName);
|
|
78
|
-
const node = graph.externalNodes[projectName];
|
|
76
|
+
const node = (_a = graph.externalNodes) === null || _a === void 0 ? void 0 : _a[projectName];
|
|
79
77
|
if (node) {
|
|
80
78
|
list[node.data.packageName] = node.data.version;
|
|
81
79
|
recursivelyCollectPeerDependencies(node.name, graph, list);
|
|
82
80
|
}
|
|
83
81
|
else {
|
|
84
82
|
// we are not interested in the dependencies of external projects
|
|
85
|
-
(
|
|
83
|
+
(_b = graph.dependencies[projectName]) === null || _b === void 0 ? void 0 : _b.forEach((dep) => {
|
|
86
84
|
// Only include dependencies if they are not a Custom UI project
|
|
87
85
|
if (!customUIProjectNames.includes(dep.target)) {
|
|
88
86
|
findAllNpmDeps(dep.target, graph, customUIProjectNames, list, seen);
|
|
@@ -92,7 +90,8 @@ function findAllNpmDeps(projectName, graph, customUIProjectNames, list = {}, see
|
|
|
92
90
|
return list;
|
|
93
91
|
}
|
|
94
92
|
function recursivelyCollectPeerDependencies(projectName, graph, list = {}, seen = new Set()) {
|
|
95
|
-
|
|
93
|
+
var _a;
|
|
94
|
+
const npmPackage = (_a = graph.externalNodes) === null || _a === void 0 ? void 0 : _a[projectName];
|
|
96
95
|
if (!npmPackage || seen.has(projectName)) {
|
|
97
96
|
return list;
|
|
98
97
|
}
|
|
@@ -106,8 +105,8 @@ function recursivelyCollectPeerDependencies(projectName, graph, list = {}, seen
|
|
|
106
105
|
}
|
|
107
106
|
Object.keys(packageJson.peerDependencies)
|
|
108
107
|
.map((dependencyName) => `npm:${dependencyName}`)
|
|
109
|
-
.map((dependency) => graph.externalNodes[dependency])
|
|
110
|
-
.filter(
|
|
108
|
+
.map((dependency) => { var _a; return (_a = graph.externalNodes) === null || _a === void 0 ? void 0 : _a[dependency]; })
|
|
109
|
+
.filter((node) => !!node)
|
|
111
110
|
.forEach((node) => {
|
|
112
111
|
var _a, _b;
|
|
113
112
|
if (!((_b = (_a = packageJson.peerDependenciesMeta) === null || _a === void 0 ? void 0 : _a[node.data.packageName]) === null || _b === void 0 ? void 0 : _b.optional)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/generate-package-json.ts"],"names":[],"mappings":";;AAkBA,kDAkBC;AAnCD,uCAAyD;AACzD,0DAA4D;AAG5D,+BAA+B;AAI/B;;;;;;;;GAQG;AACH,SAAgB,mBAAmB,CACjC,WAAmB,EACnB,KAAmB,EACnB,iBAA4B,EAC5B,OAAgB;;IAEhB,MAAM,WAAW,GAAG,iBAAiB,CACnC,WAAW,EACX,KAAK,EACL,iBAAiB,EACjB,OAAO,CACR,CAAC;IACF,WAAW,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,IAAI,mCAAI,UAAU,CAAC;IAClD,OAAO,WAAW,CAAC,eAAe,CAAC;IACnC,IAAA,sBAAa,EACX,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,EAC3D,WAAW,CACZ,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,iBAAiB,CACxB,WAAmB,EACnB,KAAmB,EACnB,iBAA4B,EAC5B,OAGC;
|
|
1
|
+
{"version":3,"file":"generate-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/generate-package-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,9 @@ const util_fs_1 = require("../../../utils/util-fs");
|
|
|
19
19
|
*/
|
|
20
20
|
async function processResourceDependencies(options, context) {
|
|
21
21
|
var _a;
|
|
22
|
+
if (!context.projectName) {
|
|
23
|
+
throw new Error(`Failed to process resource dependencies: No project name found in executor context.`);
|
|
24
|
+
}
|
|
22
25
|
const manifestPath = (0, devkit_1.joinPathFragments)(context.root, context.projectsConfigurations.projects[context.projectName].root, 'manifest.yml');
|
|
23
26
|
const manifestSchema = await (0, manifest_yml_1.readManifestYml)(manifestPath, {
|
|
24
27
|
interpolate: false,
|
|
@@ -37,15 +40,16 @@ async function processResourceDependencies(options, context) {
|
|
|
37
40
|
return uiResources;
|
|
38
41
|
}
|
|
39
42
|
const getResourceOutputPath = (options, resourceProjectGraphNode, configurationName) => {
|
|
40
|
-
var _a, _b;
|
|
43
|
+
var _a, _b, _c;
|
|
41
44
|
const resourceProjectName = resourceProjectGraphNode.data.name;
|
|
45
|
+
if (!resourceProjectName) {
|
|
46
|
+
throw new Error('Resource project name is missing.');
|
|
47
|
+
}
|
|
42
48
|
const maybeResourceOutputPath = options.resourceOutputPathMap[resourceProjectName];
|
|
43
|
-
if (maybeResourceOutputPath &&
|
|
44
|
-
typeof maybeResourceOutputPath === 'string' &&
|
|
45
|
-
maybeResourceOutputPath !== '') {
|
|
49
|
+
if (maybeResourceOutputPath && maybeResourceOutputPath !== '') {
|
|
46
50
|
return maybeResourceOutputPath;
|
|
47
51
|
}
|
|
48
|
-
const maybeBuildTargetOutputPathOption = (_b = (_a = resourceProjectGraphNode.data.targets['build']) === null ||
|
|
52
|
+
const maybeBuildTargetOutputPathOption = (_c = (_b = (_a = resourceProjectGraphNode.data.targets) === null || _a === void 0 ? void 0 : _a['build']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.outputPath;
|
|
49
53
|
if (maybeBuildTargetOutputPathOption) {
|
|
50
54
|
return maybeBuildTargetOutputPathOption;
|
|
51
55
|
}
|
|
@@ -65,10 +69,13 @@ const getResourceOutputPath = (options, resourceProjectGraphNode, configurationN
|
|
|
65
69
|
if (firstOutputDefinition && otherOutputDefinitions.length === 0) {
|
|
66
70
|
return firstOutputDefinition;
|
|
67
71
|
}
|
|
68
|
-
throw new Error(`Failed to infer output path for resource project '${resourceProjectName}': Try to define an explicit output path mapping using the 'resourceOutputPathMap' option of this executor. Add an entry to the mapping object as follows: {'${resourceProjectName}': '<replace-with-project-output-path>'}.`);
|
|
72
|
+
throw new Error(`Failed to infer the output path for resource project '${resourceProjectName}': Try to define an explicit output path mapping using the 'resourceOutputPathMap' option of this executor. Add an entry to the mapping object as follows: {'${resourceProjectName}': '<replace-with-project-output-path>'}.`);
|
|
69
73
|
};
|
|
70
74
|
const verifyAndCopyResourceDependency = (resource, context, options) => {
|
|
71
75
|
const resourceProjectName = resource.path;
|
|
76
|
+
if (!resourceProjectName) {
|
|
77
|
+
throw new Error(`Resource ${resource.key} is missing a path. Make sure the resource path references a project in your Nx workspace.`);
|
|
78
|
+
}
|
|
72
79
|
const resourceProjectGraphNode = context.projectGraph.nodes[resourceProjectName];
|
|
73
80
|
const resourceProjectConfiguration = resourceProjectGraphNode === null || resourceProjectGraphNode === void 0 ? void 0 : resourceProjectGraphNode.data;
|
|
74
81
|
if (!resourceProjectGraphNode || !resourceProjectConfiguration) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-resource-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/process-resource-dependencies.ts"],"names":[],"mappings":";;AAiCA,
|
|
1
|
+
{"version":3,"file":"process-resource-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/process-resource-dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
const async_commands_1 = require("../../utils/forge/async-commands");
|
|
6
6
|
const transform_manifest_yml_1 = require("./lib/transform-manifest-yml");
|
|
7
7
|
const normalizeOptions = (options, context) => {
|
|
8
|
-
const isEnvironmentName = (c) => ['development', 'staging', 'production'].includes(c);
|
|
8
|
+
const isEnvironmentName = (c) => ['development', 'staging', 'production'].includes(c !== null && c !== void 0 ? c : '');
|
|
9
9
|
if (isEnvironmentName(context.configurationName)) {
|
|
10
10
|
return {
|
|
11
11
|
...options,
|
|
@@ -20,7 +20,7 @@ async function runExecutor(rawOptions, context) {
|
|
|
20
20
|
const options = normalizeOptions(rawOptions, context);
|
|
21
21
|
if (options.manifestTransform && options.manifestTransform !== '') {
|
|
22
22
|
devkit_1.logger.info(`Applying Forge manifest transformation ${context.configurationName ? `(${context.configurationName})` : ''}: ${options.manifestTransform}`);
|
|
23
|
-
await (0, transform_manifest_yml_1.transformManifestYml)(options, context);
|
|
23
|
+
await (0, transform_manifest_yml_1.transformManifestYml)({ ...options, manifestTransform: options.manifestTransform }, context);
|
|
24
24
|
}
|
|
25
25
|
const args = [
|
|
26
26
|
'deploy',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/deploy/executor.ts"],"names":[],"mappings":";;AAwBA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/deploy/executor.ts"],"names":[],"mappings":";;AAwBA,8BAoCC;AA5DD,uCAAqD;AAErD,qEAAwE;AACxE,yEAAoE;AAEpE,MAAM,gBAAgB,GAAG,CACvB,OAA8B,EAC9B,OAAwB,EACD,EAAE;IACzB,MAAM,iBAAiB,GAAG,CACxB,CAAU,EACiC,EAAE,CAC7C,CAAC,aAAa,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,aAAD,CAAC,cAAD,CAAC,GAAI,EAAE,CAAC,CAAC;IAE7D,IAAI,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACjD,OAAO;YACL,GAAG,OAAO;YACV,WAAW,EAAE,OAAO,CAAC,iBAAiB;SACvC,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AAEa,KAAK,UAAU,WAAW,CACvC,UAAiC,EACjC,OAAwB;IAExB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEtD,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,KAAK,EAAE,EAAE,CAAC;QAClE,eAAM,CAAC,IAAI,CACT,0CACE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,EACjE,KAAK,OAAO,CAAC,iBAAiB,EAAE,CACjC,CAAC;QACF,MAAM,IAAA,6CAAoB,EACxB,EAAE,GAAG,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE,EAC5D,OAAO,CACR,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG;QACX,QAAQ;QACR,iBAAiB,OAAO,CAAC,WAAW,EAAE;QACtC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAChE,CAAC;IAEF,eAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE;QAC/B,GAAG,EAAE,OAAO,CAAC,UAAU;KACxB,CAAC,CAAC;IAEH,eAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACnC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { DeployExecutorOptions } from '../schema';
|
|
2
2
|
import { ExecutorContext } from '@nx/devkit';
|
|
3
|
-
type Options = Pick<DeployExecutorOptions, 'outputPath' | '
|
|
3
|
+
type Options = Pick<DeployExecutorOptions, 'outputPath' | 'verify'> & {
|
|
4
|
+
manifestTransform: string;
|
|
5
|
+
};
|
|
4
6
|
export declare const transformManifestYml: (options: Options, context: ExecutorContext) => Promise<void>;
|
|
5
7
|
export {};
|
|
@@ -6,13 +6,12 @@ const jsonata_1 = tslib_1.__importDefault(require("jsonata"));
|
|
|
6
6
|
const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
|
|
7
7
|
const devkit_1 = require("@nx/devkit");
|
|
8
8
|
const transformManifestYml = async (options, context) => {
|
|
9
|
-
var _a;
|
|
10
9
|
let expression;
|
|
11
10
|
try {
|
|
12
11
|
expression = (0, jsonata_1.default)(options.manifestTransform);
|
|
13
12
|
}
|
|
14
13
|
catch (error) {
|
|
15
|
-
throw new Error(`Failed to parse expression '${options.manifestTransform}': ${
|
|
14
|
+
throw new Error(`Failed to parse expression '${options.manifestTransform}': ${error instanceof Error ? error.message : JSON.stringify(error)}`);
|
|
16
15
|
}
|
|
17
16
|
const manifestPath = (0, devkit_1.joinPathFragments)(context.root, options.outputPath, 'manifest.yml');
|
|
18
17
|
const manifest = await (0, manifest_yml_1.readManifestYml)(manifestPath, { interpolate: false });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/deploy/lib/transform-manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,8DAA8C;AAE9C,oEAI2C;AAC3C,uCAAgE;
|
|
1
|
+
{"version":3,"file":"transform-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/deploy/lib/transform-manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,8DAA8C;AAE9C,oEAI2C;AAC3C,uCAAgE;AAMzD,MAAM,oBAAoB,GAAG,KAAK,EACvC,OAAgB,EAChB,OAAwB,EACxB,EAAE;IACF,IAAI,UAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,UAAU,GAAG,IAAA,iBAAO,EAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,CAAC,iBAAiB,MACtD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAC/D,EAAE,CACH,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IAE7E,UAAU,CAAC,gBAAgB,CACzB,KAAK,EACL,CAAC,CAAC,EAAE,EAAE;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAC;QAChE,CAAC;IACH,CAAC,EACD,SAAS,CACV,CAAC;IACF,UAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IAE5E,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAA,sCAAuB,EAAC,mBAAmB,CAAC,CAAC;IACrD,CAAC;IAED,IAAA,+BAAgB,EAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;AACtD,CAAC,CAAC;AA3CW,QAAA,oBAAoB,wBA2C/B"}
|
|
@@ -19,6 +19,9 @@ function normalizeOptions(options, root, sourceRoot, projectRoot) {
|
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
21
|
async function runExecutor(rawOptions, context) {
|
|
22
|
+
if (context.projectName === undefined) {
|
|
23
|
+
throw new Error('No project name provided in executor context.');
|
|
24
|
+
}
|
|
22
25
|
const { root, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
|
|
23
26
|
if (!sourceRoot) {
|
|
24
27
|
throw new Error(`${context.projectName} does not have a sourceRoot.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/package/executor.ts"],"names":[],"mappings":";;AAOA,4CAcC;AAED,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/package/executor.ts"],"names":[],"mappings":";;AAOA,4CAcC;AAED,8BA4CC;AAnED,uCAAqD;AAErD,8FAAyF;AACzF,wEAAmE;AACnE,uEAAkE;AAClE,8EAAwE;AAExE,SAAgB,gBAAgB,CAC9B,OAA8B,EAC9B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,OAAO;QACL,GAAG,OAAO;QACV,IAAI;QACJ,UAAU;QACV,WAAW;QACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,WAAW;QACjD,qBAAqB,EAAE,MAAA,OAAO,CAAC,qBAAqB,mCAAI,EAAE;KAC3D,CAAC;AACJ,CAAC;AAEc,KAAK,UAAU,WAAW,CACvC,UAAiC,EACjC,OAAwB;IAExB,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAE7E,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,EACjD,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,EAClD,OAAO,CACR,CAAC;IAEF,MAAM,IAAA,qCAAgB,EAAC,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAE3E,IAAA,2CAAmB,EAAC;QAClB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,iBAAiB,EAAE,SAAS;KAC7B,CAAC,CAAC;IAEH,eAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACxC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -28,10 +28,10 @@ export declare function createPackageJson(projectName: string, graph: ProjectGra
|
|
|
28
28
|
root?: string;
|
|
29
29
|
isProduction?: boolean;
|
|
30
30
|
helperDependencies?: string[];
|
|
31
|
-
}, fileMap?: ProjectFileMap): PackageJson;
|
|
32
|
-
export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph,
|
|
31
|
+
}, fileMap?: ProjectFileMap | undefined): PackageJson;
|
|
32
|
+
export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, rootPackageJson: PackageJson, options: {
|
|
33
33
|
helperDependencies?: string[];
|
|
34
34
|
ignoredDependencies?: string[];
|
|
35
35
|
isProduction?: boolean;
|
|
36
|
-
}, manifestResources: Resources, fileMap?: ProjectFileMap): NpmDeps;
|
|
36
|
+
}, manifestResources: Resources, target?: string, fileMap?: ProjectFileMap): NpmDeps;
|
|
37
37
|
export {};
|
|
@@ -5,6 +5,7 @@ exports.findProjectsNpmDependencies = findProjectsNpmDependencies;
|
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const devkit_1 = require("@nx/devkit");
|
|
8
|
+
const nx_json_1 = require("nx/src/config/nx-json");
|
|
8
9
|
const object_sort_1 = require("nx/src/utils/object-sort");
|
|
9
10
|
const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
|
|
10
11
|
const task_hasher_1 = require("nx/src/hasher/task-hasher");
|
|
@@ -24,15 +25,15 @@ const project_graph_1 = require("nx/src/config/project-graph");
|
|
|
24
25
|
*
|
|
25
26
|
* @see https://github.com/nrwl/nx/blob/4dc68beab7ff9ce94f9be5a73c87b5f9d11d3ee6/packages/nx/src/plugins/js/package-json/create-package-json.ts#L33
|
|
26
27
|
*/
|
|
27
|
-
function createPackageJson(projectName, graph, manifestResources, options = {}, fileMap =
|
|
28
|
+
function createPackageJson(projectName, graph, manifestResources, options = {}, fileMap = undefined) {
|
|
28
29
|
var _a, _b;
|
|
29
30
|
const projectNode = graph.nodes[projectName];
|
|
30
31
|
const isLibrary = projectNode.type === 'lib';
|
|
31
32
|
const rootPackageJson = (0, devkit_1.readJsonFile)((0, path_1.join)((_a = options.root) !== null && _a !== void 0 ? _a : devkit_1.workspaceRoot, 'package.json'));
|
|
32
|
-
const npmDeps = findProjectsNpmDependencies(projectNode, graph,
|
|
33
|
+
const npmDeps = findProjectsNpmDependencies(projectNode, graph, rootPackageJson, {
|
|
33
34
|
helperDependencies: options.helperDependencies,
|
|
34
35
|
isProduction: options.isProduction,
|
|
35
|
-
}, manifestResources, fileMap);
|
|
36
|
+
}, manifestResources, options.target, fileMap);
|
|
36
37
|
// default package.json if one does not exist
|
|
37
38
|
let packageJson = {
|
|
38
39
|
name: projectName,
|
|
@@ -64,9 +65,9 @@ function createPackageJson(projectName, graph, manifestResources, options = {},
|
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
67
|
const getVersion = (packageName, version, section) => {
|
|
67
|
-
var _a;
|
|
68
|
-
return (packageJson[section][packageName] ||
|
|
69
|
-
(isLibrary && ((
|
|
68
|
+
var _a, _b;
|
|
69
|
+
return (((_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson[section]) === null || _a === void 0 ? void 0 : _a[packageName]) ||
|
|
70
|
+
(isLibrary && ((_b = rootPackageJson[section]) === null || _b === void 0 ? void 0 : _b[packageName])) ||
|
|
70
71
|
version);
|
|
71
72
|
};
|
|
72
73
|
Object.entries(npmDeps.dependencies).forEach(([packageName, version]) => {
|
|
@@ -135,13 +136,13 @@ function createPackageJson(projectName, graph, manifestResources, options = {},
|
|
|
135
136
|
}
|
|
136
137
|
return packageJson;
|
|
137
138
|
}
|
|
138
|
-
function findProjectsNpmDependencies(projectNode, graph,
|
|
139
|
-
var _a, _b, _c;
|
|
140
|
-
if (fileMap
|
|
141
|
-
fileMap = ((_b = (_a = (0, nx_deps_cache_1.readFileMapCache)()) === null || _a === void 0 ? void 0 : _a.fileMap) === null || _b === void 0 ? void 0 : _b.projectFileMap)
|
|
139
|
+
function findProjectsNpmDependencies(projectNode, graph, rootPackageJson, options, manifestResources, target, fileMap) {
|
|
140
|
+
var _a, _b, _c, _d;
|
|
141
|
+
if (fileMap === undefined) {
|
|
142
|
+
fileMap = (_c = (_b = (_a = (0, nx_deps_cache_1.readFileMapCache)()) === null || _a === void 0 ? void 0 : _a.fileMap) === null || _b === void 0 ? void 0 : _b.projectFileMap) !== null && _c !== void 0 ? _c : {};
|
|
142
143
|
}
|
|
143
144
|
const { selfInputs, dependencyInputs } = target
|
|
144
|
-
? (0, task_hasher_1.getTargetInputs)((0,
|
|
145
|
+
? (0, task_hasher_1.getTargetInputs)((0, nx_json_1.readNxJson)(), projectNode, target)
|
|
145
146
|
: { selfInputs: [], dependencyInputs: [] };
|
|
146
147
|
const npmDeps = {
|
|
147
148
|
dependencies: {},
|
|
@@ -149,11 +150,15 @@ function findProjectsNpmDependencies(projectNode, graph, target, rootPackageJson
|
|
|
149
150
|
peerDependenciesMeta: {},
|
|
150
151
|
};
|
|
151
152
|
const seen = new Set();
|
|
152
|
-
(
|
|
153
|
+
(_d = options.helperDependencies) === null || _d === void 0 ? void 0 : _d.forEach((dep) => {
|
|
154
|
+
var _a;
|
|
153
155
|
seen.add(dep);
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
156
|
+
const graphDependencyNode = (_a = graph.externalNodes) === null || _a === void 0 ? void 0 : _a[dep];
|
|
157
|
+
if (graphDependencyNode) {
|
|
158
|
+
npmDeps.dependencies[graphDependencyNode.data.packageName] =
|
|
159
|
+
graphDependencyNode.data.version;
|
|
160
|
+
recursivelyCollectPeerDependencies(dep, graph, npmDeps, seen);
|
|
161
|
+
}
|
|
157
162
|
});
|
|
158
163
|
// if it's production, we want to ignore all found devDependencies
|
|
159
164
|
const ignoredDependencies = options.isProduction && rootPackageJson.devDependencies
|
|
@@ -166,6 +171,7 @@ function findProjectsNpmDependencies(projectNode, graph, target, rootPackageJson
|
|
|
166
171
|
return npmDeps;
|
|
167
172
|
}
|
|
168
173
|
function findAllNpmDeps(manifestResources, projectFileMap, projectNode, graph, npmDeps, seen, ignoredDependencies, dependencyPatterns, rootPatterns) {
|
|
174
|
+
var _a;
|
|
169
175
|
if (seen.has(projectNode.name))
|
|
170
176
|
return;
|
|
171
177
|
seen.add(projectNode.name);
|
|
@@ -183,7 +189,7 @@ function findAllNpmDeps(manifestResources, projectFileMap, projectNode, graph, n
|
|
|
183
189
|
});
|
|
184
190
|
});
|
|
185
191
|
for (const dep of projectDependencies) {
|
|
186
|
-
const node = graph.externalNodes[dep];
|
|
192
|
+
const node = (_a = graph.externalNodes) === null || _a === void 0 ? void 0 : _a[dep];
|
|
187
193
|
if (seen.has(dep)) {
|
|
188
194
|
// if it's in peerDependencies, move it to regular dependencies
|
|
189
195
|
// since this is a direct dependency of the project
|
|
@@ -210,7 +216,8 @@ function findAllNpmDeps(manifestResources, projectFileMap, projectNode, graph, n
|
|
|
210
216
|
}
|
|
211
217
|
}
|
|
212
218
|
function recursivelyCollectPeerDependencies(projectName, graph, npmDeps, seen) {
|
|
213
|
-
|
|
219
|
+
var _a;
|
|
220
|
+
const npmPackage = (_a = graph.externalNodes) === null || _a === void 0 ? void 0 : _a[projectName];
|
|
214
221
|
if (!npmPackage) {
|
|
215
222
|
return npmDeps;
|
|
216
223
|
}
|
|
@@ -223,8 +230,8 @@ function recursivelyCollectPeerDependencies(projectName, graph, npmDeps, seen) {
|
|
|
223
230
|
}
|
|
224
231
|
Object.keys(packageJson.peerDependencies)
|
|
225
232
|
.map((dependencyName) => `npm:${dependencyName}`)
|
|
226
|
-
.map((dependency) => graph.externalNodes[dependency])
|
|
227
|
-
.filter(
|
|
233
|
+
.map((dependency) => { var _a; return (_a = graph.externalNodes) === null || _a === void 0 ? void 0 : _a[dependency]; })
|
|
234
|
+
.filter((node) => !!node)
|
|
228
235
|
.forEach((node) => {
|
|
229
236
|
if (!seen.has(node.name)) {
|
|
230
237
|
seen.add(node.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/package/lib/create-package-json.ts"],"names":[],"mappings":";;AA0CA,8CA4KC;AAED,
|
|
1
|
+
{"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/package/lib/create-package-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,9 @@ const normalize_options_1 = require("./lib/normalize-options");
|
|
|
6
6
|
const patch_manifest_yml_1 = require("./lib/patch-manifest-yml");
|
|
7
7
|
const async_commands_1 = require("../../utils/forge/async-commands");
|
|
8
8
|
async function runExecutor(rawOptions, context) {
|
|
9
|
+
if (context.projectName === undefined) {
|
|
10
|
+
throw new Error('No project name provided in executor context.');
|
|
11
|
+
}
|
|
9
12
|
const { root, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
|
|
10
13
|
if (!sourceRoot) {
|
|
11
14
|
throw new Error(`${context.projectName} does not have a sourceRoot.`);
|
|
@@ -17,6 +20,10 @@ async function runExecutor(rawOptions, context) {
|
|
|
17
20
|
// https://developer.atlassian.com/platform/forge/cli-reference/register/
|
|
18
21
|
const args = [
|
|
19
22
|
'register',
|
|
23
|
+
...(options.developerSpaceId
|
|
24
|
+
? [`--developer-space-id ${options.developerSpaceId}`]
|
|
25
|
+
: []),
|
|
26
|
+
...(options.acceptTerms === true ? ['--accept-terms'] : []),
|
|
20
27
|
...(options.verbose === true ? ['--verbose'] : []),
|
|
21
28
|
options.appName,
|
|
22
29
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/register/executor.ts"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/register/executor.ts"],"names":[],"mappings":";;AAMA,8BA6CC;AAnDD,uCAAqD;AAErD,+DAA2D;AAC3D,iEAA4D;AAC5D,qEAAwE;AAEzD,KAAK,UAAU,WAAW,CACvC,UAAmC,EACnC,OAAwB;IAExB,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAE7E,yEAAyE;IACzE,MAAM,IAAI,GAAG;QACX,UAAU;QACV,GAAG,CAAC,OAAO,CAAC,gBAAgB;YAC1B,CAAC,CAAC,CAAC,wBAAwB,OAAO,CAAC,gBAAgB,EAAE,CAAC;YACtD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,OAAO,CAAC,OAAO;KAChB,CAAC;IAEF,eAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE;QAC/B,GAAG,EAAE,OAAO,CAAC,UAAU;KACxB,CAAC,CAAC;IAEH,MAAM,IAAA,qCAAgB,EAAC,OAAO,CAAC,CAAC;IAEhC,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAEtC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -17,6 +17,16 @@
|
|
|
17
17
|
"$source": "projectName"
|
|
18
18
|
}
|
|
19
19
|
},
|
|
20
|
+
"developerSpaceId": {
|
|
21
|
+
"type": "string",
|
|
22
|
+
"description": "ID of the Forge developer space this app should be part of",
|
|
23
|
+
"alias": "s"
|
|
24
|
+
},
|
|
25
|
+
"acceptTerms": {
|
|
26
|
+
"type": "boolean",
|
|
27
|
+
"description": "Automatically accept terms and conditions in non-interactive mode",
|
|
28
|
+
"alias": "y"
|
|
29
|
+
},
|
|
20
30
|
"verbose": {
|
|
21
31
|
"type": "boolean",
|
|
22
32
|
"description": "Run registration in verbose mode.",
|
|
@@ -21,6 +21,9 @@ const start_custom_uis_1 = require("./lib/start-custom-uis");
|
|
|
21
21
|
*/
|
|
22
22
|
async function runTunnelExecutor(options, context) {
|
|
23
23
|
var _a;
|
|
24
|
+
if (context.projectName === undefined) {
|
|
25
|
+
throw new Error('No project name provided in executor context.');
|
|
26
|
+
}
|
|
24
27
|
const customUIProjectConfigs = await (0, extract_custom_ui_projects_1.getCustomUiProjects)(context);
|
|
25
28
|
const customUIIters = await (0, start_custom_uis_1.startCustomUIs)(customUIProjectConfigs, context);
|
|
26
29
|
const forgeAppBuildIter = await (0, devkit_1.runExecutor)({ project: context.projectName, target: 'build' }, { watch: true }, context);
|
|
@@ -30,7 +33,7 @@ async function runTunnelExecutor(options, context) {
|
|
|
30
33
|
await (0, run_tunnel_1.isTunnelPreparationComplete)(options.outputPath, preTunnelTimeout);
|
|
31
34
|
}
|
|
32
35
|
catch (err) {
|
|
33
|
-
devkit_1.logger.error(err.message);
|
|
36
|
+
devkit_1.logger.error(err instanceof Error ? err.message : String(err));
|
|
34
37
|
return { success: false };
|
|
35
38
|
}
|
|
36
39
|
// execute the tunnel target on the focused project
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/tunnel/executor.ts"],"names":[],"mappings":";;AAmBA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/tunnel/executor.ts"],"names":[],"mappings":";;AAmBA,oCAuDC;;AA1ED,uCAAkE;AAClE,wEAA4E;AAE5E,uEAA0E;AAC1E,iFAAuE;AACvE,6DAAwD;AAExD;;;;;;;;;;;GAWG;AACY,KAAK,UAAU,iBAAiB,CAC7C,OAA8B,EAC9B,OAAwB;;IAExB,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,sBAAsB,GAAG,MAAM,IAAA,gDAAmB,EAAC,OAAO,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAc,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAE5E,MAAM,iBAAiB,GAAG,MAAM,IAAA,oBAAW,EACzC,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACjD,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,OAAO,CACR,CAAC;IAEF,MAAM,IAAA,oBAAW,EACf,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,EACnD,EAAE,EACF,OAAO,CACR,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,CAAC;QAC1D,MAAM,IAAA,wCAA2B,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAC1E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,mDAAmD;IACnD,MAAM,eAAe,GAAG,iBAAiB,CACvC,IAAA,oBAAS,EAAC,EAAE,GAAG,OAAO,EAAE,sBAAsB,EAAE,EAAE,OAAO,CAAC,CAC3D,CAAC;IAEF,MAAM,QAAQ,GACZ,IAAA,sCAAqB,EAAC,iBAAiB,EAAE,GAAG,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO;gBACjB,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAEzE,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,MAAK,QAAQ,EAAE,CAAC;gBAC5B,eAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;gBACnD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC3D,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;QACnD,OAAO,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,KAAK,SAAS,CAAC,CAAC,iBAAiB,CAG/B,CAAa;IACb,MAAM,MAAM,CAAC,CAAC;AAChB,CAAC"}
|
|
@@ -31,6 +31,9 @@ async function getCustomUiProjects(context) {
|
|
|
31
31
|
*/
|
|
32
32
|
async function extractVerifiedCustomUIProjects(context) {
|
|
33
33
|
var _a;
|
|
34
|
+
if (context.projectName === undefined) {
|
|
35
|
+
throw new Error('No project name provided in executor context.');
|
|
36
|
+
}
|
|
34
37
|
const manifestPath = (0, devkit_1.joinPathFragments)(context.root, context.projectsConfigurations.projects[context.projectName].root, 'manifest.yml');
|
|
35
38
|
const manifestSchema = await (0, manifest_yml_1.readManifestYml)(manifestPath, {
|
|
36
39
|
interpolate: false,
|
|
@@ -41,12 +44,13 @@ async function extractVerifiedCustomUIProjects(context) {
|
|
|
41
44
|
.map(verifyCustomUIDependency(context));
|
|
42
45
|
}
|
|
43
46
|
const verifyCustomUIDependency = (context) => (resource) => {
|
|
47
|
+
var _a;
|
|
44
48
|
const customUIProjectName = resource.path;
|
|
45
49
|
const customUIProjectConfiguration = context.projectsConfigurations.projects[customUIProjectName];
|
|
46
50
|
if (!customUIProjectConfiguration) {
|
|
47
51
|
throw new Error(`Nx workspace is missing project for Custom UI path ${customUIProjectName}. Make sure the Custom UI resource path references a project in your Nx workspace.`);
|
|
48
52
|
}
|
|
49
|
-
if (!customUIProjectConfiguration.targets['serve']) {
|
|
53
|
+
if (!((_a = customUIProjectConfiguration.targets) === null || _a === void 0 ? void 0 : _a['serve'])) {
|
|
50
54
|
throw new Error(`Custom UI project '${customUIProjectName}' targets is missing a 'serve' executor. Make sure the the project has a 'serve' target inferred, or the 'targets' property in the project's 'project.json' has a 'serve' executor configured.`);
|
|
51
55
|
}
|
|
52
56
|
if (!resource.tunnel || !Number.isInteger(resource.tunnel.port)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-custom-ui-projects.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/extract-custom-ui-projects.ts"],"names":[],"mappings":";;AAcA,kDAQC;AAtBD,uCAAgE;AAGhE,oEAAoE;AACpE,0EAAwE;AAIxE;;;;;GAKG;AACI,KAAK,UAAU,mBAAmB,CACvC,OAAwB;IAExB,MAAM,QAAQ,GAAG,MAAM,+BAA+B,CAAC,OAAO,CAAC,CAAC;IAChE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1B,WAAW,EAAE,CAAC,CAAC,IAAI;QACnB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI;KACpB,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,+BAA+B,CAC5C,OAAwB;;IAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,EAAE;QACzD,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,SAAS,GAAc,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;IAC5D,OAAO,SAAS;SACb,MAAM,CAAC,IAAA,8BAAc,EAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;SACrD,GAAG,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,wBAAwB,GAC5B,CAAC,OAAwB,EAAE,EAAE,CAC7B,CAAC,QAA+B,EAA0B,EAAE
|
|
1
|
+
{"version":3,"file":"extract-custom-ui-projects.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/extract-custom-ui-projects.ts"],"names":[],"mappings":";;AAcA,kDAQC;AAtBD,uCAAgE;AAGhE,oEAAoE;AACpE,0EAAwE;AAIxE;;;;;GAKG;AACI,KAAK,UAAU,mBAAmB,CACvC,OAAwB;IAExB,MAAM,QAAQ,GAAG,MAAM,+BAA+B,CAAC,OAAO,CAAC,CAAC;IAChE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1B,WAAW,EAAE,CAAC,CAAC,IAAI;QACnB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI;KACpB,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,+BAA+B,CAC5C,OAAwB;;IAExB,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,EAAE;QACzD,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,SAAS,GAAc,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;IAC5D,OAAO,SAAS;SACb,MAAM,CAAC,IAAA,8BAAc,EAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;SACrD,GAAG,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,wBAAwB,GAC5B,CAAC,OAAwB,EAAE,EAAE,CAC7B,CAAC,QAA+B,EAA0B,EAAE;;IAC1D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC;IAE1C,MAAM,4BAA4B,GAChC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE/D,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,sDAAsD,mBAAmB,oFAAoF,CAC9J,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,CAAA,MAAA,4BAA4B,CAAC,OAAO,0CAAG,OAAO,CAAC,CAAA,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CACb,sBAAsB,mBAAmB,gMAAgM,CAC1O,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CACb,+BAA+B,QAAQ,CAAC,GAAG,iIAAiI,QAAQ,CAAC,GAAG,0GAA0G,CACnS,CAAC;IACJ,CAAC;IAED,OAAO,QAAkC,CAAC;AAC5C,CAAC,CAAC"}
|
|
@@ -29,12 +29,13 @@ function waitUntilServerIsListening(port, context) {
|
|
|
29
29
|
resolve();
|
|
30
30
|
});
|
|
31
31
|
client.on('error', (err) => {
|
|
32
|
+
var _a;
|
|
32
33
|
if (attempts > maxAttempts ||
|
|
33
|
-
!allowedErrorCodes.includes(err
|
|
34
|
+
!allowedErrorCodes.includes((_a = err.code) !== null && _a !== void 0 ? _a : '')) {
|
|
34
35
|
if (context.isVerbose) {
|
|
35
36
|
devkit_1.logger.error(`Could not wait for server to start on port ${port}: ${attempts > maxAttempts
|
|
36
37
|
? `Max attempts (${maxAttempts}) exceeded`
|
|
37
|
-
: `Server returned unexpected error code ${err
|
|
38
|
+
: `Server returned unexpected error code ${err.code}`}`);
|
|
38
39
|
}
|
|
39
40
|
cleanup();
|
|
40
41
|
reject(err);
|