@equinor/fusion-framework-cli 10.7.2 → 10.7.4-next-c88655f3c93bff52499b1301c9a009301f818f5a
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/CHANGELOG.md +12 -0
- package/dist/bin/build-application.js +11 -21
- package/dist/bin/build-application.js.map +1 -1
- package/dist/bin/bundle-application.js +5 -14
- package/dist/bin/bundle-application.js.map +1 -1
- package/dist/bin/create-dev-serve.js +18 -28
- package/dist/bin/create-dev-serve.js.map +1 -1
- package/dist/bin/create-export-config.js +5 -15
- package/dist/bin/create-export-config.js.map +1 -1
- package/dist/bin/create-export-manifest.js +20 -30
- package/dist/bin/create-export-manifest.js.map +1 -1
- package/dist/bin/dev-portal/AppLoader.js +6 -4
- package/dist/bin/dev-portal/AppLoader.js.map +1 -1
- package/dist/bin/dev-portal/BookMarkSideSheet.js +1 -1
- package/dist/bin/dev-portal/BookMarkSideSheet.js.map +1 -1
- package/dist/bin/dev-portal/ContextSelector/ContextSelector.js +1 -2
- package/dist/bin/dev-portal/ContextSelector/ContextSelector.js.map +1 -1
- package/dist/bin/dev-portal/ContextSelector/useContextResolver.js +17 -21
- package/dist/bin/dev-portal/ContextSelector/useContextResolver.js.map +1 -1
- package/dist/bin/dev-portal/FusionLogo.js +1 -1
- package/dist/bin/dev-portal/FusionLogo.js.map +1 -1
- package/dist/bin/dev-portal/Header.js +3 -4
- package/dist/bin/dev-portal/Header.js.map +1 -1
- package/dist/bin/dev-portal/PersonSideSheet/index.js +1 -1
- package/dist/bin/dev-portal/PersonSideSheet/index.js.map +1 -1
- package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerApp.js +2 -3
- package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerApp.js.map +1 -1
- package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerPortal.js +1 -4
- package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerPortal.js.map +1 -1
- package/dist/bin/dev-portal/config.js +5 -14
- package/dist/bin/dev-portal/config.js.map +1 -1
- package/dist/bin/dev-portal/useAppContextNavigation.js +12 -10
- package/dist/bin/dev-portal/useAppContextNavigation.js.map +1 -1
- package/dist/bin/main.app.js +15 -26
- package/dist/bin/main.app.js.map +1 -1
- package/dist/bin/public/assets/index-zNJWGyEE.js +3686 -0
- package/dist/bin/public/index.html +1 -1
- package/dist/bin/publish-application.js +12 -21
- package/dist/bin/publish-application.js.map +1 -1
- package/dist/bin/tag-application.js +8 -17
- package/dist/bin/tag-application.js.map +1 -1
- package/dist/bin/upload-application.js +8 -17
- package/dist/bin/upload-application.js.map +1 -1
- package/dist/bin/upload-export-config.js +8 -17
- package/dist/bin/upload-export-config.js.map +1 -1
- package/dist/bin/utils/execute-command.js +4 -13
- package/dist/bin/utils/execute-command.js.map +1 -1
- package/dist/bin/utils/format.js +1 -2
- package/dist/bin/utils/format.js.map +1 -1
- package/dist/bin/utils/getEndpointUrl.js +6 -15
- package/dist/bin/utils/getEndpointUrl.js.map +1 -1
- package/dist/bin/utils/isAppRegistered.js +4 -13
- package/dist/bin/utils/isAppRegistered.js.map +1 -1
- package/dist/bin/utils/load-app-config.js +4 -13
- package/dist/bin/utils/load-app-config.js.map +1 -1
- package/dist/bin/utils/load-manifest.js +5 -14
- package/dist/bin/utils/load-manifest.js.map +1 -1
- package/dist/bin/utils/load-package.js +7 -13
- package/dist/bin/utils/load-package.js.map +1 -1
- package/dist/bin/utils/load-vite-config.js +10 -19
- package/dist/bin/utils/load-vite-config.js.map +1 -1
- package/dist/bin/utils/proxy-request-logger.js +1 -2
- package/dist/bin/utils/proxy-request-logger.js.map +1 -1
- package/dist/bin/utils/publishAppConfig.js +4 -13
- package/dist/bin/utils/publishAppConfig.js.map +1 -1
- package/dist/bin/utils/requireToken.js +1 -2
- package/dist/bin/utils/requireToken.js.map +1 -1
- package/dist/bin/utils/spinner.js +12 -25
- package/dist/bin/utils/spinner.js.map +1 -1
- package/dist/bin/utils/tagAppBundle.js +4 -13
- package/dist/bin/utils/tagAppBundle.js.map +1 -1
- package/dist/bin/utils/uploadAppBundle.js +5 -14
- package/dist/bin/utils/uploadAppBundle.js.map +1 -1
- package/dist/lib/app-config.js +10 -20
- package/dist/lib/app-config.js.map +1 -1
- package/dist/lib/app-manifest.js +14 -24
- package/dist/lib/app-manifest.js.map +1 -1
- package/dist/lib/app-package.js +3 -12
- package/dist/lib/app-package.js.map +1 -1
- package/dist/lib/plugins/app-assets/app-asset-plugin.js +35 -41
- package/dist/lib/plugins/app-assets/app-asset-plugin.js.map +1 -1
- package/dist/lib/plugins/app-assets/resolve-asset-id.js +3 -12
- package/dist/lib/plugins/app-assets/resolve-asset-id.js.map +1 -1
- package/dist/lib/plugins/app-proxy/app-proxy-plugin.js +15 -29
- package/dist/lib/plugins/app-proxy/app-proxy-plugin.js.map +1 -1
- package/dist/lib/plugins/app-settings/index.js +6 -17
- package/dist/lib/plugins/app-settings/index.js.map +1 -1
- package/dist/lib/plugins/external-public/external-public-plugin.js +20 -22
- package/dist/lib/plugins/external-public/external-public-plugin.js.map +1 -1
- package/dist/lib/plugins/help-proxy/help-proxy-plugin.js +4 -15
- package/dist/lib/plugins/help-proxy/help-proxy-plugin.js.map +1 -1
- package/dist/lib/utils/assert.js +4 -5
- package/dist/lib/utils/assert.js.map +1 -1
- package/dist/lib/utils/config.js +18 -35
- package/dist/lib/utils/config.js.map +1 -1
- package/dist/lib/utils/file-exists.js +5 -14
- package/dist/lib/utils/file-exists.js.map +1 -1
- package/dist/lib/utils/parse-json-request.js +6 -17
- package/dist/lib/utils/parse-json-request.js.map +1 -1
- package/dist/lib/utils/ts-transpile.js +14 -20
- package/dist/lib/utils/ts-transpile.js.map +1 -1
- package/dist/lib/vite-config.js +16 -28
- package/dist/lib/vite-config.js.map +1 -1
- package/dist/lib/vite-logger.js +1 -1
- package/dist/lib/vite-logger.js.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +18 -18
- package/dist/bin/public/assets/index-QigocmfE.js +0 -3614
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { chalk } from './utils/format.js';
|
|
11
2
|
import { Spinner } from './utils/spinner.js';
|
|
12
3
|
import { bundleApplication } from './bundle-application.js';
|
|
@@ -14,7 +5,7 @@ import { resolveAppPackage } from '../lib/app-package.js';
|
|
|
14
5
|
import { isAppRegistered, getEndpointUrl, requireToken, tagAppBundle, uploadAppBundle, loadAppManifest, } from './utils/index.js';
|
|
15
6
|
import { exit } from 'node:process';
|
|
16
7
|
import assert from 'node:assert';
|
|
17
|
-
export const publishApplication = (options) =>
|
|
8
|
+
export const publishApplication = async (options) => {
|
|
18
9
|
const { tag, env, service } = options;
|
|
19
10
|
const spinner = Spinner.Global({ prefixText: chalk.dim('Publish') });
|
|
20
11
|
try {
|
|
@@ -22,7 +13,7 @@ export const publishApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
22
13
|
// make sure token exist
|
|
23
14
|
requireToken();
|
|
24
15
|
// call service discovery with token, will throw error if failed
|
|
25
|
-
|
|
16
|
+
await getEndpointUrl('apps', env, '');
|
|
26
17
|
spinner.succeed('Found valid FUSION_TOKEN');
|
|
27
18
|
}
|
|
28
19
|
catch (e) {
|
|
@@ -30,20 +21,20 @@ export const publishApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
30
21
|
spinner.fail(chalk.bgRed(err.message));
|
|
31
22
|
exit(1);
|
|
32
23
|
}
|
|
33
|
-
const pkg =
|
|
34
|
-
const { manifest } =
|
|
24
|
+
const pkg = await resolveAppPackage();
|
|
25
|
+
const { manifest } = await loadAppManifest({ command: 'build', mode: 'prod' }, pkg);
|
|
35
26
|
const { appKey } = manifest;
|
|
36
27
|
try {
|
|
37
28
|
spinner.info('Verifying that App is registered');
|
|
38
29
|
const state = { endpoint: '' };
|
|
39
30
|
try {
|
|
40
|
-
state.endpoint =
|
|
31
|
+
state.endpoint = await getEndpointUrl(`apps/${appKey}`, env, service);
|
|
41
32
|
}
|
|
42
33
|
catch (e) {
|
|
43
34
|
const err = e;
|
|
44
35
|
throw new Error(`Could not get endpoint from service discovery while verifying app is registered. service-discovery status: ${err.message}`);
|
|
45
36
|
}
|
|
46
|
-
const exist =
|
|
37
|
+
const exist = await isAppRegistered(state.endpoint);
|
|
47
38
|
assert(exist, `${appKey} is not registered`);
|
|
48
39
|
spinner.succeed(`${appKey} is registered`);
|
|
49
40
|
}
|
|
@@ -55,7 +46,7 @@ export const publishApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
55
46
|
const bundle = 'app-bundle.zip';
|
|
56
47
|
/* Zip app bundle */
|
|
57
48
|
spinner.info('Creating zip bundle');
|
|
58
|
-
|
|
49
|
+
await bundleApplication({
|
|
59
50
|
archive: bundle,
|
|
60
51
|
outDir: 'dist',
|
|
61
52
|
});
|
|
@@ -68,14 +59,14 @@ export const publishApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
68
59
|
try {
|
|
69
60
|
spinner.info(`Uploading bundle ${chalk.yellowBright(bundle)} to appKey ${chalk.yellowBright(appKey)}`);
|
|
70
61
|
try {
|
|
71
|
-
state.endpoint =
|
|
62
|
+
state.endpoint = await getEndpointUrl(`bundles/apps/${appKey}`, env, service);
|
|
72
63
|
}
|
|
73
64
|
catch (e) {
|
|
74
65
|
const err = e;
|
|
75
66
|
throw new Error(`Could not get endpoint from service discovery while uploading app bundle. service-discovery status: ${err.message}`);
|
|
76
67
|
}
|
|
77
68
|
spinner.info(`Posting bundle to => ${state.endpoint}`);
|
|
78
|
-
state.uploadedBundle =
|
|
69
|
+
state.uploadedBundle = await uploadAppBundle(state.endpoint, bundle);
|
|
79
70
|
spinner.succeed('✅', `Uploaded bundle: "${chalk.greenBright(bundle)}" with version: ${chalk.greenBright(state.uploadedBundle.version)}"`);
|
|
80
71
|
}
|
|
81
72
|
catch (e) {
|
|
@@ -86,13 +77,13 @@ export const publishApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
86
77
|
try {
|
|
87
78
|
spinner.info(`Tagging ${state.uploadedBundle.version} with ${tag}`);
|
|
88
79
|
try {
|
|
89
|
-
state.endpoint =
|
|
80
|
+
state.endpoint = await getEndpointUrl(`apps/${appKey}/tags/${tag}`, env, service);
|
|
90
81
|
}
|
|
91
82
|
catch (e) {
|
|
92
83
|
const err = e;
|
|
93
84
|
throw new Error(`Could not get endpoint from service discovery while tagging app. service-discovery status: ${err.message}`);
|
|
94
85
|
}
|
|
95
|
-
const tagged =
|
|
86
|
+
const tagged = await tagAppBundle(state.endpoint, state.uploadedBundle.version);
|
|
96
87
|
spinner.succeed('✅', `Tagged version ${chalk.greenBright(tagged.version)} with ${chalk.greenBright(tagged.tagName)}`);
|
|
97
88
|
}
|
|
98
89
|
catch (e) {
|
|
@@ -101,5 +92,5 @@ export const publishApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
101
92
|
exit(1);
|
|
102
93
|
}
|
|
103
94
|
spinner.succeed('⭐️', `Published app: "${chalk.greenBright(appKey)}" version: "${chalk.greenBright(state.uploadedBundle.version)}" with tagg: "${chalk.greenBright(tag)}"`);
|
|
104
|
-
}
|
|
95
|
+
};
|
|
105
96
|
//# sourceMappingURL=publish-application.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-application.js","sourceRoot":"","sources":["../../src/bin/publish-application.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"publish-application.js","sourceRoot":"","sources":["../../src/bin/publish-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { exit } from 'node:process';
|
|
11
2
|
import { chalk } from './utils/format.js';
|
|
12
3
|
import { Spinner } from './utils/spinner.js';
|
|
@@ -18,7 +9,7 @@ var Tags;
|
|
|
18
9
|
Tags["preview"] = "preview";
|
|
19
10
|
Tags["latest"] = "latest";
|
|
20
11
|
})(Tags || (Tags = {}));
|
|
21
|
-
export const tagApplication = (options) =>
|
|
12
|
+
export const tagApplication = async (options) => {
|
|
22
13
|
const { tag, version, env, service } = options;
|
|
23
14
|
const spinner = Spinner.Global({ prefixText: chalk.dim('Tag') });
|
|
24
15
|
if (!Object.values(Tags).includes(tag)) {
|
|
@@ -31,7 +22,7 @@ export const tagApplication = (options) => __awaiter(void 0, void 0, void 0, fun
|
|
|
31
22
|
// make sure token exist
|
|
32
23
|
requireToken();
|
|
33
24
|
// call service discovery with token, will throw error if failed
|
|
34
|
-
|
|
25
|
+
await getEndpointUrl('apps', env, '');
|
|
35
26
|
spinner.succeed('Found valid FUSION_TOKEN');
|
|
36
27
|
}
|
|
37
28
|
catch (e) {
|
|
@@ -39,19 +30,19 @@ export const tagApplication = (options) => __awaiter(void 0, void 0, void 0, fun
|
|
|
39
30
|
spinner.fail(chalk.bgRed(err.message));
|
|
40
31
|
exit(1);
|
|
41
32
|
}
|
|
42
|
-
const pkg =
|
|
33
|
+
const pkg = await resolveAppPackage();
|
|
43
34
|
const appKey = resolveAppKey(pkg.packageJson);
|
|
44
35
|
try {
|
|
45
36
|
spinner.info('Verifying that App is registered');
|
|
46
37
|
const state = { endpoint: '' };
|
|
47
38
|
try {
|
|
48
|
-
state.endpoint =
|
|
39
|
+
state.endpoint = await getEndpointUrl(`apps/${appKey}`, env, service);
|
|
49
40
|
}
|
|
50
41
|
catch (e) {
|
|
51
42
|
const err = e;
|
|
52
43
|
throw new Error(`Could not get endpoint from service discovery while verifying app is registered. service-discovery status: ${err.message}`);
|
|
53
44
|
}
|
|
54
|
-
const exist =
|
|
45
|
+
const exist = await isAppRegistered(state.endpoint);
|
|
55
46
|
assert(exist, `${appKey} is not registered`);
|
|
56
47
|
spinner.succeed(`${appKey} is registered`);
|
|
57
48
|
}
|
|
@@ -64,13 +55,13 @@ export const tagApplication = (options) => __awaiter(void 0, void 0, void 0, fun
|
|
|
64
55
|
spinner.info(`Tagging "${appKey}@${version}" with: "${tag}"`);
|
|
65
56
|
const state = { endpoint: '' };
|
|
66
57
|
try {
|
|
67
|
-
state.endpoint =
|
|
58
|
+
state.endpoint = await getEndpointUrl(`apps/${appKey}/tags/${tag}`, env, service);
|
|
68
59
|
}
|
|
69
60
|
catch (e) {
|
|
70
61
|
const err = e;
|
|
71
62
|
throw new Error(`Could not get endpoint from service discovery while tagging app. service-discovery status: ${err.message}`);
|
|
72
63
|
}
|
|
73
|
-
const tagged =
|
|
64
|
+
const tagged = await tagAppBundle(state.endpoint, version);
|
|
74
65
|
spinner.succeed('✅', `Tagged app: "${chalk.greenBright(appKey)}"`, `version: "${chalk.greenBright(tagged.version)}"`, `with tag: "${chalk.greenBright(tagged.tagName)}"`);
|
|
75
66
|
}
|
|
76
67
|
catch (e) {
|
|
@@ -78,5 +69,5 @@ export const tagApplication = (options) => __awaiter(void 0, void 0, void 0, fun
|
|
|
78
69
|
spinner.fail('🙅♂️', chalk.bgRed(err.message));
|
|
79
70
|
exit(1);
|
|
80
71
|
}
|
|
81
|
-
}
|
|
72
|
+
};
|
|
82
73
|
//# sourceMappingURL=tag-application.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag-application.js","sourceRoot":"","sources":["../../src/bin/tag-application.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tag-application.js","sourceRoot":"","sources":["../../src/bin/tag-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,10 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { exit } from 'node:process';
|
|
11
2
|
import { Spinner } from './utils/spinner.js';
|
|
12
3
|
import { chalk } from './utils/format.js';
|
|
13
4
|
import { resolveAppPackage, resolveAppKey } from '../lib/app-package.js';
|
|
14
5
|
import { isAppRegistered, getEndpointUrl, requireToken, uploadAppBundle } from './utils/index.js';
|
|
15
6
|
import assert from 'node:assert';
|
|
16
|
-
export const uploadApplication = (options) =>
|
|
7
|
+
export const uploadApplication = async (options) => {
|
|
17
8
|
const { bundle, env, service } = options;
|
|
18
9
|
const spinner = Spinner.Global({ prefixText: chalk.dim('Upload') });
|
|
19
10
|
try {
|
|
@@ -21,7 +12,7 @@ export const uploadApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
21
12
|
// make sure token exist
|
|
22
13
|
requireToken();
|
|
23
14
|
// call service discovery with token, will throw error if failed
|
|
24
|
-
|
|
15
|
+
await getEndpointUrl('apps', env, '');
|
|
25
16
|
spinner.succeed('Found valid FUSION_TOKEN');
|
|
26
17
|
}
|
|
27
18
|
catch (e) {
|
|
@@ -30,20 +21,20 @@ export const uploadApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
30
21
|
exit(1);
|
|
31
22
|
}
|
|
32
23
|
/* get package.json */
|
|
33
|
-
const pkg =
|
|
24
|
+
const pkg = await resolveAppPackage();
|
|
34
25
|
const appKey = resolveAppKey(pkg.packageJson);
|
|
35
26
|
try {
|
|
36
27
|
spinner.info(`Verifying that ${appKey} is registered`);
|
|
37
28
|
const state = { endpoint: '' };
|
|
38
29
|
try {
|
|
39
|
-
state.endpoint =
|
|
30
|
+
state.endpoint = await getEndpointUrl(`apps/${appKey}`, env, service);
|
|
40
31
|
}
|
|
41
32
|
catch (e) {
|
|
42
33
|
const err = e;
|
|
43
34
|
throw new Error(`Could not get endpoint from service discovery while verifying app. service-discovery status: ${err.message}`);
|
|
44
35
|
}
|
|
45
36
|
spinner.info('Using endpoint:', state.endpoint);
|
|
46
|
-
const exist =
|
|
37
|
+
const exist = await isAppRegistered(state.endpoint);
|
|
47
38
|
assert(exist, `${appKey} is not registered`);
|
|
48
39
|
spinner.succeed(`${appKey} is registered`);
|
|
49
40
|
}
|
|
@@ -55,12 +46,12 @@ export const uploadApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
55
46
|
/* Upload app bundle */
|
|
56
47
|
try {
|
|
57
48
|
spinner.info(`Uploading bundle ${chalk.yellowBright(bundle)} to appKey ${chalk.yellowBright(appKey)}`);
|
|
58
|
-
const endpoint =
|
|
49
|
+
const endpoint = await getEndpointUrl(`bundles/apps/${appKey}`, env, service);
|
|
59
50
|
if (!endpoint) {
|
|
60
51
|
throw new Error('Could not get endpoint from service discovery');
|
|
61
52
|
}
|
|
62
53
|
spinner.info(`Posting bundle to => ${endpoint}`);
|
|
63
|
-
const uploadedBundle =
|
|
54
|
+
const uploadedBundle = await uploadAppBundle(endpoint, bundle);
|
|
64
55
|
spinner.succeed('✅', `Uploaded app: "${chalk.greenBright(appKey)}"`, `Version: "${chalk.greenBright(uploadedBundle.version)}"`);
|
|
65
56
|
}
|
|
66
57
|
catch (e) {
|
|
@@ -68,5 +59,5 @@ export const uploadApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
68
59
|
spinner.fail('🙅♂️', chalk.bgRed(err.message));
|
|
69
60
|
exit(1);
|
|
70
61
|
}
|
|
71
|
-
}
|
|
62
|
+
};
|
|
72
63
|
//# sourceMappingURL=upload-application.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-application.js","sourceRoot":"","sources":["../../src/bin/upload-application.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upload-application.js","sourceRoot":"","sources":["../../src/bin/upload-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
11
2
|
import semverValid from 'semver/functions/valid.js';
|
|
12
3
|
import { chalk } from './utils/format.js';
|
|
@@ -15,10 +6,10 @@ import { getEndpointUrl, loadPackage, isAppRegistered, requireToken, publishAppC
|
|
|
15
6
|
import { resolveAppKey } from '../lib/app-package.js';
|
|
16
7
|
import { exit } from 'node:process';
|
|
17
8
|
import assert from 'node:assert';
|
|
18
|
-
export const uploadExportConfig = (options) =>
|
|
9
|
+
export const uploadExportConfig = async (options) => {
|
|
19
10
|
const { configFile, version: pubVersion, env, service } = options;
|
|
20
11
|
const spinner = Spinner.Global({ prefixText: chalk.dim('config') });
|
|
21
|
-
const pkg =
|
|
12
|
+
const pkg = await loadPackage();
|
|
22
13
|
const appKey = resolveAppKey(pkg.packageJson);
|
|
23
14
|
if (!existsSync(`${configFile}`)) {
|
|
24
15
|
throw new Error(`Config file ${configFile} does not exist`);
|
|
@@ -37,7 +28,7 @@ export const uploadExportConfig = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
37
28
|
// make sure token exist
|
|
38
29
|
requireToken();
|
|
39
30
|
// call service discovery with token, will throw error if failed
|
|
40
|
-
|
|
31
|
+
await getEndpointUrl('apps', env, '');
|
|
41
32
|
spinner.succeed('Found valid FUSION_TOKEN');
|
|
42
33
|
}
|
|
43
34
|
catch (e) {
|
|
@@ -49,13 +40,13 @@ export const uploadExportConfig = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
49
40
|
spinner.info('Verifying that App is registered');
|
|
50
41
|
const state = { endpoint: '' };
|
|
51
42
|
try {
|
|
52
|
-
state.endpoint =
|
|
43
|
+
state.endpoint = await getEndpointUrl(`apps/${appKey}`, env, service);
|
|
53
44
|
}
|
|
54
45
|
catch (e) {
|
|
55
46
|
const err = e;
|
|
56
47
|
throw new Error(`Could not get endpoint from service discovery while verifying app. service-discovery status: ${err.message}`);
|
|
57
48
|
}
|
|
58
|
-
const exist =
|
|
49
|
+
const exist = await isAppRegistered(state.endpoint);
|
|
59
50
|
assert(exist, `${appKey} is not registered`);
|
|
60
51
|
spinner.succeed(`${appKey} is registered`);
|
|
61
52
|
}
|
|
@@ -68,13 +59,13 @@ export const uploadExportConfig = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
68
59
|
spinner.info(`Publishing config to "${appKey}@${version}"`);
|
|
69
60
|
const state = { endpoint: '' };
|
|
70
61
|
try {
|
|
71
|
-
state.endpoint =
|
|
62
|
+
state.endpoint = await getEndpointUrl(`apps/${appKey}/builds/${version}/config`, env, service);
|
|
72
63
|
}
|
|
73
64
|
catch (e) {
|
|
74
65
|
const err = e;
|
|
75
66
|
throw new Error(`Could not get endpoint from service discovery while publishig config. service-discovery status: ${err.message}`);
|
|
76
67
|
}
|
|
77
|
-
|
|
68
|
+
await publishAppConfig(state.endpoint, appKey, config);
|
|
78
69
|
spinner.succeed('✅', 'Published config to version', chalk.yellowBright(version));
|
|
79
70
|
}
|
|
80
71
|
catch (e) {
|
|
@@ -82,6 +73,6 @@ export const uploadExportConfig = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
82
73
|
spinner.fail('🙅♂️', chalk.bgRed(err.message));
|
|
83
74
|
exit(1);
|
|
84
75
|
}
|
|
85
|
-
}
|
|
76
|
+
};
|
|
86
77
|
export default uploadExportConfig;
|
|
87
78
|
//# sourceMappingURL=upload-export-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-export-config.js","sourceRoot":"","sources":["../../src/bin/upload-export-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upload-export-config.js","sourceRoot":"","sources":["../../src/bin/upload-export-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,14 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { fork } from 'node:child_process';
|
|
11
2
|
import { assert } from 'node:console';
|
|
12
|
-
export const executeCommand = (program, command,
|
|
3
|
+
export const executeCommand = async (program, command,
|
|
13
4
|
// TODO map command args
|
|
14
5
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
15
|
-
...options) =>
|
|
6
|
+
...options) => {
|
|
16
7
|
assert(process.env.CLI_BIN, 'expected bin path in env');
|
|
17
8
|
return new Promise((resolve, reject) => {
|
|
18
|
-
const job = fork(String(process.env.CLI_BIN), [program, command, ...(options
|
|
9
|
+
const job = fork(String(process.env.CLI_BIN), [program, command, ...(options ?? [])], {});
|
|
19
10
|
job.addListener('close', resolve);
|
|
20
11
|
job.addListener('error', reject);
|
|
21
12
|
});
|
|
22
|
-
}
|
|
13
|
+
};
|
|
23
14
|
//# sourceMappingURL=execute-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-command.js","sourceRoot":"","sources":["../../../src/bin/utils/execute-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute-command.js","sourceRoot":"","sources":["../../../src/bin/utils/execute-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAUtC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,OAAiB,EACjB,OAAiC;AACjC,wBAAwB;AACxB,8DAA8D;AAC9D,GAAG,OAAc,EACjB,EAAE;IACF,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;IACxD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1F,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
|
package/dist/bin/utils/format.js
CHANGED
|
@@ -4,8 +4,7 @@ import chalk from 'chalk';
|
|
|
4
4
|
import prettyBytes from 'pretty-bytes';
|
|
5
5
|
export { chalk };
|
|
6
6
|
export const formatPath = (path, opt) => {
|
|
7
|
-
|
|
8
|
-
return chalk.blueBright((opt === null || opt === void 0 ? void 0 : opt.relative) ? './' + relative((_a = opt === null || opt === void 0 ? void 0 : opt.cwd) !== null && _a !== void 0 ? _a : process.cwd(), path) : path);
|
|
7
|
+
return chalk.blueBright(opt?.relative ? './' + relative(opt?.cwd ?? process.cwd(), path) : path);
|
|
9
8
|
};
|
|
10
9
|
export const formatByteSize = (input) => {
|
|
11
10
|
if (typeof input === 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/bin/utils/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,KAAK,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,GAA0C,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/bin/utils/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,KAAK,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,GAA0C,EAAE,EAAE;IACrF,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACnG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAsB,EAAU,EAAE;IAC/D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import fetch from 'node-fetch';
|
|
11
2
|
/**
|
|
12
3
|
* Retreive full endpoint URI to env in service-discovery
|
|
@@ -16,16 +7,16 @@ import fetch from 'node-fetch';
|
|
|
16
7
|
* @param version <string> The version of the api to use
|
|
17
8
|
* @returns <string> The uri with endpoint
|
|
18
9
|
*/
|
|
19
|
-
export const getEndpointUrl =
|
|
10
|
+
export const getEndpointUrl = async (endpoint, fusionEnv, service, version = '1.0') => {
|
|
20
11
|
const { CUSTOM_APPAPI, FUSION_CLI_ENV, FUSION_TOKEN } = process.env;
|
|
21
12
|
/* use consumer provided api url */
|
|
22
13
|
if (service || CUSTOM_APPAPI) {
|
|
23
|
-
return service
|
|
14
|
+
return service ?? CUSTOM_APPAPI;
|
|
24
15
|
}
|
|
25
16
|
/* Env has changed get new api url */
|
|
26
17
|
if (FUSION_CLI_ENV !== fusionEnv || !process.env.FUSION_CLI_APPAPI) {
|
|
27
18
|
process.env.FUSION_CLI_ENV = fusionEnv;
|
|
28
|
-
const requestService =
|
|
19
|
+
const requestService = await fetch(`https://discovery.fusion.equinor.com/service-registry/environments/${fusionEnv}/services/apps`, {
|
|
29
20
|
headers: {
|
|
30
21
|
Authorization: `Bearer ${FUSION_TOKEN}`,
|
|
31
22
|
},
|
|
@@ -34,16 +25,16 @@ export const getEndpointUrl = (endpoint_1, fusionEnv_1, service_1, ...args_1) =>
|
|
|
34
25
|
throw new Error(`The provided FUSION_TOKEN is not valid. Refresh your token and try again.`);
|
|
35
26
|
}
|
|
36
27
|
if (!requestService.ok) {
|
|
37
|
-
const response =
|
|
28
|
+
const response = await requestService.json();
|
|
38
29
|
console.error(response);
|
|
39
30
|
throw new Error(`Failed getEndpointUrl from service-discovery. HTTP status: ${requestService.status} - ${requestService.statusText}`);
|
|
40
31
|
}
|
|
41
|
-
const responseService = (
|
|
32
|
+
const responseService = (await requestService.json());
|
|
42
33
|
process.env.FUSION_CLI_APPAPI = responseService.uri;
|
|
43
34
|
}
|
|
44
35
|
const uri = new URL(`${process.env.FUSION_CLI_APPAPI}/${endpoint}`);
|
|
45
36
|
uri.searchParams.set('api-version', version);
|
|
46
37
|
/* return fresh/cached endpoint url */
|
|
47
38
|
return uri.href;
|
|
48
|
-
}
|
|
39
|
+
};
|
|
49
40
|
//# sourceMappingURL=getEndpointUrl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEndpointUrl.js","sourceRoot":"","sources":["../../../src/bin/utils/getEndpointUrl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getEndpointUrl.js","sourceRoot":"","sources":["../../../src/bin/utils/getEndpointUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,QAAgB,EAChB,SAAoB,EACpB,OAAe,EACf,OAAO,GAAG,KAAK,EACE,EAAE;IACnB,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAEpE,mCAAmC;IACnC,IAAI,OAAO,IAAI,aAAa,EAAE,CAAC;QAC7B,OAAO,OAAO,IAAI,aAAa,CAAC;IAClC,CAAC;IAED,qCAAqC;IACrC,IAAI,cAAc,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;QACnE,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,SAAS,CAAC;QAEvC,MAAM,cAAc,GAAG,MAAM,KAAK,CAChC,sEAAsE,SAAS,gBAAgB,EAC/F;YACE,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,YAAY,EAAE;aACxC;SACF,CACF,CAAC;QAEF,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAC;QAC/F,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;YAC7C,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxB,MAAM,IAAI,KAAK,CACb,8DAA8D,cAAc,CAAC,MAAM,MAAM,cAAc,CAAC,UAAU,EAAE,CACrH,CAAC;QACJ,CAAC;QAED,MAAM,eAAe,GAAG,CAAC,MAAM,cAAc,CAAC,IAAI,EAAE,CAAoB,CAAC;QACzE,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC;IACtD,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,QAAQ,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAE7C,sCAAsC;IACtC,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -1,19 +1,10 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import fetch from 'node-fetch';
|
|
11
2
|
/**
|
|
12
3
|
* Make sure the app is registerred in the app-service
|
|
13
4
|
* @param endpoint <string> The endpoint to make a call to
|
|
14
5
|
*/
|
|
15
|
-
export const isAppRegistered = (endpoint) =>
|
|
16
|
-
const requestApp =
|
|
6
|
+
export const isAppRegistered = async (endpoint) => {
|
|
7
|
+
const requestApp = await fetch(endpoint, {
|
|
17
8
|
method: 'HEAD',
|
|
18
9
|
headers: {
|
|
19
10
|
Authorization: `Bearer ${process.env.FUSION_TOKEN}`,
|
|
@@ -29,7 +20,7 @@ export const isAppRegistered = (endpoint) => __awaiter(void 0, void 0, void 0, f
|
|
|
29
20
|
if (requestApp.status === 410) {
|
|
30
21
|
throw Error('App is deleted.');
|
|
31
22
|
}
|
|
32
|
-
const data =
|
|
23
|
+
const data = await requestApp.json();
|
|
33
24
|
throw Error('Custom Fusion error, see cause.', { cause: data });
|
|
34
|
-
}
|
|
25
|
+
};
|
|
35
26
|
//# sourceMappingURL=isAppRegistered.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isAppRegistered.js","sourceRoot":"","sources":["../../../src/bin/utils/isAppRegistered.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"isAppRegistered.js","sourceRoot":"","sources":["../../../src/bin/utils/isAppRegistered.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,QAAgB,EAAoB,EAAE;IAC1E,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QACvC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;SACpD;KACF,CAAC,CAAC;IAEH,sDAAsD;IACtD,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC9B,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IACrC,MAAM,KAAK,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC,CAAC"}
|
|
@@ -1,22 +1,13 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { Spinner } from './spinner.js';
|
|
11
2
|
import { formatPath, chalk } from './format.js';
|
|
12
3
|
import { createAppConfig } from '../../lib/app-config.js';
|
|
13
|
-
export const loadAppConfig = (env, pkg, options) =>
|
|
4
|
+
export const loadAppConfig = async (env, pkg, options) => {
|
|
14
5
|
const spinner = Spinner.Current;
|
|
15
6
|
try {
|
|
16
7
|
spinner.start('create application configuration');
|
|
17
8
|
spinner.info(`generating config with ${chalk.red.dim(env.command)} command in ${chalk.green.dim(env.mode)} mode`);
|
|
18
9
|
const baseAppConfig = {};
|
|
19
|
-
const appConfig =
|
|
10
|
+
const appConfig = await createAppConfig(env, baseAppConfig, { file: options?.file });
|
|
20
11
|
spinner.succeed();
|
|
21
12
|
if (appConfig.path) {
|
|
22
13
|
spinner.info(`generating config from ${formatPath(appConfig.path, { relative: true })}`);
|
|
@@ -27,9 +18,9 @@ export const loadAppConfig = (env, pkg, options) => __awaiter(void 0, void 0, vo
|
|
|
27
18
|
return appConfig;
|
|
28
19
|
}
|
|
29
20
|
catch (err) {
|
|
30
|
-
spinner.fail(`failed to resolve application config ${
|
|
21
|
+
spinner.fail(`failed to resolve application config ${options?.file ? formatPath(options?.file) : ''}`);
|
|
31
22
|
throw err;
|
|
32
23
|
}
|
|
33
|
-
}
|
|
24
|
+
};
|
|
34
25
|
export default loadAppConfig;
|
|
35
26
|
//# sourceMappingURL=load-app-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-app-config.js","sourceRoot":"","sources":["../../../src/bin/utils/load-app-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"load-app-config.js","sourceRoot":"","sources":["../../../src/bin/utils/load-app-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK1D,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,GAAsB,EACtB,GAAuB,EACvB,OAEC,EACD,EAAE;IACF,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC;QACH,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAClD,OAAO,CAAC,IAAI,CACV,0BAA0B,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CACpG,CAAC;QACF,MAAM,aAAa,GAAiB,EAAkB,CAAC;QACvD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACrF,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,0BAA0B,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CACV,wCAAwC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACzF,CAAC;QACF,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
|