@equinor/fusion-framework-cli 10.0.0-alpha-2e0570c4bda6180049fc0620aa03048d737e5831 → 10.0.0-alpha-1691ce366ff2e68db5722686eda883710ca88dea
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 +81 -21
- package/dist/bin/build-application.js +4 -0
- package/dist/bin/build-application.js.map +1 -1
- package/dist/bin/bundle-application.js +5 -9
- package/dist/bin/bundle-application.js.map +1 -1
- package/dist/bin/create-export-manifest.js +42 -25
- package/dist/bin/create-export-manifest.js.map +1 -1
- package/dist/bin/main.app.js +19 -9
- package/dist/bin/main.app.js.map +1 -1
- package/dist/bin/public/assets/{index-BF2-imeq.js → index-YUYLdAu6.js} +556 -564
- package/dist/bin/public/index.html +1 -1
- package/dist/bin/utils/load-app-config.js +1 -0
- package/dist/bin/utils/load-app-config.js.map +1 -1
- package/dist/bin/utils/load-manifest.js +8 -7
- package/dist/bin/utils/load-manifest.js.map +1 -1
- package/dist/bin/utils/spinner.js +10 -0
- package/dist/bin/utils/spinner.js.map +1 -1
- package/dist/lib/app-config.js +2 -1
- package/dist/lib/app-config.js.map +1 -1
- package/dist/lib/app-manifest.js +21 -11
- package/dist/lib/app-manifest.js.map +1 -1
- package/dist/lib/app-package.js +1 -4
- package/dist/lib/app-package.js.map +1 -1
- package/dist/lib/utils/config.js +2 -0
- package/dist/lib/utils/config.js.map +1 -1
- package/dist/lib/vite-config.js +2 -1
- package/dist/lib/vite-config.js.map +1 -1
- package/dist/types/bin/build-application.d.ts +1 -0
- package/dist/types/bin/create-export-manifest.d.ts +8 -5
- package/dist/types/bin/plugins/app-proxy.d.ts +2 -2
- package/dist/types/bin/utils/load-manifest.d.ts +2 -2
- package/dist/types/bin/utils/spinner.d.ts +1 -0
- package/dist/types/lib/app-config.d.ts +1 -1
- package/dist/types/lib/app-manifest.d.ts +9 -18
- package/dist/types/lib/app-package.d.ts +2 -2
- package/dist/types/lib/utils/config.d.ts +1 -1
- package/dist/types/lib/vite-config.d.ts +1 -1
- package/package.json +16 -16
|
@@ -14,6 +14,7 @@ export const loadAppConfig = (env, pkg, options) => __awaiter(void 0, void 0, vo
|
|
|
14
14
|
const spinner = Spinner.Current;
|
|
15
15
|
try {
|
|
16
16
|
spinner.start('create application configuration');
|
|
17
|
+
spinner.info(`generating config with ${chalk.red.dim(env.command)} command in ${chalk.green.dim(env.mode)} mode`);
|
|
17
18
|
const baseAppConfig = createAppConfigFromPackage(pkg);
|
|
18
19
|
const appConfig = yield createAppConfig(env, baseAppConfig, { file: options === null || options === void 0 ? void 0 : options.file });
|
|
19
20
|
spinner.succeed();
|
|
@@ -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,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAItF,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,MAAM,aAAa,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;QACtD,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
|
+
{"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,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAItF,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,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;QACtD,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"}
|
|
@@ -9,24 +9,25 @@ 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 { createManifest, createManifestFromPackage
|
|
12
|
+
import { createManifest, createManifestFromPackage } from '../../lib/app-manifest.js';
|
|
13
13
|
export const loadAppManifest = (env, pkg, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
|
-
const spinner = Spinner.
|
|
14
|
+
const spinner = Spinner.Clone();
|
|
15
15
|
try {
|
|
16
16
|
spinner.start('create application manifest');
|
|
17
17
|
const baseManifest = yield createManifestFromPackage(pkg);
|
|
18
18
|
spinner.info('created application manifest from package.json');
|
|
19
19
|
// TODO - this need to come from the config
|
|
20
20
|
if (env.mode !== 'development') {
|
|
21
|
-
baseManifest.entryPoint =
|
|
21
|
+
baseManifest.build.entryPoint =
|
|
22
|
+
pkg.packageJson.type === 'module' ? 'app-bundle.js' : 'app-bundle.mjs';
|
|
22
23
|
}
|
|
24
|
+
spinner.info(`generating manifest with ${chalk.red.dim(env.command)} command in ${chalk.green.dim(env.mode)} mode`);
|
|
23
25
|
const manifest = yield createManifest(env, baseManifest, { file: options === null || options === void 0 ? void 0 : options.file });
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
spinner.info(`generating manifest from ${formatPath(options.file, { relative: true })}`);
|
|
26
|
+
if (manifest.path) {
|
|
27
|
+
spinner.succeed(`Created manifest from ${formatPath(manifest.path, { relative: true })}`);
|
|
27
28
|
}
|
|
28
29
|
else {
|
|
29
|
-
spinner.
|
|
30
|
+
spinner.succeed(chalk.dim('no local manifest config applied, using default generated'));
|
|
30
31
|
}
|
|
31
32
|
return manifest;
|
|
32
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-manifest.js","sourceRoot":"","sources":["../../../src/bin/utils/load-manifest.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,
|
|
1
|
+
{"version":3,"file":"load-manifest.js","sourceRoot":"","sources":["../../../src/bin/utils/load-manifest.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAOtF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,GAAsB,EACtB,GAAuB,EACvB,OAEC,EACgD,EAAE;IACnD,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAChC,IAAI,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC7C,MAAM,YAAY,GAAG,MAAM,yBAAyB,CAAC,GAAG,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAE/D,2CAA2C;QAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YAC7B,YAAY,CAAC,KAAM,CAAC,UAAU;gBAC1B,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAC/E,CAAC;QAED,OAAO,CAAC,IAAI,CACR,4BAA4B,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CACxG,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC,CAAC;QAElF,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAChB,OAAO,CAAC,OAAO,CACX,yBAAyB,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAC3E,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC,CAAC;QAC5F,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CACR,8BAA8B,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAC,CAAC,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACjF,CAAC;QACF,MAAM,GAAG,CAAC;IACd,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -12,10 +12,20 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
12
12
|
var _Spinner_ora;
|
|
13
13
|
import ora from 'ora';
|
|
14
14
|
const parseArgs = (args) => args.length ? args.join(' ') : undefined;
|
|
15
|
+
const originalConsole = console;
|
|
15
16
|
export class Spinner {
|
|
16
17
|
get ora() {
|
|
17
18
|
return __classPrivateFieldGet(this, _Spinner_ora, "f");
|
|
18
19
|
}
|
|
20
|
+
set attachConsole(value) {
|
|
21
|
+
if (value) {
|
|
22
|
+
console.log = this.info.bind(this);
|
|
23
|
+
console.info = this.info.bind(this);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
console = originalConsole;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
19
29
|
static Global(options) {
|
|
20
30
|
_spinner = new Spinner(options);
|
|
21
31
|
return _spinner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spinner.js","sourceRoot":"","sources":["../../../src/bin/utils/spinner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,GAA0B,MAAM,KAAK,CAAC;AAE7C,MAAM,SAAS,GAAG,CAAC,IAAc,EAAsB,EAAE,CACrD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAE7C,MAAM,OAAO,OAAO;IAGhB,IAAI,GAAG;QACH,OAAO,uBAAA,IAAI,oBAAK,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,OAAiB;QAC3B,QAAQ,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAiB;QAC1B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,IAAI,QAAQ,CAAC;QAC3C,OAAO,IAAI,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,KAAK,OAAO;QACd,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,MAAM,KAAK,OAAO,CAAC,OAAgB;QAC/B,QAAQ,GAAG,OAAO,CAAC;IACvB,CAAC;IAED,YAAY,OAAiB;
|
|
1
|
+
{"version":3,"file":"spinner.js","sourceRoot":"","sources":["../../../src/bin/utils/spinner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,GAA0B,MAAM,KAAK,CAAC;AAE7C,MAAM,SAAS,GAAG,CAAC,IAAc,EAAsB,EAAE,CACrD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAE7C,MAAM,eAAe,GAAG,OAAO,CAAC;AAEhC,MAAM,OAAO,OAAO;IAGhB,IAAI,GAAG;QACH,OAAO,uBAAA,IAAI,oBAAK,CAAC;IACrB,CAAC;IAED,IAAI,aAAa,CAAC,KAAc;QAC5B,IAAI,KAAK,EAAE,CAAC;YACR,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,eAAe,CAAC;QAC9B,CAAC;IACL,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,OAAiB;QAC3B,QAAQ,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAiB;QAC1B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,IAAI,QAAQ,CAAC;QAC3C,OAAO,IAAI,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,KAAK,OAAO;QACd,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,MAAM,KAAK,OAAO,CAAC,OAAgB;QAC/B,QAAQ,GAAG,OAAO,CAAC;IACvB,CAAC;IAED,YAAY,OAAiB;QAjC7B,+BAAU;QAkCN,uBAAA,IAAI,gBAAQ,GAAG,CAAC,OAAO,CAAC,MAAA,CAAC;IAC7B,CAAC;IAED,IAAI,UAAU;QACV,OAAO,uBAAA,IAAI,oBAAK,CAAC,UAAU,CAAC;IAChC,CAAC;IACD,IAAI,CAAC,GAAG,IAAc;QAClB,uBAAA,IAAI,oBAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,CAAC,GAAG,IAAc;QACrB,uBAAA,IAAI,oBAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;IACD,KAAK,CAAC,GAAG,IAAc;QACnB,uBAAA,IAAI,oBAAK,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,CAAC,GAAG,IAAc;QAClB,uBAAA,IAAI,oBAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,IAAI,CAAC,GAAG,IAAc;QAClB,uBAAA,IAAI,oBAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,KAAK;QACD,uBAAA,IAAI,oBAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IACD,IAAI;QACA,uBAAA,IAAI,oBAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IACD,cAAc,CAAC,GAAG,IAAuC;QACrD,uBAAA,IAAI,oBAAK,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;IACtC,CAAC;CACJ;;AAED,IAAI,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC"}
|
package/dist/lib/app-config.js
CHANGED
|
@@ -38,9 +38,10 @@ export const createAppConfigFromPackage = (_pkg) => {
|
|
|
38
38
|
return appConfig;
|
|
39
39
|
};
|
|
40
40
|
export const createAppConfig = (env, base, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
|
+
var _a;
|
|
41
42
|
const resolved = yield resolveAppConfig(options);
|
|
42
43
|
if (resolved) {
|
|
43
|
-
const config = yield initiateConfig(resolved.config, env, { base });
|
|
44
|
+
const config = (_a = (yield initiateConfig(resolved.config, env, { base }))) !== null && _a !== void 0 ? _a : {};
|
|
44
45
|
assertAppConfig(config);
|
|
45
46
|
return { config, path: resolved.path };
|
|
46
47
|
}
|
|
@@ -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,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAc3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAE9C,MAAM,UAAU,eAAe,CAAC,KAAgB;IAC5C,OAAO;IACP,YAAY,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,EAAE,CAAC;AAEvD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,IAAwB,EACxB,SAA6B,EACpB,EAAE;IACX,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAyB,CAAC;IACpE,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC1B,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAiB,EAAE,EAAE,CAC/C,UAAU,CAAY,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,iBAAiB,CAAC,CAAC;AAEzD,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,0BAA0B,GAAG,CAAC,IAAwB,EAAa,EAAE;IAC9E,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,eAAe,CAAC,SAAS,CAAC,CAAC;IAC3B,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,GAAsB,EACtB,IAAe,EACf,OAA8B,EACe,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,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAc3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAE9C,MAAM,UAAU,eAAe,CAAC,KAAgB;IAC5C,OAAO;IACP,YAAY,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,EAAE,CAAC;AAEvD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,IAAwB,EACxB,SAA6B,EACpB,EAAE;IACX,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAyB,CAAC;IACpE,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC1B,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAiB,EAAE,EAAE,CAC/C,UAAU,CAAY,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,iBAAiB,CAAC,CAAC;AAEzD,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,0BAA0B,GAAG,CAAC,IAAwB,EAAa,EAAE;IAC9E,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,eAAe,CAAC,SAAS,CAAC,CAAC;IAC3B,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,GAAsB,EACtB,IAAe,EACf,OAA8B,EACe,EAAE;;IAC/C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,MAAA,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC;QAC5E,eAAe,CAAC,MAAM,CAAC,CAAC;QACxB,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/app-manifest.js
CHANGED
|
@@ -7,11 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
import
|
|
10
|
+
import deepMerge from 'deepmerge';
|
|
11
11
|
import { execSync } from 'node:child_process';
|
|
12
|
-
import { resolveEntryPoint } from './app-package.js';
|
|
12
|
+
import { resolveAppKey, resolveEntryPoint, } from './app-package.js';
|
|
13
13
|
import { loadConfig, initiateConfig, resolveConfig, } from './utils/config.js';
|
|
14
14
|
import { AssertionError, assert, assertObject } from './utils/assert.js';
|
|
15
|
+
import { parse as parseSemver } from 'semver';
|
|
15
16
|
/** base filename for configuration files */
|
|
16
17
|
export const manifestConfigFilename = 'app.manifest.config';
|
|
17
18
|
/**
|
|
@@ -34,7 +35,10 @@ export const manifestConfigFilename = 'app.manifest.config';
|
|
|
34
35
|
*/
|
|
35
36
|
export const defineAppManifest = (fn) => fn;
|
|
36
37
|
export function assertAppManifest(value) {
|
|
38
|
+
var _a;
|
|
37
39
|
assert(value, 'expected manifest');
|
|
40
|
+
assert(value.build, 'expected build');
|
|
41
|
+
assert(parseSemver((_a = value.build) === null || _a === void 0 ? void 0 : _a.version), 'invalid version');
|
|
38
42
|
// TODO make assertions
|
|
39
43
|
}
|
|
40
44
|
// /**
|
|
@@ -59,7 +63,7 @@ export function assertAppManifest(value) {
|
|
|
59
63
|
* @returns deep merged manifest
|
|
60
64
|
*/
|
|
61
65
|
export const mergeManifests = (base, overrides) => {
|
|
62
|
-
const manifest =
|
|
66
|
+
const manifest = deepMerge(base, overrides);
|
|
63
67
|
assertAppManifest(manifest);
|
|
64
68
|
return manifest;
|
|
65
69
|
};
|
|
@@ -113,20 +117,26 @@ export const createManifestFromPackage = (pkg) => {
|
|
|
113
117
|
assert(packageJson.version, 'expected [version] in packageJson');
|
|
114
118
|
const entryPoint = resolveEntryPoint(packageJson);
|
|
115
119
|
const manifest = {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
120
|
+
appKey: resolveAppKey(pkg.packageJson),
|
|
121
|
+
displayName: packageJson.name,
|
|
122
|
+
description: packageJson.description,
|
|
123
|
+
keywords: packageJson.keywords,
|
|
124
|
+
build: {
|
|
125
|
+
entryPoint,
|
|
126
|
+
version: packageJson.version,
|
|
127
|
+
timestamp: new Date().toISOString(),
|
|
128
|
+
githubRepo: resolveGithubRepo(packageJson),
|
|
129
|
+
commitSha: resolveGitCommitSha(),
|
|
130
|
+
projectPage: packageJson.homepage,
|
|
131
|
+
},
|
|
122
132
|
};
|
|
123
|
-
assertAppManifest(manifest);
|
|
124
133
|
return manifest;
|
|
125
134
|
};
|
|
126
135
|
export const createManifest = (env, base, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
127
136
|
const resolved = yield resolveManifest(options);
|
|
128
137
|
if (resolved) {
|
|
129
|
-
const
|
|
138
|
+
const configuredManifest = yield initiateConfig(resolved.config, env, { base });
|
|
139
|
+
const manifest = deepMerge(base, configuredManifest !== null && configuredManifest !== void 0 ? configuredManifest : {});
|
|
130
140
|
assertAppManifest(manifest);
|
|
131
141
|
return { manifest, path: resolved.path };
|
|
132
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-manifest.js","sourceRoot":"","sources":["../../src/lib/app-manifest.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,
|
|
1
|
+
{"version":3,"file":"app-manifest.js","sourceRoot":"","sources":["../../src/lib/app-manifest.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/app-package.js
CHANGED
|
@@ -38,10 +38,7 @@ export const resolveEntryPoint = (packageJson, pkgPath = '') => {
|
|
|
38
38
|
]
|
|
39
39
|
.filter((x) => !!x)
|
|
40
40
|
.map((x) => relative(dirname(pkgPath), x))
|
|
41
|
-
.find((entry) =>
|
|
42
|
-
console.log(entry, existsSync(entry));
|
|
43
|
-
return existsSync(entry);
|
|
44
|
-
});
|
|
41
|
+
.find((entry) => existsSync(entry));
|
|
45
42
|
assert(entrypoint, 'failed to resolve entrypoint');
|
|
46
43
|
return entrypoint;
|
|
47
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-package.js","sourceRoot":"","sources":["../../src/lib/app-package.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAEH,aAAa,GAEhB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAsB3C,MAAM,UAAU,gBAAgB,CAAC,UAAiC;IAC9D,OAAO,UAAU,CAAC;AACtB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,WAAwB,EAAE,UAAkB,EAAE,EAAU,EAAE;IACxF,MAAM,UAAU,GAAG;QACf,WAAW,CAAC,UAAU;QACtB,WAAW,CAAC,IAAI;QAChB,WAAW,CAAC,MAAM;QAClB,cAAc;QACd,eAAe;QACf,cAAc;QACd,eAAe;KAClB;SACI,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/B,GAAG,CAAC,CAAC,CAAC,EAAU,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;SACjD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"app-package.js","sourceRoot":"","sources":["../../src/lib/app-package.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAEH,aAAa,GAEhB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAsB3C,MAAM,UAAU,gBAAgB,CAAC,UAAiC;IAC9D,OAAO,UAAU,CAAC;AACtB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,WAAwB,EAAE,UAAkB,EAAE,EAAU,EAAE;IACxF,MAAM,UAAU,GAAG;QACf,WAAW,CAAC,UAAU;QACtB,WAAW,CAAC,IAAI;QAChB,WAAW,CAAC,MAAM;QAClB,cAAc;QACd,eAAe;QACf,cAAc;QACd,eAAe;KAClB;SACI,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/B,GAAG,CAAC,CAAC,CAAC,EAAU,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;SACjD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,UAAU,EAAE,8BAA8B,CAAC,CAAC;IAEnD,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,WAAsC,EAAE,EAAE;IACpE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,gCAAgC,CAAC,CAAC;IAC3D,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAA4B,EAAE,EAAE;IAC1D,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,MAAM,CAAC,iBAAiB,CAAC,GAAqB,CAAC,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC7B,OAAkC,EACP,EAAE;IAC7B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
package/dist/lib/utils/config.js
CHANGED
|
@@ -71,6 +71,8 @@ export const loadConfig = (file) => __awaiter(void 0, void 0, void 0, function*
|
|
|
71
71
|
case '.json': {
|
|
72
72
|
return () => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield readFile(file, 'utf-8')); });
|
|
73
73
|
}
|
|
74
|
+
default:
|
|
75
|
+
throw Error('unsupported file type');
|
|
74
76
|
}
|
|
75
77
|
});
|
|
76
78
|
export function initiateConfig(config, ...args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/lib/utils/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/lib/utils/config.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/vite-config.js
CHANGED
|
@@ -32,9 +32,10 @@ export const resolveViteConfig = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
32
32
|
return resolveConfig(configFilename, { find: options });
|
|
33
33
|
});
|
|
34
34
|
export const createAppViteConfig = (env, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
|
+
var _a;
|
|
35
36
|
const resolved = yield resolveViteConfig(options);
|
|
36
37
|
if (resolved) {
|
|
37
|
-
const config = yield initiateConfig(resolved.config, env);
|
|
38
|
+
const config = (_a = (yield initiateConfig(resolved.config, env))) !== null && _a !== void 0 ? _a : {};
|
|
38
39
|
return { config, path: resolved.path };
|
|
39
40
|
}
|
|
40
41
|
else if (options === null || options === void 0 ? void 0 : options.file) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-config.js","sourceRoot":"","sources":["../../src/lib/vite-config.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAsC,MAAM,MAAM,CAAC;AAErF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjE,OAAO,EACH,UAAU,EACV,aAAa,EAIb,cAAc,GACjB,MAAM,mBAAmB,CAAC;AAE3B,UAAU;AAEV,OAAO,OAAO,MAAM,yBAAyB,CAAC;AAC9C,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,cAAc,GAAG,iBAAiB,CAAC;AAEzC,MAAM,UAAU,gBAAgB,CAAC,MAAkB;IAC/C,YAAY,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAiB,EAAE,EAAE,CAChD,UAAU,CAAa,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,cAAc,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC7B,OAEC,EAC2C,EAAE;IAC9C,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,OAAO;YACH,MAAM;YACN,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC;IACN,CAAC;IACD,OAAO,aAAa,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC5D,CAAC,CAAA,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAC/B,GAAsB,EACtB,OAEC,
|
|
1
|
+
{"version":3,"file":"vite-config.js","sourceRoot":"","sources":["../../src/lib/vite-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,4 +9,5 @@ export declare const buildApplication: (options: {
|
|
|
9
9
|
}) => Promise<{
|
|
10
10
|
viteConfig: import("vite").UserConfig | Record<string, any>;
|
|
11
11
|
viteBuild: import("rollup").RollupOutput | import("rollup").RollupOutput[] | import("rollup").RollupWatcher;
|
|
12
|
+
pkg: import("../lib/app-package.js").ResolvedAppPackage;
|
|
12
13
|
}>;
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { ConfigExecuterEnv } from '../lib/utils/config.js';
|
|
2
|
-
import type {
|
|
2
|
+
import type { AppManifest } from '@equinor/fusion-framework-module-app';
|
|
3
3
|
export declare const normalizeVersion: (version: string) => {
|
|
4
4
|
major: number;
|
|
5
5
|
minor: number;
|
|
6
6
|
patch: number;
|
|
7
7
|
};
|
|
8
|
-
|
|
9
|
-
command?: ConfigExecuterEnv[
|
|
8
|
+
type CreateManifestOptions = {
|
|
9
|
+
command?: ConfigExecuterEnv['command'];
|
|
10
10
|
configFile?: string;
|
|
11
11
|
outputFile?: string;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
onlyBuild?: boolean;
|
|
13
|
+
};
|
|
14
|
+
export declare const createAppManifest: (options?: CreateManifestOptions) => Promise<AppManifest>;
|
|
15
|
+
export declare const createBuildManifest: (options?: CreateManifestOptions) => Promise<import("@equinor/fusion-framework-module-app").AppBuildManifest | undefined>;
|
|
16
|
+
export {};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Plugin } from 'vite';
|
|
2
|
-
import { AppConfig,
|
|
2
|
+
import { AppConfig, AppManifest } from '@equinor/fusion-framework-app';
|
|
3
3
|
import { ClientRequest, IncomingMessage, ServerResponse } from 'node:http';
|
|
4
4
|
/**
|
|
5
5
|
* Options for configuring the App Proxy Plugin.
|
|
@@ -26,7 +26,7 @@ export type AppProxyPluginOptions = {
|
|
|
26
26
|
/** callback function for generating configuration for the application */
|
|
27
27
|
generateConfig: () => Promise<AppConfig>;
|
|
28
28
|
/** callback function for generating manifest for the application */
|
|
29
|
-
generateManifest: () => Promise<
|
|
29
|
+
generateManifest: () => Promise<AppManifest>;
|
|
30
30
|
};
|
|
31
31
|
};
|
|
32
32
|
/**
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { AppManifest } from '@equinor/fusion-framework-module-app';
|
|
2
2
|
import { type ConfigExecuterEnv } from '../../lib/utils/config.js';
|
|
3
3
|
import { type ResolvedAppPackage } from '../../lib/app-package.js';
|
|
4
4
|
export declare const loadAppManifest: (env: ConfigExecuterEnv, pkg: ResolvedAppPackage, options?: {
|
|
5
5
|
file?: string;
|
|
6
6
|
}) => Promise<{
|
|
7
|
-
manifest:
|
|
7
|
+
manifest: AppManifest;
|
|
8
8
|
path?: string;
|
|
9
9
|
}>;
|
|
10
10
|
export default loadAppManifest;
|
|
@@ -6,7 +6,7 @@ type FindAppConfigOptions = FindConfigOptions & {
|
|
|
6
6
|
};
|
|
7
7
|
export type AppConfigFn = (env: ConfigExecuterEnv, args: {
|
|
8
8
|
base: AppConfig;
|
|
9
|
-
}) => AppConfig | Promise<AppConfig
|
|
9
|
+
}) => AppConfig | Promise<AppConfig | void> | void;
|
|
10
10
|
export type AppConfigExport = AppConfig | AppConfigFn;
|
|
11
11
|
export declare const appConfigFilename = "app.config";
|
|
12
12
|
export declare function assertAppConfig(value: AppConfig): asserts value;
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
import { ResolvedAppPackage } from './app-package.js';
|
|
2
2
|
import { type FindConfigOptions, type ResolvedConfig, ConfigExecuterEnv } from './utils/config.js';
|
|
3
3
|
import { RecursivePartial } from './utils/types.js';
|
|
4
|
-
|
|
5
|
-
version: string;
|
|
6
|
-
entryPoint: string;
|
|
7
|
-
timestamp?: string;
|
|
8
|
-
commitSha?: string;
|
|
9
|
-
githubRepo?: string;
|
|
10
|
-
projectPage?: string;
|
|
11
|
-
annotations?: Record<string, string>;
|
|
12
|
-
allowedExtensions?: string[];
|
|
13
|
-
};
|
|
4
|
+
import { AppManifest } from '@equinor/fusion-framework-module-app';
|
|
14
5
|
export type AppManifestFn = (env: ConfigExecuterEnv, args: {
|
|
15
|
-
base:
|
|
16
|
-
}) =>
|
|
6
|
+
base: AppManifest;
|
|
7
|
+
}) => AppManifest | Promise<AppManifest | void> | void;
|
|
17
8
|
type FindManifestOptions = FindConfigOptions & {
|
|
18
9
|
file?: string;
|
|
19
10
|
};
|
|
@@ -38,7 +29,7 @@ export declare const manifestConfigFilename = "app.manifest.config";
|
|
|
38
29
|
* @param fnOrObj - defines the manifest as an object or callback
|
|
39
30
|
*/
|
|
40
31
|
export declare const defineAppManifest: (fn: AppManifestFn) => AppManifestFn;
|
|
41
|
-
export declare function assertAppManifest(value:
|
|
32
|
+
export declare function assertAppManifest(value: AppManifest): asserts value;
|
|
42
33
|
/**
|
|
43
34
|
* @example
|
|
44
35
|
* ```ts
|
|
@@ -48,9 +39,9 @@ export declare function assertAppManifest(value: AppManifestExport): asserts val
|
|
|
48
39
|
* @param overrides target manifest to apply to base
|
|
49
40
|
* @returns deep merged manifest
|
|
50
41
|
*/
|
|
51
|
-
export declare const mergeManifests: (base: RecursivePartial<
|
|
42
|
+
export declare const mergeManifests: (base: RecursivePartial<AppManifest>, overrides: RecursivePartial<AppManifest>) => AppManifest;
|
|
52
43
|
/** loads manifestFn from file */
|
|
53
|
-
export declare const loadManifest: (filename?: string) => Promise<import("./utils/config.js").ConfigExecuter<
|
|
44
|
+
export declare const loadManifest: (filename?: string) => Promise<import("./utils/config.js").ConfigExecuter<AppManifest, import("./utils/config.js").ConfigExecuterArgs>>;
|
|
54
45
|
/**
|
|
55
46
|
* tries to resolve manifest
|
|
56
47
|
* @see {@link resolveConfig | resolving config}
|
|
@@ -58,9 +49,9 @@ export declare const loadManifest: (filename?: string) => Promise<import("./util
|
|
|
58
49
|
export declare const resolveManifest: (options?: FindConfigOptions & {
|
|
59
50
|
file?: string;
|
|
60
51
|
}) => Promise<ResolvedConfig<AppManifestFn> | void>;
|
|
61
|
-
export declare const createManifestFromPackage: (pkg: ResolvedAppPackage) =>
|
|
62
|
-
export declare const createManifest: (env: ConfigExecuterEnv, base:
|
|
63
|
-
manifest:
|
|
52
|
+
export declare const createManifestFromPackage: (pkg: ResolvedAppPackage) => AppManifest;
|
|
53
|
+
export declare const createManifest: (env: ConfigExecuterEnv, base: AppManifest, options?: FindManifestOptions) => Promise<{
|
|
54
|
+
manifest: AppManifest;
|
|
64
55
|
path?: string;
|
|
65
56
|
}>;
|
|
66
57
|
export {};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { PackageJson, type NormalizeOptions as ResolveAppPackageOptions } from 'read-package-up';
|
|
2
|
-
import {
|
|
2
|
+
import { AppManifest } from '@equinor/fusion-framework-module-app';
|
|
3
3
|
export type AppPackageJson = PackageJson & {
|
|
4
|
-
manifest?:
|
|
4
|
+
manifest?: AppManifest;
|
|
5
5
|
};
|
|
6
6
|
type DefinePackageFn = () => AppPackageJson | Promise<AppPackageJson>;
|
|
7
7
|
type DefinePackageExporter = AppPackageJson | DefinePackageFn;
|
|
@@ -28,5 +28,5 @@ export type ResolvedConfig<TType extends ConfigExecuter> = {
|
|
|
28
28
|
export declare const findConfigs: (filename: string, options?: FindConfigOptions) => Promise<string[]>;
|
|
29
29
|
export declare const resolveConfig: <TType>(filename: string, options?: ResolveConfigOptions) => Promise<ResolvedConfig<ConfigExecuter<TType>> | void>;
|
|
30
30
|
export declare const loadConfig: <TType>(file: string) => Promise<ConfigExecuter<TType>>;
|
|
31
|
-
export declare function initiateConfig<TConfig extends ConfigExecuter>(config: TConfig, ...args: Parameters<TConfig>): Promise<ConfigExecuterType<TConfig
|
|
31
|
+
export declare function initiateConfig<TConfig extends ConfigExecuter>(config: TConfig, ...args: Parameters<TConfig>): Promise<ConfigExecuterType<TConfig> | void>;
|
|
32
32
|
export default loadConfig;
|
|
@@ -8,7 +8,7 @@ export declare const resolveViteConfig: (options?: FindConfigOptions & {
|
|
|
8
8
|
export declare const createAppViteConfig: (env: ConfigExecuterEnv, options?: FindConfigOptions & {
|
|
9
9
|
file?: string;
|
|
10
10
|
}) => Promise<{
|
|
11
|
-
config
|
|
11
|
+
config?: UserConfig;
|
|
12
12
|
path?: string;
|
|
13
13
|
} | void>;
|
|
14
14
|
export declare const resolveEntryPoint: (cwd?: string, dir?: string, opt?: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/fusion-framework-cli",
|
|
3
|
-
"version": "10.0.0-alpha-
|
|
3
|
+
"version": "10.0.0-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"Fusion",
|
|
6
6
|
"Fusion Framework",
|
|
@@ -65,21 +65,21 @@
|
|
|
65
65
|
"rxjs": "^7.8.1",
|
|
66
66
|
"styled-components": "^6.0.7",
|
|
67
67
|
"typescript": "^5.5.4",
|
|
68
|
-
"@equinor/fusion-framework": "^7.2.7-alpha-
|
|
69
|
-
"@equinor/fusion-framework-app": "^9.1.8-alpha-
|
|
70
|
-
"@equinor/fusion-framework-module-
|
|
71
|
-
"@equinor/fusion-framework-module-
|
|
72
|
-
"@equinor/fusion-framework-module-context": "^5.0.12-alpha-
|
|
73
|
-
"@equinor/fusion-framework-module-feature-flag": "^1.1.9-alpha-
|
|
74
|
-
"@equinor/fusion-framework-module-msal": "^3.1.5-alpha-
|
|
75
|
-
"@equinor/fusion-framework-module-navigation": "^4.0.7-alpha-
|
|
76
|
-
"@equinor/fusion-framework-module-services": "^4.1.4-alpha-
|
|
77
|
-
"@equinor/fusion-framework-react
|
|
78
|
-
"@equinor/fusion-framework-react-components-people-provider": "^1.4.7-alpha-
|
|
79
|
-
"@equinor/fusion-framework-react": "^
|
|
80
|
-
"@equinor/fusion-
|
|
81
|
-
"@equinor/fusion-
|
|
82
|
-
"@equinor/fusion-
|
|
68
|
+
"@equinor/fusion-framework": "^7.2.7-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
69
|
+
"@equinor/fusion-framework-app": "^9.1.8-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
70
|
+
"@equinor/fusion-framework-module-app": "^6.0.0-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
71
|
+
"@equinor/fusion-framework-module-bookmark": "^1.2.12-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
72
|
+
"@equinor/fusion-framework-module-context": "^5.0.12-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
73
|
+
"@equinor/fusion-framework-module-feature-flag": "^1.1.9-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
74
|
+
"@equinor/fusion-framework-module-msal": "^3.1.5-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
75
|
+
"@equinor/fusion-framework-module-navigation": "^4.0.7-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
76
|
+
"@equinor/fusion-framework-module-services": "^4.1.4-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
77
|
+
"@equinor/fusion-framework-react": "^7.2.2-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
78
|
+
"@equinor/fusion-framework-react-components-people-provider": "^1.4.7-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
79
|
+
"@equinor/fusion-framework-react-module-bookmark": "^2.1.16-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
80
|
+
"@equinor/fusion-observable": "^8.4.1",
|
|
81
|
+
"@equinor/fusion-framework-react-components-bookmark": "^0.4.16-alpha-1691ce366ff2e68db5722686eda883710ca88dea",
|
|
82
|
+
"@equinor/fusion-query": "^5.1.3"
|
|
83
83
|
},
|
|
84
84
|
"scripts": {
|
|
85
85
|
"prebuild": "pnpm build:source",
|