@bleedingdev/modern-js-app-tools 3.9.0-ultramodern.9 → 3.9.3-ultramodern.10

package/bin/modern-bundle-docs.js

@@ -3,10 +3,10 @@ const nodeVersion = /^(\d+)\.(\d+)\.(\d+)$/.exec(process.versions.node);
 if (
   !nodeVersion ||
   +nodeVersion[1] < 26 ||
-  (+nodeVersion[1] === 26 && +nodeVersion[2] < 7)
+  (+nodeVersion[1] === 26 && +nodeVersion[2] < 10)
 ) {
   console.error(
-    `UltraModern.js requires Node.js >=26.7.0; detected v${process.versions.node}. Legacy Node runtimes and transpiler fallbacks are unsupported.`,
+    `UltraModern.js requires Node.js >=26.12.0; detected v${process.versions.node}. Legacy Node runtimes and transpiler fallbacks are unsupported.`,
   );
   process.exit(1);
 }

package/bin/modern.js

@@ -3,10 +3,10 @@ const nodeVersion = /^(\d+)\.(\d+)\.(\d+)$/.exec(process.versions.node);
 if (
   !nodeVersion ||
   +nodeVersion[1] < 26 ||
-  (+nodeVersion[1] === 26 && +nodeVersion[2] < 7)
+  (+nodeVersion[1] === 26 && +nodeVersion[2] < 10)
 ) {
   console.error(
-    `UltraModern.js requires Node.js >=26.7.0; detected v${process.versions.node}. Legacy Node runtimes and transpiler fallbacks are unsupported.`,
+    `UltraModern.js requires Node.js >=26.12.0; detected v${process.versions.node}. Legacy Node runtimes and transpiler fallbacks are unsupported.`,
   );
   process.exit(1);
 }

package/dist/cjs/builder/generator/createCopyPattern.js

@@ -47,7 +47,8 @@ function createPublicPattern(appContext, config, chain) {
         noErrorOnMissing: true,
         transform: (content, absoluteFrom)=>{
             if (!/\.html?$/.test(absoluteFrom)) return content;
-            return content.toString('utf8').replace(/<%=\s*assetPrefix\s*%>/g, (0, utils_namespaceObject.removeTailSlash)(chain.output.get('publicPath')));
+            const publicPath = chain.output.get('publicPath');
+            return content.toString('utf8').replace(/<%=\s*assetPrefix\s*%>/g, (0, utils_namespaceObject.removeTailSlash)('string' == typeof publicPath ? publicPath : ''));
         }
     };
 }

package/dist/cjs/builder/index.js

@@ -31,9 +31,11 @@ __webpack_require__.d(__webpack_exports__, {
     builderPluginAdapterBasic: ()=>index_js_namespaceObject.builderPluginAdapterBasic,
     builderPluginAdapterHooks: ()=>index_js_namespaceObject.builderPluginAdapterHooks,
     createBuilderGenerator: ()=>createBuilderGenerator,
+    getBundleEntry: ()=>getBundleEntry_js_namespaceObject.getBundleEntry,
     parseRspackConfig: ()=>builder_namespaceObject.parseRspackConfig
 });
 const builder_namespaceObject = require("@modern-js/builder");
+const getBundleEntry_js_namespaceObject = require("../plugins/analyze/getBundleEntry.js");
 const index_js_namespaceObject = require("./shared/builderPlugins/index.js");
 async function createBuilderGenerator() {
     const { createRspackBuilderForModern } = await import("./builder-rspack/index.js");
@@ -42,11 +44,13 @@ async function createBuilderGenerator() {
 exports.builderPluginAdapterBasic = __webpack_exports__.builderPluginAdapterBasic;
 exports.builderPluginAdapterHooks = __webpack_exports__.builderPluginAdapterHooks;
 exports.createBuilderGenerator = __webpack_exports__.createBuilderGenerator;
+exports.getBundleEntry = __webpack_exports__.getBundleEntry;
 exports.parseRspackConfig = __webpack_exports__.parseRspackConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "builderPluginAdapterBasic",
     "builderPluginAdapterHooks",
     "createBuilderGenerator",
+    "getBundleEntry",
     "parseRspackConfig"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/builder/shared/builderPlugins/adapterHtml.js

@@ -58,7 +58,8 @@ const builderPluginAdapterHtml = (options)=>({
 async function injectAssetPrefix({ chain }) {
     const entries = chain.entryPoints.entries() || {};
     const entryNames = Object.keys(entries);
-    const assetPrefix = (0, utils_namespaceObject.removeTailSlash)(chain.output.get('publicPath') || '');
+    const publicPath = chain.output.get('publicPath');
+    const assetPrefix = (0, utils_namespaceObject.removeTailSlash)('string' == typeof publicPath ? publicPath : '');
     const code = `window.__assetPrefix__ = '${assetPrefix}';`;
     entryNames.forEach((entryName)=>{
         entries[entryName].prepend(createVirtualModule(code));

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -28,6 +28,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    applySSRLoaderEntry: ()=>applySSRLoaderEntry,
     builderPluginAdapterSSR: ()=>builderPluginAdapterSSR,
     getSSRLazyCompilation: ()=>getSSRLazyCompilation
 });
@@ -70,8 +71,8 @@ const builderPluginAdapterSSR = (options)=>({
                     appNormalizedConfig: normalizedConfig
                 });
                 if ((0, utils_namespaceObject.isUseSSRBundle)(normalizedConfig) || (0, utils_namespaceObject.isUseRsc)(normalizedConfig)) {
-                    await applySSRLoaderEntry(chain, options, isServer);
-                    applySSRDataLoader(chain, options);
+                    await applySSRLoaderEntry(chain, options, isServer, isServiceWorker);
+                    applySSRDataLoader(chain, options, isServer || isServiceWorker);
                 }
                 if (!(0, builder_namespaceObject.isHtmlDisabled)(builderConfig, target)) applyAsyncChunkHtmlPlugin({
                     chain,
@@ -156,7 +157,7 @@ function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {
         if (!serverConfig?.rsc && !ssgEntries.includes(name) && !name.includes('server-loaders') && (ssr && ssrByEntries?.[name] === false || !ssr && !ssrByEntries?.[name])) chain.entryPoints.delete(name);
     });
 }
-async function applySSRLoaderEntry(chain, optinos, isServer) {
+async function applySSRLoaderEntry(chain, optinos, isServer, isServiceWorker) {
     const { appContext } = optinos;
     const { internalDirectory } = appContext;
     const { entrypoints } = appContext;
@@ -167,20 +168,24 @@ async function applySSRLoaderEntry(chain, optinos, isServer) {
             await utils_namespaceObject.fs.access(serverLoadersFile, utils_namespaceObject.fs.constants.F_OK);
             chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
         } catch (err) {}
-        else if ((0, utils_namespaceObject.isUseRsc)(optinos.normalizedConfig)) chain.entry(`${entryName}-server-loaders`).add("data:text/javascript,export%20{};");
+        else if (!isServiceWorker && (0, utils_namespaceObject.isUseRsc)(optinos.normalizedConfig)) chain.entry(`${entryName}-server-loaders`).add("data:text/javascript,export%20{};");
     }));
 }
-function applySSRDataLoader(chain, options) {
+function applySSRDataLoader(chain, options, server) {
     const { normalizedConfig, appContext } = options;
     const { appDirectory } = appContext;
     const { entriesDir = './src' } = normalizedConfig.source;
     const absolutePath = external_path_namespaceObject.resolve(appDirectory, entriesDir).split(external_path_namespaceObject.sep).join('(\\\\|/)');
     const reg = new RegExp(`${absolutePath}.*\\.(loader|data|data.client)\\.[t|j]sx?$`);
-    chain.module.rule('ssr-data-loader').test(reg).use('data-loader').loader(require.resolve('@modern-js/plugin-data-loader/loader')).end();
+    chain.module.rule('ssr-data-loader').test(reg).enforce('pre').use('data-loader').loader(require.resolve('@modern-js/plugin-data-loader/loader')).options({
+        server
+    }).end();
 }
+exports.applySSRLoaderEntry = __webpack_exports__.applySSRLoaderEntry;
 exports.builderPluginAdapterSSR = __webpack_exports__.builderPluginAdapterSSR;
 exports.getSSRLazyCompilation = __webpack_exports__.getSSRLazyCompilation;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "applySSRLoaderEntry",
     "builderPluginAdapterSSR",
     "getSSRLazyCompilation"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/builder/shared/lazyCompilation.js

@@ -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)=>{
@@ -29,11 +38,14 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     aggregateEagerRouteComponentFiles: ()=>aggregateEagerRouteComponentFiles,
+    buildDefaultLazyCompilationTest: ()=>buildDefaultLazyCompilationTest,
     buildSSRLazyCompilationTest: ()=>buildSSRLazyCompilationTest,
     collectRouteComponentFiles: ()=>utils_namespaceObject.collectRouteComponentFiles,
     normalizeModulePath: ()=>utils_namespaceObject.normalizeModulePath,
     planSSRLazyCompilation: ()=>planSSRLazyCompilation
 });
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
 function aggregateEagerRouteComponentFiles(byEntry) {
     const files = new Set();
@@ -56,6 +68,18 @@ function buildSSRLazyCompilationTest(eagerRouteFiles, userTest) {
         return userTestFn(m);
     };
 }
+function buildDefaultLazyCompilationTest(appDirectory, internalDirectory) {
+    let dirs;
+    return (m)=>{
+        if (!('resource' in m) || 'string' != typeof m.resource) return true;
+        dirs ??= {
+            app: (0, utils_namespaceObject.normalizeModulePath)(appDirectory),
+            internal: (0, utils_namespaceObject.normalizeModulePath)(internalDirectory)
+        };
+        const file = m.resource.split('?')[0].split(external_node_path_default().sep).join('/');
+        return file.startsWith(`${dirs.app}/`) && !file.startsWith(`${dirs.internal}/`) && !file.slice(dirs.app.length).includes('/node_modules/');
+    };
+}
 function planSSRLazyCompilation(current, info) {
     if (!current) return {
         apply: false
@@ -78,12 +102,14 @@ function planSSRLazyCompilation(current, info) {
     };
 }
 exports.aggregateEagerRouteComponentFiles = __webpack_exports__.aggregateEagerRouteComponentFiles;
+exports.buildDefaultLazyCompilationTest = __webpack_exports__.buildDefaultLazyCompilationTest;
 exports.buildSSRLazyCompilationTest = __webpack_exports__.buildSSRLazyCompilationTest;
 exports.collectRouteComponentFiles = __webpack_exports__.collectRouteComponentFiles;
 exports.normalizeModulePath = __webpack_exports__.normalizeModulePath;
 exports.planSSRLazyCompilation = __webpack_exports__.planSSRLazyCompilation;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "aggregateEagerRouteComponentFiles",
+    "buildDefaultLazyCompilationTest",
     "buildSSRLazyCompilationTest",
     "collectRouteComponentFiles",
     "normalizeModulePath",

package/dist/cjs/commands/build.js

@@ -98,10 +98,9 @@ const build = async (api, options)=>{
     utils_namespaceObject.logger.info('Starting production build...');
     if (!appContext.builder) throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
     await appContext.builder.onAfterBuild(async ()=>copyEnvFiles(appContext.appDirectory, appContext.distDirectory));
-    const buildResult = await appContext.builder.build({
+    await appContext.builder.build({
         watch: options?.watch
     });
-    if (!options?.watch) await buildResult?.close();
 };
 exports.build = __webpack_exports__.build;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/commands/deploy.js

@@ -31,12 +31,10 @@ __webpack_require__.d(__webpack_exports__, {
     deploy: ()=>deploy
 });
 const loadPlugins_js_namespaceObject = require("../utils/loadPlugins.js");
-const external_build_js_namespaceObject = require("./build.js");
 const deploy = async (api, options = {})=>{
     const hooks = api.getHooks();
     const { metaName } = api.getAppContext();
-    if (options.skipBuild) await (0, loadPlugins_js_namespaceObject.getServerPlugins)(api, metaName);
-    else await (0, external_build_js_namespaceObject.build)(api);
+    await (0, loadPlugins_js_namespaceObject.getServerPlugins)(api, metaName);
     await hooks.onBeforeDeploy.call(options);
     await hooks.deploy.call();
     await hooks.onAfterDeploy.call(options);

package/dist/cjs/commands/index.js

@@ -36,6 +36,10 @@ __webpack_require__.d(__webpack_exports__, {
     serverCommand: ()=>serverCommand
 });
 const index_js_namespaceObject = require("../locale/index.js");
+const deployTargetOption = [
+    '--deploy-target <target>',
+    'deploy target; overrides deploy.target and MODERNJS_DEPLOY'
+];
 const devCommand = async (program, api)=>{
     program.command('dev').alias('start').usage('[options]').description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.dev.describe)).option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('-e --entry [entry...]', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.dev.entry)).option('--analyze', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.analyze)).option('--api-only', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.dev.apiOnly)).option('--web-only', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.dev.webOnly)).action(async (options)=>{
         const { dev } = await import("./dev.js");
@@ -43,7 +47,7 @@ const devCommand = async (program, api)=>{
     });
 };
 const buildCommand = async (program, api)=>{
-    program.command('build').usage('[options]').description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.build.describe)).option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('--analyze', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.analyze)).option('-w --watch', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.build.watch)).action(async (options)=>{
+    program.command('build').usage('[options]').description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.build.describe)).option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('--analyze', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.analyze)).option('-w --watch', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.build.watch)).option(...deployTargetOption).action(async (options)=>{
         const { build } = await import("./build.js");
         await build(api, options);
     });
@@ -55,7 +59,11 @@ const serverCommand = (program, api)=>{
     });
 };
 const deployCommand = (program, api)=>{
-    program.command('deploy').usage('[options]').option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('-s --skip-build', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.skipBuild)).description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.deploy.describe)).action(async (options)=>{
+    program.command('deploy').usage('[options]').option('-c --config <config>', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.config)).option('-s --skip-build', index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.shared.skipBuild)).option(...deployTargetOption).description(index_js_namespaceObject.i18n.t(index_js_namespaceObject.localeKeys.command.deploy.describe)).action(async (options)=>{
+        if (!options.skipBuild) {
+            const { build } = await import("./build.js");
+            await build(api);
+        }
         const { deploy } = await import("./deploy.js");
         await deploy(api, options);
         process.exit(0);

package/dist/cjs/compat/hooks.js

@@ -92,7 +92,7 @@ function handleSetupResult(setupResult, api) {
             if (newAPI && api[newAPI]) api[newAPI](async (...params)=>{
                 const { isMultiple, params: transformParams } = (0, external_utils_js_namespaceObject.transformHookParams)(key, params);
                 if (isMultiple) return (0, external_utils_js_namespaceObject.transformHookResult)(key, await fn(...transformParams));
-                return (0, external_utils_js_namespaceObject.transformHookResult)(key, await fn(transformParams));
+                else return (0, external_utils_js_namespaceObject.transformHookResult)(key, await fn(transformParams));
             });
         }
     });

package/dist/cjs/esm/ts-paths-loader.js

@@ -47,8 +47,9 @@ const getParentPath = (parentURL)=>{
     } catch  {}
     return process.cwd();
 };
+const resolveSourcePath = (resolvedPath, context, defaultResolve)=>defaultResolve(context.conditions?.find((condition)=>'require' === condition || 'import' === condition) === 'require' ? resolvedPath : (0, external_url_namespaceObject.pathToFileURL)(resolvedPath).href, context, defaultResolve);
 async function initialize({ appDir: currentAppDir, baseUrl, paths }) {
-    appDir = external_node_path_namespaceObject.resolve(currentAppDir);
+    appDir = external_node_fs_namespaceObject.existsSync(currentAppDir) ? external_node_fs_namespaceObject.realpathSync(currentAppDir) : external_node_path_namespaceObject.resolve(currentAppDir);
     matchPath = (0, tsconfig_paths_namespaceObject.createMatchPath)(baseUrl || './', paths || {});
 }
 function resolve(specifier, context, defaultResolve) {
@@ -58,13 +59,13 @@ function resolve(specifier, context, defaultResolve) {
     if ((specifier.startsWith('./') || specifier.startsWith('../')) && !external_node_path_namespaceObject.extname(specifier) && isAppFile) {
         const matchedPath = external_node_path_namespaceObject.resolve(parentPath, specifier);
         const resolvedPath = (0, utils_namespaceObject.findSourceEntry)(matchedPath) || matchedPath;
-        if (resolvedPath && external_node_fs_namespaceObject.existsSync(resolvedPath)) return defaultResolve((0, external_url_namespaceObject.pathToFileURL)(resolvedPath).href, context, defaultResolve);
+        if (resolvedPath && external_node_fs_namespaceObject.existsSync(resolvedPath)) return resolveSourcePath(resolvedPath, context, defaultResolve);
     }
-    if (!matchPath) return defaultResolve(specifier, context, defaultResolve);
+    if (!matchPath || !isAppFile) return defaultResolve(specifier, context, defaultResolve);
     const match = (0, utils_namespaceObject.findMatchedSourcePath)(matchPath, specifier);
     if (!match) return defaultResolve(specifier, context, defaultResolve);
     const resolvedPath = (0, utils_namespaceObject.findSourceEntry)(match) || match;
-    return defaultResolve((0, external_url_namespaceObject.pathToFileURL)(resolvedPath).href, context, defaultResolve);
+    return resolveSourcePath(resolvedPath, context, defaultResolve);
 }
 exports.initialize = __webpack_exports__.initialize;
 exports.resolve = __webpack_exports__.resolve;

package/dist/cjs/esm/ts-paths-loader.mjs

@@ -14,8 +14,9 @@ const getParentPath = (parentURL)=>{
     } catch  {}
     return process.cwd();
 };
+const resolveSourcePath = (resolvedPath, context, defaultResolve)=>defaultResolve(context.conditions?.find((condition)=>'require' === condition || 'import' === condition) === 'require' ? resolvedPath : pathToFileURL(resolvedPath).href, context, defaultResolve);
 export async function initialize({ appDir: currentAppDir, baseUrl, paths }) {
-    appDir = path.resolve(currentAppDir);
+    appDir = fs.existsSync(currentAppDir) ? fs.realpathSync(currentAppDir) : path.resolve(currentAppDir);
     matchPath = oCreateMatchPath(baseUrl || './', paths || {});
 }
 export function resolve(specifier, context, defaultResolve) {
@@ -25,11 +26,11 @@ export function resolve(specifier, context, defaultResolve) {
     if ((specifier.startsWith('./') || specifier.startsWith('../')) && !path.extname(specifier) && isAppFile) {
         const matchedPath = path.resolve(parentPath, specifier);
         const resolvedPath = findSourceEntry(matchedPath) || matchedPath;
-        if (resolvedPath && fs.existsSync(resolvedPath)) return defaultResolve(pathToFileURL(resolvedPath).href, context, defaultResolve);
+        if (resolvedPath && fs.existsSync(resolvedPath)) return resolveSourcePath(resolvedPath, context, defaultResolve);
     }
-    if (!matchPath) return defaultResolve(specifier, context, defaultResolve);
+    if (!matchPath || !isAppFile) return defaultResolve(specifier, context, defaultResolve);
     const match = findMatchedSourcePath(matchPath, specifier);
     if (!match) return defaultResolve(specifier, context, defaultResolve);
     const resolvedPath = findSourceEntry(match) || match;
-    return defaultResolve(pathToFileURL(resolvedPath).href, context, defaultResolve);
+    return resolveSourcePath(resolvedPath, context, defaultResolve);
 }