@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

package/dist/cjs/ultramodern-workspace/routes.cjs

@@ -120,17 +120,8 @@ function createPublicRouteMetadata(app) {
 function createJsonLdHelperModule() {
     return (0, external_fs_io_cjs_namespaceObject.renderFileTemplate)('workspace/apps/shared/src/routes/ultramodern-jsonld.ts', {});
 }
-function createRouteMetadataModule(app) {
-    const routes = (0, external_types_cjs_namespaceObject.sortJsonValue)(createRouteOwnedI18nPaths(app));
-    const localisedUrls = (0, external_types_cjs_namespaceObject.sortJsonValue)(createLocalisedUrlsMap(app));
-    const publicRoutes = (0, external_types_cjs_namespaceObject.sortJsonValue)(createPublicRouteMetadata(app));
-    const namespace = (0, external_descriptors_cjs_namespaceObject.appI18nNamespace)(app);
-    return (0, external_fs_io_cjs_namespaceObject.renderFileTemplate)('workspace/apps/shared/src/routes/ultramodern-route-metadata.ts', {
-        value0: namespace,
-        value1: JSON.stringify(routes, null, 2),
-        value2: JSON.stringify(localisedUrls, null, 2),
-        value3: JSON.stringify(publicRoutes, null, 2)
-    });
+function createRouteMetadataModule() {
+    return (0, external_fs_io_cjs_namespaceObject.renderFileTemplate)('workspace/apps/shared/src/routes/ultramodern-route-metadata.ts', {});
 }
 function createRouteMetaModule(route) {
     return `const routeMeta = ${JSON.stringify((0, external_types_cjs_namespaceObject.sortJsonValue)(route), null, 2)} as const;

package/dist/cjs/ultramodern-workspace/shared-patches.cjs

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -30,8 +39,9 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     SHARED_ULTRAMODERN_WORKSPACE_PATCH_FILES: ()=>SHARED_ULTRAMODERN_WORKSPACE_PATCH_FILES
 });
-const external_policy_cjs_namespaceObject = require("./policy.cjs");
-const SHARED_ULTRAMODERN_WORKSPACE_PATCH_FILES = external_policy_cjs_namespaceObject.ULTRAMODERN_WORKSPACE_POLICY.pnpm.patchedDependencies.required.map((patch)=>patch.path.replace(/^patches\//u, '')).filter((patchFile)=>patchFile.startsWith('@module-federation__') || patchFile.startsWith('@tanstack__') || patchFile.startsWith('msgpackr@') || patchFile.startsWith('zod@'));
+const external_patch_inventory_cjs_namespaceObject = require("./patch-inventory.cjs");
+var external_patch_inventory_cjs_default = /*#__PURE__*/ __webpack_require__.n(external_patch_inventory_cjs_namespaceObject);
+const SHARED_ULTRAMODERN_WORKSPACE_PATCH_FILES = external_patch_inventory_cjs_default().filter((patch)=>patch.repository && null !== patch.workspace).map((patch)=>patch.path.slice(8));
 exports.SHARED_ULTRAMODERN_WORKSPACE_PATCH_FILES = __webpack_exports__.SHARED_ULTRAMODERN_WORKSPACE_PATCH_FILES;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "SHARED_ULTRAMODERN_WORKSPACE_PATCH_FILES"

package/dist/cjs/ultramodern-workspace/shells.cjs

@@ -31,15 +31,12 @@ __webpack_require__.d(__webpack_exports__, {
     FIRST_ADDITIONAL_SHELL_PORT: ()=>FIRST_ADDITIONAL_SHELL_PORT,
     PRIMARY_SHELL_ID: ()=>PRIMARY_SHELL_ID,
     assertValidShellName: ()=>assertValidShellName,
-    createAdditionalShellConfigEntry: ()=>createAdditionalShellConfigEntry,
     createShellDescriptor: ()=>createShellDescriptor,
-    resolveConfiguredAdditionalShells: ()=>resolveConfiguredAdditionalShells,
     shellDeliveryUnitBlock: ()=>shellDeliveryUnitBlock
 });
 const external_delivery_unit_cjs_namespaceObject = require("./delivery-unit.cjs");
 const external_descriptors_cjs_namespaceObject = require("./descriptors.cjs");
 const external_naming_cjs_namespaceObject = require("./naming.cjs");
-const external_types_cjs_namespaceObject = require("./types.cjs");
 const PRIMARY_SHELL_ID = external_descriptors_cjs_namespaceObject.shellApp.id;
 const FIRST_ADDITIONAL_SHELL_PORT = 3120;
 function createShellDescriptor(name, port) {
@@ -68,83 +65,16 @@ function assertValidShellName(name) {
 function shellDeliveryUnitBlock(scope, shell) {
     return shell.deliveryUnit ?? (0, external_delivery_unit_cjs_namespaceObject.deliveryUnitContractBlock)((0, external_delivery_unit_cjs_namespaceObject.createDeliveryUnitRecord)(scope, shell));
 }
-function createAdditionalShellConfigEntry(scope, shell, remotes = []) {
-    const verticalRefs = shell.verticalRefs ?? [];
-    return {
-        id: shell.id,
-        name: shell.id.replace(/^shell-/u, ''),
-        kind: 'shell',
-        package: (0, external_naming_cjs_namespaceObject.packageName)(scope, shell.packageSuffix),
-        path: shell.directory,
-        port: shell.port,
-        portEnv: shell.portEnv,
-        mfName: shell.mfName,
-        verticalRefs,
-        owner: (0, external_types_cjs_namespaceObject.resolveOwnerAttribution)(shell.ownership),
-        deliveryUnit: shellDeliveryUnitBlock(scope, shell),
-        moduleFederation: {
-            role: 'host',
-            name: shell.mfName,
-            verticalRefs,
-            remotes: (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)(shell, remotes),
-            ssr: true,
-            sharedContractVersion: 'mf-ssr-contract-v1'
-        }
-    };
-}
-function resolveConfiguredAdditionalShells(config) {
-    const shells = config?.shells;
-    if (!Array.isArray(shells)) return [];
-    return shells.filter((entry)=>null !== entry && 'object' == typeof entry && !Array.isArray(entry)).map((entry)=>{
-        const id = String(entry.id ?? '');
-        const suffix = 'string' == typeof entry.package ? entry.package.split('/').at(-1) ?? id : id;
-        const name = 'string' == typeof entry.name ? entry.name : id.replace(/^shell-/, '');
-        const port = 'number' == typeof entry.port ? entry.port : FIRST_ADDITIONAL_SHELL_PORT;
-        const descriptor = createShellDescriptor(name, port);
-        const moduleFederation = entry.moduleFederation && 'object' == typeof entry.moduleFederation && !Array.isArray(entry.moduleFederation) ? entry.moduleFederation : void 0;
-        const owner = entry.owner;
-        const deliveryUnit = entry.deliveryUnit;
-        const ownerAttribution = owner && 'object' == typeof owner && !Array.isArray(owner) && 'kind' in owner && ('team' === owner.kind || 'agent' === owner.kind || 'agent-team' === owner.kind) && 'id' in owner && 'string' == typeof owner.id ? {
-            kind: owner.kind,
-            id: owner.id,
-            ...'contact' in owner && 'string' == typeof owner.contact ? {
-                contact: owner.contact
-            } : {}
-        } : void 0;
-        const ownership = void 0 === ownerAttribution ? descriptor.ownership : {
-            ...descriptor.ownership,
-            owner: ownerAttribution
-        };
-        return {
-            ...descriptor,
-            id,
-            packageSuffix: suffix,
-            ownership,
-            displayName: 'string' == typeof entry.displayName ? entry.displayName : descriptor.displayName,
-            directory: 'string' == typeof entry.path ? entry.path : descriptor.directory,
-            portEnv: 'string' == typeof entry.portEnv ? entry.portEnv : descriptor.portEnv,
-            mfName: 'string' == typeof entry.mfName ? entry.mfName : 'string' == typeof moduleFederation?.name ? moduleFederation.name : descriptor.mfName,
-            verticalRefs: Array.isArray(entry.verticalRefs) ? entry.verticalRefs.filter((ref)=>'string' == typeof ref) : Array.isArray(moduleFederation?.verticalRefs) ? moduleFederation.verticalRefs.filter((ref)=>'string' == typeof ref) : [],
-            ...deliveryUnit && 'object' == typeof deliveryUnit && !Array.isArray(deliveryUnit) ? {
-                deliveryUnit: deliveryUnit
-            } : {}
-        };
-    });
-}
 exports.FIRST_ADDITIONAL_SHELL_PORT = __webpack_exports__.FIRST_ADDITIONAL_SHELL_PORT;
 exports.PRIMARY_SHELL_ID = __webpack_exports__.PRIMARY_SHELL_ID;
 exports.assertValidShellName = __webpack_exports__.assertValidShellName;
-exports.createAdditionalShellConfigEntry = __webpack_exports__.createAdditionalShellConfigEntry;
 exports.createShellDescriptor = __webpack_exports__.createShellDescriptor;
-exports.resolveConfiguredAdditionalShells = __webpack_exports__.resolveConfiguredAdditionalShells;
 exports.shellDeliveryUnitBlock = __webpack_exports__.shellDeliveryUnitBlock;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "FIRST_ADDITIONAL_SHELL_PORT",
     "PRIMARY_SHELL_ID",
     "assertValidShellName",
-    "createAdditionalShellConfigEntry",
     "createShellDescriptor",
-    "resolveConfiguredAdditionalShells",
     "shellDeliveryUnitBlock"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/ultramodern-workspace/tooling-command-catalog.cjs

@@ -27,23 +27,16 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-const defineToolingCommand = (command)=>({
-        ...command,
-        wrapperPath: `scripts/${command.wrapperName}.mts`
-    });
+const defineToolingCommand = (command)=>command;
 const generatedToolingCommands = [
     defineToolingCommand({
         id: 'validate',
         command: 'validate',
-        wrapperName: 'validate-ultramodern-workspace',
-        contractKey: 'validate',
         rootScript: 'contract:check'
     }),
     defineToolingCommand({
         id: 'typecheck',
         command: 'typecheck',
-        wrapperName: 'ultramodern-typecheck',
-        contractKey: 'typecheck',
         rootScript: 'typecheck',
         templatePath: "templates/workspace-scripts/ultramodern-typecheck.mjs",
         cwd: 'invocation'
@@ -51,96 +44,89 @@ const generatedToolingCommands = [
     defineToolingCommand({
         id: 'mfTypes',
         command: 'mf-types',
-        wrapperName: 'assert-mf-types',
-        contractKey: 'mfTypes',
         rootScript: 'mf:types'
     }),
     defineToolingCommand({
         id: 'publicSurface',
         command: 'public-surface',
-        wrapperName: 'generate-public-surface-assets',
-        contractKey: 'publicSurface',
         templatePath: "templates/workspace-scripts/generate-public-surface-assets.mjs"
     }),
     defineToolingCommand({
         id: 'backendFederationGenerate',
+        requiresBackendSurface: true,
         command: 'backend-federation-generate',
-        wrapperName: 'generate-node-backend-federation',
-        contractKey: 'backendFederationGenerate',
         rootScript: 'node:backend-federation:generate',
         templatePath: "templates/workspace-scripts/generate-node-backend-federation.mjs"
     }),
     defineToolingCommand({
         id: 'backendFederationProof',
+        requiresBackendSurface: true,
         command: 'backend-federation-proof',
-        wrapperName: 'proof-node-backend-federation',
-        contractKey: 'backendFederationProof',
         rootScript: 'node:proof',
         templatePath: "templates/workspace-scripts/proof-node-backend-federation.mjs"
     }),
     defineToolingCommand({
         id: 'cloudflareProof',
         command: 'cloudflare-proof',
-        wrapperName: 'proof-cloudflare-version',
-        contractKey: 'cloudflareProof',
         rootScript: 'cloudflare:proof',
         templatePath: "templates/workspace-scripts/proof-cloudflare-version.mjs"
     }),
     defineToolingCommand({
         id: 'cloudflareOutputVerify',
         command: 'cloudflare-output-verify',
-        wrapperName: 'verify-cloudflare-output',
-        contractKey: 'cloudflareOutputVerify',
         rootScript: 'cloudflare-output:verify'
     }),
     defineToolingCommand({
         id: 'performanceReadiness',
         command: 'performance-readiness',
-        wrapperName: 'ultramodern-performance-readiness',
-        contractKey: 'performanceReadiness',
         rootScript: 'performance:readiness',
         templatePath: "templates/workspace-scripts/ultramodern-performance-readiness.mjs"
     }),
     defineToolingCommand({
-        id: 'migrateStrictEffect',
-        command: 'migrate-strict-effect',
-        wrapperName: 'migrate-strict-effect',
-        contractKey: 'migrateStrictEffect',
-        rootScript: 'migrate:strict-effect'
+        id: 'routesGenerate',
+        command: 'routes-generate'
     }),
     defineToolingCommand({
-        id: 'routesGenerate',
-        command: 'routes-generate',
-        wrapperName: 'generate-tanstack-routes',
-        contractKey: 'routesGenerate'
+        id: 'zeropsMaterialize',
+        command: 'zerops-materialize',
+        rootScript: 'zerops:materialize',
+        requiresRemotes: true,
+        templatePath: "templates/workspace-scripts/materialize-zerops-runtime.mjs"
+    }),
+    defineToolingCommand({
+        id: 'cloudflareSsrProof',
+        command: 'cloudflare-ssr-proof',
+        rootScript: 'cloudflare:ssr-proof',
+        requiresRemotes: true,
+        templatePath: "templates/workspace-scripts/proof-workerd-ssr.mjs"
     })
 ];
+function selectGeneratedToolingCommands(options = {}) {
+    const backendSurface = options.hasBackendSurface ?? !options.shellOnly;
+    return generatedToolingCommands.filter((command)=>(!options.shellOnly || !command.requiresRemotes) && (backendSurface || !command.requiresBackendSurface));
+}
 const toolingCommandById = Object.fromEntries(generatedToolingCommands.map((command)=>[
         command.id,
         command
     ]));
 const GENERATED_TOOLING_COMMANDS = toolingCommandById;
 const generatedToolingCommandList = ()=>generatedToolingCommands.map((command)=>command.command);
-const createToolingWrapperContract = ()=>Object.fromEntries(generatedToolingCommands.map((command)=>[
-            command.contractKey,
-            command.wrapperPath
-        ]));
-const createGeneratedToolingWrapperMap = createToolingWrapperContract;
-__webpack_require__.d(__webpack_exports__, {}, {
+__webpack_require__.d(__webpack_exports__, {
+    selectGeneratedToolingCommands: ()=>selectGeneratedToolingCommands
+}, {
     GENERATED_TOOLING_COMMANDS: GENERATED_TOOLING_COMMANDS,
-    createGeneratedToolingWrapperMap: createGeneratedToolingWrapperMap,
     generatedToolingCommandList: generatedToolingCommandList,
     generatedToolingCommands: generatedToolingCommands
 });
 exports.GENERATED_TOOLING_COMMANDS = __webpack_exports__.GENERATED_TOOLING_COMMANDS;
-exports.createGeneratedToolingWrapperMap = __webpack_exports__.createGeneratedToolingWrapperMap;
 exports.generatedToolingCommandList = __webpack_exports__.generatedToolingCommandList;
 exports.generatedToolingCommands = __webpack_exports__.generatedToolingCommands;
+exports.selectGeneratedToolingCommands = __webpack_exports__.selectGeneratedToolingCommands;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "GENERATED_TOOLING_COMMANDS",
-    "createGeneratedToolingWrapperMap",
     "generatedToolingCommandList",
-    "generatedToolingCommands"
+    "generatedToolingCommands",
+    "selectGeneratedToolingCommands"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/ultramodern-workspace/tsconfigs.cjs

@@ -53,6 +53,9 @@ function createTsConfigBase() {
     return {
         compilerOptions: {
             target: 'ESNext',
+            types: [
+                'node'
+            ],
             lib: [
                 'ESNext',
                 'DOM',
@@ -117,7 +120,8 @@ function createPackageTsConfig(packageDir, options = {}) {
         'src',
         'locales/**/*.json',
         'package.json',
-        'shared'
+        'shared',
+        'shared/ultramodern-build.json'
     ];
     if (resolvedOptions.includeServer) include.push('server');
     if (resolvedOptions.includeApi) include.push('api');
@@ -159,7 +163,9 @@ function createAppMfTypesTsConfig(app) {
     const exposedFiles = Object.entries(app.exposes ?? {}).sort(([left], [right])=>'./Route' === left ? -1 : './Route' === right ? 1 : 0).map(([, exposePath])=>exposePath.replace(/^\.\//u, ''));
     return {
         extends: `${(0, external_naming_cjs_namespaceObject.relativeRootFor)(app.directory)}/tsconfig.base.json`,
-        include: [
+        include: 'api-only' === app.surfaceProfile ? [
+            'rpc' === (0, external_descriptors_cjs_namespaceObject.resolveApiProtocol)(app) ? 'shared/rpc.ts' : 'shared/api.ts'
+        ] : [
             ...new Set([
                 ...exposedFiles,
                 'src/modern-app-env.d.ts'