@equinor/fusion-framework-cli 11.0.0-next.8 → 11.0.1
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 +71 -94
- package/README.md +98 -104
- package/bin/build/bin.mjs +1 -0
- package/bin/build/cli.mjs +7 -0
- package/bin/cli.mjs +1 -1
- package/dist/esm/lib/app/app-config.js.map +1 -1
- package/dist/esm/lib/app/app-manifest.js.map +1 -1
- package/dist/esm/lib/app/app-package.js +1 -1
- package/dist/esm/lib/app/app-package.js.map +1 -1
- package/dist/esm/lib/app/merge-app-config.js +11 -5
- package/dist/esm/lib/app/merge-app-config.js.map +1 -1
- package/dist/esm/lib/app/merge-app-manifest.js +2 -2
- package/dist/esm/lib/app/merge-app-manifest.js.map +1 -1
- package/dist/esm/lib/index.js +3 -1
- package/dist/esm/lib/index.js.map +1 -1
- package/dist/esm/lib/load-dev-server-config.js +7 -3
- package/dist/esm/lib/load-dev-server-config.js.map +1 -1
- package/dist/esm/lib/merge-dev-server-config.js +24 -16
- package/dist/esm/lib/merge-dev-server-config.js.map +1 -1
- package/dist/esm/lib/portal/create-portal-manifest.js.map +1 -1
- package/dist/esm/lib/portal/load-portal-config.js +1 -1
- package/dist/esm/lib/portal/load-portal-config.js.map +1 -1
- package/dist/esm/lib/portal/load-portal-manifest.js +8 -4
- package/dist/esm/lib/portal/load-portal-manifest.js.map +1 -1
- package/dist/esm/lib/portal/load-portal-schema.js.map +1 -1
- package/dist/esm/lib/portal/portal-config.js.map +1 -1
- package/dist/esm/lib/utils/index.js +1 -0
- package/dist/esm/lib/utils/index.js.map +1 -1
- package/dist/esm/lib/utils/resolve-annotations.js +48 -5
- package/dist/esm/lib/utils/resolve-annotations.js.map +1 -1
- package/dist/esm/lib/utils/resolve-devops-annotations.js +7 -3
- package/dist/esm/lib/utils/resolve-devops-annotations.js.map +1 -1
- package/dist/esm/lib/utils/resolve-git-commit-sha.js +1 -0
- package/dist/esm/lib/utils/resolve-git-commit-sha.js.map +1 -1
- package/dist/esm/lib/utils/resolve-github-annotations.js +16 -72
- package/dist/esm/lib/utils/resolve-github-annotations.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/bin/app-build.d.ts +2 -2
- package/dist/types/bin/app-check.d.ts +2 -2
- package/dist/types/bin/app-config-publish.d.ts +2 -2
- package/dist/types/bin/app-config.d.ts +3 -3
- package/dist/types/bin/app-dev.d.ts +1 -1
- package/dist/types/bin/app-manifest.d.ts +3 -3
- package/dist/types/bin/app-pack.d.ts +1 -1
- package/dist/types/bin/app-tag.d.ts +3 -3
- package/dist/types/bin/app-upload.d.ts +2 -2
- package/dist/types/bin/helpers/load-vite-config.d.ts +1 -2
- package/dist/types/bin/helpers/resolve-app-config.d.ts +3 -3
- package/dist/types/bin/helpers/resolve-app-manifest.d.ts +3 -3
- package/dist/types/bin/helpers/resolve-portal-config.d.ts +3 -3
- package/dist/types/bin/helpers/resolve-portal-manifest.d.ts +3 -4
- package/dist/types/bin/helpers/resolve-project-package.d.ts +2 -2
- package/dist/types/bin/index.d.ts +9 -0
- package/dist/types/bin/pack.d.ts +1 -1
- package/dist/types/bin/portal-build.d.ts +5 -5
- package/dist/types/bin/portal-config-publish.d.ts +2 -2
- package/dist/types/bin/portal-config.d.ts +4 -4
- package/dist/types/bin/portal-dev.d.ts +2 -2
- package/dist/types/bin/portal-manifest.d.ts +4 -4
- package/dist/types/bin/portal-pack.d.ts +3 -3
- package/dist/types/bin/portal-tag.d.ts +2 -2
- package/dist/types/bin/portal-upload.d.ts +2 -2
- package/dist/types/bin/utils/create-dev-server.d.ts +2 -2
- package/dist/types/cli/commands/disco/resolve.d.ts +1 -1
- package/dist/types/cli/main.d.ts +0 -20
- package/dist/types/cli/options/env.d.ts +1 -2
- package/dist/types/lib/app/app-config.d.ts +2 -2
- package/dist/types/lib/app/app-manifest.d.ts +1 -1
- package/dist/types/lib/app/merge-app-config.d.ts +1 -1
- package/dist/types/lib/app/merge-app-manifest.d.ts +1 -1
- package/dist/types/lib/index.d.ts +3 -2
- package/dist/types/lib/legacy.d.ts +1 -1
- package/dist/types/lib/load-dev-server-config.d.ts +2 -2
- package/dist/types/lib/merge-dev-server-config.d.ts +1 -1
- package/dist/types/lib/portal/create-portal-manifest.d.ts +1 -1
- package/dist/types/lib/portal/load-portal-manifest.d.ts +2 -2
- package/dist/types/lib/portal/load-portal-schema.d.ts +1 -1
- package/dist/types/lib/portal/portal-config.d.ts +2 -2
- package/dist/types/lib/portal/portal-manifest.schema.d.ts +6 -6
- package/dist/types/lib/types.d.ts +29 -0
- package/dist/types/lib/utils/index.d.ts +1 -0
- package/dist/types/lib/utils/resolve-annotations.d.ts +35 -1
- package/dist/types/lib/utils/resolve-devops-annotations.d.ts +28 -3
- package/dist/types/lib/utils/resolve-git-commit-sha.d.ts +1 -0
- package/dist/types/lib/utils/resolve-github-annotations.d.ts +85 -13
- package/dist/types/lib/utils/types.d.ts +57 -1
- package/dist/types/version.d.ts +1 -1
- package/docs/application.md +73 -79
- package/docs/auth.md +18 -45
- package/docs/libsecret.md +0 -31
- package/docs/migration-v10-to-v11.md +43 -47
- package/docs/portal.md +4 -38
- package/package.json +69 -33
- package/bin/build/bin.js +0 -28
- package/bin/build/cli.js +0 -10099
- package/bin/build/create-auth-client-B_j4Y_Dr.js +0 -1415
- package/bin/build/portal-config-publish-ezU_DFki.js +0 -29578
- package/dist/esm/bin/app-build.js +0 -34
- package/dist/esm/bin/app-build.js.map +0 -1
- package/dist/esm/bin/app-check.js +0 -63
- package/dist/esm/bin/app-check.js.map +0 -1
- package/dist/esm/bin/app-config-publish.js +0 -89
- package/dist/esm/bin/app-config-publish.js.map +0 -1
- package/dist/esm/bin/app-config.js +0 -48
- package/dist/esm/bin/app-config.js.map +0 -1
- package/dist/esm/bin/app-dev.js +0 -102
- package/dist/esm/bin/app-dev.js.map +0 -1
- package/dist/esm/bin/app-manifest.js +0 -38
- package/dist/esm/bin/app-manifest.js.map +0 -1
- package/dist/esm/bin/app-pack.js +0 -51
- package/dist/esm/bin/app-pack.js.map +0 -1
- package/dist/esm/bin/app-tag.js +0 -89
- package/dist/esm/bin/app-tag.js.map +0 -1
- package/dist/esm/bin/app-upload.js +0 -109
- package/dist/esm/bin/app-upload.js.map +0 -1
- package/dist/esm/bin/helpers/load-bundle-metadata.js +0 -32
- package/dist/esm/bin/helpers/load-bundle-metadata.js.map +0 -1
- package/dist/esm/bin/helpers/load-vite-config.js +0 -55
- package/dist/esm/bin/helpers/load-vite-config.js.map +0 -1
- package/dist/esm/bin/helpers/resolve-app-config.js +0 -46
- package/dist/esm/bin/helpers/resolve-app-config.js.map +0 -1
- package/dist/esm/bin/helpers/resolve-app-manifest.js +0 -55
- package/dist/esm/bin/helpers/resolve-app-manifest.js.map +0 -1
- package/dist/esm/bin/helpers/resolve-portal-config.js +0 -46
- package/dist/esm/bin/helpers/resolve-portal-config.js.map +0 -1
- package/dist/esm/bin/helpers/resolve-portal-manifest.js +0 -55
- package/dist/esm/bin/helpers/resolve-portal-manifest.js.map +0 -1
- package/dist/esm/bin/helpers/resolve-project-package.js +0 -32
- package/dist/esm/bin/helpers/resolve-project-package.js.map +0 -1
- package/dist/esm/bin/index.js +0 -12
- package/dist/esm/bin/index.js.map +0 -1
- package/dist/esm/bin/pack.js +0 -70
- package/dist/esm/bin/pack.js.map +0 -1
- package/dist/esm/bin/portal-build.js +0 -40
- package/dist/esm/bin/portal-build.js.map +0 -1
- package/dist/esm/bin/portal-config-publish.js +0 -74
- package/dist/esm/bin/portal-config-publish.js.map +0 -1
- package/dist/esm/bin/portal-config.js +0 -48
- package/dist/esm/bin/portal-config.js.map +0 -1
- package/dist/esm/bin/portal-dev.js +0 -61
- package/dist/esm/bin/portal-dev.js.map +0 -1
- package/dist/esm/bin/portal-manifest.js +0 -38
- package/dist/esm/bin/portal-manifest.js.map +0 -1
- package/dist/esm/bin/portal-pack.js +0 -60
- package/dist/esm/bin/portal-pack.js.map +0 -1
- package/dist/esm/bin/portal-tag.js +0 -96
- package/dist/esm/bin/portal-tag.js.map +0 -1
- package/dist/esm/bin/portal-upload.js +0 -99
- package/dist/esm/bin/portal-upload.js.map +0 -1
- package/dist/esm/bin/utils/ConsoleLogger.js +0 -112
- package/dist/esm/bin/utils/ConsoleLogger.js.map +0 -1
- package/dist/esm/bin/utils/create-dev-server.js +0 -167
- package/dist/esm/bin/utils/create-dev-server.js.map +0 -1
- package/dist/esm/bin/utils/format.js +0 -47
- package/dist/esm/bin/utils/format.js.map +0 -1
- package/dist/esm/bin/utils/index.js +0 -5
- package/dist/esm/bin/utils/index.js.map +0 -1
- package/dist/esm/bin/utils/spinner.js +0 -142
- package/dist/esm/bin/utils/spinner.js.map +0 -1
- package/dist/esm/cli/commands/app/alias.js +0 -42
- package/dist/esm/cli/commands/app/alias.js.map +0 -1
- package/dist/esm/cli/commands/app/build.js +0 -53
- package/dist/esm/cli/commands/app/build.js.map +0 -1
- package/dist/esm/cli/commands/app/check.js +0 -57
- package/dist/esm/cli/commands/app/check.js.map +0 -1
- package/dist/esm/cli/commands/app/config.js +0 -103
- package/dist/esm/cli/commands/app/config.js.map +0 -1
- package/dist/esm/cli/commands/app/dev.js +0 -67
- package/dist/esm/cli/commands/app/dev.js.map +0 -1
- package/dist/esm/cli/commands/app/index.js +0 -42
- package/dist/esm/cli/commands/app/index.js.map +0 -1
- package/dist/esm/cli/commands/app/manifest.js +0 -82
- package/dist/esm/cli/commands/app/manifest.js.map +0 -1
- package/dist/esm/cli/commands/app/pack.js +0 -71
- package/dist/esm/cli/commands/app/pack.js.map +0 -1
- package/dist/esm/cli/commands/app/publish.js +0 -130
- package/dist/esm/cli/commands/app/publish.js.map +0 -1
- package/dist/esm/cli/commands/app/tag.js +0 -113
- package/dist/esm/cli/commands/app/tag.js.map +0 -1
- package/dist/esm/cli/commands/app/upload.js +0 -85
- package/dist/esm/cli/commands/app/upload.js.map +0 -1
- package/dist/esm/cli/commands/auth/index.js +0 -22
- package/dist/esm/cli/commands/auth/index.js.map +0 -1
- package/dist/esm/cli/commands/auth/login.js +0 -72
- package/dist/esm/cli/commands/auth/login.js.map +0 -1
- package/dist/esm/cli/commands/auth/logout.js +0 -58
- package/dist/esm/cli/commands/auth/logout.js.map +0 -1
- package/dist/esm/cli/commands/auth/token.js +0 -78
- package/dist/esm/cli/commands/auth/token.js.map +0 -1
- package/dist/esm/cli/commands/disco/index.js +0 -6
- package/dist/esm/cli/commands/disco/index.js.map +0 -1
- package/dist/esm/cli/commands/disco/resolve.js +0 -58
- package/dist/esm/cli/commands/disco/resolve.js.map +0 -1
- package/dist/esm/cli/commands/index.js +0 -11
- package/dist/esm/cli/commands/index.js.map +0 -1
- package/dist/esm/cli/commands/portal/build.js +0 -27
- package/dist/esm/cli/commands/portal/build.js.map +0 -1
- package/dist/esm/cli/commands/portal/config.js +0 -101
- package/dist/esm/cli/commands/portal/config.js.map +0 -1
- package/dist/esm/cli/commands/portal/dev.js +0 -27
- package/dist/esm/cli/commands/portal/dev.js.map +0 -1
- package/dist/esm/cli/commands/portal/index.js +0 -23
- package/dist/esm/cli/commands/portal/index.js.map +0 -1
- package/dist/esm/cli/commands/portal/manifest.js +0 -48
- package/dist/esm/cli/commands/portal/manifest.js.map +0 -1
- package/dist/esm/cli/commands/portal/pack.js +0 -40
- package/dist/esm/cli/commands/portal/pack.js.map +0 -1
- package/dist/esm/cli/commands/portal/publish.js +0 -76
- package/dist/esm/cli/commands/portal/publish.js.map +0 -1
- package/dist/esm/cli/commands/portal/schema.js +0 -70
- package/dist/esm/cli/commands/portal/schema.js.map +0 -1
- package/dist/esm/cli/commands/portal/tag.js +0 -73
- package/dist/esm/cli/commands/portal/tag.js.map +0 -1
- package/dist/esm/cli/commands/portal/upload.js +0 -41
- package/dist/esm/cli/commands/portal/upload.js.map +0 -1
- package/dist/esm/cli/main.js +0 -52
- package/dist/esm/cli/main.js.map +0 -1
- package/dist/esm/cli/options/auth.js +0 -96
- package/dist/esm/cli/options/auth.js.map +0 -1
- package/dist/esm/cli/options/env.js +0 -30
- package/dist/esm/cli/options/env.js.map +0 -1
- package/dist/esm/lib/framework.node.js +0 -104
- package/dist/esm/lib/framework.node.js.map +0 -1
- package/dist/esm/version.js.map +0 -1
- package/dist/tsconfig.tsbuildinfo +0 -1
- /package/dist/types/{lib → bin}/framework.node.d.ts +0 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { importConfig } from '@equinor/fusion-imports';
|
|
2
|
+
import { mergeDevServerConfig } from './merge-dev-server-config.js';
|
|
2
3
|
/**
|
|
3
4
|
* Helper to define a dev server config function with proper typing.
|
|
4
5
|
* @param fn - The configuration function to be used as the dev server config.
|
|
@@ -28,14 +29,17 @@ export const loadDevServerConfig = async (env, base, options) => {
|
|
|
28
29
|
// Custom resolver for the config module
|
|
29
30
|
resolve: async (module) => {
|
|
30
31
|
// If the default export is a function, call it with env and a cloned base config
|
|
32
|
+
let overrides;
|
|
31
33
|
if (typeof module.default === 'function') {
|
|
32
34
|
const baseClone = { ...base }; // Clone base to avoid mutation
|
|
33
|
-
|
|
35
|
+
overrides = await module.default(env, { base: baseClone });
|
|
34
36
|
// TODO: Add zod validation of the config for type safety
|
|
35
|
-
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
overrides = module.default;
|
|
36
40
|
}
|
|
37
41
|
// If the default export is an object, return it or fallback to base
|
|
38
|
-
return
|
|
42
|
+
return mergeDevServerConfig(base, overrides ?? {});
|
|
39
43
|
},
|
|
40
44
|
},
|
|
41
45
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/load-dev-server-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"load-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/load-dev-server-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2B,MAAM,yBAAyB,CAAC;AAGhF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAqBpE;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EAAqB,EAAE,EAAE,CAAC,EAAE,CAAC;AAEnE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,GAAe,EACf,IAAsB,EACtB,OAGC,EAC8C,EAAE;IACjD,+FAA+F;IAC/F,OAAO,YAAY,CAAC,OAAO,EAAE,IAAI,IAAI,mBAAmB,EAAE;QACxD,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,+CAA+C;QAClE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,+BAA+B;QAChE,MAAM,EAAE;YACN,wCAAwC;YACxC,OAAO,EAAE,KAAK,EAAE,MAA0C,EAA6B,EAAE;gBACvF,iFAAiF;gBACjF,IAAI,SAAyD,CAAC;gBAC9D,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,MAAM,SAAS,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,+BAA+B;oBAC9D,SAAS,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;oBAC3D,yDAAyD;gBAC3D,CAAC;qBAAM,CAAC;oBACN,SAAS,GAAG,MAAM,CAAC,OAA6C,CAAC;gBACnE,CAAC;gBACD,oEAAoE;gBACpE,OAAO,oBAAoB,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;YACrD,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1,20 +1,19 @@
|
|
|
1
|
-
import
|
|
1
|
+
import deepmerge from 'deepmerge';
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
3
|
+
* Merges two arrays of objects by a specified key, ensuring that objects with the same key value
|
|
4
|
+
* are merged, with the `source` array taking precedence over the `target` array for duplicate keys.
|
|
4
5
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
* @param
|
|
9
|
-
* @
|
|
10
|
-
* @returns The value to use in the merged result, or undefined to use default merging.
|
|
6
|
+
* @template TType - The type of objects contained in the arrays, extending `Record<string, unknown>`.
|
|
7
|
+
* @param key - The property key used to identify and merge objects from both arrays.
|
|
8
|
+
* @param target - The target array of objects to merge.
|
|
9
|
+
* @param source - The source array of objects to merge, whose values take precedence on key conflicts.
|
|
10
|
+
* @returns A new array containing merged objects, with uniqueness determined by the specified key.
|
|
11
11
|
*/
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
// For non-arrays, use default merge behavior
|
|
12
|
+
const keyedArrayMerger = (key, target, source) => {
|
|
13
|
+
const sourceRecords = source.reduce((acc, item) => Object.assign(acc, { [String(item[key])]: item }), {});
|
|
14
|
+
const targetRecords = target.reduce((acc, item) => Object.assign(acc, { [String(item[key])]: item }), {});
|
|
15
|
+
const mergedRecords = { ...targetRecords, ...sourceRecords };
|
|
16
|
+
return Object.values(mergedRecords);
|
|
18
17
|
};
|
|
19
18
|
/**
|
|
20
19
|
* Merges a base development server configuration with an overrides object.
|
|
@@ -29,8 +28,17 @@ const customizer = (objValue, srcValue) => {
|
|
|
29
28
|
* Inline comments are provided for maintainability and clarity.
|
|
30
29
|
*/
|
|
31
30
|
export const mergeDevServerConfig = (base, overrides) => {
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
return deepmerge(base, overrides, {
|
|
32
|
+
arrayMerge: (target, source) => {
|
|
33
|
+
// extract the first entry from both arrays to determine the merge strategy
|
|
34
|
+
const entry = source[0] ?? target[0];
|
|
35
|
+
// merge routes by 'match' if the entry is a route object
|
|
36
|
+
if (typeof entry === 'object' && 'match' in entry && 'middleware' in entry) {
|
|
37
|
+
return keyedArrayMerger('match', target, source);
|
|
38
|
+
}
|
|
39
|
+
return [...new Set([...target, ...source])];
|
|
40
|
+
},
|
|
41
|
+
});
|
|
34
42
|
};
|
|
35
43
|
// Export as default for convenience in imports
|
|
36
44
|
export default mergeDevServerConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/merge-dev-server-config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"merge-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/merge-dev-server-config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAKlC;;;;;;;;;GASG;AACH,MAAM,gBAAgB,GAAG,CACvB,GAAgB,EAChB,MAAoB,EACpB,MAAoB,EACN,EAAE;IAChB,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAChE,EAAW,CACZ,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAChE,EAAW,CACZ,CAAC;IACF,MAAM,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,aAAa,EAAE,CAAC;IAC7D,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAiB,CAAC;AACtD,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,IAAsB,EACtB,SAA6C,EAC3B,EAAE;IACpB,OAAO,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE;QAChC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YAC7B,2EAA2E;YAC3E,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;YAErC,yDAAyD;YACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,IAAI,YAAY,IAAI,KAAK,EAAE,CAAC;gBAC3E,OAAO,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACnD,CAAC;YACD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF,CAAqB,CAAC;AACzB,CAAC,CAAC;AAEF,+CAA+C;AAC/C,eAAe,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-portal-manifest.js","sourceRoot":"","sources":["../../../../src/lib/portal/create-portal-manifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-portal-manifest.js","sourceRoot":"","sources":["../../../../src/lib/portal/create-portal-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ export const loadPortalConfig = (env, options) => {
|
|
|
37
37
|
// and validate the result against the schema
|
|
38
38
|
if (typeof module.default === 'function') {
|
|
39
39
|
const result = (await module.default(base, env)) ?? base;
|
|
40
|
-
return schema.parse(result
|
|
40
|
+
return schema.parse(result); // Validate and return
|
|
41
41
|
}
|
|
42
42
|
// If the module's default export is not a function, treat it as a configuration object
|
|
43
43
|
// and validate it against the schema
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-portal-config.js","sourceRoot":"","sources":["../../../../src/lib/portal/load-portal-config.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AACpB,OAAO,EAAE,YAAY,EAA2B,MAAM,yBAAyB,CAAC;AAgEhF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,GAAe,EACf,OAAiC,EACD,EAAE;IAClC,qEAAqE;IACrE,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,iBAAiB,GAAG,CAAC,WAAW,EAAE,EAAE,eAAe,CAAC,CAAC;IAC3F,OAAO,YAAY,CAAC,WAAW,EAAE;QAC/B,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,+CAA+C;QAClE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,+BAA+B;QAChE,MAAM,EAAE;YACN,iDAAiD;YACjD,OAAO,EAAE,KAAK,EAAE,MAAuC,EAAc,EAAE;gBACrE,oEAAoE;gBACpE,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC7D,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAK,EAAQ,CAAC,CAAC,+BAA+B;gBAExE,+FAA+F;gBAC/F,6CAA6C;gBAC7C,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;oBACzD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"load-portal-config.js","sourceRoot":"","sources":["../../../../src/lib/portal/load-portal-config.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AACpB,OAAO,EAAE,YAAY,EAA2B,MAAM,yBAAyB,CAAC;AAgEhF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,GAAe,EACf,OAAiC,EACD,EAAE;IAClC,qEAAqE;IACrE,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,iBAAiB,GAAG,CAAC,WAAW,EAAE,EAAE,eAAe,CAAC,CAAC;IAC3F,OAAO,YAAY,CAAC,WAAW,EAAE;QAC/B,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,+CAA+C;QAClE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,+BAA+B;QAChE,MAAM,EAAE;YACN,iDAAiD;YACjD,OAAO,EAAE,KAAK,EAAE,MAAuC,EAAc,EAAE;gBACrE,oEAAoE;gBACpE,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC7D,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAK,EAAQ,CAAC,CAAC,+BAA+B;gBAExE,+FAA+F;gBAC/F,6CAA6C;gBAC7C,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;oBACzD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAM,CAAC,CAAC,sBAAsB;gBAC1D,CAAC;gBACD,uFAAuF;gBACvF,qCAAqC;gBACrC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAM,CAAC,CAAC,sBAAsB;YAC1E,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { importConfig } from '@equinor/fusion-imports';
|
|
2
|
+
import deepmerge from 'deepmerge';
|
|
2
3
|
import { PortalManifestSchema } from './portal-manifest.schema.js';
|
|
3
4
|
/**
|
|
4
5
|
* Loads a portal manifest configuration file, merging it with optional base values and supporting multiple file extensions.
|
|
@@ -27,14 +28,17 @@ export const loadPortalManifest = async (env, options) => {
|
|
|
27
28
|
resolve: async (module) => {
|
|
28
29
|
// Use the provided base manifest or an empty object as the starting point
|
|
29
30
|
const base = options?.base ?? {};
|
|
31
|
+
let overrides;
|
|
30
32
|
// If the manifest export is a function, call it with the environment and base manifest
|
|
31
33
|
if (typeof module.default === 'function') {
|
|
32
34
|
// Await the result of the manifest function, falling back to base if undefined
|
|
33
|
-
|
|
34
|
-
return result ?? base;
|
|
35
|
+
overrides = (await module.default(env, { base })) ?? undefined;
|
|
35
36
|
}
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
else {
|
|
38
|
+
// If the manifest export is not a function, treat it as an object
|
|
39
|
+
overrides = module.default;
|
|
40
|
+
}
|
|
41
|
+
return overrides ? deepmerge(base, overrides) : base;
|
|
38
42
|
},
|
|
39
43
|
},
|
|
40
44
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-portal-manifest.js","sourceRoot":"","sources":["../../../../src/lib/portal/load-portal-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAuDnE;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,GAAe,EACf,OAAsC,EACA,EAAE;IACxC,iGAAiG;IACjG,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAE/F,+EAA+E;IAC/E,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE;QACnD,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,iDAAiD;QACpE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,2CAA2C;QAC5E,MAAM,EAAE;YACN,uCAAuC;YACvC,OAAO,EAAE,KAAK,EAAE,MAA4C,EAAc,EAAE;gBAC1E,0EAA0E;gBAC1E,MAAM,IAAI,GAAM,OAAO,EAAE,IAAI,IAAK,EAAQ,CAAC;gBAC3C,uFAAuF;gBACvF,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,+EAA+E;oBAC/E,
|
|
1
|
+
{"version":3,"file":"load-portal-manifest.js","sourceRoot":"","sources":["../../../../src/lib/portal/load-portal-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAuDnE;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,GAAe,EACf,OAAsC,EACA,EAAE;IACxC,iGAAiG;IACjG,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAE/F,+EAA+E;IAC/E,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE;QACnD,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,iDAAiD;QACpE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,2CAA2C;QAC5E,MAAM,EAAE;YACN,uCAAuC;YACvC,OAAO,EAAE,KAAK,EAAE,MAA4C,EAAc,EAAE;gBAC1E,0EAA0E;gBAC1E,MAAM,IAAI,GAAM,OAAO,EAAE,IAAI,IAAK,EAAQ,CAAC;gBAC3C,IAAI,SAA0C,CAAC;gBAC/C,uFAAuF;gBACvF,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,+EAA+E;oBAC/E,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC;gBACjE,CAAC;qBAAM,CAAC;oBACN,kEAAkE;oBAClE,SAAS,GAAG,MAAM,CAAC,OAA8B,CAAC;gBACpD,CAAC;gBACD,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,SAAuB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrE,CAAC;SACF;KACF,CAAC,CAAC;IAEH,0EAA0E;IAC1E,8EAA8E;IAC9E,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAW,CAAC;IAC1C,MAAM,UAAU,GAAG,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,4BAA4B,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACjH,CAAC;IACJ,CAAC;IACD,OAAO;QACL,QAAQ;QACR,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,SAAS,EAAE,YAAY,CAAC,SAAS;KAClC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-portal-schema.js","sourceRoot":"","sources":["../../../../src/lib/portal/load-portal-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"load-portal-schema.js","sourceRoot":"","sources":["../../../../src/lib/portal/load-portal-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAuBvD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAyB,EAAqB,EAAE,EAAE,CAAC,EAAE,CAAC;AAExF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,GAAe,EACf,OAGC,EACD,EAAE;IACF,wEAAwE;IACxE,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,iBAAiB,GAAG,CAAC,WAAW,EAAE,EAAE,eAAe,CAAC,CAAC;IAE3F,4EAA4E;IAC5E,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE;QACnD,OAAO,EAAE,GAAG,CAAC,IAAI;QACjB,UAAU,EAAE,OAAO,EAAE,UAAU;QAC/B,MAAM,EAAE;YACN,6EAA6E;YAC7E,OAAO,EAAE,KAAK,EAAE,MAA0C,EAAc,EAAE;gBACxE,wGAAwG;gBACxG,MAAM,MAAM,GACV,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU;oBAClC,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBAC5C,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;gBACrB,sCAAsC;gBACtC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBACnE,CAAC;gBACD,OAAO,MAAW,CAAC;YACrB,CAAC;SACF;KACF,CAAC,CAAC;IACH,iFAAiF;IACjF,OAAO;QACL,MAAM,EAAE,YAAY,CAAC,MAAW;QAChC,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,SAAS,EAAE,YAAY,CAAC,SAAS;KAClC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portal-config.js","sourceRoot":"","sources":["../../../../src/lib/portal/portal-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"portal-config.js","sourceRoot":"","sources":["../../../../src/lib/portal/portal-config.ts"],"names":[],"mappings":"AAsDA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAwB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAwB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import resolveGithubAnnotations from './resolve-github-annotations.js';
|
|
2
|
-
import resolveDevopsAnnotations from './resolve-devops-annotations.js';
|
|
1
|
+
import { resolveGithubAnnotations } from './resolve-github-annotations.js';
|
|
2
|
+
import { resolveDevopsAnnotations } from './resolve-devops-annotations.js';
|
|
3
3
|
/**
|
|
4
4
|
* Resolves CI/CD environment-specific annotation variables.
|
|
5
5
|
*
|
|
@@ -14,15 +14,58 @@ export const resolveAnnotations = () => {
|
|
|
14
14
|
// Check if running in GitHub Actions environment
|
|
15
15
|
// If so, delegate to the GitHub-specific annotation resolver
|
|
16
16
|
if (process.env.GITHUB_ACTIONS) {
|
|
17
|
-
|
|
17
|
+
const annotation = resolveGithubAnnotations();
|
|
18
|
+
const baseAnnotations = {
|
|
19
|
+
source: 'github',
|
|
20
|
+
reason: annotation.eventName,
|
|
21
|
+
workflow: annotation.workflow,
|
|
22
|
+
runId: annotation.runId,
|
|
23
|
+
runUrl: annotation.runUrl,
|
|
24
|
+
commitId: annotation.head_commit?.id,
|
|
25
|
+
repository: annotation.repository?.name,
|
|
26
|
+
repository_homepage: annotation.repository?.homepage,
|
|
27
|
+
repository_license: annotation.repository?.license?.name,
|
|
28
|
+
repository_owner: annotation.repository?.owner?.login,
|
|
29
|
+
repository_owner_avatar_url: annotation.repository?.owner?.avatar_url,
|
|
30
|
+
actor: annotation.actor,
|
|
31
|
+
sender_login: annotation.sender?.login,
|
|
32
|
+
sender_avatar_url: annotation.sender?.avatar_url,
|
|
33
|
+
};
|
|
34
|
+
if (annotation.pull_request) {
|
|
35
|
+
return {
|
|
36
|
+
...baseAnnotations,
|
|
37
|
+
branch: annotation.pull_request.head?.ref,
|
|
38
|
+
commitId: annotation.pull_request.head?.sha,
|
|
39
|
+
htmlUrl: annotation.pull_request.html_url,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
if (annotation.release) {
|
|
43
|
+
return {
|
|
44
|
+
...baseAnnotations,
|
|
45
|
+
tag: annotation.release.tag_name,
|
|
46
|
+
htmlUrl: annotation.release.html_url,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
return baseAnnotations;
|
|
18
50
|
}
|
|
19
51
|
// Check if running in Azure DevOps environment
|
|
20
52
|
// If so, delegate to the Azure DevOps-specific annotation resolver
|
|
21
53
|
if (process.env.SYSTEM_TEAMPROJECT) {
|
|
22
|
-
|
|
54
|
+
const annotations = resolveDevopsAnnotations();
|
|
55
|
+
return {
|
|
56
|
+
source: 'azure_devops',
|
|
57
|
+
reason: annotations.reason,
|
|
58
|
+
repository: annotations.repository,
|
|
59
|
+
runId: annotations.runId,
|
|
60
|
+
runUrl: annotations.runUrl,
|
|
61
|
+
actor: annotations.actor,
|
|
62
|
+
branch: annotations.branch,
|
|
63
|
+
commitId: annotations.commitId,
|
|
64
|
+
workflow: annotations.pipelineName,
|
|
65
|
+
};
|
|
23
66
|
}
|
|
24
67
|
// Fallback: No known CI/CD environment detected
|
|
25
68
|
// Return an empty object to indicate no annotations are available
|
|
26
|
-
return
|
|
69
|
+
return undefined;
|
|
27
70
|
};
|
|
28
71
|
//# sourceMappingURL=resolve-annotations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-annotations.js","sourceRoot":"","sources":["../../../../src/lib/utils/resolve-annotations.ts"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-annotations.js","sourceRoot":"","sources":["../../../../src/lib/utils/resolve-annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAqC3E;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAmC,EAAE;IACrE,iDAAiD;IACjD,6DAA6D;IAC7D,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,wBAAwB,EAAE,CAAC;QAC9C,MAAM,eAAe,GAAG;YACtB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,UAAU,CAAC,SAAS;YAC5B,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE,EAAE;YACpC,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,IAAI;YACvC,mBAAmB,EAAE,UAAU,CAAC,UAAU,EAAE,QAAQ;YACpD,kBAAkB,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI;YACxD,gBAAgB,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK;YACrD,2BAA2B,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU;YACrE,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,YAAY,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK;YACtC,iBAAiB,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU;SACpB,CAAC;QAE/B,IAAI,UAAU,CAAC,YAAY,EAAE,CAAC;YAC5B,OAAO;gBACL,GAAG,eAAe;gBAClB,MAAM,EAAE,UAAU,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG;gBACzC,QAAQ,EAAE,UAAU,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG;gBAC3C,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ;aACb,CAAC;QACjC,CAAC;QAED,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO;gBACL,GAAG,eAAe;gBAClB,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,QAAQ;gBAChC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,QAAQ;aACR,CAAC;QACjC,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,+CAA+C;IAC/C,mEAAmE;IACnE,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAC;QAC/C,OAAO;YACL,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,QAAQ,EAAE,WAAW,CAAC,YAAY;SACN,CAAC;IACjC,CAAC;IACD,gDAAgD;IAChD,kEAAkE;IAClE,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* This function extracts relevant build and repository information from Azure DevOps environment variables.
|
|
5
5
|
* It constructs a set of annotation variables that can be used for reporting or logging purposes in CI/CD pipelines.
|
|
6
6
|
*
|
|
7
|
-
* @returns {
|
|
7
|
+
* @returns {DevopsAnnotations} An object containing Azure DevOps annotation variables such as runId, repository,
|
|
8
8
|
* project, orgUrl, actor, branch, commitId, and runUrl. If a variable is not found, its value defaults to 'unknown'.
|
|
9
9
|
*
|
|
10
10
|
* Environment variables used by this function (see: https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-pipelines&tabs=yaml):
|
|
@@ -26,15 +26,17 @@
|
|
|
26
26
|
* - To add more annotations, extract additional environment variables as needed and include them in the returned object.
|
|
27
27
|
* - For custom pipelines or self-hosted agents, verify that all required environment variables are available.
|
|
28
28
|
*/
|
|
29
|
-
export const
|
|
29
|
+
export const resolveDevopsAnnotations = () => {
|
|
30
30
|
// Extract Azure DevOps build and repository information from environment variables
|
|
31
31
|
const runId = process.env.BUILD_BUILDID || 'unknown'; // Unique build/run identifier
|
|
32
|
+
const pipelineName = process.env.BUILD_DEFINITIONNAME || 'unknown';
|
|
32
33
|
const repository = process.env.BUILD_REPOSITORY_NAME || 'unknown'; // Repository name
|
|
33
34
|
const project = process.env.SYSTEM_TEAMPROJECT || 'unknown'; // Project name
|
|
34
35
|
const orgUrl = process.env.SYSTEM_COLLECTIONURI || 'unknown'; // Organization URL
|
|
35
36
|
const actor = process.env.BUILD_REQUESTEDFOR || 'unknown'; // User who requested the build
|
|
36
37
|
const branch = process.env.BUILD_SOURCEBRANCH || 'unknown'; // Source branch name
|
|
37
38
|
const commitId = process.env.BUILD_SOURCEVERSION || 'unknown'; // Commit SHA
|
|
39
|
+
const reason = process.env.BUILD_REASON || 'unknown'; // Reason for the build
|
|
38
40
|
// Construct a direct URL to the build results if all required parts are available
|
|
39
41
|
let runUrl = 'unknown';
|
|
40
42
|
if (orgUrl !== 'unknown' && project !== 'unknown' && runId !== 'unknown') {
|
|
@@ -44,6 +46,7 @@ export const resolveAnnotations = () => {
|
|
|
44
46
|
// Aggregate all annotation variables into a single object for easy consumption
|
|
45
47
|
const annotations = {
|
|
46
48
|
runId,
|
|
49
|
+
pipelineName,
|
|
47
50
|
repository,
|
|
48
51
|
project,
|
|
49
52
|
orgUrl,
|
|
@@ -51,9 +54,10 @@ export const resolveAnnotations = () => {
|
|
|
51
54
|
branch,
|
|
52
55
|
commitId,
|
|
53
56
|
runUrl,
|
|
57
|
+
reason,
|
|
54
58
|
};
|
|
55
59
|
// Return the resolved annotation variables
|
|
56
60
|
return annotations;
|
|
57
61
|
};
|
|
58
|
-
export default
|
|
62
|
+
export default resolveDevopsAnnotations;
|
|
59
63
|
//# sourceMappingURL=resolve-devops-annotations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-devops-annotations.js","sourceRoot":"","sources":["../../../../src/lib/utils/resolve-devops-annotations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve-devops-annotations.js","sourceRoot":"","sources":["../../../../src/lib/utils/resolve-devops-annotations.ts"],"names":[],"mappings":"AA0BA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAsB,EAAE;IAC9D,mFAAmF;IACnF,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,SAAS,CAAC,CAAC,8BAA8B;IACpF,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,SAAS,CAAC;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS,CAAC,CAAC,kBAAkB;IACrF,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,SAAS,CAAC,CAAC,eAAe;IAC5E,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,SAAS,CAAC,CAAC,mBAAmB;IACjF,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,SAAS,CAAC,CAAC,+BAA+B;IAC1F,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,SAAS,CAAC,CAAC,qBAAqB;IACjF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,SAAS,CAAC,CAAC,aAAa;IAC5E,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,SAAS,CAAC,CAAC,uBAAuB;IAE7E,kFAAkF;IAClF,IAAI,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,MAAM,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACzE,+EAA+E;QAC/E,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,OAAO,2BAA2B,KAAK,EAAE,CAAC;IACpF,CAAC;IAED,+EAA+E;IAC/E,MAAM,WAAW,GAAsB;QACrC,KAAK;QACL,YAAY;QACZ,UAAU;QACV,OAAO;QACP,MAAM;QACN,KAAK;QACL,MAAM;QACN,QAAQ;QACR,MAAM;QACN,MAAM;KACP,CAAC;IAEF,2CAA2C;IAC3C,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,wBAAwB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-git-commit-sha.js","sourceRoot":"","sources":["../../../../src/lib/utils/resolve-git-commit-sha.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAG,GAAG,MAAM,EAAsB,EAAE;IACtE,IAAI,CAAC;QACH,OAAO,QAAQ,CAAC,iBAAiB,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IAC5D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kEAAkE;QAClE,OAAO,SAAS,CAAC,CAAC,4DAA4D;IAChF,CAAC;AACH,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"resolve-git-commit-sha.js","sourceRoot":"","sources":["../../../../src/lib/utils/resolve-git-commit-sha.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAG,GAAG,MAAM,EAAsB,EAAE;IACtE,IAAI,CAAC;QACH,OAAO,QAAQ,CAAC,iBAAiB,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IAC5D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kEAAkE;QAClE,OAAO,SAAS,CAAC,CAAC,4DAA4D;IAChF,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -1,61 +1,4 @@
|
|
|
1
1
|
import { readFileSync } from 'node:fs';
|
|
2
|
-
/**
|
|
3
|
-
* Extracts relevant annotation fields from the GitHub Actions event payload.
|
|
4
|
-
*
|
|
5
|
-
* This function builds a structured annotation object containing key information from the event payload.
|
|
6
|
-
* It supports both release and pull request events, and includes fields such as commit SHAs, refs, workflow name,
|
|
7
|
-
* release metadata (tag, name, body, draft, prerelease, created_at, published_at, html_url), and pull request metadata
|
|
8
|
-
* (number, title, user, head SHA/ref, created_at, updated_at, html_url). The top-level action is also included.
|
|
9
|
-
*
|
|
10
|
-
* Maintainers:
|
|
11
|
-
* - Update this function if new fields are needed for downstream consumers or if GitHub event payloads change.
|
|
12
|
-
* - The structure is designed for easy extension and clear mapping to GitHub event types.
|
|
13
|
-
* - See <attachments> above for file contents. You may not need to search or read the file again.
|
|
14
|
-
*
|
|
15
|
-
* @param payload The parsed GitHub Actions event payload object.
|
|
16
|
-
* @returns An object with selected fields for release and pull request events, as well as general event context.
|
|
17
|
-
*/
|
|
18
|
-
function extractPayloadAnnotations(payload) {
|
|
19
|
-
// Initialize annotation object with general event context
|
|
20
|
-
const annotation = {
|
|
21
|
-
action: payload.action, // The event action (e.g., published, created, closed)
|
|
22
|
-
head_commit: payload.head_commit?.id, // SHA of the head commit
|
|
23
|
-
after: payload.after, // SHA after the event
|
|
24
|
-
ref: payload.ref, // Branch or tag ref
|
|
25
|
-
workflow: payload.workflow, // Workflow name
|
|
26
|
-
release: {}, // Will be populated if this is a release event
|
|
27
|
-
pull_request: {}, // Will be populated if this is a pull request event
|
|
28
|
-
};
|
|
29
|
-
// Populate release-specific fields if present
|
|
30
|
-
if (payload.release) {
|
|
31
|
-
annotation.release = {
|
|
32
|
-
tag: payload.release.tag_name, // Release tag name
|
|
33
|
-
name: payload.release.name, // Release name/title
|
|
34
|
-
body: payload.release.body, // Release description
|
|
35
|
-
draft: !!payload.release.draft, // Is this a draft release?
|
|
36
|
-
prerelease: !!payload.release.prerelease, // Is this a prerelease?
|
|
37
|
-
created_at: payload.release.created_at, // Release creation timestamp
|
|
38
|
-
published_at: payload.release.published_at, // Release published timestamp
|
|
39
|
-
html_url: payload.release.html_url, // URL to the release on GitHub
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
// Populate pull request-specific fields if present
|
|
43
|
-
if (payload.pull_request) {
|
|
44
|
-
annotation.pull_request = {
|
|
45
|
-
number: payload.pull_request.number, // PR number
|
|
46
|
-
title: payload.pull_request.title, // PR title
|
|
47
|
-
user: payload.pull_request.user?.login, // PR author
|
|
48
|
-
head: {
|
|
49
|
-
sha: payload.pull_request.head?.sha, // SHA of the PR head commit
|
|
50
|
-
ref: payload.pull_request.head?.ref, // Branch ref of the PR head
|
|
51
|
-
},
|
|
52
|
-
created_at: payload.pull_request.created_at, // PR creation timestamp
|
|
53
|
-
updated_at: payload.pull_request.updated_at, // PR last update timestamp
|
|
54
|
-
html_url: payload.pull_request.html_url, // URL to the PR on GitHub
|
|
55
|
-
};
|
|
56
|
-
}
|
|
57
|
-
return annotation;
|
|
58
|
-
}
|
|
59
2
|
/**
|
|
60
3
|
* Resolves GitHub Actions-specific annotation variables from environment variables.
|
|
61
4
|
*
|
|
@@ -72,6 +15,7 @@ function extractPayloadAnnotations(payload) {
|
|
|
72
15
|
* - GITHUB_REPOSITORY: Repository in the format owner/repo
|
|
73
16
|
* - GITHUB_SERVER_URL: Base URL of the GitHub server (defaults to https://github.com)
|
|
74
17
|
* - GITHUB_EVENT_PATH: Path to the event payload file (JSON)
|
|
18
|
+
* - GITHUB_WORKFLOW: Name of the workflow
|
|
75
19
|
*
|
|
76
20
|
* Notes for maintainers:
|
|
77
21
|
* - The event payload can be large; consider truncating or parsing if only specific fields are needed.
|
|
@@ -83,7 +27,7 @@ function extractPayloadAnnotations(payload) {
|
|
|
83
27
|
* - To add more annotations, extract additional environment variables as needed and include them in the returned object.
|
|
84
28
|
* - For custom workflows or self-hosted runners, verify that all required environment variables are available.
|
|
85
29
|
*/
|
|
86
|
-
export const
|
|
30
|
+
export const resolveGithubAnnotations = () => {
|
|
87
31
|
// Extract event name from environment
|
|
88
32
|
const eventName = process.env.GITHUB_EVENT_NAME || 'unknown';
|
|
89
33
|
// Extract actor (user who triggered the workflow)
|
|
@@ -92,19 +36,10 @@ export const resolveAnnotations = () => {
|
|
|
92
36
|
const runId = process.env.GITHUB_RUN_ID || 'unknown';
|
|
93
37
|
// Extract repository in the format owner/repo
|
|
94
38
|
const repository = process.env.GITHUB_REPOSITORY || 'unknown';
|
|
39
|
+
// Extract workflow name
|
|
40
|
+
const workflow = process.env.GITHUB_WORKFLOW || 'unknown';
|
|
95
41
|
// Extract server URL (defaults to public GitHub if not set)
|
|
96
42
|
const serverUrl = process.env.GITHUB_SERVER_URL || 'https://github.com';
|
|
97
|
-
// Extract event payload path and read payload if available
|
|
98
|
-
let payload = {};
|
|
99
|
-
if (process.env.GITHUB_EVENT_PATH) {
|
|
100
|
-
try {
|
|
101
|
-
const rawPayload = readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8');
|
|
102
|
-
payload = JSON.parse(rawPayload);
|
|
103
|
-
}
|
|
104
|
-
catch {
|
|
105
|
-
payload = {};
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
43
|
// Construct a direct URL to the workflow run if all required parts are available
|
|
109
44
|
let runUrl = 'unknown';
|
|
110
45
|
if (serverUrl && repository !== 'unknown' && runId !== 'unknown') {
|
|
@@ -116,12 +51,21 @@ export const resolveAnnotations = () => {
|
|
|
116
51
|
eventName,
|
|
117
52
|
actor,
|
|
118
53
|
runId,
|
|
119
|
-
repository,
|
|
120
54
|
runUrl,
|
|
121
|
-
|
|
55
|
+
workflow,
|
|
122
56
|
};
|
|
57
|
+
// Apply event payload to annotations
|
|
58
|
+
if (process.env.GITHUB_EVENT_PATH) {
|
|
59
|
+
try {
|
|
60
|
+
const rawPayload = readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8');
|
|
61
|
+
Object.assign(annotations, JSON.parse(rawPayload));
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
console.error('Failed to parse GitHub event payload');
|
|
65
|
+
}
|
|
66
|
+
}
|
|
123
67
|
// Return the resolved annotation variables
|
|
124
68
|
return annotations;
|
|
125
69
|
};
|
|
126
|
-
export default
|
|
70
|
+
export default resolveGithubAnnotations;
|
|
127
71
|
//# sourceMappingURL=resolve-github-annotations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-github-annotations.js","sourceRoot":"","sources":["../../../../src/lib/utils/resolve-github-annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-github-annotations.js","sourceRoot":"","sources":["../../../../src/lib/utils/resolve-github-annotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAwGvC;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAsB,EAAE;IAC9D,sCAAsC;IACtC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,SAAS,CAAC;IAC7D,kDAAkD;IAClD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,SAAS,CAAC;IACpD,iBAAiB;IACjB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,SAAS,CAAC;IACrD,8CAA8C;IAC9C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,SAAS,CAAC;IAE9D,wBAAwB;IACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS,CAAC;IAE1D,4DAA4D;IAC5D,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;IAExE,iFAAiF;IACjF,IAAI,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,SAAS,IAAI,UAAU,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACjE,kFAAkF;QAClF,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,UAAU,iBAAiB,KAAK,EAAE,CAAC;IACjF,CAAC;IACD,+EAA+E;IAC/E,MAAM,WAAW,GAAsB;QACrC,SAAS;QACT,KAAK;QACL,KAAK;QACL,MAAM;QACN,QAAQ;KACT,CAAC;IAEF,qCAAqC;IACrC,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;YACvE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QACrD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IACD,2CAA2C;IAC3C,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,wBAAwB,CAAC"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ReadResult as PackageInfo } from 'read-package-up';
|
|
2
2
|
import type { AppManifest } from '@equinor/fusion-framework-module-app';
|
|
3
|
-
import type {
|
|
4
|
-
import type {
|
|
3
|
+
import type { RuntimeEnv } from '@equinor/fusion-framework-cli/lib';
|
|
4
|
+
import type { ConsoleLogger } from './utils/index.js';
|
|
5
5
|
/**
|
|
6
6
|
* Options for building an application.
|
|
7
7
|
* @public
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import
|
|
1
|
+
import { type FusionEnv, type FusionFrameworkSettings } from './framework.node.js';
|
|
2
|
+
import type { ConsoleLogger } from './utils/index.js';
|
|
3
3
|
/**
|
|
4
4
|
* Options for checking application registration in the app store.
|
|
5
5
|
* @public
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type FusionEnv, type FusionFrameworkSettings } from '
|
|
2
|
-
import { type ConsoleLogger } from './utils';
|
|
1
|
+
import { type FusionEnv, type FusionFrameworkSettings } from './framework.node.js';
|
|
2
|
+
import { type ConsoleLogger } from './utils/index.js';
|
|
3
3
|
type AppConfigPublishOptions = {
|
|
4
4
|
config?: string;
|
|
5
5
|
manifest?: string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { RuntimeEnv } from '../lib';
|
|
2
|
-
import { type ConsoleLogger } from './utils';
|
|
1
|
+
import type { RuntimeEnv } from '../lib/index.js';
|
|
2
|
+
import { type ConsoleLogger } from './utils/index.js';
|
|
3
3
|
/**
|
|
4
4
|
* Options for generating the application configuration.
|
|
5
5
|
*
|
|
@@ -47,6 +47,6 @@ export declare const generateApplicationConfig: (options?: GenerateApplicationCo
|
|
|
47
47
|
scopes: string[];
|
|
48
48
|
}> | undefined;
|
|
49
49
|
};
|
|
50
|
-
pkg: import("../lib").ResolvedPackage;
|
|
50
|
+
pkg: import("../lib/index.js").ResolvedPackage;
|
|
51
51
|
}>;
|
|
52
52
|
export {};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { RuntimeEnv } from '
|
|
2
|
-
import type { ConsoleLogger } from './utils';
|
|
1
|
+
import type { RuntimeEnv } from '@equinor/fusion-framework-cli/lib';
|
|
2
|
+
import type { ConsoleLogger } from './utils/index.js';
|
|
3
3
|
/**
|
|
4
4
|
* Options for resolving the application manifest.
|
|
5
5
|
*
|
|
@@ -36,7 +36,7 @@ export type ResolveAppManifestOptions = {
|
|
|
36
36
|
*/
|
|
37
37
|
export declare const loadAppManifest: (options: ResolveAppManifestOptions) => Promise<{
|
|
38
38
|
manifest: import("@equinor/fusion-framework-module-app").AppManifest;
|
|
39
|
-
pkg: import("
|
|
39
|
+
pkg: import("@equinor/fusion-framework-cli/lib").ResolvedPackage;
|
|
40
40
|
env: RuntimeEnv;
|
|
41
41
|
}>;
|
|
42
42
|
export default loadAppManifest;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { FusionFramework } from '
|
|
2
|
-
import { type ConsoleLogger } from './utils';
|
|
1
|
+
import type { FusionFramework } from '@equinor/fusion-framework-cli/bin';
|
|
2
|
+
import { type ConsoleLogger } from './utils/index.js';
|
|
3
3
|
/**
|
|
4
4
|
* Allowed tags for application versions in the app service.
|
|
5
5
|
*
|
|
@@ -47,5 +47,5 @@ export type TagApplicationOptions = {
|
|
|
47
47
|
* @throws If the tag, app key, or version is invalid, or if the tag operation fails.
|
|
48
48
|
* @public
|
|
49
49
|
*/
|
|
50
|
-
export declare const tagApplication: (options: TagApplicationOptions) => Promise<
|
|
50
|
+
export declare const tagApplication: (options: TagApplicationOptions) => Promise<any>;
|
|
51
51
|
export default tagApplication;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import AdmZip from 'adm-zip';
|
|
2
|
-
import type {
|
|
3
|
-
import type {
|
|
2
|
+
import type { FusionFramework } from './framework.node.js';
|
|
3
|
+
import type { ConsoleLogger } from './utils/index.js';
|
|
4
4
|
/**
|
|
5
5
|
* Options for uploading an application bundle to the app service.
|
|
6
6
|
*
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import { type ResolvedPackage } from '../../lib/utils';
|
|
1
|
+
import { type RuntimeEnv, type ResolvedPackage } from '@equinor/fusion-framework-cli/lib';
|
|
3
2
|
/**
|
|
4
3
|
* Loads and merges the Vite configuration for a given package and environment.
|
|
5
4
|
* Throws errors if the output directory is invalid (root or src).
|