@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
|
@@ -12,7 +12,11 @@ function extractExposes(configPath, value) {
|
|
|
12
12
|
if (array) return array.sort();
|
|
13
13
|
throw new Error(`Cannot statically extract Module Federation exposes from ${configPath}; use a literal exposes object or string array.`);
|
|
14
14
|
}
|
|
15
|
-
function extractDtsSettings(configPath, value) {
|
|
15
|
+
function extractDtsSettings(configPath, value, exposes) {
|
|
16
|
+
if ('false' === value) {
|
|
17
|
+
if (exposes.length > 0) throw new Error(`Module Federation DTS cannot be disabled for exposed app ${configPath}.`);
|
|
18
|
+
return {};
|
|
19
|
+
}
|
|
16
20
|
if (void 0 === value) return {};
|
|
17
21
|
const dts = parseObjectLiteral(value);
|
|
18
22
|
if (!dts || dts.hasSpread) throw new Error(`Cannot statically extract Module Federation DTS settings from ${configPath}; use a literal dts object.`);
|
|
@@ -39,7 +43,7 @@ function inspectModuleFederationConfigSource(source, appDir, configPath) {
|
|
|
39
43
|
return {
|
|
40
44
|
appDir,
|
|
41
45
|
configPath,
|
|
42
|
-
dts: extractDtsSettings(configPath, properties.properties.get('dts')),
|
|
46
|
+
dts: extractDtsSettings(configPath, properties.properties.get('dts'), exposes),
|
|
43
47
|
exposes,
|
|
44
48
|
hostOnlyNoExposes
|
|
45
49
|
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import "node:module";
|
|
2
2
|
import { createUltramodernBuildArtifact } from "@modern-js/utils/universal";
|
|
3
3
|
import { createDeliveryUnitRecord } from "../delivery-unit.js";
|
|
4
|
+
import { appEmitsBrowserUi, appHasApi } from "../descriptors.js";
|
|
4
5
|
function deliveryUnitRecordFor(scope, app) {
|
|
5
6
|
return app.deliveryUnit ? app.deliveryUnit : createDeliveryUnitRecord(scope, app);
|
|
6
7
|
}
|
|
@@ -8,61 +9,27 @@ function createUltramodernBuildArtifactJson(scope, app) {
|
|
|
8
9
|
const record = deliveryUnitRecordFor(scope, app);
|
|
9
10
|
return `${JSON.stringify(createUltramodernBuildArtifact(record), null, 2)}\n`;
|
|
10
11
|
}
|
|
11
|
-
function createUltramodernBuildModule(scope, app) {
|
|
12
|
+
function createUltramodernBuildModule(scope, app, includeUiMarker = appEmitsBrowserUi(app)) {
|
|
12
13
|
const record = deliveryUnitRecordFor(scope, app);
|
|
13
|
-
return `
|
|
14
|
-
declare const ULTRAMODERN_SOURCE_REVISION: string;
|
|
14
|
+
return `import { resolveUltramodernBuildArtifact } from '@modern-js/runtime-extensions/build-identity';
|
|
15
15
|
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
typeof ULTRAMODERN_BUILD_MARKER === 'string'
|
|
19
|
-
? ULTRAMODERN_BUILD_MARKER
|
|
20
|
-
: ultramodernGeneratedBuildArtifact.deliveryUnit.buildMarker;
|
|
21
|
-
const ultramodernSourceRevision =
|
|
22
|
-
typeof ULTRAMODERN_SOURCE_REVISION === 'string'
|
|
23
|
-
? ULTRAMODERN_SOURCE_REVISION
|
|
24
|
-
: ultramodernGeneratedBuildArtifact.deliveryUnit.sourceRevision;
|
|
25
|
-
const ultramodernBuildArtifact = {
|
|
26
|
-
...ultramodernGeneratedBuildArtifact,
|
|
27
|
-
deliveryUnit: {
|
|
28
|
-
...ultramodernGeneratedBuildArtifact.deliveryUnit,
|
|
29
|
-
build: ultramodernBuildMarker,
|
|
30
|
-
buildMarker: ultramodernBuildMarker,
|
|
31
|
-
sourceRevision: ultramodernSourceRevision,
|
|
32
|
-
},
|
|
33
|
-
surfaces: {
|
|
34
|
-
api: {
|
|
35
|
-
...ultramodernGeneratedBuildArtifact.surfaces.api,
|
|
36
|
-
build: ultramodernBuildMarker,
|
|
37
|
-
buildMarker: ultramodernBuildMarker,
|
|
38
|
-
sourceRevision: ultramodernSourceRevision,
|
|
39
|
-
},
|
|
40
|
-
ui: {
|
|
41
|
-
...ultramodernGeneratedBuildArtifact.surfaces.ui,
|
|
42
|
-
build: ultramodernBuildMarker,
|
|
43
|
-
buildMarker: ultramodernBuildMarker,
|
|
44
|
-
sourceRevision: ultramodernSourceRevision,
|
|
45
|
-
},
|
|
46
|
-
},
|
|
47
|
-
} as const;
|
|
16
|
+
declare const ULTRAMODERN_BUILD_MARKER: string;
|
|
17
|
+
declare const ULTRAMODERN_SOURCE_REVISION: string;
|
|
48
18
|
|
|
49
|
-
|
|
19
|
+
const ultramodernBuildArtifact = resolveUltramodernBuildArtifact(${JSON.stringify(createUltramodernBuildArtifact(record), null, 2)} as const, {
|
|
20
|
+
buildMarker: () => ULTRAMODERN_BUILD_MARKER,
|
|
21
|
+
sourceRevision: () => ULTRAMODERN_SOURCE_REVISION,
|
|
22
|
+
});
|
|
50
23
|
|
|
51
|
-
export const ultramodernDeliveryUnit =
|
|
52
|
-
|
|
53
|
-
export const ultramodernVerticalIdentity = ultramodernDeliveryUnit;
|
|
54
|
-
export const ultramodernUiMarker = ultramodernBuildArtifact.surfaces.ui;
|
|
55
|
-
export const ultramodernApiMarker = ultramodernBuildArtifact.surfaces.api;
|
|
56
|
-
`;
|
|
24
|
+
export const ultramodernDeliveryUnit = ultramodernBuildArtifact.deliveryUnit;
|
|
25
|
+
${includeUiMarker ? 'export const ultramodernUiMarker = ultramodernBuildArtifact.surfaces.ui;\n' : ''}${'shell' !== app.kind && appHasApi(app) ? 'export const ultramodernApiMarker = ultramodernBuildArtifact.surfaces.api;\n' : ''}`;
|
|
57
26
|
}
|
|
58
|
-
function createUltramodernBuildReexportModule() {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
} from '../shared/ultramodern-build';
|
|
66
|
-
`;
|
|
27
|
+
function createUltramodernBuildReexportModule(app, includeUiMarker = appEmitsBrowserUi(app)) {
|
|
28
|
+
const names = [
|
|
29
|
+
'ultramodernDeliveryUnit'
|
|
30
|
+
];
|
|
31
|
+
if (includeUiMarker) names.push('ultramodernUiMarker');
|
|
32
|
+
if ('shell' !== app.kind && appHasApi(app)) names.push('ultramodernApiMarker');
|
|
33
|
+
return `export { ${names.join(', ')} } from '../shared/ultramodern-build';\n`;
|
|
67
34
|
}
|
|
68
35
|
export { createUltramodernBuildArtifactJson, createUltramodernBuildModule, createUltramodernBuildReexportModule };
|
|
@@ -9,6 +9,7 @@ function appDependencies(scope, packageSource, app, remotes = [], bridge) {
|
|
|
9
9
|
const dependencies = {
|
|
10
10
|
'@modern-js/plugin-tanstack': modernPackageSpecifier('@modern-js/plugin-tanstack', packageSource),
|
|
11
11
|
'@modern-js/plugin-i18n': modernPackageSpecifier('@modern-js/plugin-i18n', packageSource),
|
|
12
|
+
'@modern-js/runtime-extensions': modernPackageSpecifier('@modern-js/runtime-extensions', packageSource),
|
|
12
13
|
'@modern-js/runtime': modernPackageSpecifier('@modern-js/runtime', packageSource),
|
|
13
14
|
...ULTRAMODERN_PACKAGE_PINS.appDependencies,
|
|
14
15
|
[packageName(scope, 'shared-contracts')]: WORKSPACE_PACKAGE_VERSION,
|
|
@@ -172,7 +173,7 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
|
|
|
172
173
|
if (Object.keys(packageExports).length > 0) packageJson.exports = packageExports;
|
|
173
174
|
return packageJson;
|
|
174
175
|
}
|
|
175
|
-
function createSharedPackage(scope, id, description) {
|
|
176
|
+
function createSharedPackage(scope, id, description, packageSource) {
|
|
176
177
|
const packageJson = {
|
|
177
178
|
private: true,
|
|
178
179
|
name: packageName(scope, id),
|
|
@@ -189,6 +190,17 @@ function createSharedPackage(scope, id, description) {
|
|
|
189
190
|
'@effect/tsgo': ULTRAMODERN_PACKAGE_PINS.appDevDependencies["@effect/tsgo"]
|
|
190
191
|
}
|
|
191
192
|
};
|
|
193
|
+
if ('shared-contracts' === id) {
|
|
194
|
+
packageJson.exports = {
|
|
195
|
+
'.': './src/index.ts',
|
|
196
|
+
'./microvertical-api-baseline': './src/microvertical-api-baseline.ts',
|
|
197
|
+
'./server/effect-bff-runtime': './src/effect-bff-runtime.ts'
|
|
198
|
+
};
|
|
199
|
+
packageJson.dependencies = {
|
|
200
|
+
...ULTRAMODERN_PACKAGE_PINS.bffEffectDependencies,
|
|
201
|
+
'@modern-js/plugin-bff': packageSource ? modernPackageSpecifier('@modern-js/plugin-bff', packageSource) : WORKSPACE_PACKAGE_VERSION
|
|
202
|
+
};
|
|
203
|
+
}
|
|
192
204
|
if ('shared-design-tokens' === id) packageJson.exports = {
|
|
193
205
|
...packageJson.exports,
|
|
194
206
|
'./tokens.css': './src/tokens.css'
|
|
@@ -250,6 +250,7 @@ const ULTRAMODERN_PACKAGE_PINS = {
|
|
|
250
250
|
rootDevDependencies: {
|
|
251
251
|
'@effect/tsgo': EFFECT_TSGO_VERSION,
|
|
252
252
|
"@typescript/native": `npm:typescript@${TYPESCRIPT_VERSION}`,
|
|
253
|
+
'@types/node': TYPES_NODE_VERSION,
|
|
253
254
|
'cross-env': CROSS_ENV_VERSION,
|
|
254
255
|
lefthook: LEFTHOOK_VERSION,
|
|
255
256
|
miniflare: MINIFLARE_VERSION,
|
|
@@ -140,7 +140,7 @@ function createWorkspaceRootScriptPlan(remotes = [], options = {}) {
|
|
|
140
140
|
migrateStrictEffect: rootToolingWrapperCommand('migrateStrictEffect'),
|
|
141
141
|
zeropsMaterialize: "node ./scripts/materialize-zerops-runtime.mjs",
|
|
142
142
|
contractCheck: rootToolingWrapperCommand('validate'),
|
|
143
|
-
typecheck: options.typecheck ?? `${rootToolingWrapperCommand('typecheck')} --
|
|
143
|
+
typecheck: options.typecheck ?? `${rootToolingWrapperCommand('typecheck')} --build tsconfig.json`,
|
|
144
144
|
check: `pnpm format:check && pnpm lint && pnpm typecheck && pnpm skills:check && pnpm i18n:boundaries && pnpm api:check && pnpm contract:check && pnpm performance:readiness${bridgeCheck}`
|
|
145
145
|
};
|
|
146
146
|
}
|
|
@@ -130,6 +130,7 @@ function writeGeneratedWorkspaceScripts(targetDir, scope, enableTailwind, remote
|
|
|
130
130
|
const hasBackendSurface = remotes.some(appHasApi);
|
|
131
131
|
writeWorkspaceOwnedMtsScript(targetDir, 'check-ultramodern-i18n-boundaries', createWorkspaceI18nBoundaryValidationScript());
|
|
132
132
|
writeWorkspaceOwnedMtsScript(targetDir, 'check-ultramodern-api-boundaries', createWorkspaceApiBoundaryValidationScript());
|
|
133
|
+
writeWorkspaceOwnedMtsScript(targetDir, 'microvertical-api-baseline-boundary', external_fs_io_js_readFileTemplate("workspace-scripts/microvertical-api-baseline-boundary.mts"));
|
|
133
134
|
if (!shellOnly) {
|
|
134
135
|
writeFileReplacing(targetDir, "scripts/materialize-zerops-runtime.mjs", createZeropsRuntimeMaterializationScript());
|
|
135
136
|
writeWorkspaceOwnedMtsScript(targetDir, 'proof-workerd-ssr', createWorkerdSsrProofScript());
|
|
@@ -157,6 +158,10 @@ function migratedWorkspaceScriptArtifacts(options) {
|
|
|
157
158
|
content: createWorkspaceI18nBoundaryValidationScript(),
|
|
158
159
|
legacyPath: "scripts/check-ultramodern-i18n-boundaries.mjs"
|
|
159
160
|
},
|
|
161
|
+
{
|
|
162
|
+
relativePath: "scripts/microvertical-api-baseline-boundary.mts",
|
|
163
|
+
content: external_fs_io_js_readFileTemplate("workspace-scripts/microvertical-api-baseline-boundary.mts")
|
|
164
|
+
},
|
|
160
165
|
{
|
|
161
166
|
relativePath: "scripts/check-ultramodern-api-boundaries.mts",
|
|
162
167
|
content: createWorkspaceApiBoundaryValidationScript(),
|
|
@@ -24,7 +24,8 @@ const modernPackageCohort = [
|
|
|
24
24
|
'@modern-js/plugin-bff',
|
|
25
25
|
'@modern-js/plugin-i18n',
|
|
26
26
|
'@modern-js/plugin-tanstack',
|
|
27
|
-
'@modern-js/runtime'
|
|
27
|
+
'@modern-js/runtime',
|
|
28
|
+
'@modern-js/runtime-extensions'
|
|
28
29
|
];
|
|
29
30
|
const asJsonRecord = (value)=>value;
|
|
30
31
|
function projectModuleFederationMetadata(value) {
|
|
@@ -46,7 +46,7 @@ function writeAppConfigFiles({ targetDir, scope, resolvedApp, packageSource, ena
|
|
|
46
46
|
writeJson(targetDir, `${resolvedApp.directory}/tsconfig.json`, createAppTsConfig(resolvedApp, remotes));
|
|
47
47
|
writeJson(targetDir, `${resolvedApp.directory}/tsconfig.mf-types.json`, createAppMfTypesTsConfig(resolvedApp));
|
|
48
48
|
writeFile(targetDir, `${resolvedApp.directory}/src/modern-app-env.d.ts`, createAppEnvDts(resolvedApp, remotes, scope));
|
|
49
|
-
writeFile(targetDir, `${resolvedApp.directory}/src/ultramodern-build.ts`, createUltramodernBuildReexportModule());
|
|
49
|
+
if ('api-only' !== resolvedApp.surfaceProfile) writeFile(targetDir, `${resolvedApp.directory}/src/ultramodern-build.ts`, createUltramodernBuildReexportModule(resolvedApp));
|
|
50
50
|
writeFile(targetDir, `${resolvedApp.directory}/shared/ultramodern-build.ts`, createUltramodernBuildModule(scope, resolvedApp));
|
|
51
51
|
writeFile(targetDir, `${resolvedApp.directory}/shared/ultramodern-build.json`, createUltramodernBuildArtifactJson(scope, resolvedApp));
|
|
52
52
|
if (emitsUi) {
|
|
@@ -89,11 +89,17 @@ function writeAppRouteAndShellFiles({ targetDir, scope, resolvedApp, emitsUi, re
|
|
|
89
89
|
function writeAppApiAndRemoteExposeFiles({ targetDir, scope, resolvedApp, emitsUi, writeAppFile }) {
|
|
90
90
|
if (appHasApi(resolvedApp)) {
|
|
91
91
|
const rpcProtocol = 'rpc' === resolveApiProtocol(resolvedApp);
|
|
92
|
-
rpcProtocol ? writeFile(targetDir, `${resolvedApp.directory}/shared/rpc.ts`, createRpcContractFile(resolvedApp)) : writeFile(targetDir, `${resolvedApp.directory}/shared/api.ts`, createSharedApi(resolvedApp
|
|
93
|
-
|
|
92
|
+
rpcProtocol ? writeFile(targetDir, `${resolvedApp.directory}/shared/rpc.ts`, createRpcContractFile(resolvedApp)) : writeFile(targetDir, `${resolvedApp.directory}/shared/api.ts`, createSharedApi(resolvedApp, {
|
|
93
|
+
scope
|
|
94
|
+
}));
|
|
95
|
+
writeFile(targetDir, `${resolvedApp.directory}/api/index.ts`, createApiServiceEntry(resolvedApp, rpcProtocol ? '../shared/rpc.ts' : '../shared/api.ts', {
|
|
96
|
+
scope
|
|
97
|
+
}));
|
|
94
98
|
writeFile(targetDir, `${resolvedApp.directory}/api/backend-federation.ts`, createBackendFederationContractFile(resolvedApp));
|
|
95
99
|
writeFile(targetDir, `${resolvedApp.directory}/api/effect-api.ts`, createBackendEffectApiExpose(scope, resolvedApp));
|
|
96
|
-
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
|
+
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', {
|
|
101
|
+
scope
|
|
102
|
+
}));
|
|
97
103
|
}
|
|
98
104
|
if ('vertical' === resolvedApp.kind && emitsUi) {
|
|
99
105
|
writeAppFile('src/federation-entry.tsx', createRemoteEntry(resolvedApp));
|
|
@@ -6,7 +6,7 @@ import { createSharedDesignTokensCss } from "./app-files.js";
|
|
|
6
6
|
import { normalizeUltramodernBridgeConfig } from "./bridge-config.js";
|
|
7
7
|
import { createDevelopmentOverlay, createOwnership, createTopology, createUltramodernConfig } from "./contracts.js";
|
|
8
8
|
import { ULTRAMODERN_CONFIG_PATH, createShellHost, sharedPackages, shellApp } from "./descriptors.js";
|
|
9
|
-
import { copyRootTemplate, formatGeneratedWorkspaceFiles, writeFile, writeFileReplacing, writeJson } from "./fs-io.js";
|
|
9
|
+
import { copyRootTemplate, formatGeneratedWorkspaceFiles, readFileTemplate, writeFile, writeFileReplacing, writeJson } from "./fs-io.js";
|
|
10
10
|
import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
|
|
11
11
|
import { assertUniqueTailwindPrefixes, toPackageScope } from "./naming.js";
|
|
12
12
|
import { runCodeSmithOverlays } from "./overlays.js";
|
|
@@ -20,12 +20,14 @@ import { createZeropsYaml } from "./zerops.js";
|
|
|
20
20
|
function hasExplicitInstallRequest(options) {
|
|
21
21
|
return void 0 !== options.packageSource && 'workspace' !== options.packageSource.strategy;
|
|
22
22
|
}
|
|
23
|
-
function writeSharedPackages(targetDir, scope) {
|
|
23
|
+
function writeSharedPackages(targetDir, scope, packageSource) {
|
|
24
24
|
for (const sharedPackage of sharedPackages){
|
|
25
|
-
writeJson(targetDir, `${sharedPackage.directory}/package.json`, createSharedPackage(scope, sharedPackage.id, sharedPackage.description));
|
|
25
|
+
writeJson(targetDir, `${sharedPackage.directory}/package.json`, createSharedPackage(scope, sharedPackage.id, sharedPackage.description, packageSource));
|
|
26
26
|
writeJson(targetDir, `${sharedPackage.directory}/tsconfig.json`, createSharedPackageTsConfig(sharedPackage.directory));
|
|
27
27
|
}
|
|
28
28
|
writeFile(targetDir, 'packages/shared-contracts/src/index.ts', createSharedContractsIndex());
|
|
29
|
+
writeFile(targetDir, 'packages/shared-contracts/src/microvertical-api-baseline.ts', readFileTemplate('packages/microvertical-api-baseline.ts'));
|
|
30
|
+
writeFile(targetDir, 'packages/shared-contracts/src/effect-bff-runtime.ts', readFileTemplate('packages/effect-bff-runtime.ts'));
|
|
29
31
|
writeFile(targetDir, 'packages/shared-design-tokens/src/index.ts', `export const sharedDesignTokens = {
|
|
30
32
|
color: {
|
|
31
33
|
accent: '#2f8f68',
|
|
@@ -145,7 +147,7 @@ function generateUltramodernWorkspaceInPlace(options, logicalWorkspaceRoot = opt
|
|
|
145
147
|
writeJson(options.targetDir, ULTRAMODERN_CONFIG_PATH, createCompactUltramodernConfig(scope, options.modernVersion, packageSource, createdApps, enableTailwind, bridge));
|
|
146
148
|
writeApp(options.targetDir, scope, shellApp, packageSource, enableTailwind, initialVerticals, bridge);
|
|
147
149
|
for (const remote of initialVerticals)writeApp(options.targetDir, scope, remote, packageSource, enableTailwind, initialVerticals, bridge);
|
|
148
|
-
writeSharedPackages(options.targetDir, scope);
|
|
150
|
+
writeSharedPackages(options.targetDir, scope, packageSource);
|
|
149
151
|
writeGeneratedWorkspaceScripts(options.targetDir, scope, enableTailwind, initialVerticals, releaseCohort);
|
|
150
152
|
const preliminaryAfterFiles = createFileSnapshot(options.targetDir);
|
|
151
153
|
const preliminaryDiff = diffFileSnapshots(beforeFiles, preliminaryAfterFiles);
|
|
@@ -7,7 +7,7 @@ export declare const BLEEDINGDEV_PACKAGE_NAME_PREFIX = "modern-js-";
|
|
|
7
7
|
export declare const ULTRAMODERN_FRAMEWORK_VERSION_ENV = "ULTRAMODERN_CREATE_FRAMEWORK_VERSION";
|
|
8
8
|
export declare const BLEEDINGDEV_FRAMEWORK_VERSION_ENV = "MODERN_CREATE_ULTRAMODERN_FRAMEWORK_VERSION";
|
|
9
9
|
export declare const ULTRAMODERN_SINGLE_APP_MODERN_PACKAGES: readonly ["@modern-js/ultramodern-create", '@modern-js/code-tools', '@modern-js/runtime', '@modern-js/app-tools', '@modern-js/tsconfig', '@modern-js/plugin-i18n', '@modern-js/plugin-tanstack', '@modern-js/plugin-bff', '@modern-js/adapter-rstest'];
|
|
10
|
-
export declare const ULTRAMODERN_WORKSPACE_MODERN_PACKAGES: readonly ["@modern-js/ultramodern-create", '@modern-js/code-tools', '@modern-js/app-tools', '@modern-js/plugin-bff', '@modern-js/plugin-i18n', '@modern-js/plugin-tanstack', '@modern-js/runtime'];
|
|
10
|
+
export declare const ULTRAMODERN_WORKSPACE_MODERN_PACKAGES: readonly ["@modern-js/ultramodern-create", '@modern-js/code-tools', '@modern-js/app-tools', '@modern-js/plugin-bff', '@modern-js/plugin-i18n', '@modern-js/plugin-tanstack', '@modern-js/runtime', '@modern-js/runtime-extensions'];
|
|
11
11
|
export type UltramodernPackageSourceStrategy = 'workspace' | 'install';
|
|
12
12
|
export type ResolvedUltramodernPackageSource = {
|
|
13
13
|
strategy: UltramodernPackageSourceStrategy;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type ResolvedUltramodernPackageSource } from '../../../ultramodern-package-source.js';
|
|
2
|
+
import type { UltramodernReleaseCohort } from '../../../ultramodern-release-cohort.js';
|
|
2
3
|
import type { WorkspaceApp } from '../../../ultramodern-workspace/types.js';
|
|
3
|
-
export declare function updateModernDependencies(packageJson: Record<string, any>, packageSource: ResolvedUltramodernPackageSource): boolean;
|
|
4
|
+
export declare function updateModernDependencies(packageJson: Record<string, any>, packageSource: ResolvedUltramodernPackageSource, releaseCohort?: Pick<UltramodernReleaseCohort, 'packages'>): boolean;
|
|
4
5
|
export declare function updateGeneratedToolingDependencies(packageJson: Record<string, any>, options?: {
|
|
5
6
|
ownsGeneratedScripts?: boolean;
|
|
6
7
|
}): boolean;
|
|
@@ -22,4 +23,5 @@ export declare function updateGeneratedPackageScripts(packageJson: Record<string
|
|
|
22
23
|
shellOnly?: boolean;
|
|
23
24
|
canRetireLegacyOxfmtCliExclusion?: boolean;
|
|
24
25
|
onPreserveScript?: (scriptName: string) => void;
|
|
26
|
+
preservedArtifacts?: ReadonlySet<string>;
|
|
25
27
|
}): boolean;
|
|
@@ -11,6 +11,13 @@ export type PnpmLockReleaseAgeCandidate = {
|
|
|
11
11
|
};
|
|
12
12
|
export type PnpmLockReleaseAgeClosure = {
|
|
13
13
|
candidates: PnpmLockReleaseAgeCandidate[];
|
|
14
|
+
tarballs: Array<{
|
|
15
|
+
packageName: string;
|
|
16
|
+
version: string;
|
|
17
|
+
url: string;
|
|
18
|
+
integrity: string;
|
|
19
|
+
path: string[];
|
|
20
|
+
}>;
|
|
14
21
|
unresolved: Array<{
|
|
15
22
|
package?: string;
|
|
16
23
|
path: string[];
|
package/dist/types/ultramodern-tooling/commands/migrate-strict-effect/shared-api-infrastructure.d.ts
ADDED
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { ResolvedPackageSource } from '../../../ultramodern-workspace/types.js';
|
|
2
|
+
import { type MigrationIo } from './io.js';
|
|
3
|
+
/** Add infrastructure only: existing contracts and business handlers stay owned by the consumer. */
|
|
4
|
+
export declare function ensureSharedApiInfrastructure(io: MigrationIo, scope: string, packageSource: ResolvedPackageSource): void;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { UltramodernReleaseCohort } from '../../../ultramodern-release-cohort.js';
|
|
2
|
+
import type { MigrationIo } from './io.js';
|
|
3
|
+
type ArtifactCandidate = {
|
|
4
|
+
relativePath: string;
|
|
5
|
+
content: string;
|
|
6
|
+
legacyPath?: string;
|
|
7
|
+
generatedDataBinding?: string;
|
|
8
|
+
};
|
|
9
|
+
/** Protect authored replacements before any stage can delete or regenerate them. */
|
|
10
|
+
export declare function preserveConsumerWorkspaceArtifacts(io: MigrationIo, candidates: readonly ArtifactCandidate[]): {
|
|
11
|
+
preservedPaths: Set<string>;
|
|
12
|
+
refreshReleaseCohort(releaseCohort?: UltramodernReleaseCohort): void;
|
|
13
|
+
io: {
|
|
14
|
+
workspaceRoot: string;
|
|
15
|
+
dryRun: boolean;
|
|
16
|
+
plan: string[];
|
|
17
|
+
log(message: string): void;
|
|
18
|
+
transaction<T>(operation: () => T, options?: {
|
|
19
|
+
commitWhen?: ((result: Awaited<T>) => boolean) | undefined;
|
|
20
|
+
}): T;
|
|
21
|
+
withStagedWorkspace<T>(operation: (stagedWorkspaceRoot: string) => T): T;
|
|
22
|
+
write: (filePath: string, content: string) => boolean;
|
|
23
|
+
writeGenerated: (filePath: string, content: string) => boolean;
|
|
24
|
+
remove: (filePath: string) => boolean;
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
export {};
|
|
@@ -2,5 +2,7 @@ import type { WorkspaceApi, WorkspaceApp } from '../types.js';
|
|
|
2
2
|
export declare function createApiClient(service: {
|
|
3
3
|
id: string;
|
|
4
4
|
api?: WorkspaceApi;
|
|
5
|
-
}, contractImportPath: string
|
|
5
|
+
}, contractImportPath: string, options?: {
|
|
6
|
+
readonly scope: string;
|
|
7
|
+
}): string;
|
|
6
8
|
export declare function createShellApiClient(scope: string, remotes?: WorkspaceApp[]): string;
|
|
@@ -2,5 +2,7 @@ import type { WorkspaceApi, WorkspaceApp } from '../types.js';
|
|
|
2
2
|
export declare function createApiServiceEntry(service: {
|
|
3
3
|
id: string;
|
|
4
4
|
api?: WorkspaceApi;
|
|
5
|
-
}, contractImportPath: string
|
|
5
|
+
}, contractImportPath: string, options?: {
|
|
6
|
+
readonly scope: string;
|
|
7
|
+
}): string;
|
|
6
8
|
export declare function createBackendEffectApiExpose(scope: string, service: WorkspaceApp): string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { WorkspaceApp } from '../types.js';
|
|
2
2
|
export declare function createUltramodernBuildArtifactJson(scope: string, app: WorkspaceApp): string;
|
|
3
|
-
export declare function createUltramodernBuildModule(scope: string, app: WorkspaceApp): string;
|
|
4
|
-
export declare function createUltramodernBuildReexportModule(): string;
|
|
3
|
+
export declare function createUltramodernBuildModule(scope: string, app: WorkspaceApp, includeUiMarker?: boolean): string;
|
|
4
|
+
export declare function createUltramodernBuildReexportModule(app: WorkspaceApp, includeUiMarker?: boolean): string;
|
|
@@ -4,5 +4,5 @@ export declare function appDependencies(scope: string, packageSource: ResolvedPa
|
|
|
4
4
|
export declare function createRootPackageJson(scope: string, packageSource: ResolvedPackageSource, remotes?: WorkspaceApp[], bridge?: UltramodernBridgeConfig, additionalShells?: WorkspaceApp[]): JsonValue;
|
|
5
5
|
export { createAppMfTypesTsConfig, createAppTsConfig, createPackageTsConfig, createRootTsConfig, createSharedPackageTsConfig, createTsConfigBase, } from './tsconfigs.js';
|
|
6
6
|
export declare function createAppPackage(scope: string, app: WorkspaceApp, packageSource: ResolvedPackageSource, enableTailwind: boolean, remotes?: WorkspaceApp[], bridge?: UltramodernBridgeConfig): JsonValue;
|
|
7
|
-
export declare function createSharedPackage(scope: string, id: string, description: string): JsonValue;
|
|
7
|
+
export declare function createSharedPackage(scope: string, id: string, description: string, packageSource?: ResolvedPackageSource): JsonValue;
|
|
8
8
|
export declare function createSharedContractsIndex(): string;
|
|
@@ -82,6 +82,7 @@ export declare const ULTRAMODERN_PACKAGE_PINS: {
|
|
|
82
82
|
readonly rootDevDependencies: {
|
|
83
83
|
readonly '@effect/tsgo': "0.41.0";
|
|
84
84
|
readonly '@typescript/native': "npm:typescript@7.0.2";
|
|
85
|
+
readonly '@types/node': "^26.4.1";
|
|
85
86
|
readonly 'cross-env': "10.1.0";
|
|
86
87
|
readonly lefthook: "^2.1.10";
|
|
87
88
|
readonly miniflare: "4.20260730.0";
|
|
@@ -134,6 +135,7 @@ export declare const ULTRAMODERN_WORKSPACE_POLICY: {
|
|
|
134
135
|
readonly rootDevDependencies: {
|
|
135
136
|
readonly '@effect/tsgo': "0.41.0";
|
|
136
137
|
readonly '@typescript/native': "npm:typescript@7.0.2";
|
|
138
|
+
readonly '@types/node': "^26.4.1";
|
|
137
139
|
readonly 'cross-env': "10.1.0";
|
|
138
140
|
readonly lefthook: "^2.1.10";
|
|
139
141
|
readonly miniflare: "4.20260730.0";
|
|
@@ -26,7 +26,7 @@ export declare function createWorkspaceValidationContract(scope: string, enableT
|
|
|
26
26
|
} | undefined;
|
|
27
27
|
};
|
|
28
28
|
cohort: {
|
|
29
|
-
modernPackages: ("@modern-js/app-tools" | "@modern-js/code-tools" | "@modern-js/plugin-bff" | "@modern-js/plugin-i18n" | "@modern-js/plugin-tanstack" | "@modern-js/runtime" | "@modern-js/ultramodern-create")[];
|
|
29
|
+
modernPackages: ("@modern-js/app-tools" | "@modern-js/code-tools" | "@modern-js/plugin-bff" | "@modern-js/plugin-i18n" | "@modern-js/plugin-tanstack" | "@modern-js/runtime" | "@modern-js/runtime-extensions" | "@modern-js/ultramodern-create")[];
|
|
30
30
|
releaseCohort?: UltramodernReleaseCohort | undefined;
|
|
31
31
|
appIds: string[];
|
|
32
32
|
additionalShellIds?: string[] | undefined;
|
package/package.json
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"engines": {
|
|
27
27
|
"node": ">=26.7.0"
|
|
28
28
|
},
|
|
29
|
-
"version": "3.9.0-ultramodern.
|
|
29
|
+
"version": "3.9.0-ultramodern.4",
|
|
30
30
|
"types": "./dist/types/index.d.ts",
|
|
31
31
|
"main": "./dist/esm-node/index.js",
|
|
32
32
|
"bin": {
|
|
@@ -81,9 +81,10 @@
|
|
|
81
81
|
"bin"
|
|
82
82
|
],
|
|
83
83
|
"dependencies": {
|
|
84
|
+
"@babel/parser": "^8.0.4",
|
|
84
85
|
"@modern-js/codesmith": "2.6.9",
|
|
85
|
-
"@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.9.0-ultramodern.
|
|
86
|
-
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.
|
|
86
|
+
"@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.9.0-ultramodern.4",
|
|
87
|
+
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.4",
|
|
87
88
|
"esbuild": "^0.28.2",
|
|
88
89
|
"oxfmt": "0.66.0",
|
|
89
90
|
"ultracite": "7.11.0"
|
|
@@ -110,6 +111,6 @@
|
|
|
110
111
|
"type-check": "tsgo --noEmit -p tsconfig.json"
|
|
111
112
|
},
|
|
112
113
|
"ultramodern": {
|
|
113
|
-
"frameworkVersion": "3.9.0-ultramodern.
|
|
114
|
+
"frameworkVersion": "3.9.0-ultramodern.4"
|
|
114
115
|
}
|
|
115
116
|
}
|