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

package/dist/esm/plugins/deploy/platforms/templates/cloudflare-worker-loadable-server.mjs

@@ -0,0 +1,185 @@
+import loadableComponent from '@loadable/component';
+import React from 'react';
+const internals = loadableComponent?.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED || {};
+const LoadableContext = internals.Context || React.createContext(null);
+const getRequiredChunkKey = internals.getRequiredChunkKey || ((namespace)=>`${namespace}__LOADABLE_REQUIRED_CHUNKS__`);
+const scriptExtensions = new Set([
+    '.js',
+    '.mjs'
+]);
+const styleExtensions = new Set([
+    '.css'
+]);
+function uniqByUrl(assets) {
+    const seen = new Set();
+    return assets.filter((asset)=>{
+        if (seen.has(asset.url)) return false;
+        seen.add(asset.url);
+        return true;
+    });
+}
+function extname(filePath) {
+    const basename = String(filePath).split('/').pop() || '';
+    const index = basename.lastIndexOf('.');
+    return index > 0 ? basename.slice(index) : '';
+}
+function joinUrl(publicPath, filename) {
+    const base = publicPath || '/';
+    return `${base.replace(/\/+$/u, '')}/${String(filename).replace(/^\/+/u, '')}`;
+}
+function extraPropsToString(extraProps = {}) {
+    return Object.entries(extraProps).filter(([, value])=>void 0 !== value && false !== value).map(([key, value])=>true === value ? ` ${key}` : ` ${key}="${value}"`).join('');
+}
+function assetScriptType(filename) {
+    const extension = extname(filename);
+    if (scriptExtensions.has(extension)) return "script";
+    if (styleExtensions.has(extension)) return 'style';
+}
+function getAssetName(asset) {
+    return 'object' == typeof asset && asset?.name ? asset.name : asset;
+}
+function getAssetIntegrity(asset) {
+    return 'object' == typeof asset && asset?.integrity ? asset.integrity : null;
+}
+function getChunkGroupAssets(chunkGroup) {
+    const assets = chunkGroup?.assets;
+    if (Array.isArray(assets)) return assets;
+    if (assets && 'object' == typeof assets) return [
+        ...assets.js || [],
+        ...assets.css || []
+    ];
+    return [];
+}
+function getChunkGroupChildAssets(chunkGroup, type) {
+    const childAssets = chunkGroup?.childAssets?.[type];
+    return Array.isArray(childAssets) ? childAssets : [];
+}
+function chunkIncludesJs(chunkInfo) {
+    return (chunkInfo?.files || []).some((file)=>scriptExtensions.has(extname(file)));
+}
+export function ChunkExtractorManager({ extractor, children }) {
+    return React.createElement(LoadableContext.Provider, {
+        value: extractor
+    }, children);
+}
+export class ChunkExtractor {
+    constructor({ stats, entrypoints = [
+        'main'
+    ], namespace = '', outputPath = '/', publicPath } = {}){
+        this.namespace = namespace;
+        this.stats = stats || {};
+        this.publicPath = publicPath || this.stats.publicPath || '/';
+        this.outputPath = outputPath || this.stats.outputPath || '/';
+        this.entrypoints = Array.isArray(entrypoints) ? entrypoints : [
+            entrypoints
+        ];
+        this.chunks = [];
+    }
+    addChunk(chunk) {
+        if (!this.chunks.includes(chunk)) this.chunks.push(chunk);
+    }
+    collectChunks(app) {
+        return React.createElement(ChunkExtractorManager, {
+            extractor: this
+        }, app);
+    }
+    getChunkGroup(chunk) {
+        return this.stats.namedChunkGroups?.[chunk] || {
+            assets: [],
+            childAssets: {},
+            chunks: []
+        };
+    }
+    getChunkInfo(chunkId) {
+        return (this.stats.chunks || []).find((chunk)=>chunk.id === chunkId);
+    }
+    resolvePublicUrl(filename) {
+        return joinUrl(this.publicPath, filename);
+    }
+    createChunkAsset({ filename, chunk, type, linkType }) {
+        const resolvedFilename = getAssetName(filename);
+        const scriptType = assetScriptType(resolvedFilename);
+        if (!scriptType) return;
+        return {
+            filename: resolvedFilename,
+            integrity: getAssetIntegrity(filename),
+            scriptType,
+            chunk,
+            url: this.resolvePublicUrl(resolvedFilename),
+            path: String(resolvedFilename).replace(/^\/+/u, ''),
+            type,
+            linkType
+        };
+    }
+    getChunkAssets(chunks) {
+        const one = (chunk)=>getChunkGroupAssets(this.getChunkGroup(chunk)).map((filename)=>this.createChunkAsset({
+                    filename,
+                    chunk,
+                    type: 'mainAsset',
+                    linkType: 'preload'
+                })).filter(Boolean);
+        return Array.isArray(chunks) ? uniqByUrl(chunks.flatMap(one)) : one(chunks);
+    }
+    getChunkChildAssets(chunks, type) {
+        const one = (chunk)=>getChunkGroupChildAssets(this.getChunkGroup(chunk), type).map((filename)=>this.createChunkAsset({
+                    filename,
+                    chunk,
+                    type: 'childAsset',
+                    linkType: type
+                })).filter(Boolean);
+        return Array.isArray(chunks) ? uniqByUrl(chunks.flatMap(one)) : one(chunks);
+    }
+    getChunkDependencies(chunks) {
+        const one = (chunk)=>(this.getChunkGroup(chunk).chunks || []).filter((chunkId)=>chunkIncludesJs(this.getChunkInfo(chunkId)));
+        return Array.isArray(chunks) ? [
+            ...new Set(chunks.flatMap(one))
+        ] : one(chunks);
+    }
+    getRequiredChunksScriptContent() {
+        return JSON.stringify(this.getChunkDependencies(this.chunks));
+    }
+    getRequiredChunksNamesScriptContent() {
+        return JSON.stringify({
+            namedChunks: this.chunks
+        });
+    }
+    getRequiredChunksScriptTag(extraProps = {}) {
+        const id = getRequiredChunkKey(this.namespace);
+        const props = `type="application/json"${extraPropsToString(extraProps)}`;
+        return [
+            `<script id="${id}" ${props}>${this.getRequiredChunksScriptContent()}</script>`,
+            `<script id="${id}_ext" ${props}>${this.getRequiredChunksNamesScriptContent()}</script>`
+        ].join('');
+    }
+    getMainAssets(scriptType) {
+        const assets = this.getChunkAssets([
+            ...this.entrypoints,
+            ...this.chunks
+        ]);
+        return scriptType ? assets.filter((asset)=>asset.scriptType === scriptType) : assets;
+    }
+    getScriptTags(extraProps = {}) {
+        const scripts = this.getMainAssets("script").map((asset)=>`<script async data-chunk="${asset.chunk}" src="${asset.url}"${extraPropsToString(extraProps)}></script>`);
+        return [
+            this.getRequiredChunksScriptTag(extraProps),
+            ...scripts
+        ].join('');
+    }
+    getStyleTags(extraProps = {}) {
+        return this.getMainAssets('style').map((asset)=>`<link data-chunk="${asset.chunk}" rel="stylesheet" href="${asset.url}"${extraPropsToString(extraProps)}>`).join('');
+    }
+    getLinkTags(extraProps = {}) {
+        const assets = [
+            ...this.getMainAssets(),
+            ...this.getChunkChildAssets([
+                ...this.entrypoints,
+                ...this.chunks
+            ], 'preload'),
+            ...this.getChunkChildAssets([
+                ...this.entrypoints,
+                ...this.chunks
+            ], 'prefetch')
+        ];
+        return uniqByUrl(assets).map((asset)=>`<link data-chunk="${asset.chunk}" rel="${asset.linkType}" as="${asset.scriptType}" href="${asset.url}"${extraPropsToString(extraProps)}>`).join('');
+    }
+}

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

@@ -0,0 +1,59 @@
+const trimSlashes = (value)=>String(value).replace(/^\/+|\/+$/gu, '');
+const normalizeSeparators = (value)=>String(value).replace(/\\+/gu, '/');
+export const sep = '/';
+export const delimiter = ':';
+export function isAbsolute(filePath) {
+    return normalizeSeparators(filePath).startsWith('/');
+}
+export function normalize(filePath) {
+    const normalized = normalizeSeparators(filePath);
+    const absolute = isAbsolute(normalized);
+    const parts = [];
+    for (const part of normalized.split('/'))if (part && '.' !== part) {
+        if ('..' === part) {
+            if (parts.length > 0 && '..' !== parts[parts.length - 1]) parts.pop();
+            else if (!absolute) parts.push(part);
+            continue;
+        }
+        parts.push(part);
+    }
+    const joined = parts.join('/');
+    if (absolute) return joined ? `/${joined}` : '/';
+    return joined || '.';
+}
+export function join(...segments) {
+    const joined = segments.map(normalizeSeparators).filter(Boolean).map((segment, index)=>0 === index ? segment : trimSlashes(segment)).filter(Boolean).join('/');
+    return joined ? normalize(joined) : '.';
+}
+export function resolve(...segments) {
+    const joined = join(...segments);
+    return joined.startsWith('/') ? joined : `/${joined}`;
+}
+export function dirname(filePath) {
+    const normalized = normalizeSeparators(filePath).replace(/\/+$/u, '');
+    const index = normalized.lastIndexOf('/');
+    if (index <= 0) return '/';
+    return normalized.slice(0, index);
+}
+export function basename(filePath, suffix = '') {
+    const normalized = normalizeSeparators(filePath).replace(/\/+$/u, '');
+    const base = normalized.slice(normalized.lastIndexOf('/') + 1);
+    return suffix && base.endsWith(suffix) ? base.slice(0, -suffix.length) : base;
+}
+export function extname(filePath) {
+    const base = basename(filePath);
+    const index = base.lastIndexOf('.');
+    if (index <= 0) return '';
+    return base.slice(index);
+}
+export default {
+    basename,
+    delimiter,
+    dirname,
+    extname,
+    isAbsolute,
+    join,
+    normalize,
+    resolve,
+    sep
+};

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 };

package/dist/esm/rsbuild.mjs

@@ -1,16 +1,11 @@
 import { parseRspackConfig } from "@modern-js/builder";
+import { createConfigOptions } from "@modern-js/plugin/cli";
+import { INTERNAL_RUNTIME_PLUGINS } from "@modern-js/utils";
 import { builderPluginAdapterBasic, builderPluginAdapterHooks } from "./builder/shared/builderPlugins/index.mjs";
 import { DEFAULT_CONFIG_FILE } from "./constants.mjs";
 import { getConfigFile } from "./utils/getConfigFile.mjs";
-import { __webpack_require__ } from "./rslib-runtime.mjs";
-import * as __rspack_external__modern_js_plugin_cli_caa09fa2 from "@modern-js/plugin/cli";
-__webpack_require__.add({
-    "@modern-js/plugin/cli?f956" (module) {
-        module.exports = __rspack_external__modern_js_plugin_cli_caa09fa2;
-    }
-});
+import { loadInternalPlugins } from "./utils/loadPlugins.mjs";
 const MODERN_META_NAME = 'modern-js';
-const { createConfigOptions: createConfigOptions } = __webpack_require__("@modern-js/plugin/cli?f956");
 async function resolveModernRsbuildConfig(options) {
     const { cwd = process.cwd(), metaName = MODERN_META_NAME } = options;
     const configFile = options.configPath || getConfigFile(void 0, cwd);
@@ -19,6 +14,7 @@ async function resolveModernRsbuildConfig(options) {
         command: options.command,
         cwd,
         configFile,
+        internalPlugins: await loadInternalPlugins(cwd, INTERNAL_RUNTIME_PLUGINS),
         metaName,
         modifyModernConfig: options.modifyModernConfig
     });

package/dist/esm-node/baseline.mjs

@@ -1,47 +1,5 @@
 import "node:module";
-import { mergeConfig } from "@modern-js/plugin/cli";
-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
-    };
-    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 };