@modern-js/app-tools 2.3.1-alpha.2 → 2.4.0

package/CHANGELOG.md

@@ -1,5 +1,61 @@
 # @modern-js/app-tools
 
+## 2.4.0
+
+### Minor Changes
+
+- e84d16b: feat: support catch-all routing
+  feat: 支持通配路由
+- a914be8: feat: modern-js support rspack bundler
+  feat: modern-js 支持 rspack 构建工具
+
+### Patch Changes
+
+- 6f83037: fix: change the builder resolve plugin
+  fix: 修复 builder resolve 插件
+- b4e01e7: chore: rename MWA to Web App
+
+  chore: 将 MWA 重命名为 Web App
+
+- 8c2db5f: feat(core): improve support for exporting a function in config file
+
+  feat(core): 完善对配置文件中导出函数的支持
+
+- 3144625: fix: sub root route should be matched by a splat route
+  fix: 子根路由应该被通配路由匹配
+- c53a0ff: fix: lazy import `rspack-provider`
+  fix: 懒加载 `rspack-provider`
+- Updated dependencies [d19484c]
+- Updated dependencies [637f16b]
+- Updated dependencies [6f83037]
+- Updated dependencies [014d06b]
+- Updated dependencies [98a2733]
+- Updated dependencies [b3f2a7e]
+- Updated dependencies [a5572b8]
+- Updated dependencies [91db54e]
+- Updated dependencies [a914be8]
+- Updated dependencies [67b5a42]
+- Updated dependencies [48b036e]
+- Updated dependencies [8c2db5f]
+  - @modern-js/server@2.4.0
+  - @modern-js/builder-webpack-provider@2.4.0
+  - @modern-js/builder-rspack-provider@2.4.0
+  - @modern-js/builder-shared@2.4.0
+  - @modern-js/builder@2.4.0
+  - @modern-js/node-bundle-require@2.4.0
+  - @modern-js/utils@2.4.0
+  - @modern-js/core@2.4.0
+  - @modern-js/builder-plugin-esbuild@2.4.0
+  - @modern-js/builder-plugin-node-polyfill@2.4.0
+  - @modern-js/new-action@2.4.0
+  - @modern-js/plugin-data-loader@2.4.0
+  - @modern-js/plugin-i18n@2.4.0
+  - @modern-js/plugin-lint@2.4.0
+  - @modern-js/prod-server@2.4.0
+  - @modern-js/upgrade@2.4.0
+  - @modern-js/plugin@2.4.0
+  - @modern-js/types@2.4.0
+
 ## 2.3.0
 
 ### Patch Changes

package/README.md

@@ -1,30 +1,26 @@
-
 <p align="center">
   <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
 </p>
+
+<h1 align="center">Modern.js</h1>
+
 <p align="center">
-现代 Web 工程体系
-  <br/>
-  <a href="https://modernjs.dev" target="blank">
-    modernjs.dev
-  </a>
-</p>
-<p align="center">
-  The meta-framework suite designed from scratch for frontend-focused modern web development
+  A Progressive React Framework for modern web development.
 </p>
 
-# Introduction
-
-> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
+## Getting Started
 
-- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
+Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js.
 
-## Getting Started
+## Documentation
 
-- [Quick Start](https://modernjs.dev/docs/start)
-- [Guides](https://modernjs.dev/docs/guides)
-- [API References](https://modernjs.dev/docs/apis)
+- [English Documentation](https://modernjs.dev/en/)
+- [中文文档](https://modernjs.dev)
 
 ## Contributing
 
-- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)
+Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+
+## License
+
+Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).

package/dist/js/modern/analyze/index.js

@@ -49,12 +49,12 @@ import {
   isDevCommand
 } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
+import { createBuilderGenerator } from "../builder";
 import {
   getServerLoadersFile,
   isPageComponentFile,
@@ -67,7 +67,9 @@ import {
   APP_INIT_IMPORTED
 } from "./constants";
 const debug = createDebugger("plugin-analyze");
-var analyze_default = () => ({
+var analyze_default = ({
+  bundler
+}) => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
     let pagesDir = [];
@@ -159,56 +161,51 @@ var analyze_default = () => ({
           if (buildCommands.includes(command)) {
             let _b;
             const normalizedConfig = api.useResolvedConfigContext();
+            const createBuilderForModern = yield createBuilderGenerator(bundler);
             const builder = yield createBuilderForModern({
               normalizedConfig,
               appContext,
-              compatPluginConfig: {
-                onBeforeBuild(_0) {
-                  return __async(this, arguments, function* ({ bundlerConfigs }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield generateRoutes(appContext);
-                    yield hookRunners2.beforeBuild({ bundlerConfigs });
-                  });
-                },
-                onAfterBuild(_0) {
-                  return __async(this, arguments, function* ({ stats }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.afterBuild({ stats });
-                    yield emitResolvedConfig(
-                      appContext.appDirectory,
-                      normalizedConfig
-                    );
-                  });
-                },
-                onDevCompileDone(_0) {
-                  return __async(this, arguments, function* ({ isFirstCompile }) {
-                    const hookRunners2 = api.useHookRunners();
-                    if (process.stdout.isTTY || isFirstCompile) {
-                      hookRunners2.afterDev();
-                      if (isFirstCompile) {
-                        printInstructions(
-                          hookRunners2,
-                          appContext,
-                          normalizedConfig
-                        );
-                      }
+              onBeforeBuild(_0) {
+                return __async(this, arguments, function* ({ bundlerConfigs }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield generateRoutes(appContext);
+                  yield hookRunners2.beforeBuild({ bundlerConfigs });
+                });
+              },
+              onAfterBuild(_0) {
+                return __async(this, arguments, function* ({ stats }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.afterBuild({ stats });
+                  yield emitResolvedConfig(
+                    appContext.appDirectory,
+                    normalizedConfig
+                  );
+                });
+              },
+              onDevCompileDone(_0) {
+                return __async(this, arguments, function* ({ isFirstCompile }) {
+                  const hookRunners2 = api.useHookRunners();
+                  if (process.stdout.isTTY || isFirstCompile) {
+                    hookRunners2.afterDev();
+                    if (isFirstCompile) {
+                      printInstructions(hookRunners2, appContext, normalizedConfig);
                     }
+                  }
+                });
+              },
+              onBeforeCreateCompiler(_0) {
+                return __async(this, arguments, function* ({ bundlerConfigs }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.beforeCreateCompiler({
+                    bundlerConfigs
                   });
-                },
-                onBeforeCreateCompiler(_0) {
-                  return __async(this, arguments, function* ({ bundlerConfigs }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.beforeCreateCompiler({
-                      bundlerConfigs
-                    });
-                  });
-                },
-                onAfterCreateCompiler(_0) {
-                  return __async(this, arguments, function* ({ compiler }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield hookRunners2.afterCreateCompiler({ compiler });
-                  });
-                }
+                });
+              },
+              onAfterCreateCompiler(_0) {
+                return __async(this, arguments, function* ({ compiler }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.afterCreateCompiler({ compiler });
+                });
               }
             });
             builder.addPlugins(resolvedConfig.builderPlugins);
@@ -251,7 +248,7 @@ var analyze_default = () => ({
       },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
-        const config = initialNormalizedConfig(resolved, appContext);
+        const config = initialNormalizedConfig(resolved, appContext, bundler);
         return {
           resolved: config
         };

package/dist/js/modern/builder/builder-rspack/index.js

@@ -0,0 +1,8 @@
+import { builderRspackProvider } from "@modern-js/builder-rspack-provider";
+import { generateBuilder } from "../generator";
+function createRspackBuilderForModern(options) {
+  return generateBuilder(options, builderRspackProvider);
+}
+export {
+  createRspackBuilderForModern
+};

package/dist/js/modern/builder/builder-webpack/builderPlugins/compatModern.js

@@ -0,0 +1,41 @@
+import { join } from "path";
+import { createCopyPattern } from "../../shared";
+import { RouterPlugin } from "../webpackPlugins";
+const PluginCompatModern = (options) => ({
+  name: "builder-plugin-compat-modern",
+  setup(api) {
+    const { normalizedConfig: modernConfig, appContext } = options;
+    api.modifyWebpackChain((chain, { CHAIN_ID }) => {
+      var _a;
+      chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
+      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+        const defaultCopyPattern = createCopyPattern(
+          appContext,
+          modernConfig,
+          "public",
+          chain
+        );
+        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
+          var _a2;
+          return [
+            {
+              patterns: [...((_a2 = args[0]) == null ? void 0 : _a2.patterns) || [], defaultCopyPattern]
+            }
+          ];
+        });
+      }
+      const { entrypoints } = appContext;
+      const existNestedRoutes = entrypoints.some(
+        (entrypoint) => entrypoint.nestedRoutesEntry
+      );
+      const routerConfig = (_a = modernConfig == null ? void 0 : modernConfig.runtime) == null ? void 0 : _a.router;
+      const routerManifest = Boolean(routerConfig == null ? void 0 : routerConfig.manifest);
+      if (existNestedRoutes || routerManifest) {
+        chain.plugin("route-plugin").use(RouterPlugin);
+      }
+    });
+  }
+});
+export {
+  PluginCompatModern
+};

package/dist/js/modern/builder/builder-webpack/index.js

@@ -0,0 +1,93 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import {
+  builderWebpackProvider
+} from "@modern-js/builder-webpack-provider";
+import { applyOptionsChain } from "@modern-js/utils";
+import { createCopyPattern } from "../shared";
+import { generateBuilder } from "../generator";
+import { PluginCompatModern } from "./builderPlugins/compatModern";
+function createWebpackBuilderForModern(options) {
+  return generateBuilder(options, builderWebpackProvider, {
+    modifyBuilderConfig(config) {
+      modifyOutputConfig(config, options.appContext);
+    },
+    modifyBuilderInstance(builder) {
+      return __async(this, null, function* () {
+        yield applyBuilderPlugins(builder, options);
+      });
+    }
+  });
+}
+function modifyOutputConfig(config, appContext) {
+  config.output = createOutputConfig(config, appContext);
+  function createOutputConfig(config2, appContext2) {
+    const defaultCopyPattern = createCopyPattern(appContext2, config2, "upload");
+    const { copy } = config2.output;
+    const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
+    const builderCopy = [...copyOptions || [], defaultCopyPattern];
+    return __spreadProps(__spreadValues({}, config2.output), {
+      copy: builderCopy
+    });
+  }
+}
+function applyBuilderPlugins(builder, options) {
+  return __async(this, null, function* () {
+    const { normalizedConfig } = options;
+    if (!normalizedConfig.output.disableNodePolyfill) {
+      const { PluginNodePolyfill } = yield import("@modern-js/builder-plugin-node-polyfill");
+      builder.addPlugins([PluginNodePolyfill()]);
+    }
+    if (normalizedConfig.tools.esbuild) {
+      const { esbuild: esbuildOptions } = normalizedConfig.tools;
+      const { PluginEsbuild } = yield import("@modern-js/builder-plugin-esbuild");
+      builder.addPlugins([
+        PluginEsbuild({
+          loader: false,
+          minimize: applyOptionsChain({}, esbuildOptions)
+        })
+      ]);
+    }
+    builder.addPlugins([PluginCompatModern(options)]);
+  });
+}
+export {
+  createWebpackBuilderForModern
+};

package/dist/js/modern/builder/{webpackPlugins/routerPlugin.js → builder-webpack/webpackPlugins/RouterPlugin.js}

@@ -109,5 +109,5 @@ class RouterPlugin {
   }
 }
 export {
-  RouterPlugin as default
+  RouterPlugin
 };

package/dist/js/modern/builder/builder-webpack/webpackPlugins/index.js

@@ -0,0 +1 @@
+export * from "./RouterPlugin";

package/dist/js/modern/builder/generator/createBuilderOptions.js

@@ -0,0 +1,24 @@
+function createBuilderOptions(target, appContext) {
+  const entries = {};
+  const { entrypoints = [], checkedEntries } = appContext;
+  for (const { entryName, entry } of entrypoints) {
+    if (checkedEntries && !checkedEntries.includes(entryName)) {
+      continue;
+    }
+    if (entryName in entries) {
+      entries[entryName].push(entry);
+    } else {
+      entries[entryName] = [entry];
+    }
+  }
+  return {
+    cwd: appContext.appDirectory,
+    target,
+    configPath: appContext.configFile || void 0,
+    entry: entries,
+    framework: appContext.metaName
+  };
+}
+export {
+  createBuilderOptions
+};

package/dist/js/modern/builder/generator/createBuilderProviderConfig.js

@@ -0,0 +1,39 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderConfig) {
+  const htmlConfig = __spreadValues({}, resolveConfig.html);
+  if (!htmlConfig.template) {
+    htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
+  }
+  const config = __spreadProps(__spreadValues({}, resolveConfig), {
+    dev: __spreadProps(__spreadValues({}, resolveConfig.dev), {
+      port: appContext.port
+    }),
+    html: htmlConfig,
+    output: __spreadProps(__spreadValues({}, resolveConfig.output), {
+      cleanDistPath: false
+    })
+  });
+  modifyBuilderConfig == null ? void 0 : modifyBuilderConfig(config);
+  return config;
+}
+export {
+  createBuilderProviderConfig
+};

package/dist/js/modern/builder/generator/getBuilderTargets.js

@@ -0,0 +1,12 @@
+import { isProd, isSSR, isUseSSRBundle } from "@modern-js/utils";
+function getBuilderTargets(normalizedConfig) {
+  const targets = ["web"];
+  const useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
+  if (useNodeTarget) {
+    targets.push("node");
+  }
+  return targets;
+}
+export {
+  getBuilderTargets
+};

package/dist/js/modern/builder/generator/index.js

@@ -0,0 +1,53 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { createBuilder } from "@modern-js/builder";
+import { createBuilderProviderConfig } from "./createBuilderProviderConfig";
+import { getBuilderTargets } from "./getBuilderTargets";
+import { createBuilderOptions } from "./createBuilderOptions";
+function generateBuilder(options, generateProvider, utils) {
+  return __async(this, null, function* () {
+    const { normalizedConfig, appContext } = options;
+    const { modifyBuilderConfig, modifyBuilderInstance } = utils || {};
+    const builderConfig = createBuilderProviderConfig(
+      normalizedConfig,
+      appContext,
+      modifyBuilderConfig
+    );
+    const provider = generateProvider({
+      builderConfig
+    });
+    const target = getBuilderTargets(normalizedConfig);
+    const builderOptions = createBuilderOptions(target, appContext);
+    const builder = yield createBuilder(provider, builderOptions);
+    yield applyBuilderPlugins(builder, options);
+    yield modifyBuilderInstance == null ? void 0 : modifyBuilderInstance(builder);
+    return builder;
+  });
+}
+function applyBuilderPlugins(builder, options) {
+  return __async(this, null, function* () {
+    const { builderPluginAdapterModern } = yield import("../shared/builderPlugins/adapterModern");
+    builder.addPlugins([builderPluginAdapterModern(options)]);
+  });
+}
+export {
+  generateBuilder
+};