@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.12 → 3.9.0-ultramodern.13
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/README.md +32 -36
- package/dist/cjs/ultramodern-release-cohort.cjs +6 -21
- package/dist/cjs/ultramodern-tooling/commands/context.cjs +2 -1
- package/dist/cjs/ultramodern-tooling/commands/validate.cjs +2 -57
- package/dist/cjs/ultramodern-tooling/commands.cjs +11 -1
- package/dist/cjs/ultramodern-tooling/config/index.cjs +11 -4
- package/dist/cjs/ultramodern-tooling/config/load.cjs +4 -17
- package/dist/cjs/ultramodern-tooling/config/metadata.cjs +41 -2
- package/dist/cjs/ultramodern-tooling/config/normalize.cjs +121 -208
- package/dist/cjs/ultramodern-workspace/add-shell.cjs +51 -18
- package/dist/cjs/ultramodern-workspace/add-vertical/execute.cjs +40 -39
- package/dist/cjs/ultramodern-workspace/add-vertical/plan.cjs +1 -1
- package/dist/cjs/ultramodern-workspace/add-vertical/preflight.cjs +2 -8
- package/dist/cjs/ultramodern-workspace/add-vertical/topology.cjs +0 -32
- package/dist/cjs/ultramodern-workspace/add-vertical/workspace-state.cjs +3 -10
- package/dist/cjs/ultramodern-workspace/api/contracts.cjs +2 -2
- package/dist/cjs/ultramodern-workspace/api/rpc.cjs +16 -14
- package/dist/cjs/ultramodern-workspace/api/service.cjs +4 -8
- package/dist/cjs/ultramodern-workspace/api/shared.cjs +1 -1
- package/dist/cjs/ultramodern-workspace/backend-federation.cjs +3 -3
- package/dist/cjs/ultramodern-workspace/contracts.cjs +14 -183
- package/dist/cjs/ultramodern-workspace/delivery-unit-stamp.cjs +10 -5
- package/dist/cjs/ultramodern-workspace/delivery-unit-sync.cjs +27 -17
- package/dist/cjs/ultramodern-workspace/delivery-unit.cjs +11 -6
- package/dist/cjs/ultramodern-workspace/descriptors.cjs +0 -4
- package/dist/cjs/ultramodern-workspace/generation-result.cjs +1 -1
- package/dist/cjs/ultramodern-workspace/index.cjs +2 -5
- package/dist/cjs/ultramodern-workspace/mf-validation/constants.cjs +0 -6
- package/dist/cjs/ultramodern-workspace/mf-validation/discovery.cjs +6 -6
- package/dist/cjs/ultramodern-workspace/mf-validation/path-utils.cjs +37 -38
- package/dist/cjs/ultramodern-workspace/module-federation/config.cjs +8 -15
- package/dist/cjs/ultramodern-workspace/package-json.cjs +47 -54
- package/dist/cjs/ultramodern-workspace/patch-inventory.cjs +27 -36
- package/dist/cjs/ultramodern-workspace/policy.cjs +6 -354
- package/dist/cjs/ultramodern-workspace/public-surface.cjs +2 -2
- package/dist/cjs/ultramodern-workspace/routes.cjs +11 -7
- package/dist/cjs/ultramodern-workspace/shells.cjs +0 -70
- package/dist/cjs/ultramodern-workspace/tooling-command-catalog.cjs +6 -43
- package/dist/cjs/ultramodern-workspace/tsconfigs.cjs +3 -1
- package/dist/cjs/ultramodern-workspace/validation/architecture.cjs +5 -5
- package/dist/cjs/ultramodern-workspace/validation/workspace.cjs +275 -1249
- package/dist/cjs/ultramodern-workspace/versions.cjs +25 -41
- package/dist/cjs/ultramodern-workspace/workspace-artifact-ownership.cjs +1 -6
- package/dist/cjs/ultramodern-workspace/workspace-script-plan.cjs +7 -7
- package/dist/cjs/ultramodern-workspace/workspace-scripts.cjs +17 -112
- package/dist/cjs/ultramodern-workspace/workspace-validation-contract.cjs +62 -371
- package/dist/cjs/ultramodern-workspace/write-app.cjs +5 -4
- package/dist/cjs/ultramodern-workspace/write-workspace.cjs +10 -50
- package/dist/esm/ultramodern-release-cohort.js +5 -14
- package/dist/esm/ultramodern-tooling/commands/context.js +2 -1
- package/dist/esm/ultramodern-tooling/commands/validate.js +3 -48
- package/dist/esm/ultramodern-tooling/commands.js +10 -1
- package/dist/esm/ultramodern-tooling/config/index.js +1 -0
- package/dist/esm/ultramodern-tooling/config/load.js +5 -17
- package/dist/esm/ultramodern-tooling/config/metadata.js +36 -1
- package/dist/esm/ultramodern-tooling/config/normalize.js +125 -201
- package/dist/esm/ultramodern-workspace/add-shell.js +55 -22
- package/dist/esm/ultramodern-workspace/add-vertical/execute.js +41 -41
- package/dist/esm/ultramodern-workspace/add-vertical/plan.js +2 -2
- package/dist/esm/ultramodern-workspace/add-vertical/preflight.js +3 -6
- package/dist/esm/ultramodern-workspace/add-vertical/topology.js +1 -30
- package/dist/esm/ultramodern-workspace/add-vertical/workspace-state.js +3 -10
- package/dist/esm/ultramodern-workspace/api/contracts.js +2 -2
- package/dist/esm/ultramodern-workspace/api/rpc.js +16 -14
- package/dist/esm/ultramodern-workspace/api/service.js +4 -8
- package/dist/esm/ultramodern-workspace/api/shared.js +1 -1
- package/dist/esm/ultramodern-workspace/backend-federation.js +3 -3
- package/dist/esm/ultramodern-workspace/contracts.js +14 -180
- package/dist/esm/ultramodern-workspace/delivery-unit-stamp.js +10 -5
- package/dist/esm/ultramodern-workspace/delivery-unit-sync.js +28 -18
- package/dist/esm/ultramodern-workspace/delivery-unit.js +11 -6
- package/dist/esm/ultramodern-workspace/descriptors.js +1 -2
- package/dist/esm/ultramodern-workspace/generation-result.js +2 -2
- package/dist/esm/ultramodern-workspace/index.js +1 -1
- package/dist/esm/ultramodern-workspace/mf-validation/constants.js +1 -4
- package/dist/esm/ultramodern-workspace/mf-validation/discovery.js +7 -7
- package/dist/esm/ultramodern-workspace/mf-validation/path-utils.js +36 -34
- package/dist/esm/ultramodern-workspace/module-federation/config.js +9 -16
- package/dist/esm/ultramodern-workspace/package-json.js +48 -55
- package/dist/esm/ultramodern-workspace/patch-inventory.js +27 -36
- package/dist/esm/ultramodern-workspace/policy.js +6 -335
- package/dist/esm/ultramodern-workspace/public-surface.js +2 -2
- package/dist/esm/ultramodern-workspace/routes.js +11 -7
- package/dist/esm/ultramodern-workspace/shells.js +3 -67
- package/dist/esm/ultramodern-workspace/tooling-command-catalog.js +7 -41
- package/dist/esm/ultramodern-workspace/tsconfigs.js +4 -2
- package/dist/esm/ultramodern-workspace/validation/architecture.js +5 -5
- package/dist/esm/ultramodern-workspace/validation/workspace.js +267 -1250
- package/dist/esm/ultramodern-workspace/versions.js +24 -28
- package/dist/esm/ultramodern-workspace/workspace-artifact-ownership.js +3 -8
- package/dist/esm/ultramodern-workspace/workspace-script-plan.js +7 -7
- package/dist/esm/ultramodern-workspace/workspace-scripts.js +18 -107
- package/dist/esm/ultramodern-workspace/workspace-validation-contract.js +64 -373
- package/dist/esm/ultramodern-workspace/write-app.js +4 -3
- package/dist/esm/ultramodern-workspace/write-workspace.js +16 -53
- package/dist/esm-node/ultramodern-release-cohort.js +5 -14
- package/dist/esm-node/ultramodern-tooling/commands/context.js +2 -1
- package/dist/esm-node/ultramodern-tooling/commands/validate.js +3 -48
- package/dist/esm-node/ultramodern-tooling/commands.js +10 -1
- package/dist/esm-node/ultramodern-tooling/config/index.js +1 -0
- package/dist/esm-node/ultramodern-tooling/config/load.js +5 -17
- package/dist/esm-node/ultramodern-tooling/config/metadata.js +36 -1
- package/dist/esm-node/ultramodern-tooling/config/normalize.js +125 -201
- package/dist/esm-node/ultramodern-workspace/add-shell.js +55 -22
- package/dist/esm-node/ultramodern-workspace/add-vertical/execute.js +41 -41
- package/dist/esm-node/ultramodern-workspace/add-vertical/plan.js +2 -2
- package/dist/esm-node/ultramodern-workspace/add-vertical/preflight.js +3 -6
- package/dist/esm-node/ultramodern-workspace/add-vertical/topology.js +1 -30
- package/dist/esm-node/ultramodern-workspace/add-vertical/workspace-state.js +3 -10
- package/dist/esm-node/ultramodern-workspace/api/contracts.js +2 -2
- package/dist/esm-node/ultramodern-workspace/api/rpc.js +16 -14
- package/dist/esm-node/ultramodern-workspace/api/service.js +4 -8
- package/dist/esm-node/ultramodern-workspace/api/shared.js +1 -1
- package/dist/esm-node/ultramodern-workspace/backend-federation.js +3 -3
- package/dist/esm-node/ultramodern-workspace/contracts.js +14 -180
- package/dist/esm-node/ultramodern-workspace/delivery-unit-stamp.js +10 -5
- package/dist/esm-node/ultramodern-workspace/delivery-unit-sync.js +28 -18
- package/dist/esm-node/ultramodern-workspace/delivery-unit.js +11 -6
- package/dist/esm-node/ultramodern-workspace/descriptors.js +1 -2
- package/dist/esm-node/ultramodern-workspace/generation-result.js +2 -2
- package/dist/esm-node/ultramodern-workspace/index.js +1 -1
- package/dist/esm-node/ultramodern-workspace/mf-validation/constants.js +1 -4
- package/dist/esm-node/ultramodern-workspace/mf-validation/discovery.js +7 -7
- package/dist/esm-node/ultramodern-workspace/mf-validation/path-utils.js +36 -34
- package/dist/esm-node/ultramodern-workspace/module-federation/config.js +9 -16
- package/dist/esm-node/ultramodern-workspace/package-json.js +48 -55
- package/dist/esm-node/ultramodern-workspace/patch-inventory.js +27 -36
- package/dist/esm-node/ultramodern-workspace/policy.js +6 -335
- package/dist/esm-node/ultramodern-workspace/public-surface.js +2 -2
- package/dist/esm-node/ultramodern-workspace/routes.js +11 -7
- package/dist/esm-node/ultramodern-workspace/shells.js +3 -67
- package/dist/esm-node/ultramodern-workspace/tooling-command-catalog.js +7 -41
- package/dist/esm-node/ultramodern-workspace/tsconfigs.js +4 -2
- package/dist/esm-node/ultramodern-workspace/validation/architecture.js +5 -5
- package/dist/esm-node/ultramodern-workspace/validation/workspace.js +267 -1250
- package/dist/esm-node/ultramodern-workspace/versions.js +24 -28
- package/dist/esm-node/ultramodern-workspace/workspace-artifact-ownership.js +3 -8
- package/dist/esm-node/ultramodern-workspace/workspace-script-plan.js +7 -7
- package/dist/esm-node/ultramodern-workspace/workspace-scripts.js +18 -107
- package/dist/esm-node/ultramodern-workspace/workspace-validation-contract.js +64 -373
- package/dist/esm-node/ultramodern-workspace/write-app.js +4 -3
- package/dist/esm-node/ultramodern-workspace/write-workspace.js +16 -53
- package/dist/types/ultramodern-release-cohort.d.ts +1 -3
- package/dist/types/ultramodern-tooling/commands/validate.d.ts +2 -2
- package/dist/types/ultramodern-tooling/config/index.d.ts +1 -0
- package/dist/types/ultramodern-tooling/config/load.d.ts +6 -58
- package/dist/types/ultramodern-tooling/config/metadata.d.ts +3 -0
- package/dist/types/ultramodern-tooling/config/normalize.d.ts +9 -90
- package/dist/types/ultramodern-tooling/config/types.d.ts +1 -9
- package/dist/types/ultramodern-workspace/add-vertical/preflight.d.ts +3 -3
- package/dist/types/ultramodern-workspace/add-vertical/topology.d.ts +0 -1
- package/dist/types/ultramodern-workspace/add-vertical/workspace-state.d.ts +1 -1
- package/dist/types/ultramodern-workspace/api/rpc.d.ts +1 -1
- package/dist/types/ultramodern-workspace/contracts.d.ts +1 -3
- package/dist/types/ultramodern-workspace/delivery-unit-stamp.d.ts +2 -2
- package/dist/types/ultramodern-workspace/delivery-unit.d.ts +2 -2
- package/dist/types/ultramodern-workspace/descriptors.d.ts +0 -1
- package/dist/types/ultramodern-workspace/index.d.ts +1 -1
- package/dist/types/ultramodern-workspace/mf-validation/constants.d.ts +0 -1
- package/dist/types/ultramodern-workspace/mf-validation/path-utils.d.ts +2 -3
- package/dist/types/ultramodern-workspace/module-federation/config.d.ts +1 -1
- package/dist/types/ultramodern-workspace/patch-inventory.d.ts +2 -10
- package/dist/types/ultramodern-workspace/policy.d.ts +60 -182
- package/dist/types/ultramodern-workspace/shells.d.ts +1 -14
- package/dist/types/ultramodern-workspace/tooling-command-catalog.d.ts +1 -6
- package/dist/types/ultramodern-workspace/validation/types.d.ts +1 -12
- package/dist/types/ultramodern-workspace/validation/workspace.d.ts +5 -2
- package/dist/types/ultramodern-workspace/versions.d.ts +23 -27
- package/dist/types/ultramodern-workspace/workspace-script-plan.d.ts +1 -1
- package/dist/types/ultramodern-workspace/workspace-scripts.d.ts +7 -14
- package/dist/types/ultramodern-workspace/workspace-validation-contract.d.ts +22 -188
- package/dist/types/ultramodern-workspace/write-workspace.d.ts +1 -3
- package/package.json +17 -16
- package/{template-workspace/.modernjs/release-cohort.json → release-cohort.json} +48 -48
- package/template-workspace/README.md.handlebars +9 -16
- package/template-workspace/pnpm-workspace.yaml.handlebars +0 -24
- package/templates/workspace/apps/modern.config.ts.handlebars +5 -5
- package/templates/workspace/apps/shared/src/routes/ultramodern-route-metadata.ts.handlebars +8 -21
- package/templates/workspace-scripts/generate-node-backend-federation.mjs +39 -49
- package/templates/workspace-scripts/generate-public-surface-assets.mjs +142 -206
- package/templates/workspace-scripts/materialize-zerops-runtime.mjs +3 -11
- package/templates/workspace-scripts/proof-cloudflare-version.mjs +53 -444
- package/templates/workspace-scripts/proof-node-backend-federation.mjs +193 -39
- package/templates/workspace-scripts/proof-workerd-ssr.mjs +126 -66
- package/templates/workspace-scripts/ultramodern-performance-readiness.mjs +45 -147
- package/dist/cjs/ultramodern-workspace/cohort-parity.cjs +0 -129
- package/dist/cjs/ultramodern-workspace/patch-parity.cjs +0 -163
- package/dist/esm/ultramodern-workspace/cohort-parity.js +0 -74
- package/dist/esm/ultramodern-workspace/patch-parity.js +0 -99
- package/dist/esm-node/ultramodern-workspace/cohort-parity.js +0 -75
- package/dist/esm-node/ultramodern-workspace/patch-parity.js +0 -100
- package/dist/types/ultramodern-workspace/cohort-parity.d.ts +0 -31
- package/dist/types/ultramodern-workspace/patch-parity.d.ts +0 -39
- package/template-workspace/patches/@module-federation__bridge-react@2.9.0.patch +0 -47
- package/template-workspace/patches/@module-federation__dts-plugin@2.9.0.patch +0 -132
- package/template-workspace/patches/@module-federation__modern-js-v3@2.9.0.patch +0 -287
- package/template-workspace/patches/@module-federation__runtime-core@2.9.0.patch +0 -13
- package/template-workspace/patches/drizzle-orm-ts7-strict-declarations.patch +0 -471
- package/template-workspace/patches/msgpackr@2.1.0.patch +0 -30
- package/template-workspace/patches/zod@4.5.4.patch +0 -56
- package/templates/packages/effect-bff-runtime.ts +0 -2
|
@@ -6,12 +6,8 @@ packages:
|
|
|
6
6
|
{{workspacePackageLinkingYaml}}minimumReleaseAge: 1440
|
|
7
7
|
minimumReleaseAgeStrict: true
|
|
8
8
|
minimumReleaseAgeIgnoreMissingTime: false
|
|
9
|
-
minimumReleaseAgeExclude:{{minimumReleaseAgeExcludeYaml}}
|
|
10
9
|
trustPolicy: no-downgrade
|
|
11
10
|
trustPolicyIgnoreAfter: 1440
|
|
12
|
-
trustPolicyExclude:
|
|
13
|
-
- '@effect/opentelemetry@{{effectVersion}}'
|
|
14
|
-
- 'effect@{{effectVersion}}'
|
|
15
11
|
blockExoticSubdeps: true
|
|
16
12
|
engineStrict: true
|
|
17
13
|
pmOnFail: error
|
|
@@ -23,31 +19,11 @@ peerDependencyRules:
|
|
|
23
19
|
react: '>=19.0.0'
|
|
24
20
|
'@effect/vitest>effect': '{{effectVersion}}'
|
|
25
21
|
|
|
26
|
-
overrides:
|
|
27
|
-
'@tanstack/react-router': {{tanstackRouterVersion}}
|
|
28
|
-
'@tanstack/router-core': {{tanstackRouterCoreVersion}}
|
|
29
|
-
'@tanstack/history': {{tanstackHistoryVersion}}
|
|
30
|
-
'@effect/opentelemetry': {{effectVersion}}
|
|
31
|
-
'@effect/vitest': {{effectVitestVersion}}
|
|
32
|
-
effect: {{effectVersion}}
|
|
33
|
-
msgpackr: {{msgpackrVersion}}
|
|
34
|
-
node-fetch: '{{nodeFetchVersion}}'
|
|
35
|
-
zod: {{zodVersion}}
|
|
36
|
-
|
|
37
22
|
allowBuilds:
|
|
38
23
|
'@parcel/watcher': true
|
|
39
24
|
'@swc/core': true
|
|
40
25
|
core-js: true
|
|
41
26
|
esbuild: true
|
|
42
27
|
lefthook: true
|
|
43
|
-
msgpackr-extract: true
|
|
44
28
|
sharp: true
|
|
45
29
|
workerd: true
|
|
46
|
-
|
|
47
|
-
patchedDependencies:
|
|
48
|
-
'@module-federation/modern-js-v3@{{moduleFederationVersion}}': patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch
|
|
49
|
-
'@module-federation/dts-plugin@{{moduleFederationVersion}}': patches/@module-federation__dts-plugin@{{moduleFederationVersion}}.patch
|
|
50
|
-
'@module-federation/bridge-react@{{moduleFederationVersion}}': patches/@module-federation__bridge-react@{{moduleFederationVersion}}.patch
|
|
51
|
-
'@module-federation/runtime-core@{{moduleFederationVersion}}': patches/@module-federation__runtime-core@{{moduleFederationVersion}}.patch
|
|
52
|
-
'msgpackr@{{msgpackrVersion}}': patches/msgpackr@{{msgpackrVersion}}.patch
|
|
53
|
-
'zod@{{zodVersion}}': patches/zod@{{zodVersion}}.patch
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
+
import developmentOverlay from '{{value29}}/topology/local-overlays/development.json';
|
|
1
2
|
import { defineConfig } from '@modern-js/app-tools';
|
|
2
3
|
import {
|
|
3
4
|
presetUltramodern,
|
|
4
5
|
ultramodernAppTools,
|
|
5
6
|
} from '@modern-js/ultramodern-app-tools';
|
|
6
|
-
import {
|
|
7
|
-
getBuildConfigEnvironment,
|
|
8
|
-
withBuildConfigEnvironment,
|
|
9
|
-
} from '@modern-js/app-tools-extensions/config';
|
|
10
7
|
{{value0}}import { i18nPlugin } from '@modern-js/plugin-i18n';
|
|
11
8
|
import { tanstackRouterPlugin } from '@modern-js/plugin-tanstack';
|
|
12
9
|
{{value22}}
|
|
@@ -15,7 +12,10 @@ const cloudflareDeployEnabled =
|
|
|
15
12
|
|
|
16
13
|
{{value23}}const appId = '{{value1}}';
|
|
17
14
|
const cloudflareWorkerName = '{{value2}}';
|
|
18
|
-
const port = Number(getBuildConfigEnvironment('{{value3}}') ??
|
|
15
|
+
const port = Number(getBuildConfigEnvironment('{{value3}}') ?? developmentOverlay.ports[appId]);
|
|
16
|
+
if (!Number.isInteger(port) || port < 1 || port > 65_535) {
|
|
17
|
+
throw new Error(`Invalid development port for ${appId}: ${port}`);
|
|
18
|
+
}
|
|
19
19
|
const envValue = (name: string) => {
|
|
20
20
|
const value = getBuildConfigEnvironment(name)?.trim();
|
|
21
21
|
return value !== undefined && value.length > 0 ? value : undefined;
|
|
@@ -1,21 +1,8 @@
|
|
|
1
|
-
// @generated by @modern-js/ultramodern-create.
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
export const
|
|
6
|
-
|
|
7
|
-
export const
|
|
8
|
-
|
|
9
|
-
export const ultramodernLocalisedUrls = {{value2}} as const;
|
|
10
|
-
|
|
11
|
-
export const ultramodernPublicRoutes = {{value3}} as const;
|
|
12
|
-
|
|
13
|
-
export const ultramodernRouteConfig = {
|
|
14
|
-
authoring: 'colocated-route-meta',
|
|
15
|
-
generatedManifest: true,
|
|
16
|
-
localisedUrls: ultramodernLocalisedUrls,
|
|
17
|
-
namespace: ultramodernRouteNamespace,
|
|
18
|
-
publicRoutes: ultramodernPublicRoutes,
|
|
19
|
-
routes: ultramodernRouteMetadata,
|
|
20
|
-
source: 'route-owned',
|
|
21
|
-
} as const;
|
|
1
|
+
// @generated by @modern-js/ultramodern-create from route-owned metadata.
|
|
2
|
+
{{value0}}
|
|
3
|
+
|
|
4
|
+
export const ultramodernRouteNamespace = {{value1}} as const;
|
|
5
|
+
export const ultramodernRouteMetadata = [{{value2}}] as const;
|
|
6
|
+
export const ultramodernLocalisedUrls = Object.fromEntries(ultramodernRouteMetadata.filter(route => route.canonicalPath !== '/').map(route => [route.canonicalPath, route.localisedPaths]));
|
|
7
|
+
export const ultramodernPublicRoutes = ultramodernRouteMetadata.filter(route => route.public && route.indexable).map(route => ({ canonicalPath: route.canonicalPath, descriptionKey: route.descriptionKey, id: route.id, localisedPaths: route.localisedPaths, namespace: route.namespace, ownerAppId: route.ownerAppId, titleKey: route.titleKey, ...('jsonLd' in route ? { jsonLd: route.jsonLd } : {}) }));
|
|
8
|
+
export const ultramodernRouteConfig = { authoring: 'colocated-route-meta', generatedManifest: true, localisedUrls: ultramodernLocalisedUrls, namespace: ultramodernRouteNamespace, publicRoutes: ultramodernPublicRoutes, routes: ultramodernRouteMetadata, source: 'route-owned' } as const;
|
|
@@ -9,7 +9,8 @@ const workspaceRoot = path.resolve(
|
|
|
9
9
|
process.env.ULTRAMODERN_WORKSPACE_ROOT ??
|
|
10
10
|
path.join(path.dirname(fileURLToPath(import.meta.url)), '../..'),
|
|
11
11
|
);
|
|
12
|
-
const
|
|
12
|
+
const topologyPath = path.join(workspaceRoot, 'topology/reference-topology.json');
|
|
13
|
+
const overlayPath = path.join(workspaceRoot, 'topology/local-overlays/development.json');
|
|
13
14
|
const { build } = createRequire(import.meta.url)('esbuild');
|
|
14
15
|
// Keep these constants/checks in sync with
|
|
15
16
|
// @modern-js/backend-federation-contracts backend-federation-contract. Generated workspace
|
|
@@ -27,43 +28,23 @@ function readBuildIdentity(app) {
|
|
|
27
28
|
app.path,
|
|
28
29
|
'shared/ultramodern-build.json',
|
|
29
30
|
);
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
};
|
|
31
|
+
const artifact = readJson(buildArtifactPath);
|
|
32
|
+
const deliveryUnit = artifact.deliveryUnit ?? {};
|
|
33
|
+
const manifest = readJson(path.join(workspaceRoot, app.path, 'package.json'));
|
|
34
|
+
if (
|
|
35
|
+
app.package !== manifest.name ||
|
|
36
|
+
app.deliveryUnit?.unitId !== deliveryUnit.unitId ||
|
|
37
|
+
deliveryUnit.packageName !== manifest.name ||
|
|
38
|
+
deliveryUnit.version !== manifest.version
|
|
39
|
+
) {
|
|
40
|
+
throw new Error(`${app.id} topology, package.json and stamped build identity disagree`);
|
|
40
41
|
}
|
|
41
|
-
|
|
42
|
-
const buildModulePath = path.join(
|
|
43
|
-
workspaceRoot,
|
|
44
|
-
app.path,
|
|
45
|
-
'shared/ultramodern-build.ts',
|
|
46
|
-
);
|
|
47
|
-
if (!fs.existsSync(buildModulePath)) {
|
|
48
|
-
return {};
|
|
49
|
-
}
|
|
50
|
-
console.warn(
|
|
51
|
-
`[backend-federation] ${path.relative(
|
|
52
|
-
workspaceRoot,
|
|
53
|
-
buildArtifactPath,
|
|
54
|
-
)} missing; falling back to legacy regex parsing of ${path.relative(
|
|
55
|
-
workspaceRoot,
|
|
56
|
-
buildModulePath,
|
|
57
|
-
)}.`,
|
|
58
|
-
);
|
|
59
|
-
|
|
60
|
-
const source = fs.readFileSync(buildModulePath, 'utf8');
|
|
61
42
|
return {
|
|
62
|
-
buildVersion:
|
|
63
|
-
packageName:
|
|
64
|
-
version:
|
|
65
|
-
unitId:
|
|
66
|
-
sourceRevision:
|
|
43
|
+
buildVersion: deliveryUnit.buildMarker ?? deliveryUnit.build,
|
|
44
|
+
packageName: deliveryUnit.packageName,
|
|
45
|
+
version: deliveryUnit.version,
|
|
46
|
+
unitId: deliveryUnit.unitId,
|
|
47
|
+
sourceRevision: deliveryUnit.sourceRevision,
|
|
67
48
|
};
|
|
68
49
|
}
|
|
69
50
|
|
|
@@ -94,8 +75,8 @@ function parseArgs(argv) {
|
|
|
94
75
|
return options;
|
|
95
76
|
}
|
|
96
77
|
|
|
97
|
-
function backendApps(
|
|
98
|
-
return
|
|
78
|
+
function backendApps(topology, appFilter) {
|
|
79
|
+
return topology.verticals.filter(app => {
|
|
99
80
|
if (app.kind !== 'vertical') {
|
|
100
81
|
return false;
|
|
101
82
|
}
|
|
@@ -107,7 +88,7 @@ function backendApps(config, appFilter) {
|
|
|
107
88
|
}
|
|
108
89
|
|
|
109
90
|
function backendFederationMetadata(app) {
|
|
110
|
-
return app.backendFederation
|
|
91
|
+
return app.backendFederation;
|
|
111
92
|
}
|
|
112
93
|
|
|
113
94
|
function backendFederationExposes(app) {
|
|
@@ -133,7 +114,7 @@ function backendFederationExposes(app) {
|
|
|
133
114
|
|
|
134
115
|
function normalizeBackendFederation(app) {
|
|
135
116
|
const backend = backendFederationMetadata(app);
|
|
136
|
-
const nodeSurface =
|
|
117
|
+
const nodeSurface = app.nodeExecution ?? {};
|
|
137
118
|
const exposes = backendFederationExposes(app);
|
|
138
119
|
|
|
139
120
|
return {
|
|
@@ -242,13 +223,8 @@ function createManifest(app, outputDir, entrySource) {
|
|
|
242
223
|
);
|
|
243
224
|
}
|
|
244
225
|
const buildIdentity = readBuildIdentity(app);
|
|
245
|
-
const
|
|
246
|
-
|
|
247
|
-
? app.deliveryUnit
|
|
248
|
-
: undefined;
|
|
249
|
-
const unitId = compactDeliveryUnit?.unitId ?? buildIdentity.unitId;
|
|
250
|
-
const sourceRevision =
|
|
251
|
-
compactDeliveryUnit?.sourceRevision ?? buildIdentity.sourceRevision;
|
|
226
|
+
const unitId = app.deliveryUnit?.unitId ?? buildIdentity.unitId;
|
|
227
|
+
const sourceRevision = app.deliveryUnit?.sourceRevision ?? buildIdentity.sourceRevision;
|
|
252
228
|
const publicPath = new URL('.', backend.containerEntry).href;
|
|
253
229
|
return {
|
|
254
230
|
schemaVersion: 1,
|
|
@@ -349,8 +325,22 @@ function createManifest(app, outputDir, entrySource) {
|
|
|
349
325
|
}
|
|
350
326
|
|
|
351
327
|
const options = parseArgs(process.argv.slice(2));
|
|
352
|
-
const
|
|
353
|
-
const
|
|
328
|
+
const topology = readJson(topologyPath);
|
|
329
|
+
const overlay = readJson(overlayPath);
|
|
330
|
+
if (topology.schemaVersion !== 1 || !Array.isArray(topology.verticals)) {
|
|
331
|
+
throw new Error('Invalid topology/reference-topology.json');
|
|
332
|
+
}
|
|
333
|
+
const apps = backendApps(topology, options.app).map(app => {
|
|
334
|
+
const nodeExecution = overlay.serverExecution?.[app.id]?.node;
|
|
335
|
+
if (
|
|
336
|
+
typeof app.path !== 'string' ||
|
|
337
|
+
!nodeExecution?.manifestUrl ||
|
|
338
|
+
!nodeExecution?.containerEntry
|
|
339
|
+
) {
|
|
340
|
+
throw new Error(`${app.id} requires a topology path and Node execution URLs`);
|
|
341
|
+
}
|
|
342
|
+
return { ...app, nodeExecution };
|
|
343
|
+
});
|
|
354
344
|
|
|
355
345
|
if (options.app && apps.length === 0) {
|
|
356
346
|
throw new Error(`No generated backend federation app matched ${options.app}`);
|