@equinor/fusion-framework-cli 10.0.0-next-eafbd16f5fe29e2541a1a35881b265cd027de89e → 10.0.0-next-54618d61fef0bcafa56d37212c9e89b2f3155db0
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 +8 -2
- package/dist/bin/create-export-config.js +2 -65
- package/dist/bin/create-export-config.js.map +1 -1
- package/dist/bin/main.app.js +36 -3
- package/dist/bin/main.app.js.map +1 -1
- package/dist/bin/public/assets/{index-CwGBhRCD.js → index-Cb85_fOB.js} +294 -294
- package/dist/bin/public/index.html +1 -1
- package/dist/bin/publish-application.js +4 -2
- package/dist/bin/publish-application.js.map +1 -1
- package/dist/bin/tag-application.js +4 -2
- package/dist/bin/tag-application.js.map +1 -1
- package/dist/bin/upload-application.js +4 -2
- package/dist/bin/upload-application.js.map +1 -1
- package/dist/bin/upload-export-config.js +87 -0
- package/dist/bin/upload-export-config.js.map +1 -0
- package/dist/bin/utils/isAppRegistered.js +11 -10
- package/dist/bin/utils/isAppRegistered.js.map +1 -1
- package/dist/bin/utils/load-app-config.js +2 -2
- package/dist/bin/utils/load-app-config.js.map +1 -1
- package/dist/bin/utils/publishAppConfig.js.map +1 -1
- package/dist/lib/app-config.js +4 -18
- package/dist/lib/app-config.js.map +1 -1
- package/dist/lib/index.js +1 -1
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/plugins/app-proxy/app-proxy-plugin.js.map +1 -1
- package/dist/types/bin/create-export-config.d.ts +7 -5
- package/dist/types/bin/upload-export-config.d.ts +10 -0
- package/dist/types/bin/utils/isAppRegistered.d.ts +1 -3
- package/dist/types/bin/utils/load-app-config.d.ts +2 -1
- package/dist/types/bin/utils/publishAppConfig.d.ts +2 -2
- package/dist/types/lib/app-config.d.ts +13 -11
- package/dist/types/lib/index.d.ts +1 -1
- package/dist/types/lib/plugins/app-proxy/app-proxy-plugin.d.ts +3 -2
- package/package.json +13 -12
|
@@ -13,6 +13,7 @@ import { bundleApplication } from './bundle-application.js';
|
|
|
13
13
|
import { resolveAppPackage, resolveAppKey } from '../lib/app-package.js';
|
|
14
14
|
import { isAppRegistered, getEndpointUrl, requireToken, tagAppBundle, uploadAppBundle, } from './utils/index.js';
|
|
15
15
|
import { exit } from 'node:process';
|
|
16
|
+
import assert from 'node:assert';
|
|
16
17
|
export const publishApplication = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
18
|
const { tag, env, service } = options;
|
|
18
19
|
const spinner = Spinner.Global({ prefixText: chalk.dim('Publish') });
|
|
@@ -41,13 +42,14 @@ export const publishApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
41
42
|
const err = e;
|
|
42
43
|
throw new Error(`Could not get endpoint from service discovery while verifying app is registered. service-discovery status: ${err.message}`);
|
|
43
44
|
}
|
|
44
|
-
yield isAppRegistered(state.endpoint
|
|
45
|
+
const exist = yield isAppRegistered(state.endpoint);
|
|
46
|
+
assert(exist, `${appKey} is not registered`);
|
|
45
47
|
spinner.succeed(`${appKey} is registered`);
|
|
46
48
|
}
|
|
47
49
|
catch (e) {
|
|
48
50
|
const err = e;
|
|
49
51
|
spinner.fail('🙅♂️', chalk.bgRed(err.message));
|
|
50
|
-
|
|
52
|
+
throw err;
|
|
51
53
|
}
|
|
52
54
|
const bundle = 'app-bundle.zip';
|
|
53
55
|
/* Zip app bundle */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-application.js","sourceRoot":"","sources":["../../src/bin/publish-application.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEzE,OAAO,EACH,eAAe,EACf,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,eAAe,GAClB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"publish-application.js","sourceRoot":"","sources":["../../src/bin/publish-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { chalk } from './utils/format.js';
|
|
|
12
12
|
import { Spinner } from './utils/spinner.js';
|
|
13
13
|
import { resolveAppPackage, resolveAppKey } from '../lib/app-package.js';
|
|
14
14
|
import { isAppRegistered, getEndpointUrl, requireToken, tagAppBundle } from './utils/index.js';
|
|
15
|
+
import assert from 'node:assert';
|
|
15
16
|
var Tags;
|
|
16
17
|
(function (Tags) {
|
|
17
18
|
Tags["preview"] = "preview";
|
|
@@ -50,13 +51,14 @@ export const tagApplication = (options) => __awaiter(void 0, void 0, void 0, fun
|
|
|
50
51
|
const err = e;
|
|
51
52
|
throw new Error(`Could not get endpoint from service discovery while verifying app is registered. service-discovery status: ${err.message}`);
|
|
52
53
|
}
|
|
53
|
-
yield isAppRegistered(state.endpoint
|
|
54
|
+
const exist = yield isAppRegistered(state.endpoint);
|
|
55
|
+
assert(exist, `${appKey} is not registered`);
|
|
54
56
|
spinner.succeed(`${appKey} is registered`);
|
|
55
57
|
}
|
|
56
58
|
catch (e) {
|
|
57
59
|
const err = e;
|
|
58
60
|
spinner.fail('🙅♂️', chalk.bgRed(err.message));
|
|
59
|
-
|
|
61
|
+
throw err;
|
|
60
62
|
}
|
|
61
63
|
try {
|
|
62
64
|
spinner.info(`Tagging "${appKey}@${version}" with: "${tag}"`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag-application.js","sourceRoot":"","sources":["../../src/bin/tag-application.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"tag-application.js","sourceRoot":"","sources":["../../src/bin/tag-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { Spinner } from './utils/spinner.js';
|
|
|
12
12
|
import { chalk } from './utils/format.js';
|
|
13
13
|
import { resolveAppPackage, resolveAppKey } from '../lib/app-package.js';
|
|
14
14
|
import { isAppRegistered, getEndpointUrl, requireToken, uploadAppBundle } from './utils/index.js';
|
|
15
|
+
import assert from 'node:assert';
|
|
15
16
|
export const uploadApplication = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
17
|
const { bundle, env, service } = options;
|
|
17
18
|
const spinner = Spinner.Global({ prefixText: chalk.dim('Upload') });
|
|
@@ -42,13 +43,14 @@ export const uploadApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
42
43
|
throw new Error(`Could not get endpoint from service discovery while verifying app. service-discovery status: ${err.message}`);
|
|
43
44
|
}
|
|
44
45
|
spinner.info('Using endpoint:', state.endpoint);
|
|
45
|
-
yield isAppRegistered(state.endpoint
|
|
46
|
+
const exist = yield isAppRegistered(state.endpoint);
|
|
47
|
+
assert(exist, `${appKey} is not registered`);
|
|
46
48
|
spinner.succeed(`${appKey} is registered`);
|
|
47
49
|
}
|
|
48
50
|
catch (e) {
|
|
49
51
|
const err = e;
|
|
50
52
|
spinner.fail('🙅♂️', chalk.bgRed(err.message));
|
|
51
|
-
|
|
53
|
+
throw err;
|
|
52
54
|
}
|
|
53
55
|
/* Upload app bundle */
|
|
54
56
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-application.js","sourceRoot":"","sources":["../../src/bin/upload-application.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"upload-application.js","sourceRoot":"","sources":["../../src/bin/upload-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,87 @@
|
|
|
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
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
11
|
+
import semverValid from 'semver/functions/valid.js';
|
|
12
|
+
import { chalk } from './utils/format.js';
|
|
13
|
+
import { Spinner } from './utils/spinner.js';
|
|
14
|
+
import { getEndpointUrl, loadPackage, isAppRegistered, requireToken, publishAppConfig, } from './utils/index.js';
|
|
15
|
+
import { resolveAppKey } from '../lib/app-package.js';
|
|
16
|
+
import { exit } from 'node:process';
|
|
17
|
+
import assert from 'node:assert';
|
|
18
|
+
export const uploadExportConfig = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
19
|
+
const { configFile, version: pubVersion, env, service } = options;
|
|
20
|
+
const spinner = Spinner.Global({ prefixText: chalk.dim('config') });
|
|
21
|
+
const pkg = yield loadPackage();
|
|
22
|
+
const appKey = resolveAppKey(pkg.packageJson);
|
|
23
|
+
if (!existsSync(`${configFile}`)) {
|
|
24
|
+
throw new Error(`Config file ${configFile} does not exist`);
|
|
25
|
+
}
|
|
26
|
+
const config = JSON.parse(readFileSync(`${configFile}`, 'utf8'));
|
|
27
|
+
spinner.info('Preparing to publishing config');
|
|
28
|
+
/* Make sure version is valid */
|
|
29
|
+
const version = pubVersion === 'current' ? pkg.packageJson.version : pubVersion;
|
|
30
|
+
if (!version || (!semverValid(version) && !['latest', 'preview'].includes(version))) {
|
|
31
|
+
spinner.fail('🙅♂️', 'Can not publish config to invalid version', chalk.redBright(version), '');
|
|
32
|
+
exit(1);
|
|
33
|
+
}
|
|
34
|
+
/** make sure user has a valid token */
|
|
35
|
+
try {
|
|
36
|
+
spinner.info('Validating FUSION_TOKEN');
|
|
37
|
+
// make sure token exist
|
|
38
|
+
requireToken();
|
|
39
|
+
// call service discovery with token, will throw error if failed
|
|
40
|
+
yield getEndpointUrl('apps', env, '');
|
|
41
|
+
spinner.succeed('Found valid FUSION_TOKEN');
|
|
42
|
+
}
|
|
43
|
+
catch (e) {
|
|
44
|
+
const err = e;
|
|
45
|
+
spinner.fail(chalk.bgRed(err.message));
|
|
46
|
+
exit(1);
|
|
47
|
+
}
|
|
48
|
+
try {
|
|
49
|
+
spinner.info('Verifying that App is registered');
|
|
50
|
+
const state = { endpoint: '' };
|
|
51
|
+
try {
|
|
52
|
+
state.endpoint = yield getEndpointUrl(`apps/${appKey}`, env, service);
|
|
53
|
+
}
|
|
54
|
+
catch (e) {
|
|
55
|
+
const err = e;
|
|
56
|
+
throw new Error(`Could not get endpoint from service discovery while verifying app. service-discovery status: ${err.message}`);
|
|
57
|
+
}
|
|
58
|
+
const exist = yield isAppRegistered(state.endpoint);
|
|
59
|
+
assert(exist, `${appKey} is not registered`);
|
|
60
|
+
spinner.succeed(`${appKey} is registered`);
|
|
61
|
+
}
|
|
62
|
+
catch (e) {
|
|
63
|
+
const err = e;
|
|
64
|
+
spinner.fail('🙅♂️', chalk.bgRed(err.message));
|
|
65
|
+
throw err;
|
|
66
|
+
}
|
|
67
|
+
try {
|
|
68
|
+
spinner.info(`Publishing config to "${appKey}@${version}"`);
|
|
69
|
+
const state = { endpoint: '' };
|
|
70
|
+
try {
|
|
71
|
+
state.endpoint = yield getEndpointUrl(`apps/${appKey}/builds/${version}/config`, env, service);
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
const err = e;
|
|
75
|
+
throw new Error(`Could not get endpoint from service discovery while publishig config. service-discovery status: ${err.message}`);
|
|
76
|
+
}
|
|
77
|
+
yield publishAppConfig(state.endpoint, appKey, config);
|
|
78
|
+
spinner.succeed('✅', 'Published config to version', chalk.yellowBright(version));
|
|
79
|
+
}
|
|
80
|
+
catch (e) {
|
|
81
|
+
const err = e;
|
|
82
|
+
spinner.fail('🙅♂️', chalk.bgRed(err.message));
|
|
83
|
+
exit(1);
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
export default uploadExportConfig;
|
|
87
|
+
//# sourceMappingURL=upload-export-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload-export-config.js","sourceRoot":"","sources":["../../src/bin/upload-export-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,24 +11,25 @@ import fetch from 'node-fetch';
|
|
|
11
11
|
/**
|
|
12
12
|
* Make sure the app is registerred in the app-service
|
|
13
13
|
* @param endpoint <string> The endpoint to make a call to
|
|
14
|
-
* @param appKey <string> The appkey to check for
|
|
15
|
-
* @returns response object as json
|
|
16
14
|
*/
|
|
17
|
-
export const isAppRegistered = (endpoint
|
|
15
|
+
export const isAppRegistered = (endpoint) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
16
|
const requestApp = yield fetch(endpoint, {
|
|
17
|
+
method: 'HEAD',
|
|
19
18
|
headers: {
|
|
20
19
|
Authorization: `Bearer ${process.env.FUSION_TOKEN}`,
|
|
21
20
|
},
|
|
22
21
|
});
|
|
23
|
-
|
|
22
|
+
/** Assume that ok response asserts that app exists */
|
|
23
|
+
if (requestApp.ok) {
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
24
26
|
if (requestApp.status === 404) {
|
|
25
|
-
|
|
26
|
-
throw new Error(`The appkey '${appKey}' is not registered, visit the app-admin app and register the application there.`);
|
|
27
|
+
return false;
|
|
27
28
|
}
|
|
28
|
-
if (
|
|
29
|
-
|
|
30
|
-
throw new Error(`Could not connect to apps-service. HTTP status ${requestApp.status}, ${requestApp.statusText}`);
|
|
29
|
+
if (requestApp.status === 410) {
|
|
30
|
+
throw Error('App is deleted.');
|
|
31
31
|
}
|
|
32
|
-
|
|
32
|
+
const data = yield requestApp.json();
|
|
33
|
+
throw Error('Custom Fusion error, see cause.', { cause: data });
|
|
33
34
|
});
|
|
34
35
|
//# sourceMappingURL=isAppRegistered.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isAppRegistered.js","sourceRoot":"","sources":["../../../src/bin/utils/isAppRegistered.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;
|
|
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,CAAO,QAAgB,EAAoB,EAAE;IACxE,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QACrC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACL,aAAa,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;SACtD;KACJ,CAAC,CAAC;IAEH,sDAAsD;IACtD,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IACrC,MAAM,KAAK,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACpE,CAAC,CAAA,CAAC"}
|
|
@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { Spinner } from './spinner.js';
|
|
11
11
|
import { formatPath, chalk } from './format.js';
|
|
12
|
-
import { createAppConfig
|
|
12
|
+
import { createAppConfig } from '../../lib/app-config.js';
|
|
13
13
|
export const loadAppConfig = (env, pkg, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
14
|
const spinner = Spinner.Current;
|
|
15
15
|
try {
|
|
16
16
|
spinner.start('create application configuration');
|
|
17
17
|
spinner.info(`generating config with ${chalk.red.dim(env.command)} command in ${chalk.green.dim(env.mode)} mode`);
|
|
18
|
-
const baseAppConfig =
|
|
18
|
+
const baseAppConfig = {};
|
|
19
19
|
const appConfig = yield createAppConfig(env, baseAppConfig, { file: options === null || options === void 0 ? void 0 : options.file });
|
|
20
20
|
spinner.succeed();
|
|
21
21
|
if (appConfig.path) {
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CACzB,GAAsB,EACtB,GAAuB,EACvB,OAEC,EACH,EAAE;IACA,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAClD,OAAO,CAAC,IAAI,CACR,0BAA0B,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CACtG,CAAC;QACF,MAAM,aAAa,GAAiB,EAAkB,CAAC;QACvD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC,CAAC;QACrF,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CACR,0BAA0B,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAC7E,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CACR,wCACI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAC,CAAC,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAChD,EAAE,CACL,CAAC;QACF,MAAM,GAAG,CAAC;IACd,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishAppConfig.js","sourceRoot":"","sources":["../../../src/bin/utils/publishAppConfig.ts"],"names":[],"mappings":";;;;;;;;;AAEA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAO,QAAgB,EAAE,MAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"publishAppConfig.js","sourceRoot":"","sources":["../../../src/bin/utils/publishAppConfig.ts"],"names":[],"mappings":";;;;;;;;;AAEA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAO,QAAgB,EAAE,MAAc,EAAE,MAAoB,EAAE,EAAE;IAC7F,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QACxC,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAC5B,OAAO,EAAE;YACL,aAAa,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;YACnD,cAAc,EAAE,kBAAkB;SACrC;KACJ,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACX,OAAO,MAAM,8CAA8C,aAAa,CAAC,MAAM,KAAK,aAAa,CAAC,UAAU,EAAE,CACjH,CAAC;IACN,CAAC;SAAM,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,aAAa,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,MAAM,IAAI,KAAK,CACX,wCAAwC,aAAa,CAAC,MAAM,KAAK,aAAa,CAAC,UAAU,EAAE,CAC9F,CAAC;IACN,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,EAAE,CAAC;AAChC,CAAC,CAAA,CAAC"}
|
package/dist/lib/app-config.js
CHANGED
|
@@ -8,19 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { loadConfig, initiateConfig, resolveConfig, } from './utils/config.js';
|
|
11
|
-
import { AssertionError
|
|
12
|
-
import
|
|
11
|
+
import { AssertionError } from './utils/assert.js';
|
|
12
|
+
import { ApiAppConfigSchema } from '@equinor/fusion-framework-module-app/schemas.js';
|
|
13
13
|
export const appConfigFilename = 'app.config';
|
|
14
|
-
export function assertAppConfig(value) {
|
|
15
|
-
// TODO
|
|
16
|
-
assertObject(value);
|
|
17
|
-
}
|
|
18
14
|
export const defineAppConfig = (fn) => fn;
|
|
19
|
-
export const mergeAppConfigs = (base, overrides) => {
|
|
20
|
-
const manifest = deepmerge(base, overrides);
|
|
21
|
-
assertAppConfig(manifest);
|
|
22
|
-
return manifest;
|
|
23
|
-
};
|
|
24
15
|
export const loadAppConfig = (filename) => loadConfig(filename !== null && filename !== void 0 ? filename : appConfigFilename);
|
|
25
16
|
export const resolveAppConfig = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
17
|
if (options === null || options === void 0 ? void 0 : options.file) {
|
|
@@ -32,17 +23,12 @@ export const resolveAppConfig = (options) => __awaiter(void 0, void 0, void 0, f
|
|
|
32
23
|
}
|
|
33
24
|
return resolveConfig(appConfigFilename, { find: options });
|
|
34
25
|
});
|
|
35
|
-
export const createAppConfigFromPackage = (_pkg) => {
|
|
36
|
-
const appConfig = {};
|
|
37
|
-
assertAppConfig(appConfig);
|
|
38
|
-
return appConfig;
|
|
39
|
-
};
|
|
40
26
|
export const createAppConfig = (env, base, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
27
|
var _a;
|
|
42
28
|
const resolved = yield resolveAppConfig(options);
|
|
43
29
|
if (resolved) {
|
|
44
|
-
const
|
|
45
|
-
|
|
30
|
+
const configValue = (_a = (yield initiateConfig(resolved.config, env, { base }))) !== null && _a !== void 0 ? _a : {};
|
|
31
|
+
const config = ApiAppConfigSchema.parse(configValue);
|
|
46
32
|
return { config, path: resolved.path };
|
|
47
33
|
}
|
|
48
34
|
else if (options === null || options === void 0 ? void 0 : options.file) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-config.js","sourceRoot":"","sources":["../../src/lib/app-config.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,UAAU,EAGV,cAAc,EAEd,aAAa,GAChB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"app-config.js","sourceRoot":"","sources":["../../src/lib/app-config.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,UAAU,EAGV,cAAc,EAEd,aAAa,GAChB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAgB,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AAYnG,MAAM,CAAC,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAC9C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,EAAE,CAAC;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAiB,EAAE,EAAE,CAC/C,UAAU,CAAe,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,iBAAiB,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,OAEC,EAC0C,EAAE;IAC7C,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,OAAO;YACH,MAAM;YACN,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC;IACN,CAAC;IACD,OAAO,aAAa,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/D,CAAC,CAAA,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,GAAsB,EACtB,IAAkB,EAClB,OAA8B,EACkB,EAAE;;IAClD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,WAAW,GAAG,MAAA,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC;QACjF,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACrD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;SAAM,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,cAAc,CAAC;YACrB,OAAO,EAAE,gCAAgC,OAAO,CAAC,IAAI,EAAE;YACvD,QAAQ,EAAE,QAAQ;SACrB,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC5B,CAAC,CAAA,CAAC"}
|
package/dist/lib/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { mergeManifests, defineAppManifest } from './app-manifest.js';
|
|
2
|
-
export {
|
|
2
|
+
export { defineAppConfig } from './app-config.js';
|
|
3
3
|
export { defineAppPackage, resolveAppKey, resolveEntryPoint, } from './app-package.js';
|
|
4
4
|
//# sourceMappingURL=index.js.map
|
package/dist/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAsB,MAAM,mBAAmB,CAAC;AAE1F,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAsB,MAAM,mBAAmB,CAAC;AAE1F,OAAO,EAAE,eAAe,EAA0C,MAAM,iBAAiB,CAAC;AAE1F,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAGpB,MAAM,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-proxy-plugin.js","sourceRoot":"","sources":["../../../../src/lib/plugins/app-proxy/app-proxy-plugin.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"app-proxy-plugin.js","sourceRoot":"","sources":["../../../../src/lib/plugins/app-proxy/app-proxy-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import type { FusionEnv } from './utils/index.js';
|
|
2
1
|
import { ConfigExecuterEnv } from '../lib/utils/config.js';
|
|
3
2
|
export declare const createExportConfig: (options: {
|
|
4
3
|
command?: ConfigExecuterEnv["command"];
|
|
5
4
|
configFile?: string;
|
|
6
|
-
publish?: string;
|
|
7
5
|
outputFile?: string;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
}) => Promise<{
|
|
7
|
+
environment: Record<string, any>;
|
|
8
|
+
endpoints?: Record<string, {
|
|
9
|
+
url: string;
|
|
10
|
+
scopes: string[];
|
|
11
|
+
}> | undefined;
|
|
12
|
+
}>;
|
|
11
13
|
export default createExportConfig;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { FusionEnv } from './utils/index.js';
|
|
2
|
+
import { ConfigExecuterEnv } from '../lib/utils/config.js';
|
|
3
|
+
export declare const uploadExportConfig: (options: {
|
|
4
|
+
command?: ConfigExecuterEnv["command"];
|
|
5
|
+
configFile: string;
|
|
6
|
+
version: string;
|
|
7
|
+
env: FusionEnv;
|
|
8
|
+
service: string;
|
|
9
|
+
}) => Promise<void>;
|
|
10
|
+
export default uploadExportConfig;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Make sure the app is registerred in the app-service
|
|
3
3
|
* @param endpoint <string> The endpoint to make a call to
|
|
4
|
-
* @param appKey <string> The appkey to check for
|
|
5
|
-
* @returns response object as json
|
|
6
4
|
*/
|
|
7
|
-
export declare const isAppRegistered: (endpoint: string
|
|
5
|
+
export declare const isAppRegistered: (endpoint: string) => Promise<boolean>;
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { type ConfigExecuterEnv } from '../../lib/utils/config.js';
|
|
2
2
|
import { type ResolvedAppPackage } from '../../lib/app-package.js';
|
|
3
|
+
import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
|
|
3
4
|
export declare const loadAppConfig: (env: ConfigExecuterEnv, pkg: ResolvedAppPackage, options?: {
|
|
4
5
|
file?: string;
|
|
5
6
|
}) => Promise<{
|
|
6
|
-
config:
|
|
7
|
+
config: ApiAppConfig;
|
|
7
8
|
path?: string;
|
|
8
9
|
}>;
|
|
9
10
|
export default loadAppConfig;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
|
|
2
2
|
/**
|
|
3
3
|
* Publishes app config to the apps-service endpoint
|
|
4
4
|
* @param endpoint string The endpoint to upload to
|
|
@@ -6,4 +6,4 @@ import type { AppConfig } from '@equinor/fusion-framework-module-app';
|
|
|
6
6
|
* @param config Object with app config
|
|
7
7
|
* @returns HTTP response as json
|
|
8
8
|
*/
|
|
9
|
-
export declare const publishAppConfig: (endpoint: string, appKey: string, config:
|
|
9
|
+
export declare const publishAppConfig: (endpoint: string, appKey: string, config: ApiAppConfig) => Promise<any>;
|
|
@@ -1,24 +1,26 @@
|
|
|
1
1
|
import { type ResolvedConfig, type FindConfigOptions, ConfigExecuterEnv } from './utils/config.js';
|
|
2
|
-
import {
|
|
3
|
-
import type { AppConfig } from '@equinor/fusion-framework-module-app';
|
|
2
|
+
import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
|
|
4
3
|
type FindAppConfigOptions = FindConfigOptions & {
|
|
5
4
|
file?: string;
|
|
6
5
|
};
|
|
7
6
|
export type AppConfigFn = (env: ConfigExecuterEnv, args: {
|
|
8
|
-
base:
|
|
9
|
-
}) =>
|
|
10
|
-
export type AppConfigExport =
|
|
7
|
+
base: ApiAppConfig;
|
|
8
|
+
}) => ApiAppConfig | Promise<ApiAppConfig | void> | void;
|
|
9
|
+
export type AppConfigExport = ApiAppConfig | AppConfigFn;
|
|
11
10
|
export declare const appConfigFilename = "app.config";
|
|
12
|
-
export declare function assertAppConfig(value: AppConfig): asserts value;
|
|
13
11
|
export declare const defineAppConfig: (fn: AppConfigFn) => AppConfigFn;
|
|
14
|
-
export declare const
|
|
15
|
-
|
|
12
|
+
export declare const loadAppConfig: (filename?: string) => Promise<import("./utils/config.js").ConfigExecuter<{
|
|
13
|
+
environment: Record<string, any>;
|
|
14
|
+
endpoints?: Record<string, {
|
|
15
|
+
url: string;
|
|
16
|
+
scopes: string[];
|
|
17
|
+
}> | undefined;
|
|
18
|
+
}, import("./utils/config.js").ConfigExecuterArgs>>;
|
|
16
19
|
export declare const resolveAppConfig: (options?: FindConfigOptions & {
|
|
17
20
|
file?: string;
|
|
18
21
|
}) => Promise<ResolvedConfig<AppConfigFn> | void>;
|
|
19
|
-
export declare const
|
|
20
|
-
|
|
21
|
-
config: AppConfig;
|
|
22
|
+
export declare const createAppConfig: (env: ConfigExecuterEnv, base: ApiAppConfig, options?: FindAppConfigOptions) => Promise<{
|
|
23
|
+
config: ApiAppConfig;
|
|
22
24
|
path?: string;
|
|
23
25
|
}>;
|
|
24
26
|
export {};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { mergeManifests, defineAppManifest, type AppManifestFn } from './app-manifest.js';
|
|
2
|
-
export {
|
|
2
|
+
export { defineAppConfig, type AppConfigFn, type AppConfigExport } from './app-config.js';
|
|
3
3
|
export { defineAppPackage, resolveAppKey, resolveEntryPoint, type AppPackageJson, type ResolvedAppPackage, } from './app-package.js';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Plugin } from 'vite';
|
|
2
|
-
import {
|
|
2
|
+
import { AppManifest } from '@equinor/fusion-framework-app';
|
|
3
3
|
import { ClientRequest, IncomingMessage, ServerResponse } from 'node:http';
|
|
4
|
+
import { ApiAppConfig } from '@equinor/fusion-framework-module-app/schemas.js';
|
|
4
5
|
/**
|
|
5
6
|
* Options for configuring the App Proxy Plugin.
|
|
6
7
|
*
|
|
@@ -24,7 +25,7 @@ export type AppProxyPluginOptions = {
|
|
|
24
25
|
/** application version */
|
|
25
26
|
version: string;
|
|
26
27
|
/** callback function for generating configuration for the application */
|
|
27
|
-
generateConfig: () => Promise<
|
|
28
|
+
generateConfig: () => Promise<ApiAppConfig>;
|
|
28
29
|
/** callback function for generating manifest for the application */
|
|
29
30
|
generateManifest: () => Promise<AppManifest>;
|
|
30
31
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/fusion-framework-cli",
|
|
3
|
-
"version": "10.0.0-next-
|
|
3
|
+
"version": "10.0.0-next-54618d61fef0bcafa56d37212c9e89b2f3155db0",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"Fusion",
|
|
6
6
|
"Fusion Framework",
|
|
@@ -54,7 +54,8 @@
|
|
|
54
54
|
"vite": "^5.4.3",
|
|
55
55
|
"vite-plugin-environment": "^1.1.3",
|
|
56
56
|
"vite-plugin-restart": "^0.4.0",
|
|
57
|
-
"vite-tsconfig-paths": "^4.2.0"
|
|
57
|
+
"vite-tsconfig-paths": "^4.2.0",
|
|
58
|
+
"zod": "^3.23.8"
|
|
58
59
|
},
|
|
59
60
|
"devDependencies": {
|
|
60
61
|
"@equinor/eds-core-react": "^0.41.2",
|
|
@@ -84,20 +85,20 @@
|
|
|
84
85
|
"styled-components": "^6.0.7",
|
|
85
86
|
"typescript": "^5.5.4",
|
|
86
87
|
"@equinor/fusion-framework": "^7.2.8",
|
|
87
|
-
"@equinor/fusion-framework-app": "^
|
|
88
|
-
"@equinor/fusion-framework-
|
|
88
|
+
"@equinor/fusion-framework-module-app": "^6.0.0-next-54618d61fef0bcafa56d37212c9e89b2f3155db0",
|
|
89
|
+
"@equinor/fusion-framework-app": "^9.1.10-next-54618d61fef0bcafa56d37212c9e89b2f3155db0",
|
|
89
90
|
"@equinor/fusion-framework-module-bookmark": "^1.2.12",
|
|
90
91
|
"@equinor/fusion-framework-module-context": "^5.0.12",
|
|
91
|
-
"@equinor/fusion-framework-module-navigation": "^4.0.7",
|
|
92
|
-
"@equinor/fusion-framework-module-msal": "^3.1.5",
|
|
93
92
|
"@equinor/fusion-framework-module-feature-flag": "^1.1.9",
|
|
94
|
-
"@equinor/fusion-framework-
|
|
95
|
-
"@equinor/fusion-framework-react-components-bookmark": "^0.5.2-next-eafbd16f5fe29e2541a1a35881b265cd027de89e",
|
|
93
|
+
"@equinor/fusion-framework-module-navigation": "^4.0.7",
|
|
96
94
|
"@equinor/fusion-framework-module-services": "^4.1.5",
|
|
97
|
-
"@equinor/fusion-framework-
|
|
98
|
-
"@equinor/fusion-framework-react
|
|
99
|
-
"@equinor/fusion-
|
|
100
|
-
"@equinor/fusion-
|
|
95
|
+
"@equinor/fusion-framework-module-msal": "^3.1.5",
|
|
96
|
+
"@equinor/fusion-framework-react": "^7.3.0-next-54618d61fef0bcafa56d37212c9e89b2f3155db0",
|
|
97
|
+
"@equinor/fusion-framework-react-components-bookmark": "^0.5.2-next-54618d61fef0bcafa56d37212c9e89b2f3155db0",
|
|
98
|
+
"@equinor/fusion-framework-react-components-people-provider": "^1.4.9-next-54618d61fef0bcafa56d37212c9e89b2f3155db0",
|
|
99
|
+
"@equinor/fusion-framework-react-module-bookmark": "^2.1.18-next-54618d61fef0bcafa56d37212c9e89b2f3155db0",
|
|
100
|
+
"@equinor/fusion-observable": "^8.4.1",
|
|
101
|
+
"@equinor/fusion-query": "^5.1.3"
|
|
101
102
|
},
|
|
102
103
|
"scripts": {
|
|
103
104
|
"prebuild": "pnpm build:source",
|