@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.2 → 3.9.0-ultramodern.4
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/dist/cjs/ultramodern-package-source.cjs +2 -1
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.cjs +5 -2
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-modern-configs.cjs +5 -0
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-typescript.cjs +1 -0
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/package-cohort.cjs +30 -9
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/pnpm-policy.cjs +9 -13
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/pnpm-yaml.cjs +30 -7
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/shared-api-infrastructure.cjs +99 -0
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/toolchain-pins.cjs +14 -5
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/workspace-artifact-ownership.cjs +215 -0
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect.cjs +72 -8
- package/dist/cjs/ultramodern-workspace/api/client.cjs +2 -2
- package/dist/cjs/ultramodern-workspace/api/service.cjs +45 -16
- package/dist/cjs/ultramodern-workspace/api/shared.cjs +26 -16
- package/dist/cjs/ultramodern-workspace/mf-validation/inspect.cjs +6 -2
- package/dist/cjs/ultramodern-workspace/module-federation/reexport-module.cjs +18 -51
- package/dist/cjs/ultramodern-workspace/package-json.cjs +13 -1
- package/dist/cjs/ultramodern-workspace/policy.cjs +1 -0
- package/dist/cjs/ultramodern-workspace/tsconfigs.cjs +3 -0
- package/dist/cjs/ultramodern-workspace/workspace-script-plan.cjs +1 -1
- package/dist/cjs/ultramodern-workspace/workspace-scripts.cjs +5 -0
- package/dist/cjs/ultramodern-workspace/workspace-validation-contract.cjs +2 -1
- package/dist/cjs/ultramodern-workspace/write-app.cjs +10 -4
- package/dist/cjs/ultramodern-workspace/write-workspace.cjs +5 -3
- package/dist/esm/ultramodern-package-source.js +2 -1
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.js +5 -2
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-modern-configs.js +5 -0
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-typescript.js +1 -0
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/package-cohort.js +30 -9
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/pnpm-policy.js +9 -13
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/pnpm-yaml.js +30 -7
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/shared-api-infrastructure.js +50 -0
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/toolchain-pins.js +14 -5
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/workspace-artifact-ownership.js +166 -0
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect.js +73 -9
- package/dist/esm/ultramodern-workspace/api/client.js +2 -2
- package/dist/esm/ultramodern-workspace/api/service.js +45 -16
- package/dist/esm/ultramodern-workspace/api/shared.js +27 -17
- package/dist/esm/ultramodern-workspace/mf-validation/inspect.js +6 -2
- package/dist/esm/ultramodern-workspace/module-federation/reexport-module.js +18 -51
- package/dist/esm/ultramodern-workspace/package-json.js +13 -1
- package/dist/esm/ultramodern-workspace/policy.js +1 -0
- package/dist/esm/ultramodern-workspace/tsconfigs.js +3 -0
- package/dist/esm/ultramodern-workspace/workspace-script-plan.js +1 -1
- package/dist/esm/ultramodern-workspace/workspace-scripts.js +5 -0
- package/dist/esm/ultramodern-workspace/workspace-validation-contract.js +2 -1
- package/dist/esm/ultramodern-workspace/write-app.js +10 -4
- package/dist/esm/ultramodern-workspace/write-workspace.js +6 -4
- package/dist/esm-node/ultramodern-package-source.js +2 -1
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.js +5 -2
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-modern-configs.js +5 -0
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-typescript.js +1 -0
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/package-cohort.js +30 -9
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/pnpm-policy.js +9 -13
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/pnpm-yaml.js +30 -7
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/shared-api-infrastructure.js +51 -0
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/toolchain-pins.js +14 -5
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/workspace-artifact-ownership.js +167 -0
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect.js +73 -9
- package/dist/esm-node/ultramodern-workspace/api/client.js +2 -2
- package/dist/esm-node/ultramodern-workspace/api/service.js +45 -16
- package/dist/esm-node/ultramodern-workspace/api/shared.js +27 -17
- package/dist/esm-node/ultramodern-workspace/mf-validation/inspect.js +6 -2
- package/dist/esm-node/ultramodern-workspace/module-federation/reexport-module.js +18 -51
- package/dist/esm-node/ultramodern-workspace/package-json.js +13 -1
- package/dist/esm-node/ultramodern-workspace/policy.js +1 -0
- package/dist/esm-node/ultramodern-workspace/tsconfigs.js +3 -0
- package/dist/esm-node/ultramodern-workspace/workspace-script-plan.js +1 -1
- package/dist/esm-node/ultramodern-workspace/workspace-scripts.js +5 -0
- package/dist/esm-node/ultramodern-workspace/workspace-validation-contract.js +2 -1
- package/dist/esm-node/ultramodern-workspace/write-app.js +10 -4
- package/dist/esm-node/ultramodern-workspace/write-workspace.js +6 -4
- package/dist/types/ultramodern-package-source.d.ts +1 -1
- package/dist/types/ultramodern-tooling/commands/migrate-strict-effect/package-cohort.d.ts +3 -1
- package/dist/types/ultramodern-tooling/commands/migrate-strict-effect/pnpm-yaml.d.ts +7 -0
- package/dist/types/ultramodern-tooling/commands/migrate-strict-effect/shared-api-infrastructure.d.ts +4 -0
- package/dist/types/ultramodern-tooling/commands/migrate-strict-effect/workspace-artifact-ownership.d.ts +27 -0
- package/dist/types/ultramodern-workspace/api/client.d.ts +3 -1
- package/dist/types/ultramodern-workspace/api/service.d.ts +3 -1
- package/dist/types/ultramodern-workspace/api/shared.d.ts +2 -0
- package/dist/types/ultramodern-workspace/module-federation/reexport-module.d.ts +2 -2
- package/dist/types/ultramodern-workspace/package-json.d.ts +1 -1
- package/dist/types/ultramodern-workspace/policy.d.ts +2 -0
- package/dist/types/ultramodern-workspace/workspace-validation-contract.d.ts +1 -1
- package/package.json +5 -4
- package/template-workspace/.modernjs/release-cohort.json +40 -40
- package/template-workspace/scripts/bootstrap-agent-skills.mjs +4 -4
- package/templates/packages/effect-bff-runtime.ts +50 -0
- package/templates/packages/microvertical-api-baseline.ts +102 -0
- package/templates/workspace-scripts/check-ultramodern-api-boundaries.mts +49 -28
- package/templates/workspace-scripts/microvertical-api-baseline-boundary.mts +944 -0
- package/templates/workspace-scripts/ultramodern-cloudflare-proof.mjs +25 -7
- package/templates/workspace-scripts/validate-ultramodern-workspace.mjs.handlebars +1 -1
|
@@ -11,7 +11,11 @@ function extractExposes(configPath, value) {
|
|
|
11
11
|
if (array) return array.sort();
|
|
12
12
|
throw new Error(`Cannot statically extract Module Federation exposes from ${configPath}; use a literal exposes object or string array.`);
|
|
13
13
|
}
|
|
14
|
-
function extractDtsSettings(configPath, value) {
|
|
14
|
+
function extractDtsSettings(configPath, value, exposes) {
|
|
15
|
+
if ('false' === value) {
|
|
16
|
+
if (exposes.length > 0) throw new Error(`Module Federation DTS cannot be disabled for exposed app ${configPath}.`);
|
|
17
|
+
return {};
|
|
18
|
+
}
|
|
15
19
|
if (void 0 === value) return {};
|
|
16
20
|
const dts = parseObjectLiteral(value);
|
|
17
21
|
if (!dts || dts.hasSpread) throw new Error(`Cannot statically extract Module Federation DTS settings from ${configPath}; use a literal dts object.`);
|
|
@@ -38,7 +42,7 @@ function inspectModuleFederationConfigSource(source, appDir, configPath) {
|
|
|
38
42
|
return {
|
|
39
43
|
appDir,
|
|
40
44
|
configPath,
|
|
41
|
-
dts: extractDtsSettings(configPath, properties.properties.get('dts')),
|
|
45
|
+
dts: extractDtsSettings(configPath, properties.properties.get('dts'), exposes),
|
|
42
46
|
exposes,
|
|
43
47
|
hostOnlyNoExposes
|
|
44
48
|
};
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createUltramodernBuildArtifact } from "@modern-js/utils/universal";
|
|
2
2
|
import { createDeliveryUnitRecord } from "../delivery-unit.js";
|
|
3
|
+
import { appEmitsBrowserUi, appHasApi } from "../descriptors.js";
|
|
3
4
|
function deliveryUnitRecordFor(scope, app) {
|
|
4
5
|
return app.deliveryUnit ? app.deliveryUnit : createDeliveryUnitRecord(scope, app);
|
|
5
6
|
}
|
|
@@ -7,61 +8,27 @@ function createUltramodernBuildArtifactJson(scope, app) {
|
|
|
7
8
|
const record = deliveryUnitRecordFor(scope, app);
|
|
8
9
|
return `${JSON.stringify(createUltramodernBuildArtifact(record), null, 2)}\n`;
|
|
9
10
|
}
|
|
10
|
-
function createUltramodernBuildModule(scope, app) {
|
|
11
|
+
function createUltramodernBuildModule(scope, app, includeUiMarker = appEmitsBrowserUi(app)) {
|
|
11
12
|
const record = deliveryUnitRecordFor(scope, app);
|
|
12
|
-
return `
|
|
13
|
-
declare const ULTRAMODERN_SOURCE_REVISION: string;
|
|
13
|
+
return `import { resolveUltramodernBuildArtifact } from '@modern-js/runtime-extensions/build-identity';
|
|
14
14
|
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
typeof ULTRAMODERN_BUILD_MARKER === 'string'
|
|
18
|
-
? ULTRAMODERN_BUILD_MARKER
|
|
19
|
-
: ultramodernGeneratedBuildArtifact.deliveryUnit.buildMarker;
|
|
20
|
-
const ultramodernSourceRevision =
|
|
21
|
-
typeof ULTRAMODERN_SOURCE_REVISION === 'string'
|
|
22
|
-
? ULTRAMODERN_SOURCE_REVISION
|
|
23
|
-
: ultramodernGeneratedBuildArtifact.deliveryUnit.sourceRevision;
|
|
24
|
-
const ultramodernBuildArtifact = {
|
|
25
|
-
...ultramodernGeneratedBuildArtifact,
|
|
26
|
-
deliveryUnit: {
|
|
27
|
-
...ultramodernGeneratedBuildArtifact.deliveryUnit,
|
|
28
|
-
build: ultramodernBuildMarker,
|
|
29
|
-
buildMarker: ultramodernBuildMarker,
|
|
30
|
-
sourceRevision: ultramodernSourceRevision,
|
|
31
|
-
},
|
|
32
|
-
surfaces: {
|
|
33
|
-
api: {
|
|
34
|
-
...ultramodernGeneratedBuildArtifact.surfaces.api,
|
|
35
|
-
build: ultramodernBuildMarker,
|
|
36
|
-
buildMarker: ultramodernBuildMarker,
|
|
37
|
-
sourceRevision: ultramodernSourceRevision,
|
|
38
|
-
},
|
|
39
|
-
ui: {
|
|
40
|
-
...ultramodernGeneratedBuildArtifact.surfaces.ui,
|
|
41
|
-
build: ultramodernBuildMarker,
|
|
42
|
-
buildMarker: ultramodernBuildMarker,
|
|
43
|
-
sourceRevision: ultramodernSourceRevision,
|
|
44
|
-
},
|
|
45
|
-
},
|
|
46
|
-
} as const;
|
|
15
|
+
declare const ULTRAMODERN_BUILD_MARKER: string;
|
|
16
|
+
declare const ULTRAMODERN_SOURCE_REVISION: string;
|
|
47
17
|
|
|
48
|
-
|
|
18
|
+
const ultramodernBuildArtifact = resolveUltramodernBuildArtifact(${JSON.stringify(createUltramodernBuildArtifact(record), null, 2)} as const, {
|
|
19
|
+
buildMarker: () => ULTRAMODERN_BUILD_MARKER,
|
|
20
|
+
sourceRevision: () => ULTRAMODERN_SOURCE_REVISION,
|
|
21
|
+
});
|
|
49
22
|
|
|
50
|
-
export const ultramodernDeliveryUnit =
|
|
51
|
-
|
|
52
|
-
export const ultramodernVerticalIdentity = ultramodernDeliveryUnit;
|
|
53
|
-
export const ultramodernUiMarker = ultramodernBuildArtifact.surfaces.ui;
|
|
54
|
-
export const ultramodernApiMarker = ultramodernBuildArtifact.surfaces.api;
|
|
55
|
-
`;
|
|
23
|
+
export const ultramodernDeliveryUnit = ultramodernBuildArtifact.deliveryUnit;
|
|
24
|
+
${includeUiMarker ? 'export const ultramodernUiMarker = ultramodernBuildArtifact.surfaces.ui;\n' : ''}${'shell' !== app.kind && appHasApi(app) ? 'export const ultramodernApiMarker = ultramodernBuildArtifact.surfaces.api;\n' : ''}`;
|
|
56
25
|
}
|
|
57
|
-
function createUltramodernBuildReexportModule() {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
} from '../shared/ultramodern-build';
|
|
65
|
-
`;
|
|
26
|
+
function createUltramodernBuildReexportModule(app, includeUiMarker = appEmitsBrowserUi(app)) {
|
|
27
|
+
const names = [
|
|
28
|
+
'ultramodernDeliveryUnit'
|
|
29
|
+
];
|
|
30
|
+
if (includeUiMarker) names.push('ultramodernUiMarker');
|
|
31
|
+
if ('shell' !== app.kind && appHasApi(app)) names.push('ultramodernApiMarker');
|
|
32
|
+
return `export { ${names.join(', ')} } from '../shared/ultramodern-build';\n`;
|
|
66
33
|
}
|
|
67
34
|
export { createUltramodernBuildArtifactJson, createUltramodernBuildModule, createUltramodernBuildReexportModule };
|
|
@@ -8,6 +8,7 @@ function appDependencies(scope, packageSource, app, remotes = [], bridge) {
|
|
|
8
8
|
const dependencies = {
|
|
9
9
|
'@modern-js/plugin-tanstack': modernPackageSpecifier('@modern-js/plugin-tanstack', packageSource),
|
|
10
10
|
'@modern-js/plugin-i18n': modernPackageSpecifier('@modern-js/plugin-i18n', packageSource),
|
|
11
|
+
'@modern-js/runtime-extensions': modernPackageSpecifier('@modern-js/runtime-extensions', packageSource),
|
|
11
12
|
'@modern-js/runtime': modernPackageSpecifier('@modern-js/runtime', packageSource),
|
|
12
13
|
...ULTRAMODERN_PACKAGE_PINS.appDependencies,
|
|
13
14
|
[packageName(scope, 'shared-contracts')]: WORKSPACE_PACKAGE_VERSION,
|
|
@@ -171,7 +172,7 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
|
|
|
171
172
|
if (Object.keys(packageExports).length > 0) packageJson.exports = packageExports;
|
|
172
173
|
return packageJson;
|
|
173
174
|
}
|
|
174
|
-
function createSharedPackage(scope, id, description) {
|
|
175
|
+
function createSharedPackage(scope, id, description, packageSource) {
|
|
175
176
|
const packageJson = {
|
|
176
177
|
private: true,
|
|
177
178
|
name: packageName(scope, id),
|
|
@@ -188,6 +189,17 @@ function createSharedPackage(scope, id, description) {
|
|
|
188
189
|
'@effect/tsgo': ULTRAMODERN_PACKAGE_PINS.appDevDependencies["@effect/tsgo"]
|
|
189
190
|
}
|
|
190
191
|
};
|
|
192
|
+
if ('shared-contracts' === id) {
|
|
193
|
+
packageJson.exports = {
|
|
194
|
+
'.': './src/index.ts',
|
|
195
|
+
'./microvertical-api-baseline': './src/microvertical-api-baseline.ts',
|
|
196
|
+
'./server/effect-bff-runtime': './src/effect-bff-runtime.ts'
|
|
197
|
+
};
|
|
198
|
+
packageJson.dependencies = {
|
|
199
|
+
...ULTRAMODERN_PACKAGE_PINS.bffEffectDependencies,
|
|
200
|
+
'@modern-js/plugin-bff': packageSource ? modernPackageSpecifier('@modern-js/plugin-bff', packageSource) : WORKSPACE_PACKAGE_VERSION
|
|
201
|
+
};
|
|
202
|
+
}
|
|
191
203
|
if ('shared-design-tokens' === id) packageJson.exports = {
|
|
192
204
|
...packageJson.exports,
|
|
193
205
|
'./tokens.css': './src/tokens.css'
|
|
@@ -249,6 +249,7 @@ const ULTRAMODERN_PACKAGE_PINS = {
|
|
|
249
249
|
rootDevDependencies: {
|
|
250
250
|
'@effect/tsgo': EFFECT_TSGO_VERSION,
|
|
251
251
|
"@typescript/native": `npm:typescript@${TYPESCRIPT_VERSION}`,
|
|
252
|
+
'@types/node': TYPES_NODE_VERSION,
|
|
252
253
|
'cross-env': CROSS_ENV_VERSION,
|
|
253
254
|
lefthook: LEFTHOOK_VERSION,
|
|
254
255
|
miniflare: MINIFLARE_VERSION,
|
|
@@ -139,7 +139,7 @@ function createWorkspaceRootScriptPlan(remotes = [], options = {}) {
|
|
|
139
139
|
migrateStrictEffect: rootToolingWrapperCommand('migrateStrictEffect'),
|
|
140
140
|
zeropsMaterialize: "node ./scripts/materialize-zerops-runtime.mjs",
|
|
141
141
|
contractCheck: rootToolingWrapperCommand('validate'),
|
|
142
|
-
typecheck: options.typecheck ?? `${rootToolingWrapperCommand('typecheck')} --
|
|
142
|
+
typecheck: options.typecheck ?? `${rootToolingWrapperCommand('typecheck')} --build tsconfig.json`,
|
|
143
143
|
check: `pnpm format:check && pnpm lint && pnpm typecheck && pnpm skills:check && pnpm i18n:boundaries && pnpm api:check && pnpm contract:check && pnpm performance:readiness${bridgeCheck}`
|
|
144
144
|
};
|
|
145
145
|
}
|
|
@@ -129,6 +129,7 @@ function writeGeneratedWorkspaceScripts(targetDir, scope, enableTailwind, remote
|
|
|
129
129
|
const hasBackendSurface = remotes.some(appHasApi);
|
|
130
130
|
writeWorkspaceOwnedMtsScript(targetDir, 'check-ultramodern-i18n-boundaries', createWorkspaceI18nBoundaryValidationScript());
|
|
131
131
|
writeWorkspaceOwnedMtsScript(targetDir, 'check-ultramodern-api-boundaries', createWorkspaceApiBoundaryValidationScript());
|
|
132
|
+
writeWorkspaceOwnedMtsScript(targetDir, 'microvertical-api-baseline-boundary', external_fs_io_js_readFileTemplate("workspace-scripts/microvertical-api-baseline-boundary.mts"));
|
|
132
133
|
if (!shellOnly) {
|
|
133
134
|
writeFileReplacing(targetDir, "scripts/materialize-zerops-runtime.mjs", createZeropsRuntimeMaterializationScript());
|
|
134
135
|
writeWorkspaceOwnedMtsScript(targetDir, 'proof-workerd-ssr', createWorkerdSsrProofScript());
|
|
@@ -156,6 +157,10 @@ function migratedWorkspaceScriptArtifacts(options) {
|
|
|
156
157
|
content: createWorkspaceI18nBoundaryValidationScript(),
|
|
157
158
|
legacyPath: "scripts/check-ultramodern-i18n-boundaries.mjs"
|
|
158
159
|
},
|
|
160
|
+
{
|
|
161
|
+
relativePath: "scripts/microvertical-api-baseline-boundary.mts",
|
|
162
|
+
content: external_fs_io_js_readFileTemplate("workspace-scripts/microvertical-api-baseline-boundary.mts")
|
|
163
|
+
},
|
|
159
164
|
{
|
|
160
165
|
relativePath: "scripts/check-ultramodern-api-boundaries.mts",
|
|
161
166
|
content: createWorkspaceApiBoundaryValidationScript(),
|
|
@@ -23,7 +23,8 @@ const modernPackageCohort = [
|
|
|
23
23
|
'@modern-js/plugin-bff',
|
|
24
24
|
'@modern-js/plugin-i18n',
|
|
25
25
|
'@modern-js/plugin-tanstack',
|
|
26
|
-
'@modern-js/runtime'
|
|
26
|
+
'@modern-js/runtime',
|
|
27
|
+
'@modern-js/runtime-extensions'
|
|
27
28
|
];
|
|
28
29
|
const asJsonRecord = (value)=>value;
|
|
29
30
|
function projectModuleFederationMetadata(value) {
|
|
@@ -45,7 +45,7 @@ function writeAppConfigFiles({ targetDir, scope, resolvedApp, packageSource, ena
|
|
|
45
45
|
writeJson(targetDir, `${resolvedApp.directory}/tsconfig.json`, createAppTsConfig(resolvedApp, remotes));
|
|
46
46
|
writeJson(targetDir, `${resolvedApp.directory}/tsconfig.mf-types.json`, createAppMfTypesTsConfig(resolvedApp));
|
|
47
47
|
writeFile(targetDir, `${resolvedApp.directory}/src/modern-app-env.d.ts`, createAppEnvDts(resolvedApp, remotes, scope));
|
|
48
|
-
writeFile(targetDir, `${resolvedApp.directory}/src/ultramodern-build.ts`, createUltramodernBuildReexportModule());
|
|
48
|
+
if ('api-only' !== resolvedApp.surfaceProfile) writeFile(targetDir, `${resolvedApp.directory}/src/ultramodern-build.ts`, createUltramodernBuildReexportModule(resolvedApp));
|
|
49
49
|
writeFile(targetDir, `${resolvedApp.directory}/shared/ultramodern-build.ts`, createUltramodernBuildModule(scope, resolvedApp));
|
|
50
50
|
writeFile(targetDir, `${resolvedApp.directory}/shared/ultramodern-build.json`, createUltramodernBuildArtifactJson(scope, resolvedApp));
|
|
51
51
|
if (emitsUi) {
|
|
@@ -88,11 +88,17 @@ function writeAppRouteAndShellFiles({ targetDir, scope, resolvedApp, emitsUi, re
|
|
|
88
88
|
function writeAppApiAndRemoteExposeFiles({ targetDir, scope, resolvedApp, emitsUi, writeAppFile }) {
|
|
89
89
|
if (appHasApi(resolvedApp)) {
|
|
90
90
|
const rpcProtocol = 'rpc' === resolveApiProtocol(resolvedApp);
|
|
91
|
-
rpcProtocol ? writeFile(targetDir, `${resolvedApp.directory}/shared/rpc.ts`, createRpcContractFile(resolvedApp)) : writeFile(targetDir, `${resolvedApp.directory}/shared/api.ts`, createSharedApi(resolvedApp
|
|
92
|
-
|
|
91
|
+
rpcProtocol ? writeFile(targetDir, `${resolvedApp.directory}/shared/rpc.ts`, createRpcContractFile(resolvedApp)) : writeFile(targetDir, `${resolvedApp.directory}/shared/api.ts`, createSharedApi(resolvedApp, {
|
|
92
|
+
scope
|
|
93
|
+
}));
|
|
94
|
+
writeFile(targetDir, `${resolvedApp.directory}/api/index.ts`, createApiServiceEntry(resolvedApp, rpcProtocol ? '../shared/rpc.ts' : '../shared/api.ts', {
|
|
95
|
+
scope
|
|
96
|
+
}));
|
|
93
97
|
writeFile(targetDir, `${resolvedApp.directory}/api/backend-federation.ts`, createBackendFederationContractFile(resolvedApp));
|
|
94
98
|
writeFile(targetDir, `${resolvedApp.directory}/api/effect-api.ts`, createBackendEffectApiExpose(scope, resolvedApp));
|
|
95
|
-
rpcProtocol ? writeFile(targetDir, `${resolvedApp.directory}/src/api/${resolvedApp.api.stem}-rpc-client.ts`, createRpcClientFile(resolvedApp)) : writeFile(targetDir, `${resolvedApp.directory}/src/api/${resolvedApp.api.stem}-client.ts`, createApiClient(resolvedApp, '../../shared/api'
|
|
99
|
+
rpcProtocol ? writeFile(targetDir, `${resolvedApp.directory}/src/api/${resolvedApp.api.stem}-rpc-client.ts`, createRpcClientFile(resolvedApp)) : writeFile(targetDir, `${resolvedApp.directory}/src/api/${resolvedApp.api.stem}-client.ts`, createApiClient(resolvedApp, '../../shared/api', {
|
|
100
|
+
scope
|
|
101
|
+
}));
|
|
96
102
|
}
|
|
97
103
|
if ('vertical' === resolvedApp.kind && emitsUi) {
|
|
98
104
|
writeAppFile('src/federation-entry.tsx', createRemoteEntry(resolvedApp));
|
|
@@ -5,7 +5,7 @@ import { createSharedDesignTokensCss } from "./app-files.js";
|
|
|
5
5
|
import { normalizeUltramodernBridgeConfig } from "./bridge-config.js";
|
|
6
6
|
import { createDevelopmentOverlay, createOwnership, createTopology, createUltramodernConfig } from "./contracts.js";
|
|
7
7
|
import { ULTRAMODERN_CONFIG_PATH, createShellHost, sharedPackages, shellApp } from "./descriptors.js";
|
|
8
|
-
import { copyRootTemplate, formatGeneratedWorkspaceFiles, writeFile, writeFileReplacing, writeJson } from "./fs-io.js";
|
|
8
|
+
import { copyRootTemplate, formatGeneratedWorkspaceFiles, readFileTemplate, writeFile, writeFileReplacing, writeJson } from "./fs-io.js";
|
|
9
9
|
import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
|
|
10
10
|
import { assertUniqueTailwindPrefixes, toPackageScope } from "./naming.js";
|
|
11
11
|
import { runCodeSmithOverlays } from "./overlays.js";
|
|
@@ -19,12 +19,14 @@ import { createZeropsYaml } from "./zerops.js";
|
|
|
19
19
|
function hasExplicitInstallRequest(options) {
|
|
20
20
|
return void 0 !== options.packageSource && 'workspace' !== options.packageSource.strategy;
|
|
21
21
|
}
|
|
22
|
-
function writeSharedPackages(targetDir, scope) {
|
|
22
|
+
function writeSharedPackages(targetDir, scope, packageSource) {
|
|
23
23
|
for (const sharedPackage of sharedPackages){
|
|
24
|
-
writeJson(targetDir, `${sharedPackage.directory}/package.json`, createSharedPackage(scope, sharedPackage.id, sharedPackage.description));
|
|
24
|
+
writeJson(targetDir, `${sharedPackage.directory}/package.json`, createSharedPackage(scope, sharedPackage.id, sharedPackage.description, packageSource));
|
|
25
25
|
writeJson(targetDir, `${sharedPackage.directory}/tsconfig.json`, createSharedPackageTsConfig(sharedPackage.directory));
|
|
26
26
|
}
|
|
27
27
|
writeFile(targetDir, 'packages/shared-contracts/src/index.ts', createSharedContractsIndex());
|
|
28
|
+
writeFile(targetDir, 'packages/shared-contracts/src/microvertical-api-baseline.ts', readFileTemplate('packages/microvertical-api-baseline.ts'));
|
|
29
|
+
writeFile(targetDir, 'packages/shared-contracts/src/effect-bff-runtime.ts', readFileTemplate('packages/effect-bff-runtime.ts'));
|
|
28
30
|
writeFile(targetDir, 'packages/shared-design-tokens/src/index.ts', `export const sharedDesignTokens = {
|
|
29
31
|
color: {
|
|
30
32
|
accent: '#2f8f68',
|
|
@@ -144,7 +146,7 @@ function generateUltramodernWorkspaceInPlace(options, logicalWorkspaceRoot = opt
|
|
|
144
146
|
writeJson(options.targetDir, ULTRAMODERN_CONFIG_PATH, createCompactUltramodernConfig(scope, options.modernVersion, packageSource, createdApps, enableTailwind, bridge));
|
|
145
147
|
writeApp(options.targetDir, scope, shellApp, packageSource, enableTailwind, initialVerticals, bridge);
|
|
146
148
|
for (const remote of initialVerticals)writeApp(options.targetDir, scope, remote, packageSource, enableTailwind, initialVerticals, bridge);
|
|
147
|
-
writeSharedPackages(options.targetDir, scope);
|
|
149
|
+
writeSharedPackages(options.targetDir, scope, packageSource);
|
|
148
150
|
writeGeneratedWorkspaceScripts(options.targetDir, scope, enableTailwind, initialVerticals, releaseCohort);
|
|
149
151
|
const preliminaryAfterFiles = createFileSnapshot(options.targetDir);
|
|
150
152
|
const preliminaryDiff = diffFileSnapshots(beforeFiles, preliminaryAfterFiles);
|
|
@@ -25,7 +25,8 @@ const ULTRAMODERN_WORKSPACE_MODERN_PACKAGES = [
|
|
|
25
25
|
'@modern-js/plugin-bff',
|
|
26
26
|
'@modern-js/plugin-i18n',
|
|
27
27
|
'@modern-js/plugin-tanstack',
|
|
28
|
-
'@modern-js/runtime'
|
|
28
|
+
'@modern-js/runtime',
|
|
29
|
+
'@modern-js/runtime-extensions'
|
|
29
30
|
];
|
|
30
31
|
function modernPackageVersion(packageSource) {
|
|
31
32
|
return 'install' === packageSource.strategy ? packageSource.modernPackageVersion : WORKSPACE_PACKAGE_VERSION;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import "node:module";
|
|
2
2
|
import node_fs from "node:fs";
|
|
3
3
|
import node_path from "node:path";
|
|
4
|
+
import { appEmitsBrowserUi } from "../../../ultramodern-workspace/descriptors.js";
|
|
4
5
|
import { createUltramodernBuildArtifactJson, createUltramodernBuildModule, createUltramodernBuildReexportModule } from "../../../ultramodern-workspace/module-federation.js";
|
|
5
6
|
import { allWorkspaceAppsFromToolingConfig } from "../../config.js";
|
|
6
7
|
const legacyApiMarkerPattern = /export const ultramodernApiMarker\s*=\s*\{[\s\S]*?\}\s+as const;\n?/u;
|
|
@@ -40,8 +41,10 @@ function updateGeneratedBuildIdentityModules(io, config) {
|
|
|
40
41
|
for (const app of allWorkspaceAppsFromToolingConfig(config)){
|
|
41
42
|
const sharedApiPath = node_path.join(io.workspaceRoot, app.directory, 'shared/api.ts');
|
|
42
43
|
if (app.api && node_fs.existsSync(sharedApiPath)) io.write(sharedApiPath, rewriteApiMarkerIdentitySchema(rewriteLegacyApiMarkerBinding(node_fs.readFileSync(sharedApiPath, 'utf-8'))));
|
|
43
|
-
|
|
44
|
-
|
|
44
|
+
const reexportPath = node_path.join(io.workspaceRoot, app.directory, 'src/ultramodern-build.ts');
|
|
45
|
+
const includeUiMarker = appEmitsBrowserUi(app) && ('shell' !== app.kind || node_fs.existsSync(reexportPath));
|
|
46
|
+
if (node_fs.existsSync(reexportPath)) io.writeGenerated(reexportPath, createUltramodernBuildReexportModule(app, includeUiMarker));
|
|
47
|
+
io.writeGenerated(node_path.join(io.workspaceRoot, app.directory, 'shared/ultramodern-build.ts'), createUltramodernBuildModule(config.workspace.packageScope, app, includeUiMarker));
|
|
45
48
|
io.write(node_path.join(io.workspaceRoot, app.directory, 'shared/ultramodern-build.json'), createUltramodernBuildArtifactJson(config.workspace.packageScope, app));
|
|
46
49
|
}
|
|
47
50
|
}
|
|
@@ -118,6 +118,7 @@ function updateGeneratedModernConfigs(io, config) {
|
|
|
118
118
|
generatedModuleFederationConfig,
|
|
119
119
|
createGeneratedModuleFederationConfig(!enableBridgeRouter)
|
|
120
120
|
];
|
|
121
|
+
const ownsUiComposition = !node_fs.existsSync(moduleFederationConfigPath) || recognizedModuleFederationConfigs.includes(node_fs.readFileSync(moduleFederationConfigPath, 'utf8'));
|
|
121
122
|
if (appEmitsBrowserUi(app)) writeOwnedTypeScriptConfig(io, moduleFederationConfigPath, generatedModuleFederationConfig, recognizedModuleFederationConfigs);
|
|
122
123
|
else removeOwnedTypeScriptConfig(io, moduleFederationConfigPath, recognizedModuleFederationConfigs);
|
|
123
124
|
const backendFederationConfigPath = node_path.join(io.workspaceRoot, app.directory, 'backend-federation.config.ts');
|
|
@@ -128,6 +129,10 @@ function updateGeneratedModernConfigs(io, config) {
|
|
|
128
129
|
else removeOwnedTypeScriptConfig(io, backendFederationConfigPath, [
|
|
129
130
|
generatedBackendFederationConfig
|
|
130
131
|
]);
|
|
132
|
+
if (!ownsUiComposition) {
|
|
133
|
+
io.log(`${app.directory} preserves its consumer-owned federation composition instead of regenerating routes from unproven metadata.`);
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
131
136
|
if ('shell' === app.kind) {
|
|
132
137
|
const shellUiRemotes = resolveRemoteRefs(app, remotes).filter(appEmitsBrowserUi);
|
|
133
138
|
const componentsPath = node_path.join(io.workspaceRoot, app.directory, 'src/routes/vertical-components.tsx');
|
|
@@ -71,6 +71,7 @@ function mergeTypeScriptConfig(generated, existing) {
|
|
|
71
71
|
...existingCompilerOptions,
|
|
72
72
|
...generatedCompilerOptions
|
|
73
73
|
};
|
|
74
|
+
if (Array.isArray(generatedCompilerOptions.types)) compilerOptions.types = mergeUniqueJsonValues(generatedCompilerOptions.types, existingCompilerOptions.types);
|
|
74
75
|
if (Array.isArray(generatedCompilerOptions.plugins) || Array.isArray(existingCompilerOptions.plugins)) compilerOptions.plugins = mergeTypeScriptPlugins(generatedCompilerOptions.plugins, existingCompilerOptions.plugins);
|
|
75
76
|
const merged = {
|
|
76
77
|
...existingConfig,
|
|
@@ -25,13 +25,20 @@ function updateDeclaredDependencies(packageJson, pins) {
|
|
|
25
25
|
}
|
|
26
26
|
return changed;
|
|
27
27
|
}
|
|
28
|
-
function updateModernDependencies(packageJson, packageSource) {
|
|
28
|
+
function updateModernDependencies(packageJson, packageSource, releaseCohort) {
|
|
29
29
|
let changed = false;
|
|
30
30
|
for (const section of [
|
|
31
31
|
'dependencies',
|
|
32
32
|
'devDependencies'
|
|
33
33
|
]){
|
|
34
34
|
const dependencies = packageJson[section];
|
|
35
|
+
if (dependencies && Object.hasOwn(dependencies, '@modern-js/runtime')) {
|
|
36
|
+
const runtimeExtensions = modernPackageSpecifier('@modern-js/runtime-extensions', packageSource);
|
|
37
|
+
if (dependencies['@modern-js/runtime-extensions'] !== runtimeExtensions) {
|
|
38
|
+
dependencies['@modern-js/runtime-extensions'] = runtimeExtensions;
|
|
39
|
+
changed = true;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
35
42
|
if (dependencies && Object.hasOwn(dependencies, '@modern-js/create')) {
|
|
36
43
|
dependencies[ULTRAMODERN_CREATE_PACKAGE] = modernPackageSpecifier(ULTRAMODERN_CREATE_PACKAGE, packageSource);
|
|
37
44
|
delete dependencies['@modern-js/create'];
|
|
@@ -39,11 +46,23 @@ function updateModernDependencies(packageJson, packageSource) {
|
|
|
39
46
|
}
|
|
40
47
|
}
|
|
41
48
|
return updateDeclaredDependencies(packageJson, new Map([
|
|
42
|
-
...
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
49
|
+
...[
|
|
50
|
+
...modernPackageNames
|
|
51
|
+
].map((packageName)=>[
|
|
52
|
+
packageName,
|
|
53
|
+
modernPackageSpecifier(packageName, packageSource)
|
|
54
|
+
]),
|
|
55
|
+
...(releaseCohort?.packages ?? []).flatMap((item)=>[
|
|
56
|
+
[
|
|
57
|
+
item.sourceName,
|
|
58
|
+
modernPackageSpecifier(item.sourceName, packageSource)
|
|
59
|
+
],
|
|
60
|
+
[
|
|
61
|
+
item.targetName,
|
|
62
|
+
item.version
|
|
63
|
+
]
|
|
64
|
+
])
|
|
65
|
+
])) || changed;
|
|
47
66
|
}
|
|
48
67
|
const generatedToolingDependencyPins = new Map(Object.entries({
|
|
49
68
|
...ULTRAMODERN_PACKAGE_PINS.appDependencies,
|
|
@@ -136,6 +155,8 @@ function mergeGeneratedScript(consumer, framework, canRetireLegacyOxfmtCliExclus
|
|
|
136
155
|
const frameworkSegmentSet = new Set(frameworkSegments);
|
|
137
156
|
const canonicalFrameworkSegment = (segment)=>{
|
|
138
157
|
if (frameworkSegmentSet.has(segment)) return segment;
|
|
158
|
+
const referenceBuild = segment.replace('--project tsconfig.json', '--build tsconfig.json');
|
|
159
|
+
if (frameworkSegmentSet.has(referenceBuild)) return referenceBuild;
|
|
139
160
|
const portableEnvironmentSegment = `cross-env ${segment}`;
|
|
140
161
|
if (frameworkSegmentSet.has(portableEnvironmentSegment)) return portableEnvironmentSegment;
|
|
141
162
|
const portableOxfmtSegment = segment.replace(/ '!repos\/\*\*'$/u, '');
|
|
@@ -188,12 +209,12 @@ function mergeGeneratedScript(consumer, framework, canRetireLegacyOxfmtCliExclus
|
|
|
188
209
|
preservedConsumerSegments: consumerExtras.length > 0
|
|
189
210
|
};
|
|
190
211
|
}
|
|
191
|
-
function rewriteMigratedScriptReferences(scripts) {
|
|
212
|
+
function rewriteMigratedScriptReferences(scripts, preservedArtifacts) {
|
|
192
213
|
let changed = false;
|
|
193
214
|
const pattern = new RegExp(`(scripts/(?:${migratedWorkspaceScriptBasenames.join('|')}))\\.mjs`, 'gu');
|
|
194
215
|
for (const [name, value] of Object.entries(scripts)){
|
|
195
216
|
if ('string' != typeof value) continue;
|
|
196
|
-
const next = value.replace(pattern,
|
|
217
|
+
const next = value.replace(pattern, (original, basename)=>preservedArtifacts?.has(`${basename}.mjs`) ? original : `${basename}.mts`);
|
|
197
218
|
if (next !== value) {
|
|
198
219
|
scripts[name] = next;
|
|
199
220
|
changed = true;
|
|
@@ -208,7 +229,7 @@ function updateGeneratedPackageScripts(packageJson, options = {}) {
|
|
|
208
229
|
const apps = options.apps ?? [];
|
|
209
230
|
const app = apps.find((candidate)=>`${candidate.directory}/package.json` === options.relativePackageFile);
|
|
210
231
|
const isRootPackage = 'package.json' === options.relativePackageFile;
|
|
211
|
-
if (rewriteMigratedScriptReferences(scripts)) changed = true;
|
|
232
|
+
if (rewriteMigratedScriptReferences(scripts, options.preservedArtifacts)) changed = true;
|
|
212
233
|
if (isRootPackage) {
|
|
213
234
|
for (const [name, [legacy, portable]] of legacyPortableRootScripts)if (true === options.canRetireLegacyOxfmtCliExclusion && scripts[name] === legacy) {
|
|
214
235
|
scripts[name] = portable;
|
|
@@ -200,11 +200,7 @@ function reconcilePatchedDependencies(document, includeDrizzleOrmPatch) {
|
|
|
200
200
|
patchKey(patch),
|
|
201
201
|
patch
|
|
202
202
|
]));
|
|
203
|
-
const ownedPackageNames = new Set(
|
|
204
|
-
...policy.required,
|
|
205
|
-
...policy.conditional,
|
|
206
|
-
...policy.stale
|
|
207
|
-
].map((patch)=>patch.packageName));
|
|
203
|
+
const ownedPackageNames = new Set(expectedPatches.map((patch)=>patch.packageName));
|
|
208
204
|
const patchedDependencies = ensureMap(document, 'patchedDependencies');
|
|
209
205
|
for (const [selector, patchPath] of Object.entries(patchedDependencies)){
|
|
210
206
|
const stalePatch = stale.get(selector);
|
|
@@ -213,15 +209,13 @@ function reconcilePatchedDependencies(document, includeDrizzleOrmPatch) {
|
|
|
213
209
|
delete patchedDependencies[selector];
|
|
214
210
|
continue;
|
|
215
211
|
}
|
|
216
|
-
const
|
|
217
|
-
if (
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
delete patchedDependencies[selector];
|
|
221
|
-
continue;
|
|
222
|
-
}
|
|
223
|
-
throw new Error(`Framework-owned patch selector ${selector} has unknown provenance.`);
|
|
212
|
+
const conditionalPatch = policy.conditional.find((patch)=>patchKey(patch) === selector);
|
|
213
|
+
if (conditionalPatch && !includeDrizzleOrmPatch && patchPath === conditionalPatch.path) {
|
|
214
|
+
delete patchedDependencies[selector];
|
|
215
|
+
continue;
|
|
224
216
|
}
|
|
217
|
+
const parts = packageVersionParts(selector);
|
|
218
|
+
if (parts && ownedPackageNames.has(parts.packageName) && !expected.has(selector)) throw new Error(`Framework-owned patch selector ${selector} has unknown provenance.`);
|
|
225
219
|
}
|
|
226
220
|
for (const [selector, patchPath] of expected)patchedDependencies[selector] = patchPath;
|
|
227
221
|
}
|
|
@@ -512,6 +506,8 @@ async function validateGeneratedPnpmLockReleaseAgePolicy(workspaceRoot, packageS
|
|
|
512
506
|
const firstPartyTargetNames = new Set(releaseCohort?.packages.map((item)=>item.targetName) ?? []);
|
|
513
507
|
const { document: lockfile } = parsePnpmWorkspaceYaml(node_fs.readFileSync(lockfilePath, 'utf-8'), lockfilePath);
|
|
514
508
|
const closure = discoverReachablePnpmLockReleaseAgeClosure(lockfile);
|
|
509
|
+
const firstPartySourceNames = new Set(releaseCohort?.packages.map((item)=>item.sourceName) ?? []);
|
|
510
|
+
for (const tarball of closure.tarballs)if (firstPartyTargetNames.has(tarball.packageName) || firstPartySourceNames.has(tarball.packageName)) throw new Error(`First-party lock candidate ${tarball.packageName} must resolve through the authenticated release cohort, not a tarball URL.`);
|
|
515
511
|
if (closure.unresolved.length > 0) {
|
|
516
512
|
const unresolved = closure.unresolved.slice(0, 20).map((candidate)=>{
|
|
517
513
|
const packageName = candidate.package ?? 'unknown package';
|
|
@@ -10,6 +10,11 @@ const integrityPattern = /^sha512-[A-Za-z0-9+/]+={0,2}$/u;
|
|
|
10
10
|
function isExactSemver(version) {
|
|
11
11
|
return semver.valid(version) === version;
|
|
12
12
|
}
|
|
13
|
+
function isHttpsTarballLocator(value) {
|
|
14
|
+
if (!value.startsWith('https://') || /[\s()]/u.test(value) || !URL.canParse(value)) return false;
|
|
15
|
+
const url = new URL(value);
|
|
16
|
+
return url.href === value && '' === url.username && '' === url.password && '' === url.hash;
|
|
17
|
+
}
|
|
13
18
|
function isYamlRecord(value) {
|
|
14
19
|
return Boolean(value) && 'object' == typeof value && !Array.isArray(value);
|
|
15
20
|
}
|
|
@@ -63,7 +68,7 @@ function splitPeerContext(locator) {
|
|
|
63
68
|
for (const segment of segments){
|
|
64
69
|
if (/^patch_hash=[a-f0-9]{32,128}$/u.test(segment) || /^[a-f0-9]{32,128}$/u.test(segment)) continue;
|
|
65
70
|
const peer = parsePackageKey(segment);
|
|
66
|
-
if (!peer) return {
|
|
71
|
+
if (!peer || isHttpsTarballLocator(peer.version)) return {
|
|
67
72
|
unresolved: locator
|
|
68
73
|
};
|
|
69
74
|
peers.push(peer);
|
|
@@ -75,11 +80,12 @@ function splitPeerContext(locator) {
|
|
|
75
80
|
}
|
|
76
81
|
function parsePackageLocator(rawLocator) {
|
|
77
82
|
const locator = rawLocator.replace(/^\//u, '');
|
|
78
|
-
const
|
|
83
|
+
const tarballSeparator = locator.indexOf('@https://');
|
|
84
|
+
const separator = tarballSeparator > 0 ? tarballSeparator : locator.lastIndexOf('@');
|
|
79
85
|
if (separator <= 0) return;
|
|
80
86
|
const packageName = locator.slice(0, separator);
|
|
81
87
|
const version = locator.slice(separator + 1);
|
|
82
|
-
if (!exactPackageNamePattern.test(packageName) || !isExactSemver(version)) return;
|
|
88
|
+
if (!exactPackageNamePattern.test(packageName) || !isExactSemver(version) && !isHttpsTarballLocator(version)) return;
|
|
83
89
|
return {
|
|
84
90
|
packageName,
|
|
85
91
|
version,
|
|
@@ -123,6 +129,11 @@ function dependencyIdentity(dependencyName, rawValue) {
|
|
|
123
129
|
const peerContext = splitPeerContext(value.startsWith('npm:') ? value.slice(4) : value);
|
|
124
130
|
if ('unresolved' in peerContext) return peerContext;
|
|
125
131
|
const { base, peers } = peerContext;
|
|
132
|
+
if (isHttpsTarballLocator(base) && exactPackageNamePattern.test(dependencyName)) return {
|
|
133
|
+
packageName: dependencyName,
|
|
134
|
+
version: base,
|
|
135
|
+
peers
|
|
136
|
+
};
|
|
126
137
|
const full = parsePackageLocator(base);
|
|
127
138
|
if (full) return {
|
|
128
139
|
...full,
|
|
@@ -265,13 +276,11 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
|
|
|
265
276
|
const currentPath = shortestIdentityPaths.get(key);
|
|
266
277
|
if (!currentPath || nodePath.length < currentPath.length) shortestIdentityPaths.set(key, nodePath);
|
|
267
278
|
}
|
|
279
|
+
const tarballs = [];
|
|
268
280
|
const candidates = [
|
|
269
281
|
...shortestIdentityPaths.entries()
|
|
270
282
|
].map(([key, path])=>{
|
|
271
|
-
const
|
|
272
|
-
key.slice(0, key.lastIndexOf('@')),
|
|
273
|
-
key.slice(key.lastIndexOf('@') + 1)
|
|
274
|
-
];
|
|
283
|
+
const { packageName, version } = nodes.get(nodeIdsByIdentity.get(key)[0]).identity;
|
|
275
284
|
const packageRecordsForIdentity = packageRecordsByIdentity.get(key);
|
|
276
285
|
if (!packageRecordsForIdentity?.length) return void recordUnresolved({
|
|
277
286
|
packageName,
|
|
@@ -279,12 +288,25 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
|
|
|
279
288
|
peers: []
|
|
280
289
|
}, path, 'missing exact SHA-512 lock integrity');
|
|
281
290
|
let integrity;
|
|
291
|
+
let tarballVersion;
|
|
282
292
|
for (const [packageKey, packageRecord] of packageRecordsForIdentity){
|
|
283
293
|
const resolution = requiredYamlRecord(requiredYamlRecord(packageRecord, `pnpm lockfile package ${packageKey}`).resolution, `pnpm lockfile package ${packageKey} resolution`);
|
|
284
294
|
if ('string' != typeof resolution.integrity || !integrityPattern.test(resolution.integrity)) throw new Error(`pnpm lockfile package ${packageKey} has uncertain registry integrity.`);
|
|
285
295
|
if (integrity && integrity !== resolution.integrity) throw new Error(`pnpm lockfile has conflicting registry integrity for ${key}.`);
|
|
286
296
|
integrity = resolution.integrity;
|
|
297
|
+
if (isHttpsTarballLocator(version)) {
|
|
298
|
+
const metadata = requiredYamlRecord(packageRecord, `pnpm lockfile package ${packageKey}`);
|
|
299
|
+
if (resolution.tarball !== version || 'string' != typeof metadata.version || !isExactSemver(metadata.version) || void 0 !== tarballVersion && tarballVersion !== metadata.version) throw new Error(`pnpm lockfile package ${packageKey} has uncertain tarball identity.`);
|
|
300
|
+
tarballVersion = metadata.version;
|
|
301
|
+
}
|
|
287
302
|
}
|
|
303
|
+
if (void 0 !== tarballVersion) return void tarballs.push({
|
|
304
|
+
packageName,
|
|
305
|
+
version: tarballVersion,
|
|
306
|
+
url: version,
|
|
307
|
+
integrity: integrity,
|
|
308
|
+
path
|
|
309
|
+
});
|
|
288
310
|
return {
|
|
289
311
|
packageName,
|
|
290
312
|
version,
|
|
@@ -299,6 +321,7 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
|
|
|
299
321
|
unresolved.sort((left, right)=>JSON.stringify(left).localeCompare(JSON.stringify(right)));
|
|
300
322
|
return {
|
|
301
323
|
candidates,
|
|
324
|
+
tarballs,
|
|
302
325
|
unresolved
|
|
303
326
|
};
|
|
304
327
|
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import "node:module";
|
|
2
|
+
import node_fs from "node:fs";
|
|
3
|
+
import node_path from "node:path";
|
|
4
|
+
import { readFileTemplate } from "../../../ultramodern-workspace/fs-io.js";
|
|
5
|
+
import { createSharedPackage, createSharedPackageTsConfig } from "../../../ultramodern-workspace/package-json.js";
|
|
6
|
+
import { readJsonFile, writeJsonFile } from "./io.js";
|
|
7
|
+
const directory = 'packages/shared-contracts';
|
|
8
|
+
function record(value, label) {
|
|
9
|
+
if (null === value || 'object' != typeof value || Array.isArray(value)) throw new Error(`${label} must be an object; resolve it before migration.`);
|
|
10
|
+
return value;
|
|
11
|
+
}
|
|
12
|
+
function ensureSharedApiInfrastructure(io, scope, packageSource) {
|
|
13
|
+
for (const relativePath of [
|
|
14
|
+
'packages',
|
|
15
|
+
directory,
|
|
16
|
+
`${directory}/package.json`,
|
|
17
|
+
`${directory}/src`,
|
|
18
|
+
`${directory}/src/index.ts`
|
|
19
|
+
])if (node_fs.lstatSync(node_path.join(io.workspaceRoot, relativePath), {
|
|
20
|
+
throwIfNoEntry: false
|
|
21
|
+
})?.isSymbolicLink()) throw new Error(`Shared API migration cannot write through a symbolic link: ${relativePath}`);
|
|
22
|
+
const manifestPath = node_path.join(io.workspaceRoot, directory, 'package.json');
|
|
23
|
+
const defaults = createSharedPackage(scope, 'shared-contracts', 'Shared workspace contracts', packageSource);
|
|
24
|
+
const manifest = node_fs.existsSync(manifestPath) ? record(readJsonFile(manifestPath), `${directory}/package.json`) : defaults;
|
|
25
|
+
const exports = void 0 === manifest.exports ? {} : 'string' == typeof manifest.exports ? {
|
|
26
|
+
'.': manifest.exports
|
|
27
|
+
} : record(manifest.exports, `${directory}/package.json exports`);
|
|
28
|
+
if (Object.keys(exports).some((key)=>!key.startsWith('.')) || void 0 !== exports['.'] && './src/index.ts' !== exports['.']) throw new Error(`${directory}/package.json exports must expose ./src/index.ts at "." before adding shared API infrastructure; consumer exports were not overwritten.`);
|
|
29
|
+
for (const [subpath, target] of Object.entries(record(defaults.exports, 'Shared contract exports')))if (void 0 !== exports[subpath] && exports[subpath] !== target) throw new Error(`${directory}/package.json ${subpath} must expose ${String(target)}; consumer exports were not overwritten.`);
|
|
30
|
+
const dependencies = record(manifest.dependencies ?? {}, `${directory}/package.json dependencies`);
|
|
31
|
+
manifest.exports = {
|
|
32
|
+
...record(defaults.exports, 'Shared contract exports'),
|
|
33
|
+
...exports
|
|
34
|
+
};
|
|
35
|
+
manifest.dependencies = {
|
|
36
|
+
...record(defaults.dependencies, 'Shared contract dependencies'),
|
|
37
|
+
...dependencies
|
|
38
|
+
};
|
|
39
|
+
const writeMissing = (relativePath, content)=>{
|
|
40
|
+
const filePath = node_path.join(io.workspaceRoot, directory, relativePath);
|
|
41
|
+
if (void 0 === node_fs.lstatSync(filePath, {
|
|
42
|
+
throwIfNoEntry: false
|
|
43
|
+
})) io.writeGenerated(filePath, content);
|
|
44
|
+
};
|
|
45
|
+
writeMissing('src/effect-bff-runtime.ts', readFileTemplate('packages/effect-bff-runtime.ts'));
|
|
46
|
+
writeMissing('src/microvertical-api-baseline.ts', readFileTemplate('packages/microvertical-api-baseline.ts'));
|
|
47
|
+
writeMissing('tsconfig.json', `${JSON.stringify(createSharedPackageTsConfig(directory), null, 2)}\n`);
|
|
48
|
+
writeMissing('src/index.ts', readFileTemplate('packages/shared-contracts-index.ts'));
|
|
49
|
+
writeJsonFile(io, manifestPath, manifest);
|
|
50
|
+
}
|
|
51
|
+
export { ensureSharedApiInfrastructure };
|