@bleedingdev/modern-js-ultramodern-create 3.8.3-ultramodern.2 → 3.8.3-ultramodern.3
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-tooling/commands/mf-types.cjs +29 -3
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-modern-configs.cjs +11 -3
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-typescript.cjs +31 -3
- package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/package-cohort.cjs +13 -1
- package/dist/cjs/ultramodern-workspace/demo-components.cjs +90 -6
- package/dist/cjs/ultramodern-workspace/mf-validation/constants.cjs +7 -4
- package/dist/cjs/ultramodern-workspace/mf-validation/validate.cjs +3 -3
- package/dist/cjs/ultramodern-workspace/routes.cjs +6 -9
- package/dist/cjs/ultramodern-workspace/tsconfigs.cjs +11 -3
- package/dist/cjs/ultramodern-workspace/workspace-script-plan.cjs +32 -2
- package/dist/esm/ultramodern-tooling/commands/mf-types.js +29 -3
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-modern-configs.js +11 -3
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-typescript.js +32 -4
- package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/package-cohort.js +14 -2
- package/dist/esm/ultramodern-workspace/demo-components.js +88 -7
- package/dist/esm/ultramodern-workspace/mf-validation/constants.js +5 -2
- package/dist/esm/ultramodern-workspace/mf-validation/validate.js +4 -4
- package/dist/esm/ultramodern-workspace/routes.js +4 -10
- package/dist/esm/ultramodern-workspace/tsconfigs.js +11 -3
- package/dist/esm/ultramodern-workspace/workspace-script-plan.js +33 -3
- package/dist/esm-node/ultramodern-tooling/commands/mf-types.js +29 -3
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-modern-configs.js +11 -3
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-typescript.js +32 -4
- package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/package-cohort.js +14 -2
- package/dist/esm-node/ultramodern-workspace/demo-components.js +88 -7
- package/dist/esm-node/ultramodern-workspace/mf-validation/constants.js +5 -2
- package/dist/esm-node/ultramodern-workspace/mf-validation/validate.js +4 -4
- package/dist/esm-node/ultramodern-workspace/routes.js +4 -10
- package/dist/esm-node/ultramodern-workspace/tsconfigs.js +11 -3
- package/dist/esm-node/ultramodern-workspace/workspace-script-plan.js +33 -3
- package/dist/types/ultramodern-workspace/demo-components.d.ts +2 -1
- package/dist/types/ultramodern-workspace/mf-validation/constants.d.ts +4 -1
- package/dist/types/ultramodern-workspace/mf-validation/types.d.ts +2 -0
- package/dist/types/ultramodern-workspace/mf-validation/validate.d.ts +2 -2
- package/dist/types/ultramodern-workspace/mf-validation.d.ts +1 -1
- package/dist/types/ultramodern-workspace/routes.d.ts +1 -0
- package/dist/types/ultramodern-workspace/tsconfigs.d.ts +1 -0
- package/package.json +4 -4
- package/template-workspace/.modernjs/release-cohort.json +40 -40
- package/templates/workspace-scripts/validate-ultramodern-workspace.mjs.handlebars +15 -0
|
@@ -413,6 +413,21 @@ function ensureNamedImport(source, moduleName, names) {
|
|
|
413
413
|
const importLine = `import { ${names.join(', ')} } from '${moduleName}';\n`;
|
|
414
414
|
return firstImportEnd < 0 ? `${importLine}${source}` : `${source.slice(0, firstImportEnd + 1)}${importLine}${source.slice(firstImportEnd + 1)}`;
|
|
415
415
|
}
|
|
416
|
+
function removeNamedImport(source, moduleName, name) {
|
|
417
|
+
const importEndMarker = `from '${moduleName}';`;
|
|
418
|
+
const importEnd = source.indexOf(importEndMarker);
|
|
419
|
+
if (importEnd < 0) return source;
|
|
420
|
+
const importStart = source.lastIndexOf('import ', importEnd);
|
|
421
|
+
const openBrace = source.indexOf('{', importStart);
|
|
422
|
+
const closeBrace = source.indexOf('}', openBrace);
|
|
423
|
+
if (openBrace < 0 || closeBrace < 0 || closeBrace > importEnd) return source;
|
|
424
|
+
const names = source.slice(openBrace + 1, closeBrace).split(',').map((importName)=>importName.trim()).filter((importName)=>'' !== importName && importName !== name);
|
|
425
|
+
if (0 === names.length) {
|
|
426
|
+
const lineEnd = source.indexOf('\n', importEnd + importEndMarker.length);
|
|
427
|
+
return `${source.slice(0, importStart)}${source.slice(lineEnd < 0 ? source.length : lineEnd + 1)}`;
|
|
428
|
+
}
|
|
429
|
+
return `${source.slice(0, openBrace + 1)} ${names.join(', ')} ${source.slice(closeBrace)}`;
|
|
430
|
+
}
|
|
416
431
|
function ensureNavigateHook(source) {
|
|
417
432
|
if (source.includes('const navigate = useNavigate();')) return source;
|
|
418
433
|
const functionStart = source.indexOf('export default function ');
|
|
@@ -532,6 +547,43 @@ function removeSyntheticClickHandler(openingTag) {
|
|
|
532
547
|
}
|
|
533
548
|
return openingTag;
|
|
534
549
|
}
|
|
550
|
+
function rewriteCheckoutCartLink(source) {
|
|
551
|
+
let changed = false;
|
|
552
|
+
const next = source.replace(/^(\s*)to=\{`\/\$\{language\}\/cart\?sku=\$\{sku\}`\},?$/gmu, (_match, indentation)=>{
|
|
553
|
+
changed = true;
|
|
554
|
+
return `${indentation}params={{ lang: language }}\n${indentation}search={{ sku }}\n${indentation}to="/$lang/cart"`;
|
|
555
|
+
});
|
|
556
|
+
return {
|
|
557
|
+
changed,
|
|
558
|
+
source: next
|
|
559
|
+
};
|
|
560
|
+
}
|
|
561
|
+
function rewriteCrossRemoteTractorsLink(source) {
|
|
562
|
+
let next = source;
|
|
563
|
+
let searchFrom = 0;
|
|
564
|
+
let changed = false;
|
|
565
|
+
while(true){
|
|
566
|
+
const openingTagStart = next.indexOf('<Link', searchFrom);
|
|
567
|
+
if (openingTagStart < 0) break;
|
|
568
|
+
const openingTagEnd = closingJsxTag(next, openingTagStart);
|
|
569
|
+
if (openingTagEnd < 0) break;
|
|
570
|
+
const openingTag = next.slice(openingTagStart, openingTagEnd + 1);
|
|
571
|
+
if (!openingTag.includes("to={`/${language}/tractors`}")) {
|
|
572
|
+
searchFrom = openingTagEnd + 1;
|
|
573
|
+
continue;
|
|
574
|
+
}
|
|
575
|
+
const closingTagStart = next.indexOf('</Link>', openingTagEnd + 1);
|
|
576
|
+
if (closingTagStart < 0) break;
|
|
577
|
+
const nativeOpeningTag = openingTag.replace('<Link', '<a').replace('to=', 'href=');
|
|
578
|
+
next = `${next.slice(0, openingTagStart)}${nativeOpeningTag}${next.slice(openingTagEnd + 1, closingTagStart)}</a>${next.slice(closingTagStart + 7)}`;
|
|
579
|
+
searchFrom = openingTagStart + nativeOpeningTag.length;
|
|
580
|
+
changed = true;
|
|
581
|
+
}
|
|
582
|
+
return {
|
|
583
|
+
changed,
|
|
584
|
+
source: next
|
|
585
|
+
};
|
|
586
|
+
}
|
|
535
587
|
function rewriteInternalAnchors(source) {
|
|
536
588
|
let next = source;
|
|
537
589
|
let searchFrom = 0;
|
|
@@ -589,21 +641,49 @@ function rewriteJsxElementName(source, elementName, componentName) {
|
|
|
589
641
|
source: next
|
|
590
642
|
};
|
|
591
643
|
}
|
|
644
|
+
function ensureNoPropsComponentContract(source) {
|
|
645
|
+
let changed = false;
|
|
646
|
+
let next = source.replace(/export default function ([A-Za-z_$][\w$]*)\(\) \{/u, (_match, componentName)=>{
|
|
647
|
+
changed = true;
|
|
648
|
+
return `export default function ${componentName}(\n props: Record<string, never>\n): JSX.Element {\n void props;`;
|
|
649
|
+
});
|
|
650
|
+
if (changed) next = ensureNamedImport(next, 'react', [
|
|
651
|
+
'JSX'
|
|
652
|
+
]);
|
|
653
|
+
return {
|
|
654
|
+
changed,
|
|
655
|
+
source: next
|
|
656
|
+
};
|
|
657
|
+
}
|
|
658
|
+
function regenerateGeneratedProductRouteAdapter(source) {
|
|
659
|
+
let next = source.replaceAll('search.sku', "search['sku']");
|
|
660
|
+
next = next.replace(/<(DecideProductPage|ProductPage) sku=\{sku\} slug=\{slug\} \/>/u, `<$1\n {...(sku === undefined ? {} : { sku })}\n {...(slug === undefined ? {} : { slug })}\n />`);
|
|
661
|
+
return next;
|
|
662
|
+
}
|
|
592
663
|
function regenerateGeneratedNavigationSurface(source, kind) {
|
|
593
664
|
const routerLocationSuffix = rewriteRouterLocationSuffix(source);
|
|
594
|
-
const anchors = rewriteInternalAnchors(routerLocationSuffix.source);
|
|
595
|
-
const
|
|
596
|
-
|
|
665
|
+
const anchors = 'checkout-page' === kind ? rewriteCrossRemoteTractorsLink(routerLocationSuffix.source) : rewriteInternalAnchors(routerLocationSuffix.source);
|
|
666
|
+
const cartLink = 'checkout-add-to-cart' === kind ? rewriteCheckoutCartLink(anchors.source) : {
|
|
667
|
+
changed: false,
|
|
668
|
+
source: anchors.source
|
|
669
|
+
};
|
|
670
|
+
const locationAssignments = rewriteWindowLocationAssignments(cartLink.source);
|
|
671
|
+
const forms = 'demo-component' === kind || 'checkout-page' === kind ? rewriteJsxElementName(locationAssignments.source, 'form', 'Form') : {
|
|
597
672
|
changed: false,
|
|
598
673
|
source: locationAssignments.source
|
|
599
674
|
};
|
|
600
|
-
|
|
601
|
-
|
|
675
|
+
const noProps = 'checkout-page' === kind ? ensureNoPropsComponentContract(forms.source) : {
|
|
676
|
+
changed: false,
|
|
677
|
+
source: forms.source
|
|
678
|
+
};
|
|
679
|
+
let next = noProps.source;
|
|
680
|
+
const usesLink = next.includes('<Link');
|
|
681
|
+
if (forms.changed || anchors.changed && usesLink || locationAssignments.changed) {
|
|
602
682
|
const imports = [
|
|
603
683
|
...forms.changed ? [
|
|
604
684
|
'Form'
|
|
605
685
|
] : [],
|
|
606
|
-
...anchors.changed ? [
|
|
686
|
+
...anchors.changed && usesLink ? [
|
|
607
687
|
'Link'
|
|
608
688
|
] : [],
|
|
609
689
|
...locationAssignments.changed ? [
|
|
@@ -612,7 +692,8 @@ function regenerateGeneratedNavigationSurface(source, kind) {
|
|
|
612
692
|
];
|
|
613
693
|
next = ensureNamedImport(next, tanstackRuntimeModule, imports);
|
|
614
694
|
}
|
|
695
|
+
if (!usesLink) next = removeNamedImport(next, tanstackRuntimeModule, 'Link');
|
|
615
696
|
if (locationAssignments.changed) next = ensureNavigateHook(next);
|
|
616
697
|
return next;
|
|
617
698
|
}
|
|
618
|
-
export { createFederatedComponentsRegistry, createLayout, createRemoteEntry, createRemoteExposeComponent, createRemoteExposeFragmentPage, createRemotePage, createShellPage, createShellRemoteComponents, createShellWorkerRemoteComponents, regenerateGeneratedNavigationSurface, remoteComponentOutputPath };
|
|
699
|
+
export { createFederatedComponentsRegistry, createLayout, createRemoteEntry, createRemoteExposeComponent, createRemoteExposeFragmentPage, createRemotePage, createShellPage, createShellRemoteComponents, createShellWorkerRemoteComponents, regenerateGeneratedNavigationSurface, regenerateGeneratedProductRouteAdapter, remoteComponentOutputPath };
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import "node:module";
|
|
2
2
|
const moduleFederationConfigFile = 'module-federation.config.ts';
|
|
3
|
-
const
|
|
3
|
+
const mfTypesArchives = {
|
|
4
|
+
cloudflare: 'dist-cloudflare/@mf-types.zip',
|
|
5
|
+
node: 'dist/@mf-types.zip'
|
|
6
|
+
};
|
|
4
7
|
const generatedMetadataPaths = [
|
|
5
8
|
'.modernjs/ultramodern.json'
|
|
6
9
|
];
|
|
@@ -17,4 +20,4 @@ const skippedScanDirs = new Set([
|
|
|
17
20
|
'dist',
|
|
18
21
|
'node_modules'
|
|
19
22
|
]);
|
|
20
|
-
export { defaultAppRootDirs, generatedMetadataPaths,
|
|
23
|
+
export { defaultAppRootDirs, generatedMetadataPaths, mfTypesArchives, moduleFederationConfigFile, skippedScanDirs };
|
|
@@ -1,7 +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 {
|
|
4
|
+
import { mfTypesArchives } from "./constants.js";
|
|
5
5
|
import { discoverModuleFederationConfigs } from "./discovery.js";
|
|
6
6
|
import { inspectModuleFederationConfigSource } from "./inspect.js";
|
|
7
7
|
import { relativePath } from "./path-utils.js";
|
|
@@ -9,8 +9,8 @@ function assertExposedAppDtsSettings(app) {
|
|
|
9
9
|
if ('effect-tsgo' !== app.dts.compilerInstance) throw new Error(`Module Federation DTS compilerInstance must resolve "@effect/tsgo" for ${app.appDir}.`);
|
|
10
10
|
if ('./tsconfig.mf-types.json' !== app.dts.tsConfigPath) throw new Error(`Module Federation DTS tsConfigPath must be "./tsconfig.mf-types.json" for ${app.appDir}.`);
|
|
11
11
|
}
|
|
12
|
-
function assertTypesArchive(workspaceRoot, appDir) {
|
|
13
|
-
const typesArchivePath = node_path.join(workspaceRoot, appDir,
|
|
12
|
+
function assertTypesArchive(workspaceRoot, appDir, target = 'node') {
|
|
13
|
+
const typesArchivePath = node_path.join(workspaceRoot, appDir, mfTypesArchives[target]);
|
|
14
14
|
if (!node_fs.existsSync(typesArchivePath)) throw new Error(`Missing Module Federation DTS archive: ${relativePath(workspaceRoot, typesArchivePath)}`);
|
|
15
15
|
if (0 === node_fs.statSync(typesArchivePath).size) throw new Error(`Empty Module Federation DTS archive: ${relativePath(workspaceRoot, typesArchivePath)}`);
|
|
16
16
|
}
|
|
@@ -44,7 +44,7 @@ function validateModuleFederationTypes(options) {
|
|
|
44
44
|
continue;
|
|
45
45
|
}
|
|
46
46
|
assertExposedAppDtsSettings(app);
|
|
47
|
-
assertTypesArchive(workspaceRoot, app.appDir);
|
|
47
|
+
assertTypesArchive(workspaceRoot, app.appDir, options.target);
|
|
48
48
|
exposedAppCount += 1;
|
|
49
49
|
}
|
|
50
50
|
if (apps.length > 0 && 0 === exposedAppCount && hostOnlyAppCount !== apps.length) throw new Error('Module Federation validation inspected configs but validated zero exposed apps. Declare host-only/no-exposes intent only for host apps without exposes.');
|
|
@@ -45,16 +45,10 @@ function isPublicIndexableRoute(route) {
|
|
|
45
45
|
return route.public && route.indexable;
|
|
46
46
|
}
|
|
47
47
|
function createLocalisedUrlsMapFromRoutes(routes) {
|
|
48
|
-
return Object.fromEntries(routes.
|
|
49
|
-
if ('/' === route.canonicalPath) return [];
|
|
50
|
-
return Array.from(new Set([
|
|
48
|
+
return Object.fromEntries(routes.filter((route)=>'/' !== route.canonicalPath).map((route)=>[
|
|
51
49
|
route.canonicalPath,
|
|
52
|
-
|
|
53
|
-
]))
|
|
54
|
-
pathname,
|
|
55
|
-
route.localisedPaths
|
|
56
|
-
]);
|
|
57
|
-
}));
|
|
50
|
+
route.localisedPaths
|
|
51
|
+
]));
|
|
58
52
|
}
|
|
59
53
|
function createLocalisedUrlsMap(app) {
|
|
60
54
|
return createLocalisedUrlsMapFromRoutes(createRouteOwnedI18nPaths(app));
|
|
@@ -144,4 +138,4 @@ function createRouteAliasPage(canonicalPath) {
|
|
|
144
138
|
return `export { default } from '${rootPageImport}';
|
|
145
139
|
`;
|
|
146
140
|
}
|
|
147
|
-
export { createJsonLdHelperModule, createLocalisedUrlsMap, createPublicRouteMetadata, createPublicRouteMetadataFromRoutes, createRouteAliasPage, createRouteMetaFilePath, createRouteMetaModule, createRouteMetadataModule, createRouteOwnedI18nPaths, createRoutePageFilePath, isConcretePublicPath, normalisePublicPath, routePathParamName, routeSegmentToDirectory, splitPublicPathSegments };
|
|
141
|
+
export { createJsonLdHelperModule, createLocalisedUrlsMap, createLocalisedUrlsMapFromRoutes, createPublicRouteMetadata, createPublicRouteMetadataFromRoutes, createRouteAliasPage, createRouteMetaFilePath, createRouteMetaModule, createRouteMetadataModule, createRouteOwnedI18nPaths, createRoutePageFilePath, isConcretePublicPath, normalisePublicPath, routePathParamName, routeSegmentToDirectory, splitPublicPathSegments };
|
|
@@ -85,6 +85,9 @@ function createPackageTsConfig(packageDir, options = {}) {
|
|
|
85
85
|
emitDeclarationOnly: true,
|
|
86
86
|
incremental: true,
|
|
87
87
|
noEmit: false,
|
|
88
|
+
...resolvedOptions.skipLibCheck ? {
|
|
89
|
+
skipLibCheck: true
|
|
90
|
+
} : {},
|
|
88
91
|
outDir: createTsDeclarationOutDir(packageDir),
|
|
89
92
|
tsBuildInfoFile: createTsBuildInfoFile(packageDir)
|
|
90
93
|
},
|
|
@@ -94,14 +97,16 @@ function createPackageTsConfig(packageDir, options = {}) {
|
|
|
94
97
|
return tsconfig;
|
|
95
98
|
}
|
|
96
99
|
function createAppTsConfig(app, remotes = []) {
|
|
100
|
+
const remoteRefs = 'shell' === app.kind ? [] : resolveRemoteRefs(app, remotes);
|
|
97
101
|
const references = [
|
|
98
102
|
...sharedPackages.map((sharedPackage)=>sharedPackage.directory),
|
|
99
|
-
...
|
|
103
|
+
...remoteRefs.map((remote)=>remote.directory)
|
|
100
104
|
];
|
|
101
105
|
return createPackageTsConfig(app.directory, {
|
|
102
106
|
includeApi: appHasApi(app),
|
|
103
107
|
includeServer: true,
|
|
104
|
-
references
|
|
108
|
+
references,
|
|
109
|
+
skipLibCheck: remoteRefs.length > 0
|
|
105
110
|
});
|
|
106
111
|
}
|
|
107
112
|
function createAppMfTypesTsConfig(app) {
|
|
@@ -113,7 +118,10 @@ function createAppMfTypesTsConfig(app) {
|
|
|
113
118
|
...exposedFiles,
|
|
114
119
|
'src/modern-app-env.d.ts'
|
|
115
120
|
])
|
|
116
|
-
]
|
|
121
|
+
],
|
|
122
|
+
compilerOptions: {
|
|
123
|
+
skipLibCheck: true
|
|
124
|
+
}
|
|
117
125
|
};
|
|
118
126
|
}
|
|
119
127
|
function createSharedPackageTsConfig(packageDir) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import "node:module";
|
|
2
|
-
import { appHasApi, shellApp } from "./descriptors.js";
|
|
2
|
+
import { appHasApi, sharedPackages, shellApp } from "./descriptors.js";
|
|
3
3
|
import { relativeRootFor } from "./naming.js";
|
|
4
4
|
import { createPublicSurfaceGenerationCommand } from "./public-surface.js";
|
|
5
5
|
import { GENERATED_TOOLING_COMMANDS } from "./tooling-command-catalog.js";
|
|
@@ -79,6 +79,29 @@ function createWorkspaceAppPackageScripts(app) {
|
|
|
79
79
|
plan[planKey]
|
|
80
80
|
]));
|
|
81
81
|
}
|
|
82
|
+
function createReferencedRemoteDeclarationBuilds(remotes) {
|
|
83
|
+
const remotesById = new Map(remotes.map((remote)=>[
|
|
84
|
+
remote.id,
|
|
85
|
+
remote
|
|
86
|
+
]));
|
|
87
|
+
const referencedRemoteIds = new Set(remotes.flatMap((remote)=>remote.verticalRefs ?? []));
|
|
88
|
+
const orderedRemotes = [];
|
|
89
|
+
const visiting = new Set();
|
|
90
|
+
const visited = new Set();
|
|
91
|
+
const visit = (remote)=>{
|
|
92
|
+
if (visited.has(remote.id) || visiting.has(remote.id)) return;
|
|
93
|
+
visiting.add(remote.id);
|
|
94
|
+
for (const dependencyId of remote.verticalRefs ?? []){
|
|
95
|
+
const dependency = remotesById.get(dependencyId);
|
|
96
|
+
if (void 0 !== dependency) visit(dependency);
|
|
97
|
+
}
|
|
98
|
+
visiting.delete(remote.id);
|
|
99
|
+
visited.add(remote.id);
|
|
100
|
+
orderedRemotes.push(remote);
|
|
101
|
+
};
|
|
102
|
+
for (const remote of remotes)if (referencedRemoteIds.has(remote.id)) visit(remote);
|
|
103
|
+
return orderedRemotes.map((remote)=>`${rootToolingWrapperCommand('typecheck')} --project ${remote.directory}/tsconfig.json --skipLibCheck`).join(' && ');
|
|
104
|
+
}
|
|
82
105
|
function createWorkspaceRootScriptPlan(remotes = [], options = {}) {
|
|
83
106
|
const hasRemotes = remotes.length > 0;
|
|
84
107
|
remotes.some(appHasApi);
|
|
@@ -92,13 +115,20 @@ function createWorkspaceRootScriptPlan(remotes = [], options = {}) {
|
|
|
92
115
|
const performanceReadinessScript = rootToolingScriptName('performanceReadiness');
|
|
93
116
|
const cloudflareOutputVerifyScript = rootToolingScriptName('cloudflareOutputVerify');
|
|
94
117
|
const bridgeCheck = options.bridgeCheck ?? '';
|
|
118
|
+
const sharedDeclarationsBuild = sharedPackages.map((sharedPackage)=>`${rootToolingWrapperCommand('typecheck')} --build ${sharedPackage.directory}/tsconfig.json`).join(' && ');
|
|
119
|
+
const referencedRemoteDeclarationsBuild = createReferencedRemoteDeclarationBuilds(remotes);
|
|
120
|
+
const declarationBuild = [
|
|
121
|
+
sharedDeclarationsBuild,
|
|
122
|
+
referencedRemoteDeclarationsBuild
|
|
123
|
+
].filter(Boolean).join(' && ');
|
|
124
|
+
const buildPrefix = `${declarationBuild} && `;
|
|
95
125
|
const remoteBuildPrefix = hasRemotes ? 'pnpm -r --filter "./verticals/*" run build && ' : '';
|
|
96
126
|
const remoteCloudflareBuildPrefix = hasRemotes ? 'pnpm -r --filter "./verticals/*" run cloudflare:build && ' : '';
|
|
97
127
|
const remoteCloudflareDeployPrefix = hasRemotes ? 'pnpm -r --filter "./verticals/*" run cloudflare:deploy && ' : '';
|
|
98
128
|
const cloudflareSsrProofSuffix = hasRemotes ? ' && pnpm cloudflare:ssr-proof' : '';
|
|
99
129
|
return {
|
|
100
|
-
build: `${remoteBuildPrefix}${shellBuild} && pnpm ${mfTypesScript} && pnpm ${performanceReadinessScript}`,
|
|
101
|
-
cloudflareBuild: `${remoteCloudflareBuildPrefix}${shellCloudflareBuild} && pnpm ${mfTypesScript} && pnpm ${cloudflareOutputVerifyScript}${cloudflareSsrProofSuffix}`,
|
|
130
|
+
build: `${buildPrefix}${remoteBuildPrefix}${shellBuild} && pnpm ${mfTypesScript} && pnpm ${performanceReadinessScript}`,
|
|
131
|
+
cloudflareBuild: `${buildPrefix}${remoteCloudflareBuildPrefix}${shellCloudflareBuild} && pnpm ${mfTypesScript} --target cloudflare && pnpm ${cloudflareOutputVerifyScript}${cloudflareSsrProofSuffix}`,
|
|
102
132
|
cloudflareDeploy: `${remoteCloudflareDeployPrefix}${shellCloudflareDeploy}`,
|
|
103
133
|
cloudflareProof: `${rootToolingWrapperCommand('cloudflareProof')} --out .codex/reports/cloudflare-version-proof/public-url-proof.json`,
|
|
104
134
|
cloudflareSsrProof: "node ./scripts/proof-workerd-ssr.mts",
|
|
@@ -15,5 +15,6 @@ export declare function createRemoteEntry(app: WorkspaceApp): string;
|
|
|
15
15
|
export declare function createRemoteExposeFragmentPage(app: WorkspaceApp, expose: string): string;
|
|
16
16
|
export declare function createRemoteExposeComponent(app: WorkspaceApp, expose: string): string;
|
|
17
17
|
export declare function remoteComponentOutputPath(app: WorkspaceApp, expose: string): string | undefined;
|
|
18
|
-
export type GeneratedNavigationSurfaceKind = 'demo-component' | 'shell-frame';
|
|
18
|
+
export type GeneratedNavigationSurfaceKind = 'checkout-add-to-cart' | 'checkout-page' | 'demo-component' | 'shell-frame';
|
|
19
|
+
export declare function regenerateGeneratedProductRouteAdapter(source: string): string;
|
|
19
20
|
export declare function regenerateGeneratedNavigationSurface(source: string, kind: GeneratedNavigationSurfaceKind): string;
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
export declare const moduleFederationConfigFile = "module-federation.config.ts";
|
|
2
|
-
export declare const
|
|
2
|
+
export declare const mfTypesArchives: {
|
|
3
|
+
readonly cloudflare: 'dist-cloudflare/@mf-types.zip';
|
|
4
|
+
readonly node: 'dist/@mf-types.zip';
|
|
5
|
+
};
|
|
3
6
|
export declare const generatedMetadataPaths: string[];
|
|
4
7
|
export declare const defaultAppRootDirs: string[];
|
|
5
8
|
export declare const skippedScanDirs: Set<string>;
|
|
@@ -19,9 +19,11 @@ export type ModuleFederationValidationResult = {
|
|
|
19
19
|
hostOnlyAppCount: number;
|
|
20
20
|
apps: ModuleFederationConfigInspection[];
|
|
21
21
|
};
|
|
22
|
+
export type ModuleFederationValidationTarget = 'cloudflare' | 'node';
|
|
22
23
|
export type ModuleFederationValidationOptions = {
|
|
23
24
|
workspaceRoot: string;
|
|
24
25
|
appDirs?: string[];
|
|
26
|
+
target?: ModuleFederationValidationTarget;
|
|
25
27
|
};
|
|
26
28
|
export type BalancedBlock = {
|
|
27
29
|
inner: string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ModuleFederationConfigInspection, ModuleFederationValidationOptions, ModuleFederationValidationResult } from './types';
|
|
1
|
+
import type { ModuleFederationConfigInspection, ModuleFederationValidationOptions, ModuleFederationValidationResult, ModuleFederationValidationTarget } from './types';
|
|
2
2
|
export declare function assertExposedAppDtsSettings(app: ModuleFederationConfigInspection): void;
|
|
3
|
-
export declare function assertTypesArchive(workspaceRoot: string, appDir: string): void;
|
|
3
|
+
export declare function assertTypesArchive(workspaceRoot: string, appDir: string, target?: ModuleFederationValidationTarget): void;
|
|
4
4
|
export declare function validateModuleFederationTypes(options: ModuleFederationValidationOptions): ModuleFederationValidationResult;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { discoverModuleFederationConfigs } from './mf-validation/discovery';
|
|
2
2
|
export { inspectModuleFederationConfigSource } from './mf-validation/inspect';
|
|
3
|
-
export type { ModuleFederationConfigInspection, ModuleFederationDiscoveredConfig, ModuleFederationValidationOptions, ModuleFederationValidationResult, } from './mf-validation/types';
|
|
3
|
+
export type { ModuleFederationConfigInspection, ModuleFederationDiscoveredConfig, ModuleFederationValidationOptions, ModuleFederationValidationResult, ModuleFederationValidationTarget, } from './mf-validation/types';
|
|
4
4
|
export { validateModuleFederationTypes } from './mf-validation/validate';
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { JsonValue, PublicRouteMetadata, RouteOwnedI18nPath, WorkspaceApp } from './types';
|
|
2
2
|
export declare function createRouteOwnedI18nPaths(app: WorkspaceApp): RouteOwnedI18nPath[];
|
|
3
|
+
export declare function createLocalisedUrlsMapFromRoutes(routes: RouteOwnedI18nPath[]): Record<string, JsonValue>;
|
|
3
4
|
export declare function createLocalisedUrlsMap(app: WorkspaceApp): Record<string, JsonValue>;
|
|
4
5
|
export declare function createPublicRouteMetadataFromRoutes(routes: RouteOwnedI18nPath[]): PublicRouteMetadata[];
|
|
5
6
|
export declare function createPublicRouteMetadata(app: WorkspaceApp): PublicRouteMetadata[];
|
|
@@ -5,6 +5,7 @@ type CreatePackageTsConfigOptions = {
|
|
|
5
5
|
includeApi?: boolean;
|
|
6
6
|
includeServer?: boolean;
|
|
7
7
|
references?: string[];
|
|
8
|
+
skipLibCheck?: boolean;
|
|
8
9
|
};
|
|
9
10
|
export declare function createPackageTsConfig(packageDir: string, options?: CreatePackageTsConfigOptions | boolean): JsonValue;
|
|
10
11
|
export declare function createAppTsConfig(app: WorkspaceApp, remotes?: WorkspaceApp[]): JsonValue;
|
package/package.json
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"engines": {
|
|
27
27
|
"node": ">=26.7.0"
|
|
28
28
|
},
|
|
29
|
-
"version": "3.8.3-ultramodern.
|
|
29
|
+
"version": "3.8.3-ultramodern.3",
|
|
30
30
|
"types": "./dist/types/index.d.ts",
|
|
31
31
|
"main": "./dist/esm-node/index.js",
|
|
32
32
|
"bin": {
|
|
@@ -82,8 +82,8 @@
|
|
|
82
82
|
],
|
|
83
83
|
"dependencies": {
|
|
84
84
|
"@modern-js/codesmith": "2.6.9",
|
|
85
|
-
"@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.8.3-ultramodern.
|
|
86
|
-
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.3-ultramodern.
|
|
85
|
+
"@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.8.3-ultramodern.3",
|
|
86
|
+
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.3-ultramodern.3",
|
|
87
87
|
"esbuild": "^0.28.1",
|
|
88
88
|
"oxfmt": "0.65.0",
|
|
89
89
|
"ultracite": "7.10.6"
|
|
@@ -110,6 +110,6 @@
|
|
|
110
110
|
"type-check": "tsgo --noEmit -p tsconfig.json"
|
|
111
111
|
},
|
|
112
112
|
"ultramodern": {
|
|
113
|
-
"frameworkVersion": "3.8.3-ultramodern.
|
|
113
|
+
"frameworkVersion": "3.8.3-ultramodern.3"
|
|
114
114
|
}
|
|
115
115
|
}
|
|
@@ -43,202 +43,202 @@
|
|
|
43
43
|
{
|
|
44
44
|
"sourceName": "@modern-js/adapter-rstest",
|
|
45
45
|
"targetName": "@bleedingdev/modern-js-adapter-rstest",
|
|
46
|
-
"version": "3.8.3-ultramodern.
|
|
46
|
+
"version": "3.8.3-ultramodern.3"
|
|
47
47
|
},
|
|
48
48
|
{
|
|
49
49
|
"sourceName": "@modern-js/app-tools",
|
|
50
50
|
"targetName": "@bleedingdev/modern-js-app-tools",
|
|
51
|
-
"version": "3.8.3-ultramodern.
|
|
51
|
+
"version": "3.8.3-ultramodern.3"
|
|
52
52
|
},
|
|
53
53
|
{
|
|
54
54
|
"sourceName": "@modern-js/app-tools-extensions",
|
|
55
55
|
"targetName": "@bleedingdev/modern-js-app-tools-extensions",
|
|
56
|
-
"version": "3.8.3-ultramodern.
|
|
56
|
+
"version": "3.8.3-ultramodern.3"
|
|
57
57
|
},
|
|
58
58
|
{
|
|
59
59
|
"sourceName": "@modern-js/bff-core",
|
|
60
60
|
"targetName": "@bleedingdev/modern-js-bff-core",
|
|
61
|
-
"version": "3.8.3-ultramodern.
|
|
61
|
+
"version": "3.8.3-ultramodern.3"
|
|
62
62
|
},
|
|
63
63
|
{
|
|
64
64
|
"sourceName": "@modern-js/bff-effect",
|
|
65
65
|
"targetName": "@bleedingdev/modern-js-bff-effect",
|
|
66
|
-
"version": "3.8.3-ultramodern.
|
|
66
|
+
"version": "3.8.3-ultramodern.3"
|
|
67
67
|
},
|
|
68
68
|
{
|
|
69
69
|
"sourceName": "@modern-js/bff-runtime",
|
|
70
70
|
"targetName": "@bleedingdev/modern-js-bff-runtime",
|
|
71
|
-
"version": "3.8.3-ultramodern.
|
|
71
|
+
"version": "3.8.3-ultramodern.3"
|
|
72
72
|
},
|
|
73
73
|
{
|
|
74
74
|
"sourceName": "@modern-js/builder",
|
|
75
75
|
"targetName": "@bleedingdev/modern-js-builder",
|
|
76
|
-
"version": "3.8.3-ultramodern.
|
|
76
|
+
"version": "3.8.3-ultramodern.3"
|
|
77
77
|
},
|
|
78
78
|
{
|
|
79
79
|
"sourceName": "@modern-js/code-tools",
|
|
80
80
|
"targetName": "@bleedingdev/modern-js-code-tools",
|
|
81
|
-
"version": "3.8.3-ultramodern.
|
|
81
|
+
"version": "3.8.3-ultramodern.3"
|
|
82
82
|
},
|
|
83
83
|
{
|
|
84
84
|
"sourceName": "@modern-js/create-request",
|
|
85
85
|
"targetName": "@bleedingdev/modern-js-create-request",
|
|
86
|
-
"version": "3.8.3-ultramodern.
|
|
86
|
+
"version": "3.8.3-ultramodern.3"
|
|
87
87
|
},
|
|
88
88
|
{
|
|
89
89
|
"sourceName": "@modern-js/i18n-runtime-extensions",
|
|
90
90
|
"targetName": "@bleedingdev/modern-js-i18n-runtime-extensions",
|
|
91
|
-
"version": "3.8.3-ultramodern.
|
|
91
|
+
"version": "3.8.3-ultramodern.3"
|
|
92
92
|
},
|
|
93
93
|
{
|
|
94
94
|
"sourceName": "@modern-js/i18n-utils",
|
|
95
95
|
"targetName": "@bleedingdev/modern-js-i18n-utils",
|
|
96
|
-
"version": "3.8.3-ultramodern.
|
|
96
|
+
"version": "3.8.3-ultramodern.3"
|
|
97
97
|
},
|
|
98
98
|
{
|
|
99
99
|
"sourceName": "@modern-js/image",
|
|
100
100
|
"targetName": "@bleedingdev/modern-js-image",
|
|
101
|
-
"version": "3.8.3-ultramodern.
|
|
101
|
+
"version": "3.8.3-ultramodern.3"
|
|
102
102
|
},
|
|
103
103
|
{
|
|
104
104
|
"sourceName": "@modern-js/main-doc",
|
|
105
105
|
"targetName": "@bleedingdev/modern-js-main-doc",
|
|
106
|
-
"version": "3.8.3-ultramodern.
|
|
106
|
+
"version": "3.8.3-ultramodern.3"
|
|
107
107
|
},
|
|
108
108
|
{
|
|
109
109
|
"sourceName": "@modern-js/plugin",
|
|
110
110
|
"targetName": "@bleedingdev/modern-js-plugin",
|
|
111
|
-
"version": "3.8.3-ultramodern.
|
|
111
|
+
"version": "3.8.3-ultramodern.3"
|
|
112
112
|
},
|
|
113
113
|
{
|
|
114
114
|
"sourceName": "@modern-js/plugin-bff",
|
|
115
115
|
"targetName": "@bleedingdev/modern-js-plugin-bff",
|
|
116
|
-
"version": "3.8.3-ultramodern.
|
|
116
|
+
"version": "3.8.3-ultramodern.3"
|
|
117
117
|
},
|
|
118
118
|
{
|
|
119
119
|
"sourceName": "@modern-js/plugin-bff-extensions",
|
|
120
120
|
"targetName": "@bleedingdev/modern-js-plugin-bff-extensions",
|
|
121
|
-
"version": "3.8.3-ultramodern.
|
|
121
|
+
"version": "3.8.3-ultramodern.3"
|
|
122
122
|
},
|
|
123
123
|
{
|
|
124
124
|
"sourceName": "@modern-js/plugin-data-loader",
|
|
125
125
|
"targetName": "@bleedingdev/modern-js-plugin-data-loader",
|
|
126
|
-
"version": "3.8.3-ultramodern.
|
|
126
|
+
"version": "3.8.3-ultramodern.3"
|
|
127
127
|
},
|
|
128
128
|
{
|
|
129
129
|
"sourceName": "@modern-js/plugin-i18n",
|
|
130
130
|
"targetName": "@bleedingdev/modern-js-plugin-i18n",
|
|
131
|
-
"version": "3.8.3-ultramodern.
|
|
131
|
+
"version": "3.8.3-ultramodern.3"
|
|
132
132
|
},
|
|
133
133
|
{
|
|
134
134
|
"sourceName": "@modern-js/plugin-polyfill",
|
|
135
135
|
"targetName": "@bleedingdev/modern-js-plugin-polyfill",
|
|
136
|
-
"version": "3.8.3-ultramodern.
|
|
136
|
+
"version": "3.8.3-ultramodern.3"
|
|
137
137
|
},
|
|
138
138
|
{
|
|
139
139
|
"sourceName": "@modern-js/plugin-ssg",
|
|
140
140
|
"targetName": "@bleedingdev/modern-js-plugin-ssg",
|
|
141
|
-
"version": "3.8.3-ultramodern.
|
|
141
|
+
"version": "3.8.3-ultramodern.3"
|
|
142
142
|
},
|
|
143
143
|
{
|
|
144
144
|
"sourceName": "@modern-js/plugin-styled-components",
|
|
145
145
|
"targetName": "@bleedingdev/modern-js-plugin-styled-components",
|
|
146
|
-
"version": "3.8.3-ultramodern.
|
|
146
|
+
"version": "3.8.3-ultramodern.3"
|
|
147
147
|
},
|
|
148
148
|
{
|
|
149
149
|
"sourceName": "@modern-js/plugin-tanstack",
|
|
150
150
|
"targetName": "@bleedingdev/modern-js-plugin-tanstack",
|
|
151
|
-
"version": "3.8.3-ultramodern.
|
|
151
|
+
"version": "3.8.3-ultramodern.3"
|
|
152
152
|
},
|
|
153
153
|
{
|
|
154
154
|
"sourceName": "@modern-js/prod-server",
|
|
155
155
|
"targetName": "@bleedingdev/modern-js-prod-server",
|
|
156
|
-
"version": "3.8.3-ultramodern.
|
|
156
|
+
"version": "3.8.3-ultramodern.3"
|
|
157
157
|
},
|
|
158
158
|
{
|
|
159
159
|
"sourceName": "@modern-js/render",
|
|
160
160
|
"targetName": "@bleedingdev/modern-js-render",
|
|
161
|
-
"version": "3.8.3-ultramodern.
|
|
161
|
+
"version": "3.8.3-ultramodern.3"
|
|
162
162
|
},
|
|
163
163
|
{
|
|
164
164
|
"sourceName": "@modern-js/runtime",
|
|
165
165
|
"targetName": "@bleedingdev/modern-js-runtime",
|
|
166
|
-
"version": "3.8.3-ultramodern.
|
|
166
|
+
"version": "3.8.3-ultramodern.3"
|
|
167
167
|
},
|
|
168
168
|
{
|
|
169
169
|
"sourceName": "@modern-js/runtime-extensions",
|
|
170
170
|
"targetName": "@bleedingdev/modern-js-runtime-extensions",
|
|
171
|
-
"version": "3.8.3-ultramodern.
|
|
171
|
+
"version": "3.8.3-ultramodern.3"
|
|
172
172
|
},
|
|
173
173
|
{
|
|
174
174
|
"sourceName": "@modern-js/runtime-utils",
|
|
175
175
|
"targetName": "@bleedingdev/modern-js-runtime-utils",
|
|
176
|
-
"version": "3.8.3-ultramodern.
|
|
176
|
+
"version": "3.8.3-ultramodern.3"
|
|
177
177
|
},
|
|
178
178
|
{
|
|
179
179
|
"sourceName": "@modern-js/sandpack-react",
|
|
180
180
|
"targetName": "@bleedingdev/modern-js-sandpack-react",
|
|
181
|
-
"version": "3.8.3-ultramodern.
|
|
181
|
+
"version": "3.8.3-ultramodern.3"
|
|
182
182
|
},
|
|
183
183
|
{
|
|
184
184
|
"sourceName": "@modern-js/server",
|
|
185
185
|
"targetName": "@bleedingdev/modern-js-server",
|
|
186
|
-
"version": "3.8.3-ultramodern.
|
|
186
|
+
"version": "3.8.3-ultramodern.3"
|
|
187
187
|
},
|
|
188
188
|
{
|
|
189
189
|
"sourceName": "@modern-js/server-core",
|
|
190
190
|
"targetName": "@bleedingdev/modern-js-server-core",
|
|
191
|
-
"version": "3.8.3-ultramodern.
|
|
191
|
+
"version": "3.8.3-ultramodern.3"
|
|
192
192
|
},
|
|
193
193
|
{
|
|
194
194
|
"sourceName": "@modern-js/server-runtime",
|
|
195
195
|
"targetName": "@bleedingdev/modern-js-server-runtime",
|
|
196
|
-
"version": "3.8.3-ultramodern.
|
|
196
|
+
"version": "3.8.3-ultramodern.3"
|
|
197
197
|
},
|
|
198
198
|
{
|
|
199
199
|
"sourceName": "@modern-js/server-runtime-extensions",
|
|
200
200
|
"targetName": "@bleedingdev/modern-js-server-runtime-extensions",
|
|
201
|
-
"version": "3.8.3-ultramodern.
|
|
201
|
+
"version": "3.8.3-ultramodern.3"
|
|
202
202
|
},
|
|
203
203
|
{
|
|
204
204
|
"sourceName": "@modern-js/server-utils",
|
|
205
205
|
"targetName": "@bleedingdev/modern-js-server-utils",
|
|
206
|
-
"version": "3.8.3-ultramodern.
|
|
206
|
+
"version": "3.8.3-ultramodern.3"
|
|
207
207
|
},
|
|
208
208
|
{
|
|
209
209
|
"sourceName": "@modern-js/tsconfig",
|
|
210
210
|
"targetName": "@bleedingdev/modern-js-tsconfig",
|
|
211
|
-
"version": "3.8.3-ultramodern.
|
|
211
|
+
"version": "3.8.3-ultramodern.3"
|
|
212
212
|
},
|
|
213
213
|
{
|
|
214
214
|
"sourceName": "@modern-js/types",
|
|
215
215
|
"targetName": "@bleedingdev/modern-js-types",
|
|
216
|
-
"version": "3.8.3-ultramodern.
|
|
216
|
+
"version": "3.8.3-ultramodern.3"
|
|
217
217
|
},
|
|
218
218
|
{
|
|
219
219
|
"sourceName": "@modern-js/ultramodern-create",
|
|
220
220
|
"targetName": "@bleedingdev/modern-js-ultramodern-create",
|
|
221
|
-
"version": "3.8.3-ultramodern.
|
|
221
|
+
"version": "3.8.3-ultramodern.3"
|
|
222
222
|
},
|
|
223
223
|
{
|
|
224
224
|
"sourceName": "@modern-js/ultramodern-sandpack-profile",
|
|
225
225
|
"targetName": "@bleedingdev/modern-js-ultramodern-sandpack-profile",
|
|
226
|
-
"version": "3.8.3-ultramodern.
|
|
226
|
+
"version": "3.8.3-ultramodern.3"
|
|
227
227
|
},
|
|
228
228
|
{
|
|
229
229
|
"sourceName": "@modern-js/utils",
|
|
230
230
|
"targetName": "@bleedingdev/modern-js-utils",
|
|
231
|
-
"version": "3.8.3-ultramodern.
|
|
231
|
+
"version": "3.8.3-ultramodern.3"
|
|
232
232
|
}
|
|
233
233
|
],
|
|
234
234
|
"release": {
|
|
235
235
|
"tag": "latest",
|
|
236
|
-
"version": "3.8.3-ultramodern.
|
|
236
|
+
"version": "3.8.3-ultramodern.3"
|
|
237
237
|
},
|
|
238
238
|
"schema": "bleedingdev.ultramodern.release-cohort",
|
|
239
239
|
"schemaVersion": 1,
|
|
240
240
|
"source": {
|
|
241
|
-
"commit": "
|
|
241
|
+
"commit": "0b880441a5c003e7b82f1be1ad27ec9f96ca83df",
|
|
242
242
|
"repository": "BleedingDev/ultramodern.js"
|
|
243
243
|
}
|
|
244
244
|
}
|