@modern-js/app-tools 2.12.0 → 2.13.1

package/dist/esm-node/analyze/templates.js

@@ -68,9 +68,6 @@ const html = (partials) => `
 
   ${partials.top.join("\n")}
 
-  <script>
-    window.__assetPrefix__ = '<%= assetPrefix %>';
-  </script>
   ${partials.head.join("\n")}
 
 </head>
@@ -168,13 +165,10 @@ const fileSystemRoutes = async ({
     if (!ssrMode) {
       return "";
     }
-    let dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
     if (nestedRoutesEntry) {
-      dataLoaderPath = `${slash(dataLoaderPath)}?mapFile=${slash(
-        loadersMapFile
-      )}&loaderId=${loaderId}!`;
+      return `?mapFile=${slash(loadersMapFile)}&loaderId=${loaderId}`;
     }
-    return dataLoaderPath;
+    return "";
   };
   const traverseRouteTree = (route) => {
     var _a;
@@ -292,14 +286,14 @@ const fileSystemRoutes = async ({
   let importLoadersCode = "";
   for (const [key, loaderInfo] of Object.entries(loadersMap)) {
     if (loaderInfo.inline) {
-      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(
-        key
-      )}${slash(loaderInfo.filePath)}";
+      importLoadersCode += `import { loader as ${key} } from "${slash(
+        loaderInfo.filePath
+      )}${getDataLoaderPath(key)}";
 `;
     } else {
-      importLoadersCode += `import ${key} from "${getDataLoaderPath(
-        key
-      )}${slash(loaderInfo.filePath)}";
+      importLoadersCode += `import ${key} from "${slash(
+        loaderInfo.filePath
+      )}${getDataLoaderPath(key)}";
 `;
     }
   }

package/dist/esm-node/builder/builder-rspack/index.js

@@ -1,18 +1,7 @@
 import { builderRspackProvider } from "@modern-js/builder-rspack-provider";
 import { generateBuilder } from "../generator";
 function createRspackBuilderForModern(options) {
-  return generateBuilder(options, builderRspackProvider, {
-    async modifyBuilderInstance(builder) {
-      applyBuilderPlugins(builder, options);
-    }
-  });
-}
-async function applyBuilderPlugins(builder, options) {
-  const { normalizedConfig } = options;
-  if (!normalizedConfig.output.disableNodePolyfill) {
-    const { builderPluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
-    builder.addPlugins([builderPluginNodePolyfill()]);
-  }
+  return generateBuilder(options, builderRspackProvider);
 }
 export {
   createRspackBuilderForModern

package/dist/esm-node/builder/builder-webpack/index.js

@@ -29,10 +29,6 @@ function modifyOutputConfig(config, appContext) {
 }
 async function applyBuilderPlugins(builder, options) {
   const { normalizedConfig } = options;
-  if (!normalizedConfig.output.disableNodePolyfill) {
-    const { builderPluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
-    builder.addPlugins([builderPluginNodePolyfill()]);
-  }
   if (normalizedConfig.tools.esbuild) {
     const { esbuild: esbuildOptions } = normalizedConfig.tools;
     const { builderPluginEsbuild } = await import("@modern-js/builder-plugin-esbuild");

package/dist/esm-node/builder/generator/index.js

@@ -31,6 +31,11 @@ async function applyBuilderPlugins(builder, options) {
     builderPluginAdapterSSR(options),
     builderPluginAdapterHtml(options)
   ]);
+  const { normalizedConfig } = options;
+  if (!normalizedConfig.output.disableNodePolyfill) {
+    const { builderPluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
+    builder.addPlugins([builderPluginNodePolyfill()]);
+  }
 }
 export {
   generateBuilder

package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.js

@@ -1,4 +1,10 @@
-import { getEntryOptions } from "@modern-js/utils";
+import {
+  createVirtualModule
+} from "@modern-js/builder-shared";
+import {
+  getEntryOptions,
+  removeTailSlash
+} from "@modern-js/utils";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { BottomTemplatePlugin } from "../bundlerPlugins";
 function isHtmlEnabled(config, target) {
@@ -6,10 +12,10 @@ function isHtmlEnabled(config, target) {
   return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
 }
 const builderPluginAdapterHtml = (options) => ({
-  name: "builder-plugin-adpater-modern-html",
+  name: "builder-plugin-adapter-modern-html",
   setup(api) {
     api.modifyBundlerChain(
-      (chain, { CHAIN_ID, target, HtmlPlugin: HtmlBundlerPlugin }) => {
+      async (chain, { CHAIN_ID, target, HtmlPlugin: HtmlBundlerPlugin }) => {
         const builderConfig = api.getNormalizedConfig();
         if (isHtmlEnabled(builderConfig, target)) {
           applyBottomHtmlPlugin({
@@ -19,11 +25,37 @@ const builderPluginAdapterHtml = (options) => ({
             CHAIN_ID,
             HtmlBundlerPlugin
           });
+          await injectAssetPrefix({
+            api,
+            chain
+          });
         }
       }
     );
   }
 });
+async function injectAssetPrefix({
+  api,
+  chain
+}) {
+  const entries = chain.entryPoints.entries() || {};
+  const entryNames = Object.keys(entries);
+  const assetPrefix = removeTailSlash(chain.output.get("publicPath") || "");
+  const code = `window.__assetPrefix__ = '${assetPrefix}';`;
+  const isRspack = api.context.bundlerType === "rspack";
+  if (isRspack) {
+    const fileName = "rspack-asset-prefix";
+    const { default: RspackVirtualModulePlugin } = await import("rspack-plugin-virtual-module");
+    entryNames.forEach((entryName) => {
+      entries[entryName].prepend(fileName);
+      chain.plugin("rspack-asset-prefix").use(RspackVirtualModulePlugin, [{ [fileName]: code }]);
+    });
+  } else {
+    entryNames.forEach((entryName) => {
+      entries[entryName].prepend(createVirtualModule(code));
+    });
+  }
+}
 function applyBottomHtmlPlugin({
   api,
   chain,

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -1,3 +1,4 @@
+import * as path from "path";
 import {
   mergeBuilderConfig
 } from "@modern-js/builder-shared";
@@ -26,6 +27,7 @@ const builderPluginAdapterSSR = (options) => ({
         applyRouterPlugin(chain, options);
         if (isSSR(normalizedConfig2)) {
           await applySSRLoaderEntry(chain, options, isServer);
+          applySSRDataLoader(chain, options);
         }
         if (["node", "service-worker"].includes(target)) {
           applyFilterEntriesBySSRConfig({
@@ -141,6 +143,14 @@ async function applySSRLoaderEntry(chain, optinos, isServer) {
     })
   );
 }
+function applySSRDataLoader(chain, options) {
+  const { normalizedConfig, appContext } = options;
+  const { appDirectory } = appContext;
+  const { entriesDir = "./src" } = normalizedConfig.source;
+  const absolutePath = path.resolve(appDirectory, entriesDir);
+  const reg = new RegExp(`${absolutePath}.*\\.loader\\.[t|j]s$`);
+  chain.module.rule("ssr-data-loader").test(reg).use("data-loader").loader(require.resolve("@modern-js/plugin-data-loader/loader")).end();
+}
 export {
   builderPluginAdapterSSR
 };

package/dist/esm-node/config/legacy/index.js

@@ -16,7 +16,8 @@ function transformNormalizedConfig(config) {
     server,
     cliOptions,
     plugins,
-    testing
+    testing,
+    autoLoadPlugins
   } = config;
   return {
     source,
@@ -36,7 +37,7 @@ function transformNormalizedConfig(config) {
     security: {},
     _raw: {},
     experiments: {},
-    autoLoadPlugins: true,
+    autoLoadPlugins,
     performance: {
       removeMomentLocale: true
     }

package/dist/esm-node/defineConfig.js

@@ -1,8 +1,12 @@
 const defineConfig = (config) => config;
-const defineLegacyConfig = (config) => ({
-  ...config,
-  legacy: true
-});
+const defineLegacyConfig = (config) => {
+  var _a;
+  return {
+    ...config,
+    legacy: true,
+    autoLoadPlugins: (_a = config.autoLoadPlugins) != null ? _a : true
+  };
+};
 export {
   defineConfig,
   defineLegacyConfig

package/dist/esm-node/index.js

@@ -7,13 +7,14 @@ import {
   getCommand
 } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
+import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
 import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
-import { getLocaleLanguage } from "./utils/language";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
+import { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
 const upgradeModel = Import.lazy(
@@ -169,5 +170,6 @@ var src_default = (options = {
 export {
   buildCommand,
   src_default as default,
-  devCommand
+  devCommand,
+  mergeConfig
 };

package/dist/esm-node/initialize/index.js

@@ -15,10 +15,22 @@ var initialize_default = ({
   bundler
 }) => ({
   name: "@modern-js/plugin-initialize",
+  post: [
+    "@modern-js/plugin-ssr",
+    "@modern-js/plugin-document",
+    "@modern-js/plugin-state",
+    "@modern-js/plugin-router",
+    "@modern-js/plugin-router-v5",
+    "@modern-js/plugin-polyfill"
+  ],
   setup(api) {
     const config = () => {
       const appContext = api.useAppContext();
       const userConfig = api.useConfigContext();
+      api.setAppContext({
+        ...appContext,
+        bundlerType: bundler
+      });
       return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
     };
     const validateSchema = () => {
@@ -30,7 +42,7 @@ var initialize_default = ({
       config,
       validateSchema,
       async resolvedConfig({ resolved }) {
-        var _a;
+        var _a, _b;
         let appContext = api.useAppContext();
         const userConfig = api.useConfigContext();
         const port = await getServerPort(resolved);
@@ -49,7 +61,7 @@ var initialize_default = ({
           ...normalizedConfig.server || {},
           port
         };
-        resolved.autoLoadPlugins = normalizedConfig.autoLoadPlugins || false;
+        resolved.autoLoadPlugins = (_b = normalizedConfig.autoLoadPlugins) != null ? _b : false;
         stabilizeConfig(resolved, normalizedConfig, [
           "source",
           "bff",

package/dist/esm-node/locale/index.js

@@ -2,7 +2,7 @@ import { I18n } from "@modern-js/plugin-i18n";
 import { ZH_LOCALE } from "./zh";
 import { EN_LOCALE } from "./en";
 const i18n = new I18n();
-const localeKeys = i18n.init("zh", { zh: ZH_LOCALE, en: EN_LOCALE });
+const localeKeys = i18n.init("en", { zh: ZH_LOCALE, en: EN_LOCALE });
 export {
   i18n,
   localeKeys

package/dist/types/builder/builder-rspack/index.d.ts

@@ -1,3 +1,2 @@
-import { BuilderInstance } from '@modern-js/builder-shared';
 import { BuilderOptions } from '../shared';
-export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<BuilderInstance<import("@modern-js/builder-shared").BuilderProvider<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>>>;
+export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<import("@modern-js/builder-shared").BuilderInstance<import("@modern-js/builder-shared").BuilderProvider<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>>>;

package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts

@@ -1,4 +1,4 @@
-import type { BuilderPlugin, BuilderTarget } from '@modern-js/builder-shared';
+import { BuilderPlugin, BuilderTarget } from '@modern-js/builder-shared';
 import { Bundler } from '../../../types';
 import type { BuilderNormalizedConfig, BuilderOptions, BuilderPluginAPI } from '../types';
 export declare function isHtmlEnabled(config: BuilderNormalizedConfig, target: BuilderTarget): boolean;

package/dist/types/defineConfig.d.ts

@@ -2,8 +2,9 @@ import type { UserConfigExport } from '@modern-js/core';
 import type { AppLegacyUserConfig, AppUserConfig } from './types';
 export declare const defineConfig: <B extends "webpack" | "rspack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
 /**
- * @deprecated
- * Using defineConfig first.
+ * Recommend use `defineConfig` first.
+ *
+ * `defineLegacyConfig` will be deprecated in the future.
  */
 
 export declare const defineLegacyConfig: (config: AppLegacyUserConfig) => AppLegacyUserConfig;

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 import { Command } from '@modern-js/utils';
 import { CliPlugin, PluginAPI } from '@modern-js/core';
 import { AppTools } from './types';
+export { mergeConfig } from '@modern-js/core';
 export * from './defineConfig';
 export * from './types';
 export type { RuntimeUserConfig } from './types/config';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.12.0",
+  "version": "2.13.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -68,23 +68,24 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "2.12.0",
-    "@modern-js/builder-plugin-esbuild": "2.12.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.12.0",
-    "@modern-js/builder-shared": "2.12.0",
-    "@modern-js/builder-webpack-provider": "2.12.0",
-    "@modern-js/core": "2.12.0",
-    "@modern-js/new-action": "2.12.0",
-    "@modern-js/node-bundle-require": "2.12.0",
-    "@modern-js/plugin": "2.12.0",
-    "@modern-js/plugin-data-loader": "2.12.0",
-    "@modern-js/plugin-i18n": "2.12.0",
-    "@modern-js/plugin-lint": "2.12.0",
-    "@modern-js/prod-server": "2.12.0",
-    "@modern-js/server": "2.12.0",
-    "@modern-js/types": "2.12.0",
-    "@modern-js/upgrade": "2.12.0",
-    "@modern-js/utils": "2.12.0"
+    "rspack-plugin-virtual-module": "0.1.0",
+    "@modern-js/builder": "2.13.1",
+    "@modern-js/builder-plugin-esbuild": "2.13.1",
+    "@modern-js/builder-plugin-node-polyfill": "2.13.1",
+    "@modern-js/builder-shared": "2.13.1",
+    "@modern-js/builder-webpack-provider": "2.13.1",
+    "@modern-js/core": "2.13.1",
+    "@modern-js/new-action": "2.13.1",
+    "@modern-js/node-bundle-require": "2.13.1",
+    "@modern-js/plugin": "2.13.1",
+    "@modern-js/plugin-data-loader": "2.13.1",
+    "@modern-js/plugin-i18n": "2.13.1",
+    "@modern-js/plugin-lint": "2.13.1",
+    "@modern-js/prod-server": "2.13.1",
+    "@modern-js/server": "2.13.1",
+    "@modern-js/types": "2.13.1",
+    "@modern-js/upgrade": "2.13.1",
+    "@modern-js/utils": "2.13.1"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -93,14 +94,14 @@
     "jest": "^29",
     "typescript": "^4",
     "webpack": "^5.76.2",
-    "@modern-js/builder-plugin-swc": "2.12.0",
-    "@modern-js/builder-rspack-provider": "2.12.0",
-    "@modern-js/server-core": "2.12.0",
-    "@scripts/build": "2.12.0",
-    "@scripts/jest-config": "2.12.0"
+    "@modern-js/builder-plugin-swc": "2.13.1",
+    "@modern-js/builder-rspack-provider": "2.13.1",
+    "@modern-js/server-core": "2.13.1",
+    "@scripts/build": "2.13.1",
+    "@scripts/jest-config": "2.13.1"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.12.0"
+    "@modern-js/builder-rspack-provider": "^2.13.1"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {

package/dist/cjs/utils/language.js

@@ -1,31 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var language_exports = {};
-__export(language_exports, {
-  getLocaleLanguage: () => getLocaleLanguage
-});
-module.exports = __toCommonJS(language_exports);
-var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
-function getLocaleLanguage() {
-  const detector = new import_language_detector.I18CLILanguageDetector();
-  return detector.detect();
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getLocaleLanguage
-});

package/dist/esm/utils/language.js

@@ -1,6 +0,0 @@
-import { I18CLILanguageDetector } from "@modern-js/plugin-i18n/language-detector";
-function getLocaleLanguage() {
-    var detector = new I18CLILanguageDetector();
-    return detector.detect();
-}
-export { getLocaleLanguage };

package/dist/esm-node/utils/language.js

@@ -1,8 +0,0 @@
-import { I18CLILanguageDetector } from "@modern-js/plugin-i18n/language-detector";
-function getLocaleLanguage() {
-  const detector = new I18CLILanguageDetector();
-  return detector.detect();
-}
-export {
-  getLocaleLanguage
-};

package/dist/types/utils/language.d.ts

@@ -1 +0,0 @@
-export declare function getLocaleLanguage(): string;