@bleedingdev/modern-js-app-tools 3.2.0-ultramodern.120 → 3.2.0-ultramodern.121

package/dist/cjs/rsbuild.js

@@ -1,19 +1,5 @@
 "use strict";
-var __webpack_modules__ = {
-    "@modern-js/plugin/cli" (module) {
-        module.exports = require("@modern-js/plugin/cli");
-    }
-};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
+var __webpack_require__ = {};
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -40,54 +26,52 @@ function __webpack_require__(moduleId) {
     };
 })();
 var __webpack_exports__ = {};
-(()=>{
-    __webpack_require__.r(__webpack_exports__);
-    __webpack_require__.d(__webpack_exports__, {
-        resolveModernRsbuildConfig: ()=>resolveModernRsbuildConfig
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    resolveModernRsbuildConfig: ()=>resolveModernRsbuildConfig
+});
+const builder_namespaceObject = require("@modern-js/builder");
+const cli_namespaceObject = require("@modern-js/plugin/cli");
+const utils_namespaceObject = require("@modern-js/utils");
+const index_js_namespaceObject = require("./builder/shared/builderPlugins/index.js");
+const external_constants_js_namespaceObject = require("./constants.js");
+const getConfigFile_js_namespaceObject = require("./utils/getConfigFile.js");
+const loadPlugins_js_namespaceObject = require("./utils/loadPlugins.js");
+const MODERN_META_NAME = 'modern-js';
+async function resolveModernRsbuildConfig(options) {
+    const { cwd = process.cwd(), metaName = MODERN_META_NAME } = options;
+    const configFile = options.configPath || (0, getConfigFile_js_namespaceObject.getConfigFile)(void 0, cwd);
+    if (!configFile) throw new Error(`Cannot find config file in ${cwd}. Please make sure you have a ${external_constants_js_namespaceObject.DEFAULT_CONFIG_FILE} file in your project.`);
+    const { config: modernConfig, getAppContext } = await (0, cli_namespaceObject.createConfigOptions)({
+        command: options.command,
+        cwd,
+        configFile,
+        internalPlugins: await (0, loadPlugins_js_namespaceObject.loadInternalPlugins)(cwd, utils_namespaceObject.INTERNAL_RUNTIME_PLUGINS),
+        metaName,
+        modifyModernConfig: options.modifyModernConfig
     });
-    const builder_namespaceObject = require("@modern-js/builder");
-    const utils_namespaceObject = require("@modern-js/utils");
-    const index_js_namespaceObject = require("./builder/shared/builderPlugins/index.js");
-    const external_constants_js_namespaceObject = require("./constants.js");
-    const getConfigFile_js_namespaceObject = require("./utils/getConfigFile.js");
-    const loadPlugins_js_namespaceObject = require("./utils/loadPlugins.js");
-    const MODERN_META_NAME = 'modern-js';
-    const { createConfigOptions } = __webpack_require__("@modern-js/plugin/cli");
-    async function resolveModernRsbuildConfig(options) {
-        const { cwd = process.cwd(), metaName = MODERN_META_NAME } = options;
-        const configFile = options.configPath || (0, getConfigFile_js_namespaceObject.getConfigFile)(void 0, cwd);
-        if (!configFile) throw new Error(`Cannot find config file in ${cwd}. Please make sure you have a ${external_constants_js_namespaceObject.DEFAULT_CONFIG_FILE} file in your project.`);
-        const { config: modernConfig, getAppContext } = await createConfigOptions({
-            command: options.command,
-            cwd,
-            configFile,
-            internalPlugins: await (0, loadPlugins_js_namespaceObject.loadInternalPlugins)(cwd, utils_namespaceObject.INTERNAL_RUNTIME_PLUGINS),
-            metaName,
-            modifyModernConfig: options.modifyModernConfig
-        });
-        const nonStandardConfig = {
-            ...modernConfig,
-            plugins: modernConfig.builderPlugins
-        };
-        const appContext = getAppContext();
-        const { rsbuildConfig, rsbuildPlugins } = await (0, builder_namespaceObject.parseRspackConfig)(nonStandardConfig, {
-            cwd
-        });
-        const adapterParams = {
-            appContext,
-            normalizedConfig: modernConfig
-        };
-        rsbuildConfig.plugins = [
-            ...rsbuildPlugins,
-            ...rsbuildConfig.plugins || [],
-            (0, index_js_namespaceObject.builderPluginAdapterBasic)(adapterParams),
-            (0, index_js_namespaceObject.builderPluginAdapterHooks)(adapterParams)
-        ];
-        return {
-            rsbuildConfig
-        };
-    }
-})();
+    const nonStandardConfig = {
+        ...modernConfig,
+        plugins: modernConfig.builderPlugins
+    };
+    const appContext = getAppContext();
+    const { rsbuildConfig, rsbuildPlugins } = await (0, builder_namespaceObject.parseRspackConfig)(nonStandardConfig, {
+        cwd
+    });
+    const adapterParams = {
+        appContext,
+        normalizedConfig: modernConfig
+    };
+    rsbuildConfig.plugins = [
+        ...rsbuildPlugins,
+        ...rsbuildConfig.plugins || [],
+        (0, index_js_namespaceObject.builderPluginAdapterBasic)(adapterParams),
+        (0, index_js_namespaceObject.builderPluginAdapterHooks)(adapterParams)
+    ];
+    return {
+        rsbuildConfig
+    };
+}
 exports.resolveModernRsbuildConfig = __webpack_exports__.resolveModernRsbuildConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "resolveModernRsbuildConfig"

package/dist/cjs/types/config/cloudflareDeploy.js

@@ -0,0 +1,18 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/types/config/precompress.js

@@ -0,0 +1,18 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/baseline.mjs

@@ -1,78 +1,4 @@
-import { createRequire } from "node:module";
-import node_path from "node:path";
-import { mergeConfig } from "@modern-js/plugin/cli";
-const resolveReactRouterPackageDir = ()=>{
-    const localRequire = createRequire(node_path.join(process.cwd(), 'package.json'));
-    try {
-        const reactRouterDomPackageJson = localRequire.resolve('react-router-dom/package.json', {
-            paths: [
-                process.cwd()
-            ]
-        });
-        const reactRouterPackageJson = localRequire.resolve('react-router/package.json', {
-            paths: [
-                node_path.dirname(reactRouterDomPackageJson)
-            ]
-        });
-        return node_path.dirname(reactRouterPackageJson);
-    } catch  {
-        return;
-    }
-};
-const setReactRouterBridgeSafeAliases = (chain)=>{
-    const reactRouterPackageDir = resolveReactRouterPackageDir();
-    if (!reactRouterPackageDir) return;
-    const productionEntry = node_path.join(reactRouterPackageDir, 'dist/production/index.mjs');
-    const developmentEntry = node_path.join(reactRouterPackageDir, 'dist/development/index.mjs');
-    chain.resolve.alias.set('react-router$', productionEntry);
-    chain.resolve.alias.set('react-router/dist/production/index.js', productionEntry);
-    chain.resolve.alias.set('react-router/dist/development/index.js', developmentEntry);
-};
-const createAppBaselineConfig = (options = {})=>{
-    const { appId = 'app', enableBffRequestId = true, enableTelemetry = true, enableTelemetryExporters = true, otlpEndpoint = process.env.MODERN_TELEMETRY_OTLP_ENDPOINT || 'http://127.0.0.1:4318/v1/logs', victoriaMetricsEndpoint = process.env.MODERN_TELEMETRY_VICTORIA_ENDPOINT || 'http://127.0.0.1:8428/api/v1/import/prometheus', telemetryFailLoudStartup = true, enableModuleFederationSSR = true } = options;
-    const server = {};
-    if (enableTelemetry) {
-        server.telemetry = {
-            enabled: true,
-            failLoudStartup: telemetryFailLoudStartup
-        };
-        if (enableTelemetryExporters) server.telemetry.exporters = {
-            otlp: {
-                enabled: true,
-                endpoint: otlpEndpoint
-            },
-            victoriaMetrics: {
-                enabled: true,
-                endpoint: victoriaMetricsEndpoint
-            }
-        };
-    }
-    if (enableModuleFederationSSR) server.ssr = {
-        mode: 'stream',
-        moduleFederationAppSSR: true
-    };
-    const baselineConfig = {
-        output: {
-            precompress: true
-        },
-        performance: {
-            rsdoctor: {
-                enabled: 'production' === process.env.NODE_ENV,
-                disableClientServer: true
-            }
-        },
-        server,
-        tools: {
-            bundlerChain: setReactRouterBridgeSafeAliases
-        }
-    };
-    if (enableBffRequestId) baselineConfig.bff = {
-        requestId: appId
-    };
-    return baselineConfig;
-};
-const withAppBaseline = (config, options = {})=>mergeConfig([
-        createAppBaselineConfig(options),
-        config
-    ]);
+import { createPresetUltramodernConfig, presetUltramodern } from "./presetUltramodern.mjs";
+const createAppBaselineConfig = createPresetUltramodernConfig;
+const withAppBaseline = presetUltramodern;
 export { createAppBaselineConfig, withAppBaseline };

package/dist/esm/commands/index.mjs

@@ -1,5 +1,4 @@
 import { i18n, localeKeys } from "../locale/index.mjs";
-import { runtimeCommand } from "./runtime.mjs";
 const devCommand = async (program, api)=>{
     program.command('dev').alias('start').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('-e --entry [entry...]', i18n.t(localeKeys.command.dev.entry)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).option('--web-only', i18n.t(localeKeys.command.dev.webOnly)).action(async (options)=>{
         const { dev } = await import("./dev.mjs");
@@ -41,7 +40,5 @@ const infoCommand = (program, api)=>{
         await info(api, options);
     });
 };
-const runtimeOperationsCommand = async (program, api)=>{
-    await runtimeCommand(program, api);
-};
-export { buildCommand, deployCommand, devCommand, infoCommand, inspectCommand, runtimeOperationsCommand, serverCommand };
+export { runtimeCommand } from "./runtime.mjs";
+export { buildCommand, deployCommand, devCommand, infoCommand, inspectCommand, serverCommand };

package/dist/esm/commands/runtime.mjs

@@ -54,9 +54,39 @@ const parseResponseBody = async (response)=>{
         };
     }
 };
+const INDENT_STEP = '  ';
+const formatScalar = (value)=>'string' == typeof value ? value : JSON.stringify(value) ?? 'undefined';
+const formatHumanReadableLines = (value, indent)=>{
+    if (Array.isArray(value)) {
+        if (0 === value.length) return [
+            `${indent}(empty)`
+        ];
+        return value.flatMap((entry)=>null !== entry && 'object' == typeof entry ? [
+                `${indent}-`,
+                ...formatHumanReadableLines(entry, indent + INDENT_STEP)
+            ] : [
+                `${indent}- ${formatScalar(entry)}`
+            ]);
+    }
+    if (null !== value && 'object' == typeof value) {
+        const entries = Object.entries(value);
+        if (0 === entries.length) return [
+            `${indent}(empty)`
+        ];
+        return entries.flatMap(([key, entry])=>null !== entry && 'object' == typeof entry ? [
+                `${indent}${key}:`,
+                ...formatHumanReadableLines(entry, indent + INDENT_STEP)
+            ] : [
+                `${indent}${key}: ${formatScalar(entry)}`
+            ]);
+    }
+    return [
+        `${indent}${formatScalar(value)}`
+    ];
+};
+const formatRuntimeOutput = (payload, jsonOnly)=>jsonOnly ? JSON.stringify(payload, null, 2) : formatHumanReadableLines(payload, '').join('\n');
 const printOutput = (payload, jsonOnly)=>{
-    if (jsonOnly) return void console.log(JSON.stringify(payload, null, 2));
-    console.log(JSON.stringify(payload, null, 2));
+    console.log(formatRuntimeOutput(payload, jsonOnly));
 };
 const createRuntimeFallbackSignalPayload = (options)=>{
     const payload = {
@@ -113,4 +143,4 @@ const runtimeCommand = async (program, _api)=>{
         printOutput(responsePayload, options.json);
     });
 };
-export { createRuntimeFallbackSignalPayload, resolveRuntimeEndpoint, resolveToken, runtimeCommand };
+export { createRuntimeFallbackSignalPayload, formatRuntimeOutput, resolveRuntimeEndpoint, resolveToken, runtimeCommand };

package/dist/esm/index.mjs

@@ -3,7 +3,7 @@ import { getLocaleLanguage } from "@modern-js/i18n-utils/language-detector";
 import { createAsyncHook } from "@modern-js/plugin";
 import { cleanRequireCache, deprecatedCommands, emptyDir, getArgv, getCommand } from "@modern-js/utils";
 import path from "path";
-import { buildCommand, deployCommand, devCommand, infoCommand, inspectCommand, runtimeOperationsCommand, serverCommand } from "./commands/index.mjs";
+import { buildCommand, deployCommand, devCommand, infoCommand, inspectCommand, runtimeCommand, serverCommand } from "./commands/index.mjs";
 import { compatPlugin } from "./compat/index.mjs";
 import { DEFAULT_RUNTIME_CONFIG_FILE } from "./constants.mjs";
 import { i18n } from "./locale/index.mjs";
@@ -71,7 +71,7 @@ const appTools = ()=>({
                 deployCommand(program, api);
                 inspectCommand(program, api);
                 infoCommand(program, api);
-                await runtimeOperationsCommand(program, api);
+                await runtimeCommand(program, api);
                 deprecatedCommands(program);
             });
             api.onPrepare(async ()=>{

package/dist/esm/plugins/deploy/platforms/cloudflare.mjs

@@ -19,6 +19,15 @@ const DEFAULT_SECURITY_HEADERS = {
     contentTypeOptions: 'nosniff',
     permissionsPolicy: 'camera=(), geolocation=(), microphone=(), payment=(), usb=()'
 };
+const DEFAULT_CORS_ALLOWED_METHODS = [
+    'GET',
+    'HEAD',
+    'POST',
+    'PUT',
+    'PATCH',
+    'DELETE',
+    'OPTIONS'
+];
 const DEFAULT_CSP_DIRECTIVES = {
     'base-uri': [
         "'self'"
@@ -156,10 +165,20 @@ const createNoindexPolicy = (noindex)=>{
         reason: noindex.reason
     };
 };
+const createCloudflareWorkerCorsPolicy = (cors)=>({
+        assets: cors?.assets ?? true,
+        allowedOrigins: normalizeDirectiveValues(cors?.allowedOrigins ?? []),
+        allowedMethods: cors?.allowedMethods?.length ? normalizeDirectiveValues(cors.allowedMethods.map((method)=>method.toUpperCase())) : DEFAULT_CORS_ALLOWED_METHODS,
+        allowedHeaders: cors?.allowedHeaders?.length ? normalizeDirectiveValues(cors.allowedHeaders) : [
+            '*'
+        ],
+        reason: cors?.reason
+    });
 const createCloudflareWorkerSecurityPolicy = (modernConfig)=>{
     const security = modernConfig.deploy?.worker?.security;
     if (security?.enabled === false) return {
         enabled: false,
+        cors: createCloudflareWorkerCorsPolicy(security.cors),
         reason: security.reason
     };
     return {
@@ -171,10 +190,7 @@ const createCloudflareWorkerSecurityPolicy = (modernConfig)=>{
         },
         contentSecurityPolicy: createContentSecurityPolicy(security?.contentSecurityPolicy),
         noindex: createNoindexPolicy(security?.noindex),
-        cookies: {
-            mutateSetCookie: false,
-            reason: security?.cookies?.reason ?? 'Cloudflare worker does not own application Set-Cookie headers.'
-        },
+        cors: createCloudflareWorkerCorsPolicy(security?.cors),
         reason: security?.reason
     };
 };

package/dist/esm/plugins/deploy/platforms/templates/cloudflare-entry.mjs

@@ -3,16 +3,57 @@ const MODERN_WORKER_MANIFEST = p_workerManifest;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
 const remoteJsonPromises = new Map();
-const CORS_HEADERS = {
+const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
+const ASSET_CORS_ENABLED = false !== CORS_POLICY.assets;
+const APP_CORS_ALLOWED_ORIGINS = (CORS_POLICY.allowedOrigins || []).map((origin)=>String(origin).toLowerCase());
+const APP_CORS_ALLOWED_METHODS = (CORS_POLICY.allowedMethods?.length ? CORS_POLICY.allowedMethods : [
+    'GET',
+    'HEAD',
+    'POST',
+    'PUT',
+    'PATCH',
+    'DELETE',
+    'OPTIONS'
+]).join(', ');
+const APP_CORS_ALLOWED_HEADERS = (CORS_POLICY.allowedHeaders?.length ? CORS_POLICY.allowedHeaders : [
+    '*'
+]).join(', ');
+const ASSET_CORS_HEADERS = {
     'access-control-allow-headers': '*',
     'access-control-allow-methods': 'GET, HEAD, OPTIONS',
     'access-control-allow-origin': '*'
 };
 globalThis.__dirname ??= '/';
 globalThis.__filename ??= '/index.js';
-function withCorsHeaders(response) {
+function getAllowedAppCorsOrigin(request) {
+    if (0 === APP_CORS_ALLOWED_ORIGINS.length) return null;
+    const origin = request.headers.get('origin');
+    if (!origin) return null;
+    if (APP_CORS_ALLOWED_ORIGINS.includes('*')) return '*';
+    return APP_CORS_ALLOWED_ORIGINS.includes(origin.toLowerCase()) ? origin : null;
+}
+function appendVaryOrigin(headers) {
+    const vary = headers.get('vary');
+    if (!vary) return void headers.set('vary', 'origin');
+    const varyValues = vary.split(',').map((value)=>value.trim().toLowerCase());
+    if (!varyValues.includes('origin')) headers.set('vary', `${vary}, origin`);
+}
+function withAppCorsHeaders(response, request) {
+    const allowedOrigin = getAllowedAppCorsOrigin(request);
+    if (!allowedOrigin) return response;
     const headers = new Headers(response.headers);
-    for (const [name, value] of Object.entries(CORS_HEADERS))if (!headers.has(name)) headers.set(name, value);
+    if (!headers.has('access-control-allow-origin')) headers.set('access-control-allow-origin', allowedOrigin);
+    if ('*' !== allowedOrigin) appendVaryOrigin(headers);
+    return new Response(response.body, {
+        headers,
+        status: response.status,
+        statusText: response.statusText
+    });
+}
+function withAssetCorsHeaders(response) {
+    if (!ASSET_CORS_ENABLED) return response;
+    const headers = new Headers(response.headers);
+    for (const [name, value] of Object.entries(ASSET_CORS_HEADERS))if (!headers.has(name)) headers.set(name, value);
     return new Response(response.body, {
         headers,
         status: response.status,
@@ -84,7 +125,7 @@ function isFingerprintedAssetPathname(pathname) {
     return /(?:^|\/)[^/]+\.[a-f0-9]{8,}\.(?:css|js|mjs|json|svg|png|jpe?g|webp|avif|gif|woff2?|ttf)$/iu.test(pathname);
 }
 function withAssetHeaders(response, request) {
-    const corsResponse = withCorsHeaders(response);
+    const corsResponse = withAssetCorsHeaders(response);
     const headers = new Headers(corsResponse.headers);
     const { pathname } = new URL(request.url);
     if (isFingerprintedAssetPathname(pathname)) headers.set('cache-control', 'public, max-age=31536000, immutable');
@@ -94,10 +135,30 @@ function withAssetHeaders(response, request) {
         statusText: corsResponse.statusText
     });
 }
-function createCorsPreflightResponse(request) {
+async function createCorsPreflightResponse(request, env) {
     if ('OPTIONS' !== request.method) return null;
+    const allowedOrigin = getAllowedAppCorsOrigin(request);
+    if (allowedOrigin) {
+        const headers = new Headers({
+            'access-control-allow-headers': APP_CORS_ALLOWED_HEADERS,
+            'access-control-allow-methods': APP_CORS_ALLOWED_METHODS,
+            'access-control-allow-origin': allowedOrigin
+        });
+        if ('*' !== allowedOrigin) headers.set('vary', 'origin');
+        return new Response(null, {
+            headers,
+            status: 204
+        });
+    }
+    if (!ASSET_CORS_ENABLED) return null;
+    const assets = env?.[ASSETS_BINDING];
+    if (!assets || 'function' != typeof assets.fetch) return null;
+    const assetResponse = await assets.fetch(new Request(request.url, {
+        method: 'HEAD'
+    }));
+    if (!assetResponse || 404 === assetResponse.status) return null;
     return new Response(null, {
-        headers: CORS_HEADERS,
+        headers: ASSET_CORS_HEADERS,
         status: 204
     });
 }
@@ -478,25 +539,25 @@ async function dispatchBffRequest(request, env) {
 }
 export default {
     async fetch (request, env, ctx) {
-        const corsPreflightResponse = createCorsPreflightResponse(request);
+        const corsPreflightResponse = await createCorsPreflightResponse(request, env);
         if (corsPreflightResponse) return finalizeResponseForRequest(corsPreflightResponse, request);
         const assetResponse = await fetchAsset(request, env);
         if (assetResponse) return finalizeResponseForRequest(assetResponse, request);
         const bffResponse = await dispatchBffRequest(request, env);
-        if (bffResponse) return finalizeResponseForRequest(withCorsHeaders(bffResponse), request);
+        if (bffResponse) return finalizeResponseForRequest(withAppCorsHeaders(bffResponse, request), request);
         const route = findRoute(request);
         const { pathname } = new URL(request.url);
-        if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) return finalizeResponseForRequest(withCorsHeaders(new Response('Not found', {
+        if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) return finalizeResponseForRequest(withAppCorsHeaders(new Response('Not found', {
             status: 404
-        })), request);
+        }), request), request);
         if (route?.worker) {
             const renderableRequest = createRenderableRequest(request);
-            return finalizeResponseForRequest(withCorsHeaders(await dispatchRouteWorker(route, renderableRequest, env, ctx)), request);
+            return finalizeResponseForRequest(withAppCorsHeaders(await dispatchRouteWorker(route, renderableRequest, env, ctx), request), request);
         }
         const htmlResponse = await fetchRouteHtml(route, request, env);
         if (htmlResponse) return finalizeResponseForRequest(htmlResponse, request);
-        return finalizeResponseForRequest(withCorsHeaders(new Response('Not found', {
+        return finalizeResponseForRequest(withAppCorsHeaders(new Response('Not found', {
             status: 404
-        })), request);
+        }), request), request);
     }
 };

package/dist/esm/plugins/deploy/utils/index.mjs

@@ -1,5 +1,6 @@
 import { createRequire } from "node:module";
-import { ROUTE_SPEC_FILE, SERVER_DIR, fs, getMeta } from "@modern-js/utils";
+import { pathToFileURL } from "node:url";
+import { ROUTE_SPEC_FILE, SERVER_DIR, dynamicImport, fs, getMeta } from "@modern-js/utils";
 import path from "path";
 const normalizePath = (filePath)=>filePath.replace(/\\/g, '/');
 const getProjectUsage = (appDirectory, distDirectory, metaName)=>{
@@ -25,43 +26,17 @@ const getProjectUsage = (appDirectory, distDirectory, metaName)=>{
 };
 const getTemplatePath = (file)=>path.join(__dirname, '../platforms/templates', file);
 const readTemplate = async (file)=>(await fs.readFile(getTemplatePath(file))).toString();
-const localRequire = createRequire(path.join(__dirname, 'package.json'));
-const findNearestPackageJson = (resolvedEntry)=>{
-    let currentDir = path.dirname(resolvedEntry);
-    while(currentDir !== path.dirname(currentDir)){
-        const manifestPath = path.join(currentDir, 'package.json');
-        if (fs.existsSync(manifestPath)) return manifestPath;
-        currentDir = path.dirname(currentDir);
-    }
-};
-const splitPackageSpecifier = (entry)=>{
-    const segments = entry.split('/');
-    if (entry.startsWith('@')) {
-        const [scope, name, ...rest] = segments;
-        return {
-            packageName: `${scope}/${name}`,
-            exportKey: rest.length > 0 ? `./${rest.join('/')}` : '.'
-        };
-    }
-    const [name, ...rest] = segments;
-    return {
-        packageName: name,
-        exportKey: rest.length > 0 ? `./${rest.join('/')}` : '.'
-    };
-};
 const resolveESMDependency = async (entry)=>{
+    const conditions = new Set([
+        'node',
+        'import',
+        'module',
+        'default'
+    ]);
     try {
-        const { packageName, exportKey } = splitPackageSpecifier(entry);
-        const resolvedEntry = localRequire.resolve(entry);
-        const packageJsonPath = findNearestPackageJson(localRequire.resolve(packageName));
-        if (!packageJsonPath) return normalizePath(resolvedEntry);
-        const packageDir = path.dirname(packageJsonPath);
-        const packageJson = fs.readJSONSync(packageJsonPath);
-        const exportConfig = packageJson.exports?.[exportKey];
-        if ('string' == typeof exportConfig) return normalizePath(path.join(packageDir, exportConfig));
-        const esmExportPath = exportConfig?.node?.import || exportConfig?.import || exportConfig?.default;
-        if ('string' == typeof esmExportPath) return normalizePath(path.join(packageDir, esmExportPath));
-        return normalizePath(resolvedEntry);
+        const resolverPath = pathToFileURL(createRequire(__filename).resolve('import-meta-resolve')).href;
+        const { moduleResolve } = await dynamicImport(resolverPath);
+        return normalizePath(moduleResolve(entry, pathToFileURL(`${__dirname}/`), conditions, false).pathname.replace(/^\/(\w):/, '$1:'));
     } catch (err) {}
 };
 export { getProjectUsage, getTemplatePath, normalizePath, readTemplate, resolveESMDependency };

package/dist/esm/presetUltramodern.mjs

@@ -1,4 +1,78 @@
-import { createAppBaselineConfig, withAppBaseline } from "./baseline.mjs";
-const createPresetUltramodernConfig = (options = {})=>createAppBaselineConfig(options);
-const presetUltramodern = (config, options = {})=>withAppBaseline(config, options);
+import { createRequire } from "node:module";
+import node_path from "node:path";
+import { mergeConfig } from "@modern-js/plugin/cli";
+const DEFAULT_OTLP_ENDPOINT = 'http://127.0.0.1:4318/v1/logs';
+const DEFAULT_VICTORIA_METRICS_ENDPOINT = 'http://127.0.0.1:8428/api/v1/import/prometheus';
+const resolveReactRouterPackageDir = (appDirectory)=>{
+    const localRequire = createRequire(node_path.join(appDirectory, 'package.json'));
+    try {
+        const reactRouterDomPackageJson = localRequire.resolve('react-router-dom/package.json', {
+            paths: [
+                appDirectory
+            ]
+        });
+        const reactRouterPackageJson = localRequire.resolve('react-router/package.json', {
+            paths: [
+                node_path.dirname(reactRouterDomPackageJson)
+            ]
+        });
+        return node_path.dirname(reactRouterPackageJson);
+    } catch  {
+        return;
+    }
+};
+const setReactRouterBridgeSafeAliases = (chain, { isProd })=>{
+    const chainContext = chain.get('context');
+    const appDirectory = 'string' == typeof chainContext && chainContext.length > 0 ? chainContext : process.cwd();
+    const reactRouterPackageDir = resolveReactRouterPackageDir(appDirectory);
+    if (!reactRouterPackageDir) return;
+    const productionEntry = node_path.join(reactRouterPackageDir, 'dist/production/index.mjs');
+    const developmentEntry = node_path.join(reactRouterPackageDir, 'dist/development/index.mjs');
+    chain.resolve.alias.set('react-router$', isProd ? productionEntry : developmentEntry);
+    chain.resolve.alias.set('react-router/dist/production/index.js', productionEntry);
+    chain.resolve.alias.set('react-router/dist/development/index.js', developmentEntry);
+};
+const createPresetUltramodernConfig = (options = {})=>{
+    const { appId = 'app', enableBffRequestId = true, enableTelemetry = true, enableTelemetryExporters, otlpEndpoint = process.env.MODERN_TELEMETRY_OTLP_ENDPOINT, victoriaMetricsEndpoint = process.env.MODERN_TELEMETRY_VICTORIA_ENDPOINT, telemetryFailLoudStartup = true, enableModuleFederationSSR = true } = options;
+    const server = {};
+    if (enableTelemetry) {
+        server.telemetry = {
+            enabled: true,
+            failLoudStartup: telemetryFailLoudStartup
+        };
+        if (false !== enableTelemetryExporters) {
+            const exporters = {};
+            if (true === enableTelemetryExporters || otlpEndpoint) exporters.otlp = {
+                enabled: true,
+                endpoint: otlpEndpoint || DEFAULT_OTLP_ENDPOINT
+            };
+            if (true === enableTelemetryExporters || victoriaMetricsEndpoint) exporters.victoriaMetrics = {
+                enabled: true,
+                endpoint: victoriaMetricsEndpoint || DEFAULT_VICTORIA_METRICS_ENDPOINT
+            };
+            if (Object.keys(exporters).length > 0) server.telemetry.exporters = exporters;
+        }
+    }
+    if (enableModuleFederationSSR) server.ssr = {
+        mode: 'stream',
+        moduleFederationAppSSR: true
+    };
+    const presetConfig = {
+        output: {
+            precompress: true
+        },
+        server,
+        tools: {
+            bundlerChain: setReactRouterBridgeSafeAliases
+        }
+    };
+    if (enableBffRequestId) presetConfig.bff = {
+        requestId: appId
+    };
+    return presetConfig;
+};
+const presetUltramodern = (config, options = {})=>mergeConfig([
+        createPresetUltramodernConfig(options),
+        config
+    ]);
 export { createPresetUltramodernConfig, presetUltramodern };