@otwld/nx-helm 0.0.18-staging.0 → 0.0.19-staging.0
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 -7
- package/src/executors/commands.js +1 -1
- package/src/executors/commands.js.map +1 -1
- package/src/generators/chart.js +8 -8
- package/src/generators/chart.js.map +1 -1
- package/src/index.d.ts +2 -2
- package/src/index.js +2 -2
- package/src/index.js.map +1 -1
- package/src/plugin.js +37 -37
- package/src/plugin.js.map +1 -1
- package/src/release/version-actions.d.ts +5 -5
- package/src/release/version-actions.js +27 -12
- package/src/release/version-actions.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@otwld/nx-helm",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.19-staging.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": {
|
|
8
8
|
"@nx/nx-source": "./src/index.ts",
|
|
9
9
|
"types": "./src/index.d.ts",
|
|
10
|
-
"
|
|
11
|
-
"
|
|
10
|
+
"default": "./src/index.js",
|
|
11
|
+
"import": "./src/index.js"
|
|
12
12
|
},
|
|
13
13
|
"./release": {
|
|
14
14
|
"@nx/nx-source": "./src/release/version-actions.ts",
|
|
@@ -20,19 +20,19 @@
|
|
|
20
20
|
"./generators.json": "./generators.json"
|
|
21
21
|
},
|
|
22
22
|
"main": "./src/index.js",
|
|
23
|
-
"module": "./src/index.js",
|
|
24
23
|
"types": "./src/index.d.ts",
|
|
25
24
|
"dependencies": {
|
|
26
|
-
"@nx/devkit": "23.
|
|
25
|
+
"@nx/devkit": "23.2.1",
|
|
27
26
|
"tslib": "^2.8.1",
|
|
28
27
|
"yaml": "2.9.0"
|
|
29
28
|
},
|
|
30
29
|
"peerDependencies": {
|
|
31
|
-
"nx": "23.
|
|
30
|
+
"nx": "23.2.1"
|
|
32
31
|
},
|
|
33
32
|
"publishConfig": {
|
|
34
33
|
"access": "public"
|
|
35
34
|
},
|
|
36
35
|
"executors": "./executors.json",
|
|
37
|
-
"generators": "./generators.json"
|
|
36
|
+
"generators": "./generators.json",
|
|
37
|
+
"module": "./src/index.js"
|
|
38
38
|
}
|
|
@@ -98,7 +98,7 @@ export const releasePublishExecutor = async (options, context) => {
|
|
|
98
98
|
helm(['push', join(output, archives[0]), options.registry], root);
|
|
99
99
|
}
|
|
100
100
|
finally {
|
|
101
|
-
rmSync(output, {
|
|
101
|
+
rmSync(output, { force: true, recursive: true });
|
|
102
102
|
}
|
|
103
103
|
return { success: true };
|
|
104
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/executors/commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/executors/commands.ts"],"names":[],"mappings":"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"}
|
package/src/generators/chart.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { addProjectConfiguration, getProjects, joinPathFragments, readNxJson, updateNxJson, } from '@nx/devkit';
|
|
2
1
|
import { spawnSync } from 'node:child_process';
|
|
3
2
|
import { mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
|
|
4
|
-
import { join } from 'node:path';
|
|
5
3
|
import { tmpdir } from 'node:os';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
import { addProjectConfiguration, getProjects, joinPathFragments, readNxJson, updateNxJson, } from '@nx/devkit';
|
|
6
6
|
const chartName = /^[a-z0-9](?:[-a-z0-9]*[a-z0-9])?$/;
|
|
7
7
|
/**
|
|
8
8
|
* Generates a standalone Helm chart and registers its Nx Release group.
|
|
@@ -37,17 +37,17 @@ export default async function chartGenerator(tree, options) {
|
|
|
37
37
|
copyDirectory(tree, generated, root);
|
|
38
38
|
}
|
|
39
39
|
finally {
|
|
40
|
-
rmSync(temporary, {
|
|
40
|
+
rmSync(temporary, { force: true, recursive: true });
|
|
41
41
|
}
|
|
42
42
|
addProjectConfiguration(tree, projectName, {
|
|
43
|
-
|
|
43
|
+
metadata: { helm: options.registry ? { registry: options.registry } : {} },
|
|
44
44
|
projectType: 'application',
|
|
45
|
+
root,
|
|
45
46
|
tags: options.tags ?? [
|
|
46
47
|
'type:chart',
|
|
47
48
|
`scope:${options.name}`,
|
|
48
49
|
'artifact:oci-chart',
|
|
49
50
|
],
|
|
50
|
-
metadata: { helm: options.registry ? { registry: options.registry } : {} },
|
|
51
51
|
});
|
|
52
52
|
updateNxJson(tree, {
|
|
53
53
|
...nxJson,
|
|
@@ -56,6 +56,7 @@ export default async function chartGenerator(tree, options) {
|
|
|
56
56
|
groups: {
|
|
57
57
|
...nxJson.release?.groups,
|
|
58
58
|
[releaseGroup]: {
|
|
59
|
+
changelog: { createRelease: false },
|
|
59
60
|
projects: [projectName],
|
|
60
61
|
projectsRelationship: 'independent',
|
|
61
62
|
releaseTag: {
|
|
@@ -63,14 +64,13 @@ export default async function chartGenerator(tree, options) {
|
|
|
63
64
|
requireSemver: true,
|
|
64
65
|
},
|
|
65
66
|
version: {
|
|
66
|
-
versionActions: '@otwld/nx-helm/release',
|
|
67
|
-
versionActionsOptions: { registry: options.registry ?? '' },
|
|
68
67
|
currentVersionResolver: 'git-tag',
|
|
69
68
|
fallbackCurrentVersionResolver: 'disk',
|
|
70
69
|
specifierSource: 'conventional-commits',
|
|
71
70
|
updateDependents: 'never',
|
|
71
|
+
versionActions: '@otwld/nx-helm/release',
|
|
72
|
+
versionActionsOptions: { registry: options.registry ?? '' },
|
|
72
73
|
},
|
|
73
|
-
changelog: { createRelease: false },
|
|
74
74
|
},
|
|
75
75
|
},
|
|
76
76
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chart.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/generators/chart.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"chart.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/generators/chart.ts"],"names":[],"mappings":"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"}
|
package/src/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export { createDependencies, createNodes } from './plugin.js';
|
|
2
|
-
export { default as chartGenerator } from './generators/chart.js';
|
|
3
1
|
export { lintExecutor, packageExecutor, releasePublishExecutor, templateExecutor, } from './executors/commands.js';
|
|
2
|
+
export { default as chartGenerator } from './generators/chart.js';
|
|
3
|
+
export { createDependencies, createNodes } from './plugin.js';
|
package/src/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { createDependencies, createNodes } from './plugin.js';
|
|
2
|
-
export { default as chartGenerator } from './generators/chart.js';
|
|
3
1
|
export { lintExecutor, packageExecutor, releasePublishExecutor, templateExecutor, } from './executors/commands.js';
|
|
2
|
+
export { default as chartGenerator } from './generators/chart.js';
|
|
3
|
+
export { createDependencies, createNodes } from './plugin.js';
|
|
4
4
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,eAAe,EACf,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC"}
|
package/src/plugin.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { createNodesFromFiles, DependencyType, readJsonFile } from '@nx/devkit';
|
|
2
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
3
2
|
import { dirname, join, relative, resolve } from 'node:path';
|
|
4
3
|
import { parseDocument } from 'yaml';
|
|
4
|
+
import { createNodesFromFiles, DependencyType, readJsonFile } from '@nx/devkit';
|
|
5
5
|
const helmRuntime = { runtime: "helm version --template '{{.Version}}'" };
|
|
6
6
|
const semverCore = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
|
|
7
7
|
const semverIdentifiers = /^[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*$/;
|
|
@@ -42,8 +42,8 @@ export const createDependencies = (_options, context) => {
|
|
|
42
42
|
if (target && target !== source) {
|
|
43
43
|
dependencies.push({
|
|
44
44
|
source,
|
|
45
|
-
target,
|
|
46
45
|
sourceFile: join(project.root, 'Chart.yaml').replaceAll('\\', '/'),
|
|
46
|
+
target,
|
|
47
47
|
type: DependencyType.static,
|
|
48
48
|
});
|
|
49
49
|
}
|
|
@@ -55,23 +55,6 @@ function isChartProject(project, workspaceRoot) {
|
|
|
55
55
|
return (project.tags?.includes('type:chart') === true &&
|
|
56
56
|
existsSync(join(workspaceRoot, project.root, 'Chart.yaml')));
|
|
57
57
|
}
|
|
58
|
-
function localDependencyRoots(chartPath) {
|
|
59
|
-
const document = parseDocument(readFileSync(chartPath, 'utf8'));
|
|
60
|
-
if (document.errors.length) {
|
|
61
|
-
throw new Error(`[nx-helm] Invalid ${chartPath}: ${document.errors[0].message}`);
|
|
62
|
-
}
|
|
63
|
-
const dependencies = document.toJS()?.dependencies;
|
|
64
|
-
if (!Array.isArray(dependencies)) {
|
|
65
|
-
return [];
|
|
66
|
-
}
|
|
67
|
-
return dependencies.flatMap((dependency) => {
|
|
68
|
-
const repository = dependency?.repository;
|
|
69
|
-
if (typeof repository !== 'string' || !repository.startsWith('file://')) {
|
|
70
|
-
return [];
|
|
71
|
-
}
|
|
72
|
-
return [resolve(dirname(chartPath), repository.slice('file://'.length))];
|
|
73
|
-
});
|
|
74
|
-
}
|
|
75
58
|
function createChartNodes(file, options, context) {
|
|
76
59
|
const absoluteRoot = dirname(join(context.workspaceRoot, file));
|
|
77
60
|
const root = relative(context.workspaceRoot, absoluteRoot).replaceAll('\\', '/');
|
|
@@ -85,24 +68,24 @@ function createChartNodes(file, options, context) {
|
|
|
85
68
|
const projectRegistry = readRegistry(project.metadata?.helm?.registry);
|
|
86
69
|
const inputs = ['{projectRoot}/**/*', helmRuntime];
|
|
87
70
|
const targets = {
|
|
88
|
-
'helm:lint': { executor: '@otwld/nx-helm:lint',
|
|
71
|
+
'helm:lint': { cache: true, executor: '@otwld/nx-helm:lint', inputs },
|
|
72
|
+
'helm:package': {
|
|
73
|
+
cache: true,
|
|
74
|
+
executor: '@otwld/nx-helm:package',
|
|
75
|
+
inputs,
|
|
76
|
+
options: { outputPath: 'dist/{projectName}' },
|
|
77
|
+
outputs: ['{workspaceRoot}/dist/{projectName}'],
|
|
78
|
+
},
|
|
89
79
|
'helm:template': {
|
|
90
|
-
executor: '@otwld/nx-helm:template',
|
|
91
80
|
cache: true,
|
|
81
|
+
configurations: { production: {}, staging: {} },
|
|
82
|
+
executor: '@otwld/nx-helm:template',
|
|
92
83
|
inputs,
|
|
93
|
-
outputs: ['{workspaceRoot}/dist/{projectName}/helm-template.yaml'],
|
|
94
84
|
options: {
|
|
95
85
|
outputPath: 'dist/{projectName}/helm-template.yaml',
|
|
96
86
|
releaseName: '{projectName}',
|
|
97
87
|
},
|
|
98
|
-
|
|
99
|
-
},
|
|
100
|
-
'helm:package': {
|
|
101
|
-
executor: '@otwld/nx-helm:package',
|
|
102
|
-
cache: true,
|
|
103
|
-
inputs,
|
|
104
|
-
outputs: ['{workspaceRoot}/dist/{projectName}'],
|
|
105
|
-
options: { outputPath: 'dist/{projectName}' },
|
|
88
|
+
outputs: ['{workspaceRoot}/dist/{projectName}/helm-template.yaml'],
|
|
106
89
|
},
|
|
107
90
|
};
|
|
108
91
|
// A chart owns its OCI repository in project metadata. A workspace plugin
|
|
@@ -110,30 +93,47 @@ function createChartNodes(file, options, context) {
|
|
|
110
93
|
const registry = readRegistry(options?.publish?.registry) ?? projectRegistry;
|
|
111
94
|
if (registry) {
|
|
112
95
|
targets['nx-release-publish'] = {
|
|
113
|
-
executor: '@otwld/nx-helm:release-publish',
|
|
114
96
|
cache: false,
|
|
97
|
+
executor: '@otwld/nx-helm:release-publish',
|
|
115
98
|
options: { registry },
|
|
116
99
|
};
|
|
117
100
|
}
|
|
118
101
|
return {
|
|
119
102
|
projects: {
|
|
120
103
|
[root]: {
|
|
121
|
-
root,
|
|
122
|
-
targets,
|
|
123
104
|
metadata: {
|
|
124
|
-
targetGroups: {
|
|
125
|
-
...readTargetGroups(project.metadata?.targetGroups),
|
|
126
|
-
Helm: Object.keys(targets),
|
|
127
|
-
},
|
|
128
105
|
helm: {
|
|
129
106
|
...(projectRegistry ? { registry: projectRegistry } : {}),
|
|
130
107
|
version,
|
|
131
108
|
},
|
|
109
|
+
targetGroups: {
|
|
110
|
+
...readTargetGroups(project.metadata?.targetGroups),
|
|
111
|
+
Helm: Object.keys(targets),
|
|
112
|
+
},
|
|
132
113
|
},
|
|
114
|
+
root,
|
|
115
|
+
targets,
|
|
133
116
|
},
|
|
134
117
|
},
|
|
135
118
|
};
|
|
136
119
|
}
|
|
120
|
+
function localDependencyRoots(chartPath) {
|
|
121
|
+
const document = parseDocument(readFileSync(chartPath, 'utf8'));
|
|
122
|
+
if (document.errors.length) {
|
|
123
|
+
throw new Error(`[nx-helm] Invalid ${chartPath}: ${document.errors[0].message}`);
|
|
124
|
+
}
|
|
125
|
+
const dependencies = document.toJS()?.dependencies;
|
|
126
|
+
if (!Array.isArray(dependencies)) {
|
|
127
|
+
return [];
|
|
128
|
+
}
|
|
129
|
+
return dependencies.flatMap((dependency) => {
|
|
130
|
+
const repository = dependency?.repository;
|
|
131
|
+
if (typeof repository !== 'string' || !repository.startsWith('file://')) {
|
|
132
|
+
return [];
|
|
133
|
+
}
|
|
134
|
+
return [resolve(dirname(chartPath), repository.slice('file://'.length))];
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
137
|
function readProjectFile(root) {
|
|
138
138
|
return readJsonFile(join(root, 'project.json'));
|
|
139
139
|
}
|
package/src/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,10 @@ export default class HelmVersionActions extends VersionActions {
|
|
|
18
18
|
* Reads the current chart version from the OCI registry.
|
|
19
19
|
* @returns No registry lookup result; chart versions come from source.
|
|
20
20
|
*/
|
|
21
|
-
readCurrentVersionFromRegistry(): Promise<{
|
|
22
|
-
currentVersion:
|
|
21
|
+
readCurrentVersionFromRegistry(): Promise<null | {
|
|
22
|
+
currentVersion: null | string;
|
|
23
23
|
logText: string;
|
|
24
|
-
}
|
|
24
|
+
}>;
|
|
25
25
|
/**
|
|
26
26
|
* Reads the current version of a local chart dependency.
|
|
27
27
|
* @param tree - Virtual workspace tree containing the charts.
|
|
@@ -30,8 +30,8 @@ export default class HelmVersionActions extends VersionActions {
|
|
|
30
30
|
* @returns The dependency version and collection to update.
|
|
31
31
|
*/
|
|
32
32
|
readCurrentVersionOfDependency(tree: Tree, projectGraph: ProjectGraph, dependencyProjectName: string): Promise<{
|
|
33
|
-
currentVersion:
|
|
34
|
-
dependencyCollection:
|
|
33
|
+
currentVersion: null | string;
|
|
34
|
+
dependencyCollection: null | string;
|
|
35
35
|
}>;
|
|
36
36
|
/**
|
|
37
37
|
* Updates the chart version in every manifest selected by Nx Release.
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { VersionActions } from 'nx/release';
|
|
2
|
-
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
|
|
3
1
|
import { spawnSync } from 'node:child_process';
|
|
2
|
+
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
|
|
4
3
|
import { tmpdir } from 'node:os';
|
|
5
4
|
import { dirname, join, relative, resolve } from 'node:path';
|
|
5
|
+
import { VersionActions } from 'nx/release';
|
|
6
6
|
import { isMap, isSeq, parseDocument } from 'yaml';
|
|
7
7
|
/** Nx Release version-phase actions for standalone Helm charts. */
|
|
8
8
|
export default class HelmVersionActions extends VersionActions {
|
|
@@ -85,7 +85,7 @@ export default class HelmVersionActions extends VersionActions {
|
|
|
85
85
|
return [];
|
|
86
86
|
}
|
|
87
87
|
tree.write(chartPath, chart.toString());
|
|
88
|
-
regenerateLock(tree, chartRoot
|
|
88
|
+
regenerateLock(tree, chartRoot);
|
|
89
89
|
return [
|
|
90
90
|
`✍️ Local chart dependency versions and Helm lock updated: ${chartPath}`,
|
|
91
91
|
];
|
|
@@ -160,10 +160,10 @@ function resolveDependencyVersion(currentVersion, requestedVersion, sourceVersio
|
|
|
160
160
|
}
|
|
161
161
|
return typeof currentVersion === 'string' ? currentVersion : undefined;
|
|
162
162
|
}
|
|
163
|
-
function regenerateLock(tree, chartRoot
|
|
163
|
+
function regenerateLock(tree, chartRoot) {
|
|
164
164
|
const temporary = mkdtempSync(join(tmpdir(), 'otwld-helm-version-'));
|
|
165
165
|
try {
|
|
166
|
-
materializeLocalChartTree(tree, chartRoot,
|
|
166
|
+
materializeLocalChartTree(tree, chartRoot, temporary);
|
|
167
167
|
const temporaryChartRoot = join(temporary, chartRoot);
|
|
168
168
|
const result = spawnSync('/usr/bin/env', ['helm', 'dependency', 'update', '--skip-refresh', '.'], {
|
|
169
169
|
cwd: temporaryChartRoot,
|
|
@@ -179,21 +179,26 @@ function regenerateLock(tree, chartRoot, projectGraph) {
|
|
|
179
179
|
tree.write(join(chartRoot, 'Chart.lock'), readFileSync(lockPath));
|
|
180
180
|
}
|
|
181
181
|
finally {
|
|
182
|
-
rmSync(temporary, {
|
|
182
|
+
rmSync(temporary, { force: true, recursive: true });
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
|
-
function materializeLocalChartTree(tree, chartRoot,
|
|
185
|
+
function materializeLocalChartTree(tree, chartRoot, temporary, versionOverride, materialized = new Set()) {
|
|
186
186
|
if (materialized.has(chartRoot)) {
|
|
187
187
|
return;
|
|
188
188
|
}
|
|
189
189
|
materialized.add(chartRoot);
|
|
190
190
|
copyTreeDirectory(tree, chartRoot, temporary);
|
|
191
|
-
const
|
|
192
|
-
|
|
193
|
-
|
|
191
|
+
const chartDocument = readChart(tree, join(chartRoot, 'Chart.yaml'));
|
|
192
|
+
if (versionOverride) {
|
|
193
|
+
chartDocument.set('version', versionOverride);
|
|
194
|
+
writeFileSync(join(temporary, chartRoot, 'Chart.yaml'), chartDocument.toString());
|
|
195
|
+
}
|
|
196
|
+
const chart = chartDocument.toJS();
|
|
197
|
+
for (const dependency of localChartDependencies(tree, chartRoot, chart)) {
|
|
198
|
+
materializeLocalChartTree(tree, dependency.root, temporary, dependency.version, materialized);
|
|
194
199
|
}
|
|
195
200
|
}
|
|
196
|
-
function
|
|
201
|
+
function localChartDependencies(tree, chartRoot, chart) {
|
|
197
202
|
const dependencies = chart.dependencies;
|
|
198
203
|
if (!Array.isArray(dependencies)) {
|
|
199
204
|
return [];
|
|
@@ -204,7 +209,17 @@ function localChartDependencyRoots(tree, chartRoot, chart) {
|
|
|
204
209
|
return [];
|
|
205
210
|
}
|
|
206
211
|
const targetRoot = resolveLocalRepository(chartRoot, dependency.repository);
|
|
207
|
-
|
|
212
|
+
if (!tree.exists(join(targetRoot, 'Chart.yaml'))) {
|
|
213
|
+
return [];
|
|
214
|
+
}
|
|
215
|
+
return [
|
|
216
|
+
{
|
|
217
|
+
root: targetRoot,
|
|
218
|
+
version: typeof dependency.version === 'string'
|
|
219
|
+
? dependency.version
|
|
220
|
+
: undefined,
|
|
221
|
+
},
|
|
222
|
+
];
|
|
208
223
|
});
|
|
209
224
|
}
|
|
210
225
|
function copyTreeDirectory(tree, source, destinationRoot) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/release/version-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/release/version-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,UAAU,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAQnD,mEAAmE;AACnE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc;IAC5D,+DAA+D;IAC/D,sBAAsB,GAAG,CAAC,YAAY,CAAC,CAAC;IAExC;;;;;OAKG;IACH,KAAK,CAAC,oCAAoC,CACxC,IAAU;QAEV,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5C,IAAI,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,aAAa,YAAY,6BAA6B,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS,CAAW,EAAE,YAAY,EAAE,CAAC;IAC1E,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,8BAA8B;QAIlC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,8BAA8B,CAClC,IAAU,EACV,YAA0B,EAC1B,qBAA6B;QAK7B,MAAM,UAAU,GAAG,wBAAwB,CACzC,IAAI,EACJ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAC/B,YAAY,EACZ,qBAAqB,CACtB,CAAC;QACF,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACzD,OAAO;gBACL,cAAc,EAAE,UAAU,CAAC,OAAO;gBAClC,oBAAoB,EAAE,cAAc;aACrC,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,oBAAoB,CACxB,IAAU,EACV,UAAkB;QAElB,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC9C,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,QAAQ,CAAC,IAAI,CACX,mBAAmB,UAAU,yBAAyB,QAAQ,CAAC,YAAY,EAAE,CAC9E,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,yBAAyB,CAC7B,IAAU,EACV,YAA0B,EAC1B,oBAA4C;QAE5C,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;QAClD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACzC,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC;aAC9B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACjD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAC7D,CAAC;QACF,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CACrD,qBAAqB,CACnB,UAAU,EACV,IAAI,EACJ,SAAS,EACT,kBAAkB,EAClB,oBAAoB,CACrB,CACF,CAAC;QACF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAChC,OAAO;YACL,8DAA8D,SAAS,EAAE;SAC1E,CAAC;IACJ,CAAC;CACF;AAED,SAAS,qBAAqB,CAC5B,UAAmB,EACnB,IAAU,EACV,SAAiB,EACjB,kBAAuC,EACvC,oBAA4C;IAE5C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAChD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACxE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,eAAe,GAAG,sBAAsB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAC/D,MAAM,gBAAgB,GAAG,MAAM,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,wBAAwB,CACzC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EACzB,gBAAgB,EAChB,aAAa,CACd,CAAC;IACF,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,UAAU,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC;IACf,CAAC;IACD,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACtC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,SAAS,CAAC,IAAU,EAAE,IAAY;IACzC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,GAAG,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,wBAAwB,CAC/B,IAAU,EACV,SAAiB,EACjB,YAA0B,EAC1B,qBAA6B;IAE7B,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACpE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC;QACxC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QAClD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAC5B,CAAC,UAAmC,EAAE,EAAE,CACtC,OAAO,UAAU,CAAC,UAAU,KAAK,QAAQ;QACzC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC;QAC3C,sBAAsB,CAAC,SAAS,EAAE,UAAU,CAAC,UAAU,CAAC;YACtD,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CACpC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,SAAiB;IACtD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAChD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1D,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3D,CAAC;AAED,SAAS,wBAAwB,CAC/B,cAAuB,EACvB,gBAAoC,EACpC,aAAiC;IAEjC,6EAA6E;IAC7E,yEAAyE;IACzE,uEAAuE;IACvE,0EAA0E;IAC1E,kDAAkD;IAClD,IAAI,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,IAAI,gBAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;AACzE,CAAC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,SAAiB;IACnD,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACrE,IAAI,CAAC;QACH,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACtD,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,SAAS,CACtB,cAAc,EACd,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,CAAC,EACvD;YACE,GAAG,EAAE,kBAAkB;YACvB,QAAQ,EAAE,MAAM;SACjB,CACF,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACb,4CAA4C,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACtF,CAAC;QACJ,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAChC,IAAU,EACV,SAAiB,EACjB,SAAiB,EACjB,eAAwB,EACxB,eAAe,IAAI,GAAG,EAAU;IAEhC,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IACD,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5B,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;IACrE,IAAI,eAAe,EAAE,CAAC;QACpB,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAC9C,aAAa,CACX,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,EACxC,aAAa,CAAC,QAAQ,EAAE,CACzB,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,EAAe,CAAC;IAChD,KAAK,MAAM,UAAU,IAAI,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QACxE,yBAAyB,CACvB,IAAI,EACJ,UAAU,CAAC,IAAI,EACf,SAAS,EACT,UAAU,CAAC,OAAO,EAClB,YAAY,CACb,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,SAAiB,EACjB,KAAgB;IAEhB,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACzC,IACE,OAAO,UAAU,CAAC,UAAU,KAAK,QAAQ;YACzC,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAC5C,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,UAAU,GAAG,sBAAsB,CAAC,SAAS,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;QAC5E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;YACjD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO;YACL;gBACE,IAAI,EAAE,UAAU;gBAChB,OAAO,EACL,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ;oBACpC,CAAC,CAAC,UAAU,CAAC,OAAO;oBACpB,CAAC,CAAC,SAAS;aAChB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAU,EACV,MAAc,EACd,eAAuB;IAEvB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACjC,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,SAAS;YACX,CAAC;YACD,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACrD,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CACrB,OAA0C,EAC1C,IAAU;IAEV,OAAO,CACL,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,KAAK,IAAI;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAC9C,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAiB,EAAE,UAAkB;IACnE,OAAO,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC5D,CAAC"}
|