@toolsplus/nx-forge 6.0.2 → 6.0.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 +1 -1
- package/src/executors/deploy/lib/transform-manifest-yml.js +1 -1
- package/src/executors/deploy/lib/transform-manifest-yml.js.map +1 -1
- package/src/executors/install/executor.js +1 -0
- package/src/executors/install/executor.js.map +1 -1
- package/src/executors/install/schema.d.ts +1 -0
- package/src/executors/install/schema.json +31 -2
- package/src/executors/register/lib/patch-manifest-yml.js +6 -2
- package/src/executors/register/lib/patch-manifest-yml.js.map +1 -1
- package/src/executors/tunnel/lib/extract-custom-ui-projects.js +3 -1
- package/src/executors/tunnel/lib/extract-custom-ui-projects.js.map +1 -1
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@ const transformManifestYml = async (options, context) => {
|
|
|
15
15
|
throw new Error(`Failed to parse expression '${options.manifestTransform}': ${(_a = error.message) !== null && _a !== void 0 ? _a : JSON.stringify(error)}`);
|
|
16
16
|
}
|
|
17
17
|
const manifestPath = (0, devkit_1.joinPathFragments)(context.root, options.outputPath, 'manifest.yml');
|
|
18
|
-
const manifest = await (0, manifest_yml_1.readManifestYml)(manifestPath);
|
|
18
|
+
const manifest = await (0, manifest_yml_1.readManifestYml)(manifestPath, { interpolate: false });
|
|
19
19
|
expression.registerFunction('env', (s) => {
|
|
20
20
|
if (process.env[s]) {
|
|
21
21
|
return process.env[s];
|
|
@@ -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;AAOzD,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,MAAA,KAAK,CAAC,OAAO,mCAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CACvC,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,CAAC,CAAC;
|
|
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;AAOzD,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,MAAA,KAAK,CAAC,OAAO,mCAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CACvC,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"}
|
|
@@ -12,6 +12,7 @@ async function runExecutor(options) {
|
|
|
12
12
|
`--environment=${options.environment}`,
|
|
13
13
|
...(options.upgrade === true ? ['--upgrade'] : []),
|
|
14
14
|
...(options.confirmScopes === true ? ['--confirm-scopes'] : []),
|
|
15
|
+
...(options.license ? [`--license ${options.license}`] : []),
|
|
15
16
|
...(options.interactive === false ? ['--non-interactive'] : []),
|
|
16
17
|
...(options.verbose === true ? ['--verbose'] : []),
|
|
17
18
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/install/executor.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/install/executor.ts"],"names":[],"mappings":";;AAIA,8BAyBC;AA5BD,uCAAoC;AACpC,qEAAwE;AAEzD,KAAK,UAAU,WAAW,CAAC,OAA+B;IACvE,wEAAwE;IACxE,MAAM,IAAI,GAAG;QACX,SAAS;QACT,UAAU,OAAO,CAAC,IAAI,EAAE;QACxB,aAAa,OAAO,CAAC,OAAO,EAAE;QAC9B,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,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACnD,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,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAErC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -13,13 +13,36 @@
|
|
|
13
13
|
"site": {
|
|
14
14
|
"type": "string",
|
|
15
15
|
"description": "Atlassian site URL (example.atlassian.net)",
|
|
16
|
-
"alias": "s"
|
|
16
|
+
"alias": "s",
|
|
17
|
+
"x-prompt": "Enter the site URL where you would like to install the app (???.atlassian.net)."
|
|
17
18
|
},
|
|
18
19
|
"product": {
|
|
19
20
|
"type": "string",
|
|
20
21
|
"description": "Atlassian product: jira, confluence, compass, bitbucket",
|
|
21
22
|
"enum": ["jira", "confluence", "compass", "bitbucket"],
|
|
22
|
-
"alias": "p"
|
|
23
|
+
"alias": "p",
|
|
24
|
+
"x-prompt": {
|
|
25
|
+
"message": "For which Atlassian product would like to install the app?",
|
|
26
|
+
"type": "list",
|
|
27
|
+
"items": [
|
|
28
|
+
{
|
|
29
|
+
"value": "jira",
|
|
30
|
+
"label": "Jira"
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
"value": "confluence",
|
|
34
|
+
"label": "Confluence"
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
"value": "compass",
|
|
38
|
+
"label": "Compass"
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
"value": "bitbucket",
|
|
42
|
+
"label": "Bitbucket"
|
|
43
|
+
}
|
|
44
|
+
]
|
|
45
|
+
}
|
|
23
46
|
},
|
|
24
47
|
"environment": {
|
|
25
48
|
"type": "string",
|
|
@@ -37,6 +60,12 @@
|
|
|
37
60
|
"description": "Skip confirmation of scopes for the app before installing or upgrading the app.",
|
|
38
61
|
"default": false
|
|
39
62
|
},
|
|
63
|
+
"license": {
|
|
64
|
+
"type": "string",
|
|
65
|
+
"description": "Specify the license value for the app",
|
|
66
|
+
"enum": ["active", "inactive", "trial"],
|
|
67
|
+
"alias": "l"
|
|
68
|
+
},
|
|
40
69
|
"interactive": {
|
|
41
70
|
"type": "boolean",
|
|
42
71
|
"description": "Run installation with or without input prompts.",
|
|
@@ -11,10 +11,14 @@ const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
|
|
|
11
11
|
*/
|
|
12
12
|
async function patchManifestYml(options) {
|
|
13
13
|
const outputManifestPath = (0, devkit_1.joinPathFragments)(options.outputPath, 'manifest.yml');
|
|
14
|
-
const outputManifestSchema = await (0, manifest_yml_1.readManifestYml)(outputManifestPath
|
|
14
|
+
const outputManifestSchema = await (0, manifest_yml_1.readManifestYml)(outputManifestPath, {
|
|
15
|
+
interpolate: false,
|
|
16
|
+
});
|
|
15
17
|
const appId = outputManifestSchema.app.id;
|
|
16
18
|
const projectManifestPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'manifest.yml');
|
|
17
|
-
const projectManifestSchema = await (0, manifest_yml_1.readManifestYml)(projectManifestPath
|
|
19
|
+
const projectManifestSchema = await (0, manifest_yml_1.readManifestYml)(projectManifestPath, {
|
|
20
|
+
interpolate: false,
|
|
21
|
+
});
|
|
18
22
|
devkit_1.logger.info(`Patching project manifest ${projectManifestPath} with app id ${appId}...`);
|
|
19
23
|
const patchedProjectManifest = {
|
|
20
24
|
...projectManifestSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/register/lib/patch-manifest-yml.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"patch-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/register/lib/patch-manifest-yml.ts"],"names":[],"mappings":";;AAaA,4CAiCC;AA9CD,uCAAuD;AAEvD,oEAG2C;AAE3C;;;;;GAKG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAA0B;IAC/D,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IACF,MAAM,oBAAoB,GAAG,MAAM,IAAA,8BAAe,EAAC,kBAAkB,EAAE;QACrE,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,MAAM,KAAK,GAAW,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC;IAElD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,WAAW,EACnB,cAAc,CACf,CAAC;IACF,MAAM,qBAAqB,GAAG,MAAM,IAAA,8BAAe,EAAC,mBAAmB,EAAE;QACvE,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,eAAM,CAAC,IAAI,CACT,6BAA6B,mBAAmB,gBAAgB,KAAK,KAAK,CAC3E,CAAC;IACF,MAAM,sBAAsB,GAAG;QAC7B,GAAG,qBAAqB;QACxB,GAAG,EAAE;YACH,GAAG,qBAAqB,CAAC,GAAG;YAC5B,EAAE,EAAE,KAAK;SACV;KACF,CAAC;IAEF,IAAA,+BAAgB,EAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;IAE9D,eAAM,CAAC,IAAI,CAAC,iBAAiB,mBAAmB,GAAG,CAAC,CAAC;AACvD,CAAC"}
|
|
@@ -32,7 +32,9 @@ async function getCustomUiProjects(context) {
|
|
|
32
32
|
async function extractVerifiedCustomUIProjects(context) {
|
|
33
33
|
var _a;
|
|
34
34
|
const manifestPath = (0, devkit_1.joinPathFragments)(context.root, context.projectsConfigurations.projects[context.projectName].root, 'manifest.yml');
|
|
35
|
-
const manifestSchema = await (0, manifest_yml_1.readManifestYml)(manifestPath
|
|
35
|
+
const manifestSchema = await (0, manifest_yml_1.readManifestYml)(manifestPath, {
|
|
36
|
+
interpolate: false,
|
|
37
|
+
});
|
|
36
38
|
const resources = (_a = manifestSchema.resources) !== null && _a !== void 0 ? _a : [];
|
|
37
39
|
return resources
|
|
38
40
|
.filter((0, util_manifest_1.isResourceType)(manifestSchema, ['custom-ui']))
|
|
@@ -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,CAAC,CAAC;
|
|
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;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,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,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"}
|