@equinor/fusion-framework-cli 15.2.0 → 15.2.2
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 +51 -0
- package/bin/build/bin.mjs +1 -1
- package/bin/build/cli.mjs +3 -3
- package/dist/esm/lib/app/{schemas.js → api-app-config-schema.js} +1 -1
- package/dist/esm/lib/app/api-app-config-schema.js.map +1 -0
- package/dist/esm/lib/app/{create-app-manifest.js → create-app-manifest-from-package.js} +10 -8
- package/dist/esm/lib/app/create-app-manifest-from-package.js.map +1 -0
- package/dist/esm/lib/app/{app-config.js → define-app-config.js} +1 -1
- package/dist/esm/lib/app/define-app-config.js.map +1 -0
- package/dist/esm/lib/app/{app-manifest.js → define-app-manifest.js} +1 -1
- package/dist/esm/lib/app/define-app-manifest.js.map +1 -0
- package/dist/esm/lib/app/define-app-package.js +11 -0
- package/dist/esm/lib/app/define-app-package.js.map +1 -0
- package/dist/esm/lib/app/index.js +5 -5
- package/dist/esm/lib/app/index.js.map +1 -1
- package/dist/esm/lib/app/load-app-config.js +1 -1
- package/dist/esm/lib/app/load-app-config.js.map +1 -1
- package/dist/esm/lib/app/load-app-manifest.js +1 -1
- package/dist/esm/lib/app/load-app-manifest.js.map +1 -1
- package/dist/esm/lib/app/merge-app-config.js +1 -0
- package/dist/esm/lib/app/merge-app-config.js.map +1 -1
- package/dist/esm/lib/app/{merge-app-manifest.js → merge-app-manifests.js} +2 -2
- package/dist/esm/lib/app/merge-app-manifests.js.map +1 -0
- package/dist/esm/lib/app/resolve-app-key.js +17 -0
- package/dist/esm/lib/app/resolve-app-key.js.map +1 -0
- package/dist/esm/lib/define-app-config.js +20 -0
- package/dist/esm/lib/define-app-config.js.map +1 -0
- package/dist/esm/lib/define-app-manifest.js +20 -0
- package/dist/esm/lib/define-app-manifest.js.map +1 -0
- package/dist/esm/lib/define-dev-server-config.js +7 -0
- package/dist/esm/lib/define-dev-server-config.js.map +1 -0
- package/dist/esm/lib/{fusion-cli-config.js → define-fusion-cli.js} +1 -1
- package/dist/esm/lib/define-fusion-cli.js.map +1 -0
- package/dist/esm/lib/dev-server.js +2 -1
- package/dist/esm/lib/dev-server.js.map +1 -1
- package/dist/esm/lib/index.js +7 -5
- package/dist/esm/lib/index.js.map +1 -1
- package/dist/esm/lib/load-dev-server-config.js +2 -7
- package/dist/esm/lib/load-dev-server-config.js.map +1 -1
- package/dist/esm/lib/merge-dev-server-config.js +4 -0
- package/dist/esm/lib/merge-dev-server-config.js.map +1 -1
- package/dist/esm/lib/portal/{create-portal-manifest.js → create-portal-manifest-from-package.js} +11 -6
- package/dist/esm/lib/portal/create-portal-manifest-from-package.js.map +1 -0
- package/dist/esm/lib/portal/{portal-config.js → define-portal-config.js} +1 -1
- package/dist/esm/lib/portal/define-portal-config.js.map +1 -0
- package/dist/esm/lib/portal/{portal-manifest.js → define-portal-manifest.js} +5 -17
- package/dist/esm/lib/portal/define-portal-manifest.js.map +1 -0
- package/dist/esm/lib/portal/define-portal-schema.js +8 -0
- package/dist/esm/lib/portal/define-portal-schema.js.map +1 -0
- package/dist/esm/lib/portal/index.js +4 -3
- package/dist/esm/lib/portal/index.js.map +1 -1
- package/dist/esm/lib/portal/load-portal-manifest.js +7 -2
- package/dist/esm/lib/portal/load-portal-manifest.js.map +1 -1
- package/dist/esm/lib/portal/load-portal-schema.js +0 -7
- package/dist/esm/lib/portal/load-portal-schema.js.map +1 -1
- package/dist/esm/lib/portal/{portal-manifest.schema.js → portal-manifest-build-schema.js} +5 -30
- package/dist/esm/lib/portal/portal-manifest-build-schema.js.map +1 -0
- package/dist/esm/lib/portal/portal-manifest-schema.js +31 -0
- package/dist/esm/lib/portal/portal-manifest-schema.js.map +1 -0
- package/dist/esm/lib/portal/validate-portal-manifest.js +15 -0
- package/dist/esm/lib/portal/validate-portal-manifest.js.map +1 -0
- package/dist/esm/lib/static.js +3 -1
- package/dist/esm/lib/static.js.map +1 -1
- package/dist/esm/lib/utils/assert-object.js +25 -0
- package/dist/esm/lib/utils/assert-object.js.map +1 -0
- package/dist/esm/lib/utils/assert.js +1 -135
- package/dist/esm/lib/utils/assert.js.map +1 -1
- package/dist/esm/lib/utils/{extension-filter.js → create-extension-filter-pattern.js} +6 -2
- package/dist/esm/lib/utils/create-extension-filter-pattern.js.map +1 -0
- package/dist/esm/lib/utils/fetch-latest-version.js +26 -0
- package/dist/esm/lib/utils/fetch-latest-version.js.map +1 -0
- package/dist/esm/lib/utils/fetch-package-info.js +65 -0
- package/dist/esm/lib/utils/fetch-package-info.js.map +1 -0
- package/dist/esm/lib/utils/file-exists-sync.js +29 -0
- package/dist/esm/lib/utils/file-exists-sync.js.map +1 -0
- package/dist/esm/lib/utils/file-exists.js +2 -27
- package/dist/esm/lib/utils/file-exists.js.map +1 -1
- package/dist/esm/lib/utils/{snapshot.js → generate-snapshot-version.js} +2 -1
- package/dist/esm/lib/utils/generate-snapshot-version.js.map +1 -0
- package/dist/esm/lib/utils/index.js +4 -3
- package/dist/esm/lib/utils/index.js.map +1 -1
- package/dist/esm/lib/utils/is-git-dir.js +1 -0
- package/dist/esm/lib/utils/is-git-dir.js.map +1 -1
- package/dist/esm/lib/utils/{parse-json-request.js → parse-json-from-request.js} +1 -1
- package/dist/esm/lib/utils/parse-json-from-request.js.map +1 -0
- package/dist/esm/lib/utils/resolve-annotations.js +3 -0
- package/dist/esm/lib/utils/resolve-annotations.js.map +1 -1
- package/dist/esm/lib/utils/resolve-devops-annotations.js +1 -0
- package/dist/esm/lib/utils/resolve-devops-annotations.js.map +1 -1
- package/dist/esm/lib/utils/{resolve-source-entry-point.js → resolve-entry-point.js} +3 -2
- package/dist/esm/lib/utils/resolve-entry-point.js.map +1 -0
- package/dist/esm/lib/utils/resolve-git-commit-sha.js +1 -1
- package/dist/esm/lib/utils/resolve-git-commit-sha.js.map +1 -1
- package/dist/esm/lib/utils/resolve-git-remote-url.js +1 -1
- package/dist/esm/lib/utils/resolve-git-remote-url.js.map +1 -1
- package/dist/esm/lib/utils/resolve-github-annotations.js +4 -0
- package/dist/esm/lib/utils/resolve-github-annotations.js.map +1 -1
- package/dist/esm/lib/utils/resolve-package.js +1 -0
- package/dist/esm/lib/utils/resolve-package.js.map +1 -1
- package/dist/esm/lib/utils/{resolve-package-repo.js → resolve-repo-from-package.js} +2 -1
- package/dist/esm/lib/utils/resolve-repo-from-package.js.map +1 -0
- package/dist/esm/lib/utils/safe-rm-sync.js +20 -0
- package/dist/esm/lib/utils/safe-rm-sync.js.map +1 -0
- package/dist/esm/lib/utils/{path-security.js → validate-safe-path.js} +3 -19
- package/dist/esm/lib/utils/validate-safe-path.js.map +1 -0
- package/dist/esm/version.js +1 -1
- package/dist/types/bin/{portal-build.d.ts → build-portal.d.ts} +1 -1
- package/dist/types/bin/{app-check.d.ts → check-app.d.ts} +2 -1
- package/dist/types/bin/configure-framework.d.ts +58 -0
- package/dist/types/bin/fusion-env.d.ts +24 -0
- package/dist/types/bin/{portal-config.d.ts → generate-portal-config.d.ts} +1 -1
- package/dist/types/bin/helpers/ProjectTemplate.d.ts +7 -1
- package/dist/types/bin/helpers/ProjectTemplateRepository.d.ts +15 -0
- package/dist/types/bin/helpers/install-package-dependencies.d.ts +1 -0
- package/dist/types/bin/helpers/parse-templates-manifest.d.ts +20 -0
- package/dist/types/bin/helpers/resolve-app-from-artifact.d.ts +1 -1
- package/dist/types/bin/helpers/{project-templates.schema.d.ts → template.schemas.d.ts} +7 -26
- package/dist/types/bin/index.d.ts +23 -20
- package/dist/types/bin/initialize-framework.d.ts +39 -0
- package/dist/types/bin/{app-config-publish.d.ts → publish-app-config.d.ts} +2 -2
- package/dist/types/bin/{portal-config-publish.d.ts → publish-portal-config.d.ts} +2 -1
- package/dist/types/bin/resolve-default-env.d.ts +8 -0
- package/dist/types/bin/{portal-tag.d.ts → tag-portal.d.ts} +1 -1
- package/dist/types/bin/{app-upload.d.ts → upload-application.d.ts} +1 -1
- package/dist/types/bin/{portal-upload.d.ts → upload-portal-bundle.d.ts} +1 -1
- package/dist/types/bin/utils/ConsoleLogger.d.ts +1 -1
- package/dist/types/bin/utils/{spinner.d.ts → Spinner.d.ts} +8 -0
- package/dist/types/bin/utils/auth-error-docs.d.ts +7 -0
- package/dist/types/bin/utils/create-dev-server-config.d.ts +47 -0
- package/dist/types/bin/utils/create-dev-server.d.ts +2 -47
- package/dist/types/bin/utils/env-token-hint.d.ts +7 -0
- package/dist/types/bin/utils/format-auth-error.d.ts +0 -17
- package/dist/types/bin/utils/format-byte-size.d.ts +16 -0
- package/dist/types/bin/utils/format-path.d.ts +16 -0
- package/dist/types/bin/utils/format-token-acquisition-error.d.ts +17 -0
- package/dist/types/bin/utils/index.d.ts +9 -5
- package/dist/types/bin/utils/normalize-dev-server-config.d.ts +24 -0
- package/dist/types/cli/commands/app/default-archive.d.ts +4 -0
- package/dist/types/cli/commands/app/{pack.d.ts → pack.command.d.ts} +0 -1
- package/dist/types/cli/commands/create/_helpers/check-target-directory.d.ts +1 -0
- package/dist/types/cli/options/{env.d.ts → create-env-option.d.ts} +0 -5
- package/dist/types/cli/options/options.d.ts +20 -0
- package/dist/types/cli/options/{auth.d.ts → with-auth-options.d.ts} +0 -20
- package/dist/types/cli/plugins/load-plugins.d.ts +9 -0
- package/dist/types/lib/app/{app-config.d.ts → define-app-config.d.ts} +2 -2
- package/dist/types/lib/app/define-app-package.d.ts +26 -0
- package/dist/types/lib/app/index.d.ts +5 -5
- package/dist/types/lib/app/load-app-config.d.ts +2 -2
- package/dist/types/lib/app/load-app-manifest.d.ts +1 -1
- package/dist/types/lib/app/resolve-app-key.d.ts +11 -0
- package/dist/types/lib/define-app-config.d.ts +12 -0
- package/dist/types/lib/define-app-manifest.d.ts +12 -0
- package/dist/types/lib/define-dev-server-config.d.ts +21 -0
- package/dist/types/lib/dev-server.d.ts +2 -1
- package/dist/types/lib/index.d.ts +6 -4
- package/dist/types/lib/load-dev-server-config.d.ts +1 -20
- package/dist/types/lib/portal/{create-portal-manifest.d.ts → create-portal-manifest-from-package.d.ts} +1 -1
- package/dist/types/lib/portal/{portal-manifest.d.ts → define-portal-manifest.d.ts} +5 -13
- package/dist/types/lib/portal/define-portal-schema.d.ts +24 -0
- package/dist/types/lib/portal/index.d.ts +4 -3
- package/dist/types/lib/portal/load-portal-config.d.ts +1 -1
- package/dist/types/lib/portal/load-portal-manifest.d.ts +1 -1
- package/dist/types/lib/portal/load-portal-schema.d.ts +1 -23
- package/dist/types/lib/portal/portal-manifest-build-schema.d.ts +32 -0
- package/dist/types/lib/portal/{portal-manifest.schema.d.ts → portal-manifest-schema.d.ts} +0 -31
- package/dist/types/lib/portal/validate-portal-manifest.d.ts +11 -0
- package/dist/types/lib/static.d.ts +0 -9
- package/dist/types/lib/utils/assert-object.d.ts +20 -0
- package/dist/types/lib/utils/assert.d.ts +1 -100
- package/dist/types/lib/utils/fetch-latest-version.d.ts +20 -0
- package/dist/types/lib/utils/{package-info.d.ts → fetch-package-info.d.ts} +0 -45
- package/dist/types/lib/utils/file-exists-sync.d.ts +21 -0
- package/dist/types/lib/utils/file-exists.d.ts +0 -15
- package/dist/types/lib/utils/index.d.ts +4 -3
- package/dist/types/lib/utils/safe-rm-sync.d.ts +15 -0
- package/dist/types/lib/utils/{path-security.d.ts → validate-safe-path.d.ts} +0 -15
- package/dist/types/version.d.ts +1 -1
- package/package.json +13 -13
- package/dist/esm/lib/app/app-config.js.map +0 -1
- package/dist/esm/lib/app/app-manifest.js.map +0 -1
- package/dist/esm/lib/app/app-package.js +0 -92
- package/dist/esm/lib/app/app-package.js.map +0 -1
- package/dist/esm/lib/app/create-app-manifest.js.map +0 -1
- package/dist/esm/lib/app/merge-app-manifest.js.map +0 -1
- package/dist/esm/lib/app/schemas.js.map +0 -1
- package/dist/esm/lib/fusion-cli-config.js.map +0 -1
- package/dist/esm/lib/legacy.js +0 -38
- package/dist/esm/lib/legacy.js.map +0 -1
- package/dist/esm/lib/portal/create-portal-manifest.js.map +0 -1
- package/dist/esm/lib/portal/portal-config.js.map +0 -1
- package/dist/esm/lib/portal/portal-manifest.js.map +0 -1
- package/dist/esm/lib/portal/portal-manifest.schema.js.map +0 -1
- package/dist/esm/lib/utils/extension-filter.js.map +0 -1
- package/dist/esm/lib/utils/package-info.js +0 -135
- package/dist/esm/lib/utils/package-info.js.map +0 -1
- package/dist/esm/lib/utils/parse-json-request.js.map +0 -1
- package/dist/esm/lib/utils/path-security.js.map +0 -1
- package/dist/esm/lib/utils/resolve-package-repo.js.map +0 -1
- package/dist/esm/lib/utils/resolve-source-entry-point.js.map +0 -1
- package/dist/esm/lib/utils/snapshot.js.map +0 -1
- package/dist/types/bin/framework.node.d.ts +0 -123
- package/dist/types/bin/utils/format.d.ts +0 -35
- package/dist/types/cli/plugins/loader.d.ts +0 -2
- package/dist/types/lib/app/app-package.d.ts +0 -76
- package/dist/types/lib/legacy.d.ts +0 -24
- /package/dist/types/bin/{app-build.d.ts → build-application.d.ts} +0 -0
- /package/dist/types/bin/{app-pack.d.ts → bundle-app.d.ts} +0 -0
- /package/dist/types/bin/{portal-pack.d.ts → bundle-portal.d.ts} +0 -0
- /package/dist/types/bin/{app-config.d.ts → generate-application-config.d.ts} +0 -0
- /package/dist/types/bin/helpers/{load-bundle-metadata.d.ts → load-metadata.d.ts} +0 -0
- /package/dist/types/bin/{app-manifest.d.ts → load-app-manifest.d.ts} +0 -0
- /package/dist/types/bin/{portal-manifest.d.ts → load-portal-manifest.d.ts} +0 -0
- /package/dist/types/bin/{app-serve.d.ts → serve-application.d.ts} +0 -0
- /package/dist/types/bin/{portal-serve.d.ts → serve-portal.d.ts} +0 -0
- /package/dist/types/bin/{app-dev.d.ts → start-app-dev-server.d.ts} +0 -0
- /package/dist/types/bin/{portal-dev.d.ts → start-portal-dev-server.d.ts} +0 -0
- /package/dist/types/bin/{app-tag.d.ts → tag-application.d.ts} +0 -0
- /package/dist/types/bin/utils/{defaultHeaders.d.ts → default-headers.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{build.d.ts → build.command.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{check.d.ts → check.command.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{config.d.ts → config.command.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{dev.d.ts → dev.command.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{manifest.d.ts → manifest.command.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{publish.d.ts → publish.command.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{serve.d.ts → serve.command.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{tag.d.ts → tag.command.d.ts} +0 -0
- /package/dist/types/cli/commands/app/{upload.d.ts → upload.command.d.ts} +0 -0
- /package/dist/types/cli/commands/auth/{login.d.ts → login.command.d.ts} +0 -0
- /package/dist/types/cli/commands/auth/{logout.d.ts → logout.command.d.ts} +0 -0
- /package/dist/types/cli/commands/auth/{token.d.ts → token.command.d.ts} +0 -0
- /package/dist/types/cli/commands/create/_helpers/{resolve-workspace-dependencies.d.ts → resolve-package-json-workspace-dependencies.d.ts} +0 -0
- /package/dist/types/cli/commands/create/{app.d.ts → create-app-command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{build.d.ts → build.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{config.d.ts → config.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{dev.d.ts → dev.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{manifest.d.ts → manifest.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{pack.d.ts → pack.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{publish.d.ts → publish.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{schema.d.ts → schema.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{serve.d.ts → serve.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{tag.d.ts → tag.command.d.ts} +0 -0
- /package/dist/types/cli/commands/portal/{upload.d.ts → upload.command.d.ts} +0 -0
- /package/dist/types/lib/app/{schemas.d.ts → api-app-config-schema.d.ts} +0 -0
- /package/dist/types/lib/app/{create-app-manifest.d.ts → create-app-manifest-from-package.d.ts} +0 -0
- /package/dist/types/lib/app/{app-manifest.d.ts → define-app-manifest.d.ts} +0 -0
- /package/dist/types/lib/app/{merge-app-manifest.d.ts → merge-app-manifests.d.ts} +0 -0
- /package/dist/types/lib/{fusion-cli-config.d.ts → define-fusion-cli.d.ts} +0 -0
- /package/dist/types/lib/portal/{portal-config.d.ts → define-portal-config.d.ts} +0 -0
- /package/dist/types/lib/utils/{extension-filter.d.ts → create-extension-filter-pattern.d.ts} +0 -0
- /package/dist/types/lib/utils/{snapshot.d.ts → generate-snapshot-version.d.ts} +0 -0
- /package/dist/types/lib/utils/{parse-json-request.d.ts → parse-json-from-request.d.ts} +0 -0
- /package/dist/types/lib/utils/{resolve-source-entry-point.d.ts → resolve-entry-point.d.ts} +0 -0
- /package/dist/types/lib/utils/{resolve-package-repo.d.ts → resolve-repo-from-package.d.ts} +0 -0
|
@@ -25,4 +25,4 @@ export const ApiAppConfigSchema = z
|
|
|
25
25
|
.optional(), // Endpoints are optional
|
|
26
26
|
})
|
|
27
27
|
.describe('The API application configuration schema, defining environment variables and endpoints for the application.');
|
|
28
|
-
//# sourceMappingURL=
|
|
28
|
+
//# sourceMappingURL=api-app-config-schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"api-app-config-schema.js","sourceRoot":"","sources":["../../../../src/lib/app/api-app-config-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC;KAChC,MAAM,CAAC;IACN,WAAW,EAAE,CAAC;SACX,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;SAC3B,QAAQ,CACP,mHAAmH,CACpH;SACA,QAAQ,EAAE;SACV,OAAO,CAAC,EAAE,CAAC,EAAE,iDAAiD;IACjE,SAAS,EAAE,CAAC;SACT,MAAM,CACL,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,MAAM,CAAC;QACP,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC;QACvE,MAAM,EAAE,CAAC;aACN,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;aACjB,QAAQ,EAAE;aACV,OAAO,CAAC,EAAE,CAAC;aACX,QAAQ,CACP,kFAAkF,CACnF;KACJ,CAAC,CACH;SACA,QAAQ,CACP,sHAAsH,CACvH;SACA,QAAQ,EAAE,EAAE,yBAAyB;CACzC,CAAC;KACD,QAAQ,CACP,6GAA6G,CAC9G,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { assert
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import { assert } from '../utils/assert.js';
|
|
2
|
+
import { assertObject } from '../utils/assert-object.js';
|
|
3
|
+
import { resolveEntryPoint } from '../utils/resolve-entry-point.js';
|
|
4
|
+
import { resolveRepoFromPackage } from '../utils/resolve-repo-from-package.js';
|
|
4
5
|
import { resolveGitRemoteUrl } from '../utils/resolve-git-remote-url.js';
|
|
5
6
|
import { resolveGitCommitSha } from '../utils/resolve-git-commit-sha.js';
|
|
6
7
|
import { resolveAnnotations } from '../utils/resolve-annotations.js';
|
|
7
8
|
import { ASSET_EXTENSIONS } from '../static.js';
|
|
8
|
-
import { generateSnapshotVersion } from '../utils/snapshot.js';
|
|
9
|
+
import { generateSnapshotVersion } from '../utils/generate-snapshot-version.js';
|
|
9
10
|
/**
|
|
10
11
|
* Resolves the entry point for the application based on the environment and package.json.
|
|
11
12
|
*
|
|
@@ -52,6 +53,9 @@ export const createAppManifestFromPackage = (env, packageJson, options) => {
|
|
|
52
53
|
const assetPath = env.command === 'build' ? undefined : `/bundles/apps/${appKey}@${version}`;
|
|
53
54
|
// Try to resolve the GitHub repo from package or git config
|
|
54
55
|
const githubRepo = resolveRepoFromPackage(packageJson) ?? resolveGitRemoteUrl();
|
|
56
|
+
// Normalize extensions to a leading-dot format expected by the asset matcher
|
|
57
|
+
// TODO(#5072): @jaysencpp, this is just 🫤, extensions should not require leading dot
|
|
58
|
+
const allowedExtensions = ASSET_EXTENSIONS.map((ext) => `.${ext}`);
|
|
55
59
|
// Return the manifest object, using satisfies for type safety
|
|
56
60
|
return {
|
|
57
61
|
appKey,
|
|
@@ -68,10 +72,8 @@ export const createAppManifestFromPackage = (env, packageJson, options) => {
|
|
|
68
72
|
commitSha: resolveGitCommitSha(), // Current git commit SHA for traceability
|
|
69
73
|
annotations: resolveAnnotations(), // Resolve any build annotations
|
|
70
74
|
projectPage: packageJson.homepage,
|
|
71
|
-
allowedExtensions
|
|
72
|
-
// TODO: @jaysencpp, this is just 🫤, extensions should not require leading dot
|
|
73
|
-
(ext) => `.${ext}`),
|
|
75
|
+
allowedExtensions,
|
|
74
76
|
},
|
|
75
77
|
};
|
|
76
78
|
};
|
|
77
|
-
//# sourceMappingURL=create-app-manifest.js.map
|
|
79
|
+
//# sourceMappingURL=create-app-manifest-from-package.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-app-manifest-from-package.js","sourceRoot":"","sources":["../../../../src/lib/app/create-app-manifest-from-package.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF;;;;;;;;GAQG;AACH,MAAM,oBAAoB,GAAG,CAAC,GAAe,EAAE,WAAwB,EAAU,EAAE;IACjF,mEAAmE;IACnE,IAAI,GAAG,CAAC,OAAO,KAAK,OAAO,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;QAC7C,OAAO,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,MAAM,IAAI,oBAAoB,CAAC;IACxE,CAAC;IACD,yCAAyC;IACzC,OAAO,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,GAAe,EACf,WAAwB,EACxB,OAAyC,EAC5B,EAAE;IACf,yBAAyB;IACzB,YAAY,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;IAClD,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,gCAAgC,CAAC,CAAC;IAC3D,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAC;IAEjE,sCAAsC;IACtC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAE1D,uEAAuE;IACvE,oDAAoD;IACpD,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,OAAO,EAAE,QAAQ;QAC/B,CAAC,CAAC,uBAAuB,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC;QAChE,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC;IACxB,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,MAAM,IAAI,OAAO,EAAE,CAAC;IAE7F,4DAA4D;IAC5D,MAAM,UAAU,GAAG,sBAAsB,CAAC,WAAW,CAAC,IAAI,mBAAmB,EAAE,CAAC;IAEhF,6EAA6E;IAC7E,sFAAsF;IACtF,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAEnE,8DAA8D;IAC9D,OAAO;QACL,MAAM;QACN,WAAW,EAAE,WAAW,CAAC,IAAI;QAC7B,WAAW,EAAE,WAAW,CAAC,WAAW,IAAI,EAAE;QAC1C,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE;YACL,UAAU;YACV,SAAS;YACT,UAAU;YACV,OAAO;YACP,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,mCAAmC;YACxE,SAAS,EAAE,mBAAmB,EAAE,EAAE,0CAA0C;YAC5E,WAAW,EAAE,kBAAkB,EAAE,EAAE,gCAAgC;YACnE,WAAW,EAAE,WAAW,CAAC,QAAQ;YACjC,iBAAiB;SAClB;KACoB,CAAC;AAC1B,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-app-config.js","sourceRoot":"","sources":["../../../../src/lib/app/define-app-config.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAqBvD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-app-manifest.js","sourceRoot":"","sources":["../../../../src/lib/app/define-app-manifest.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAiB,EAAE,EAAE,CAAC,EAAE,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Implementation for `defineAppPackage`, returns the input as-is.
|
|
3
|
+
*
|
|
4
|
+
* @param fnOrObject - The application package object or a function returning it.
|
|
5
|
+
* @returns The same object or function, unchanged.
|
|
6
|
+
*/
|
|
7
|
+
export function defineAppPackage(fnOrObject) {
|
|
8
|
+
// This function is intentionally a passthrough for both object and function types.
|
|
9
|
+
return fnOrObject;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=define-app-package.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-app-package.js","sourceRoot":"","sources":["../../../../src/lib/app/define-app-package.ts"],"names":[],"mappings":"AAmCA;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,UAAiC;IAChE,mFAAmF;IACnF,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -6,12 +6,12 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @packageDocumentation
|
|
8
8
|
*/
|
|
9
|
-
export { defineAppManifest, } from './app-manifest.js';
|
|
10
|
-
export { createAppManifestFromPackage } from './create-app-manifest.js';
|
|
11
|
-
export { mergeAppManifests } from './merge-app-
|
|
9
|
+
export { defineAppManifest, } from './define-app-manifest.js';
|
|
10
|
+
export { createAppManifestFromPackage } from './create-app-manifest-from-package.js';
|
|
11
|
+
export { mergeAppManifests } from './merge-app-manifests.js';
|
|
12
12
|
export { loadAppManifest } from './load-app-manifest.js';
|
|
13
13
|
export { mergeAppConfig } from './merge-app-config.js';
|
|
14
|
-
export { defineAppConfig } from './app-config.js';
|
|
14
|
+
export { defineAppConfig } from './define-app-config.js';
|
|
15
15
|
export { loadAppConfig } from './load-app-config.js';
|
|
16
|
-
export { ApiAppConfigSchema } from './
|
|
16
|
+
export { ApiAppConfigSchema } from './api-app-config-schema.js';
|
|
17
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/app/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,iBAAiB,GAGlB,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/app/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,iBAAiB,GAGlB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAA0B,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAoC,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAwB,MAAM,sBAAsB,CAAC;AAE3E,OAAO,EAAE,kBAAkB,EAAqB,MAAM,4BAA4B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { importConfig } from '@equinor/fusion-imports';
|
|
2
|
-
import { ApiAppConfigSchema } from './
|
|
2
|
+
import { ApiAppConfigSchema } from './api-app-config-schema.js';
|
|
3
3
|
/**
|
|
4
4
|
* Loads and resolves the application configuration from a file or function export.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-app-config.js","sourceRoot":"","sources":["../../../../src/lib/app/load-app-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2B,MAAM,yBAAyB,CAAC;AAEhF,OAAO,EAAqB,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"load-app-config.js","sourceRoot":"","sources":["../../../../src/lib/app/load-app-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2B,MAAM,yBAAyB,CAAC;AAEhF,OAAO,EAAqB,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAmCnF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,GAAe,EACf,OAA8B,EACa,EAAE;IAC7C,qEAAqE;IACrE,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,WAAW,EAAE,EAAE,YAAY,CAAC,CAAC;IACrF,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,MAAoC,EAAyB,EAAE;gBAC7E,MAAM,IAAI,GAAiB,OAAO,EAAE,IAAI,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC,+BAA+B;gBAEhG,+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,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;oBAC7D,OAAO,kBAAkB,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,sBAAsB;gBACzE,CAAC;gBACD,uFAAuF;gBACvF,qCAAqC;gBACrC,OAAO,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,sBAAsB;YACjF,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-app-manifest.js","sourceRoot":"","sources":["../../../../src/lib/app/load-app-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAOvD,OAAO,iBAAiB,MAAM,
|
|
1
|
+
{"version":3,"file":"load-app-manifest.js","sourceRoot":"","sources":["../../../../src/lib/app/load-app-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAOvD,OAAO,iBAAiB,MAAM,0BAA0B,CAAC;AAyCzD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,GAAe,EACf,OAAgC,EACA,EAAE;IAClC,gDAAgD;IAChD,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI;QACnC,gBAAgB,GAAG,CAAC,WAAW,EAAE;QACjC,cAAc;QACd,qBAAqB;KACtB,CAAC;IACF,kEAAkE;IAClE,MAAM,YAAY,GAAG,MAAM,YAAY,CACrC,WAAW,EACX;QACE,OAAO,EAAE,GAAG,CAAC,IAAI;QACjB,UAAU,EAAE,OAAO,EAAE,UAAU;QAC/B,MAAM,EAAE;YACN;;;;;;;;;eASG;YACH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;gBACxB,MAAM,IAAI,GAAgB,OAAO,EAAE,IAAI,IAAK,EAAkB,CAAC,CAAC,gDAAgD;gBAChH,iGAAiG;gBACjG,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;oBACnD,wGAAwG;oBACxG,OAAO,iBAAiB,CAAC,IAAI,EAAE,CAAC,MAAM,IAAI,EAAE,CAAkC,CAAC,CAAC;gBAClF,CAAC;gBACD,kFAAkF;gBAClF,OAAO,iBAAiB,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAkC,CAAC,CAAC;YAC1F,CAAC;SACF;KACF,CACF,CAAC;IACF,uEAAuE;IACvE,6GAA6G;IAC7G,OAAO;QACL,QAAQ,EAAE,YAAY,CAAC,MAAM;QAC7B,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,SAAS,EAAE,YAAY,CAAC,SAAS;KAClC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -14,6 +14,7 @@ export const mergeAppConfig = (base, overrides) => {
|
|
|
14
14
|
// if scopes are provided in overrides, use the new scopes
|
|
15
15
|
return deepmerge(base, overrides, {
|
|
16
16
|
customMerge: (key) => {
|
|
17
|
+
// Replace (rather than deep-merge) scopes so overrides fully control the array
|
|
17
18
|
if (key === 'scopes') {
|
|
18
19
|
return (_target, source) => {
|
|
19
20
|
// If scopes are provided in overrides, replace the base scopes with the new ones
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-app-config.js","sourceRoot":"","sources":["../../../../src/lib/app/merge-app-config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAGlC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAsB,IAAO,EAAE,SAAqB,EAAK,EAAE;IACvF,0DAA0D;IAC1D,OAAO,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE;QAChC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;YACnB,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACrB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACzB,iFAAiF;oBACjF,OAAO,MAAM,CAAC;gBAChB,CAAC,CAAC;YACJ,CAAC;YACD,OAAO,SAAS,CAAC,CAAC,qCAAqC;QACzD,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"merge-app-config.js","sourceRoot":"","sources":["../../../../src/lib/app/merge-app-config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAGlC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAsB,IAAO,EAAE,SAAqB,EAAK,EAAE;IACvF,0DAA0D;IAC1D,OAAO,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE;QAChC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;YACnB,+EAA+E;YAC/E,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACrB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACzB,iFAAiF;oBACjF,OAAO,MAAM,CAAC;gBAChB,CAAC,CAAC;YACJ,CAAC;YACD,OAAO,SAAS,CAAC,CAAC,qCAAqC;QACzD,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -23,9 +23,9 @@ export const mergeAppManifests = (base, // The base manifest (may be partial)
|
|
|
23
23
|
overrides) => {
|
|
24
24
|
// Use lodash.mergeWith for deep merging of manifest objects
|
|
25
25
|
const manifest = mergeWith(base, overrides);
|
|
26
|
-
// TODO: Add assertions or schema validation here if needed
|
|
26
|
+
// TODO(#5077): Add assertions or schema validation here if needed
|
|
27
27
|
return manifest;
|
|
28
28
|
};
|
|
29
29
|
// Export as default for convenience in import statements
|
|
30
30
|
export default mergeAppManifests;
|
|
31
|
-
//# sourceMappingURL=merge-app-
|
|
31
|
+
//# sourceMappingURL=merge-app-manifests.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge-app-manifests.js","sourceRoot":"","sources":["../../../../src/lib/app/merge-app-manifests.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAIlC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAmC,EAAE,qCAAqC;AAC1E,SAAwC,EAC3B,EAAE;IACf,4DAA4D;IAC5D,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAgB,CAAC;IAC3D,kEAAkE;IAClE,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,yDAAyD;AACzD,eAAe,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { assert } from '@equinor/fusion-framework-cli/utils';
|
|
2
|
+
/**
|
|
3
|
+
* Resolves the application key from the given package.json object.
|
|
4
|
+
*
|
|
5
|
+
* This function strips any leading '@' or scope from the package name, returning a normalized key.
|
|
6
|
+
*
|
|
7
|
+
* @param packageJson - An object containing the 'name' property from the package.json.
|
|
8
|
+
* @returns The resolved application key, which is the package name with any leading '@' or scope removed.
|
|
9
|
+
* @throws Will throw an error if the 'name' property is not present in the packageJson.
|
|
10
|
+
*/
|
|
11
|
+
export const resolveAppKey = (packageJson) => {
|
|
12
|
+
// Ensure the package has a name property.
|
|
13
|
+
assert(packageJson.name, 'expected [name] in packageJson');
|
|
14
|
+
// Remove leading '@' or scope from the name for normalization.
|
|
15
|
+
return packageJson.name.replace(/^@|\w.*\//gm, '');
|
|
16
|
+
};
|
|
17
|
+
//# sourceMappingURL=resolve-app-key.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-app-key.js","sourceRoot":"","sources":["../../../../src/lib/app/resolve-app-key.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAE7D;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,WAAsC,EAAE,EAAE;IACtE,0CAA0C;IAC1C,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,gCAAgC,CAAC,CAAC;IAC3D,+DAA+D;IAC/D,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import { defineAppConfig as _defineConfig } from './app/define-app-config.js';
|
|
3
|
+
/**
|
|
4
|
+
* @deprecated
|
|
5
|
+
* Will be removed in the next major version.
|
|
6
|
+
* Please use `defineAppConfig` from `@equinor/fusion-framework-cli/app` instead.
|
|
7
|
+
*
|
|
8
|
+
* Transitional wrapper for legacy defineAppConfig. This function exists only to prevent immediate breaking changes
|
|
9
|
+
* and should be removed as soon as possible. Consumers should migrate to the new API without delay.
|
|
10
|
+
*
|
|
11
|
+
* @param args - Arguments passed to the new defineAppConfig function.
|
|
12
|
+
*/
|
|
13
|
+
export const defineAppConfig = (...args) => {
|
|
14
|
+
// Emit a strong warning to alert consumers that this usage is deprecated and must be fixed ASAP
|
|
15
|
+
console.warn(chalk.bgRed.white.bold('[DEPRECATION]'), chalk.redBright.bold('[@equinor/fusion-framework-cli] `defineAppConfig` is deprecated and will be removed in the next major version!\n' +
|
|
16
|
+
'Please update your code to use `defineAppConfig` from `@equinor/fusion-framework-cli/app` as soon as possible.'));
|
|
17
|
+
// Forward the call to the new implementation
|
|
18
|
+
return _defineConfig(...args);
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=define-app-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-app-config.js","sourceRoot":"","sources":["../../../src/lib/define-app-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,eAAe,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE9E;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG,IAAsC,EAAE,EAAE;IAC3E,gGAAgG;IAChG,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EACvC,KAAK,CAAC,SAAS,CAAC,IAAI,CAClB,kHAAkH;QAChH,gHAAgH,CACnH,CACF,CAAC;IACF,6CAA6C;IAC7C,OAAO,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import { defineAppManifest as _defineManifest } from './app/define-app-manifest.js';
|
|
3
|
+
/**
|
|
4
|
+
* @deprecated
|
|
5
|
+
* Will be removed in the next major version.
|
|
6
|
+
* Please use `defineAppManifest` from `@equinor/fusion-framework-cli/app` instead.
|
|
7
|
+
*
|
|
8
|
+
* Transitional wrapper for legacy defineAppManifest. This function exists only to prevent immediate breaking changes
|
|
9
|
+
* and should be removed as soon as possible. Consumers should migrate to the new API without delay.
|
|
10
|
+
*
|
|
11
|
+
* @param args - Arguments passed to the new defineAppManifest function.
|
|
12
|
+
*/
|
|
13
|
+
export const defineAppManifest = (...args) => {
|
|
14
|
+
// Emit a strong warning to alert consumers that this usage is deprecated and must be fixed ASAP
|
|
15
|
+
console.warn(chalk.bgRed.white.bold('[DEPRECATION]'), chalk.redBright.bold('[@equinor/fusion-framework-cli] `defineAppManifest` is deprecated and will be removed in the next major version!\n' +
|
|
16
|
+
'Please update your code to use `defineAppManifest` from `@equinor/fusion-framework-cli/app` as soon as possible.'));
|
|
17
|
+
// Forward the call to the new implementation
|
|
18
|
+
return _defineManifest(...args);
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=define-app-manifest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-app-manifest.js","sourceRoot":"","sources":["../../../src/lib/define-app-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,iBAAiB,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAG,IAAwC,EAAE,EAAE;IAC/E,gGAAgG;IAChG,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EACvC,KAAK,CAAC,SAAS,CAAC,IAAI,CAClB,oHAAoH;QAClH,kHAAkH,CACrH,CACF,CAAC;IACF,6CAA6C;IAC7C,OAAO,eAAe,CAAC,GAAG,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Helper to define a dev server config function with proper typing.
|
|
3
|
+
* @param fn - The configuration function to be used as the dev server config.
|
|
4
|
+
* @returns The same function, typed as DevServerConfigFn.
|
|
5
|
+
*/
|
|
6
|
+
export const defineDevServerConfig = (fn) => fn;
|
|
7
|
+
//# sourceMappingURL=define-dev-server-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/define-dev-server-config.ts"],"names":[],"mappings":"AAsBA;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EAAqB,EAAE,EAAE,CAAC,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-fusion-cli.js","sourceRoot":"","sources":["../../../src/lib/define-fusion-cli.ts"],"names":[],"mappings":"AAsEA;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAqB,EAAE,EAAE,CAAC,EAAE,CAAC"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* @packageDocumentation
|
|
8
8
|
*/
|
|
9
9
|
export { processServices } from '@equinor/fusion-framework-dev-server';
|
|
10
|
-
export {
|
|
10
|
+
export { defineDevServerConfig, } from './define-dev-server-config.js';
|
|
11
|
+
export { loadDevServerConfig } from './load-dev-server-config.js';
|
|
11
12
|
export { mergeDevServerConfig } from './merge-dev-server-config.js';
|
|
12
13
|
//# sourceMappingURL=dev-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../../src/lib/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../../src/lib/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EACL,qBAAqB,GAGtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}
|
package/dist/esm/lib/index.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
export { resolvePackage } from './utils/resolve-package.js';
|
|
2
|
-
export { resolveEntryPoint } from './utils/resolve-
|
|
3
|
-
export {
|
|
4
|
-
export {
|
|
2
|
+
export { resolveEntryPoint } from './utils/resolve-entry-point.js';
|
|
3
|
+
export { defineDevServerConfig, } from './define-dev-server-config.js';
|
|
4
|
+
export { loadDevServerConfig } from './load-dev-server-config.js';
|
|
5
|
+
export { defineFusionCli, } from './define-fusion-cli.js';
|
|
5
6
|
// Legacy imports - these will be removed in the next major version
|
|
6
|
-
//
|
|
7
|
-
export { defineAppConfig
|
|
7
|
+
// TODO(#5070): remove these imports, introduced in v11
|
|
8
|
+
export { defineAppConfig } from './define-app-config.js';
|
|
9
|
+
export { defineAppManifest } from './define-app-manifest.js';
|
|
8
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAwB,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAwB,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EACL,qBAAqB,GAGtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EACL,eAAe,GAIhB,MAAM,wBAAwB,CAAC;AAEhC,mEAAmE;AACnE,uDAAuD;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
import { importConfig } from '@equinor/fusion-imports';
|
|
2
2
|
import { mergeDevServerConfig } from './merge-dev-server-config.js';
|
|
3
|
-
/**
|
|
4
|
-
* Helper to define a dev server config function with proper typing.
|
|
5
|
-
* @param fn - The configuration function to be used as the dev server config.
|
|
6
|
-
* @returns The same function, typed as DevServerConfigFn.
|
|
7
|
-
*/
|
|
8
|
-
export const defineDevServerConfig = (fn) => fn;
|
|
9
3
|
/**
|
|
10
4
|
* Loads the dev server configuration from a file or function.
|
|
11
5
|
*
|
|
@@ -30,10 +24,11 @@ export const loadDevServerConfig = async (env, base, options) => {
|
|
|
30
24
|
resolve: async (module) => {
|
|
31
25
|
// If the default export is a function, call it with env and a cloned base config
|
|
32
26
|
let overrides;
|
|
27
|
+
// Config files may export either a factory function or a plain overrides object
|
|
33
28
|
if (typeof module.default === 'function') {
|
|
34
29
|
const baseClone = { ...base }; // Clone base to avoid mutation
|
|
35
30
|
overrides = await module.default(env, { base: baseClone });
|
|
36
|
-
// TODO: Add zod validation of the config for type safety
|
|
31
|
+
// TODO(#5075): Add zod validation of the config for type safety
|
|
37
32
|
}
|
|
38
33
|
else {
|
|
39
34
|
overrides = module.default;
|
|
@@ -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;AAGhF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,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;AAGpE;;;;;;;;;;;;;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,gFAAgF;gBAChF,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,gEAAgE;gBAClE,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"}
|
|
@@ -10,8 +10,11 @@ import deepmerge from 'deepmerge';
|
|
|
10
10
|
* @returns A new array containing merged objects, with uniqueness determined by the specified key.
|
|
11
11
|
*/
|
|
12
12
|
const keyedArrayMerger = (key, target, source) => {
|
|
13
|
+
// Index source records by key for O(1) lookup during the merge below
|
|
13
14
|
const sourceRecords = source.reduce((acc, item) => Object.assign(acc, { [String(item[key])]: item }), {});
|
|
15
|
+
// Index target records by key so source entries can override matching keys
|
|
14
16
|
const targetRecords = target.reduce((acc, item) => Object.assign(acc, { [String(item[key])]: item }), {});
|
|
17
|
+
// Overlay source records onto target records so source entries win on matching keys
|
|
15
18
|
const mergedRecords = { ...targetRecords, ...sourceRecords };
|
|
16
19
|
return Object.values(mergedRecords);
|
|
17
20
|
};
|
|
@@ -36,6 +39,7 @@ export const mergeDevServerConfig = (base, overrides) => {
|
|
|
36
39
|
if (typeof entry === 'object' && 'match' in entry && 'middleware' in entry) {
|
|
37
40
|
return keyedArrayMerger('match', target, source);
|
|
38
41
|
}
|
|
42
|
+
// Deduplicate the combined target and source entries
|
|
39
43
|
return [...new Set([...target, ...source])];
|
|
40
44
|
},
|
|
41
45
|
});
|
|
@@ -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,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
|
+
{"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,qEAAqE;IACrE,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,2EAA2E;IAC3E,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,oFAAoF;IACpF,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,qDAAqD;YACrD,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"}
|
package/dist/esm/lib/portal/{create-portal-manifest.js → create-portal-manifest-from-package.js}
RENAMED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { assert
|
|
1
|
+
import { assert } from '../utils/assert.js';
|
|
2
|
+
import { assertObject } from '../utils/assert-object.js';
|
|
2
3
|
import { resolveAnnotations } from '../utils/resolve-annotations.js';
|
|
3
|
-
import { resolveEntryPoint } from '../utils/resolve-
|
|
4
|
-
import { resolveRepoFromPackage } from '../utils/resolve-package
|
|
4
|
+
import { resolveEntryPoint } from '../utils/resolve-entry-point.js';
|
|
5
|
+
import { resolveRepoFromPackage } from '../utils/resolve-repo-from-package.js';
|
|
5
6
|
import { resolveGitRemoteUrl } from '../utils/resolve-git-remote-url.js';
|
|
6
7
|
import { resolveGitCommitSha } from '../utils/resolve-git-commit-sha.js';
|
|
7
8
|
import { ASSET_EXTENSIONS } from '../static.js';
|
|
8
|
-
import { PortalManifestSchema } from './portal-manifest
|
|
9
|
+
import { PortalManifestSchema } from './portal-manifest-schema.js';
|
|
9
10
|
/**
|
|
10
11
|
* Resolves the appropriate entry point for a portal based on the current runtime environment.
|
|
11
12
|
*
|
|
@@ -59,6 +60,8 @@ export const createPortalManifestFromPackage = (env, packageJson) => {
|
|
|
59
60
|
const assetPath = env.command === 'build' ? undefined : '/@fs';
|
|
60
61
|
// Attempt to resolve GitHub repo from package, fallback to local git remote
|
|
61
62
|
const githubRepo = resolveRepoFromPackage(packageJson) ?? resolveGitRemoteUrl();
|
|
63
|
+
// Normalize extensions to a leading-dot format expected by the asset matcher
|
|
64
|
+
const allowedExtensions = ASSET_EXTENSIONS.map((ext) => `.${ext}`);
|
|
62
65
|
// Construct the portal manifest object with all required fields
|
|
63
66
|
const manifest = {
|
|
64
67
|
name,
|
|
@@ -77,12 +80,14 @@ export const createPortalManifestFromPackage = (env, packageJson) => {
|
|
|
77
80
|
// ...packageJson.annotations ?? {}
|
|
78
81
|
},
|
|
79
82
|
projectPage: packageJson.homepage,
|
|
80
|
-
allowedExtensions
|
|
83
|
+
allowedExtensions,
|
|
81
84
|
},
|
|
82
85
|
};
|
|
83
86
|
// Validate manifest against schema and throw if invalid
|
|
84
87
|
const parsed = PortalManifestSchema.safeParse(manifest);
|
|
88
|
+
// Fail fast with a readable error instead of returning an invalid manifest
|
|
85
89
|
if (!parsed.success) {
|
|
90
|
+
// Format each Zod issue as a single readable line
|
|
86
91
|
const details = parsed.error.issues
|
|
87
92
|
.map((i) => `- ${i.path.join('.')}: ${i.message}`)
|
|
88
93
|
.join('\n');
|
|
@@ -90,4 +95,4 @@ export const createPortalManifestFromPackage = (env, packageJson) => {
|
|
|
90
95
|
}
|
|
91
96
|
return parsed.data;
|
|
92
97
|
};
|
|
93
|
-
//# sourceMappingURL=create-portal-manifest.js.map
|
|
98
|
+
//# sourceMappingURL=create-portal-manifest-from-package.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-portal-manifest-from-package.js","sourceRoot":"","sources":["../../../../src/lib/portal/create-portal-manifest-from-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-portal-config.js","sourceRoot":"","sources":["../../../../src/lib/portal/define-portal-config.ts"],"names":[],"mappings":"AAuDA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { PortalManifestSchema } from './portal-manifest.schema.js';
|
|
2
1
|
// Re-export relevant manifest utilities and types for external use
|
|
3
2
|
export { loadPortalManifest, } from './load-portal-manifest.js';
|
|
4
|
-
export { createPortalManifestFromPackage } from './create-portal-manifest.js';
|
|
3
|
+
export { createPortalManifestFromPackage } from './create-portal-manifest-from-package.js';
|
|
5
4
|
/**
|
|
6
5
|
* Utility to define a portal manifest function with proper typing.
|
|
7
6
|
*
|
|
@@ -23,18 +22,7 @@ export { createPortalManifestFromPackage } from './create-portal-manifest.js';
|
|
|
23
22
|
* ```
|
|
24
23
|
*/
|
|
25
24
|
export const definePortalManifest = (fn) => fn;
|
|
26
|
-
export { PortalManifestSchema,
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
* @param manifest - The manifest object to validate.
|
|
31
|
-
* @returns The validated manifest object (typed) if valid.
|
|
32
|
-
* @throws ZodError if validation fails.
|
|
33
|
-
*
|
|
34
|
-
* Use this utility to ensure a manifest conforms to the expected schema before further processing.
|
|
35
|
-
*/
|
|
36
|
-
export function validatePortalManifest(manifest) {
|
|
37
|
-
// Throws if validation fails; returns typed manifest if valid
|
|
38
|
-
return PortalManifestSchema.parse(manifest);
|
|
39
|
-
}
|
|
40
|
-
//# sourceMappingURL=portal-manifest.js.map
|
|
25
|
+
export { PortalManifestSchema, } from './portal-manifest-schema.js';
|
|
26
|
+
export { PortalManifestBuildSchema, } from './portal-manifest-build-schema.js';
|
|
27
|
+
export { validatePortalManifest } from './validate-portal-manifest.js';
|
|
28
|
+
//# sourceMappingURL=define-portal-manifest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-portal-manifest.js","sourceRoot":"","sources":["../../../../src/lib/portal/define-portal-manifest.ts"],"names":[],"mappings":"AAGA,mEAAmE;AACnE,OAAO,EACL,kBAAkB,GAGnB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AAE3F;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAqC,EAAuB,EAAE,EAAE,CAClG,EAAE,CAAC;AAEL,OAAO,EACL,oBAAoB,GAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,yBAAyB,GAE1B,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Helper to define a portal schema function with type inference.
|
|
3
|
+
* @template T - The type of the portal schema.
|
|
4
|
+
* @param fn - The schema function to define.
|
|
5
|
+
* @returns The provided schema function.
|
|
6
|
+
*/
|
|
7
|
+
export const definePortalSchema = (fn) => fn;
|
|
8
|
+
//# sourceMappingURL=define-portal-schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-portal-schema.js","sourceRoot":"","sources":["../../../../src/lib/portal/define-portal-schema.ts"],"names":[],"mappings":"AAqBA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAyB,EAAqB,EAAE,EAAE,CAAC,EAAE,CAAC"}
|
|
@@ -6,8 +6,9 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @packageDocumentation
|
|
8
8
|
*/
|
|
9
|
-
export { createPortalManifestFromPackage, definePortalManifest, loadPortalManifest, validatePortalManifest, } from './portal-manifest.js';
|
|
10
|
-
export {
|
|
11
|
-
export {
|
|
9
|
+
export { createPortalManifestFromPackage, definePortalManifest, loadPortalManifest, validatePortalManifest, } from './define-portal-manifest.js';
|
|
10
|
+
export { definePortalSchema, } from './define-portal-schema.js';
|
|
11
|
+
export { loadPortalSchema } from './load-portal-schema.js';
|
|
12
|
+
export { definePortalConfig, } from './define-portal-config.js';
|
|
12
13
|
export { loadPortalConfig, } from './load-portal-config.js';
|
|
13
14
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/portal/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,+BAA+B,EAC/B,oBAAoB,EACpB,kBAAkB,EAClB,sBAAsB,GAIvB,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/portal/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,+BAA+B,EAC/B,oBAAoB,EACpB,kBAAkB,EAClB,sBAAsB,GAIvB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,kBAAkB,GAInB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EACL,kBAAkB,GAGnB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,gBAAgB,GAEjB,MAAM,yBAAyB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { importConfig } from '@equinor/fusion-imports';
|
|
2
2
|
import deepmerge from 'deepmerge';
|
|
3
|
-
import { PortalManifestSchema } from './portal-manifest
|
|
3
|
+
import { PortalManifestSchema } from './portal-manifest-schema.js';
|
|
4
4
|
/**
|
|
5
5
|
* Loads a portal manifest configuration file, merging it with optional base values and supporting multiple file extensions.
|
|
6
6
|
*
|
|
@@ -46,8 +46,13 @@ export const loadPortalManifest = async (env, options) => {
|
|
|
46
46
|
// Validate the manifest before returning using the PortalManifestSchema (Zod)
|
|
47
47
|
const manifest = importResult.config;
|
|
48
48
|
const validation = PortalManifestSchema.safeParse(manifest);
|
|
49
|
+
// Fail fast with a readable error instead of returning an invalid manifest
|
|
49
50
|
if (!validation.success) {
|
|
50
|
-
|
|
51
|
+
// Format each Zod issue as a single readable, semicolon-joined line
|
|
52
|
+
const issueMessages = validation.error.issues
|
|
53
|
+
.map((e) => `${e.path.join('.')}: ${e.message}`)
|
|
54
|
+
.join('; ');
|
|
55
|
+
throw new Error(`Invalid portal manifest: ${issueMessages}`);
|
|
51
56
|
}
|
|
52
57
|
return {
|
|
53
58
|
manifest,
|
|
@@ -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,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;
|
|
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;AAwDnE;;;;;;;;;;;;;;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,2EAA2E;IAC3E,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACxB,oEAAoE;QACpE,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM;aAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aAC/C,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,4BAA4B,aAAa,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO;QACL,QAAQ;QACR,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,SAAS,EAAE,YAAY,CAAC,SAAS;KAClC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
1
|
import { importConfig } from '@equinor/fusion-imports';
|
|
2
|
-
/**
|
|
3
|
-
* Helper to define a portal schema function with type inference.
|
|
4
|
-
* @template T - The type of the portal schema.
|
|
5
|
-
* @param fn - The schema function to define.
|
|
6
|
-
* @returns The provided schema function.
|
|
7
|
-
*/
|
|
8
|
-
export const definePortalSchema = (fn) => fn;
|
|
9
2
|
/**
|
|
10
3
|
* Loads a portal schema from configuration files or schema functions.
|
|
11
4
|
*
|
|
@@ -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;AAKvD;;;;;;;;;;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"}
|