@modern-js/app-tools 2.4.0 → 2.5.0

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

@@ -0,0 +1,281 @@
+import * as path from "path";
+import {
+  createDebugger,
+  findExists,
+  fs,
+  getEntryOptions,
+  isApiOnly,
+  minimist,
+  getCommand,
+  isDevCommand
+} from "@modern-js/utils";
+import { cloneDeep } from "@modern-js/utils/lodash";
+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,
+  parseModule,
+  replaceWithAlias
+} from "./utils";
+import {
+  APP_CONFIG_NAME,
+  APP_INIT_EXPORTED,
+  APP_INIT_IMPORTED
+} from "./constants";
+const debug = createDebugger("plugin-analyze");
+var analyze_default = ({
+  bundler
+}) => ({
+  name: "@modern-js/plugin-analyze",
+  setup: (api) => {
+    let pagesDir = [];
+    let nestedRouteEntries = [];
+    let originEntrypoints = [];
+    return {
+      async prepare() {
+        var _a;
+        let appContext = api.useAppContext();
+        const resolvedConfig = api.useResolvedConfigContext();
+        const hookRunners = api.useHookRunners();
+        try {
+          fs.emptydirSync(appContext.internalDirectory);
+        } catch {
+        }
+        const apiOnly = await isApiOnly(
+          appContext.appDirectory,
+          (_a = resolvedConfig.source) == null ? void 0 : _a.entriesDir
+        );
+        await hookRunners.addRuntimeExports();
+        if (apiOnly) {
+          const { routes: routes2 } = await hookRunners.modifyServerRoutes({
+            routes: []
+          });
+          debug(`server routes: %o`, routes2);
+          appContext = {
+            ...appContext,
+            apiOnly,
+            serverRoutes: routes2
+          };
+          api.setAppContext(appContext);
+          return;
+        }
+        const [
+          { getBundleEntry },
+          { getServerRoutes },
+          { generateCode },
+          { getHtmlTemplate }
+        ] = await Promise.all([
+          import("./getBundleEntry"),
+          import("./getServerRoutes"),
+          import("./generateCode"),
+          import("./getHtmlTemplate")
+        ]);
+        const entrypoints = getBundleEntry(appContext, resolvedConfig);
+        debug(`entrypoints: %o`, entrypoints);
+        const initialRoutes = getServerRoutes(entrypoints, {
+          appContext,
+          config: resolvedConfig
+        });
+        const { routes } = await hookRunners.modifyServerRoutes({
+          routes: initialRoutes
+        });
+        debug(`server routes: %o`, routes);
+        appContext = {
+          ...appContext,
+          entrypoints,
+          serverRoutes: routes
+        };
+        api.setAppContext(appContext);
+        nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
+        pagesDir = entrypoints.map((point) => point.entry).filter(Boolean).concat(nestedRouteEntries);
+        originEntrypoints = cloneDeep(entrypoints);
+        await generateCode(appContext, resolvedConfig, entrypoints, api);
+        const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
+          appContext,
+          config: resolvedConfig
+        });
+        debug(`html templates: %o`, htmlTemplates);
+        await hookRunners.addDefineTypes();
+        debug(`add Define Types`);
+        let checkedEntries = entrypoints.map((point) => point.entryName);
+        if (isDevCommand()) {
+          const { entry } = minimist(process.argv.slice(2));
+          checkedEntries = await getSelectedEntries(
+            typeof entry === "string" ? entry.split(",") : entry,
+            entrypoints
+          );
+        }
+        appContext = {
+          ...appContext,
+          entrypoints,
+          checkedEntries,
+          apiOnly,
+          serverRoutes: routes,
+          htmlTemplates
+        };
+        api.setAppContext(appContext);
+        const command = getCommand();
+        const buildCommands = ["dev", "start", "build", "inspect", "deploy"];
+        if (buildCommands.includes(command)) {
+          const normalizedConfig = api.useResolvedConfigContext();
+          const createBuilderForModern = await createBuilderGenerator(bundler);
+          const builder = await createBuilderForModern({
+            normalizedConfig,
+            appContext,
+            async onBeforeBuild({ bundlerConfigs }) {
+              const hookRunners2 = api.useHookRunners();
+              await generateRoutes(appContext);
+              await hookRunners2.beforeBuild({
+                bundlerConfigs
+              });
+            },
+            async onAfterBuild({ stats }) {
+              const hookRunners2 = api.useHookRunners();
+              await hookRunners2.afterBuild({ stats });
+              await emitResolvedConfig(
+                appContext.appDirectory,
+                normalizedConfig
+              );
+            },
+            async onDevCompileDone({ isFirstCompile }) {
+              const hookRunners2 = api.useHookRunners();
+              if (process.stdout.isTTY || isFirstCompile) {
+                hookRunners2.afterDev();
+                if (isFirstCompile) {
+                  printInstructions(hookRunners2, appContext, normalizedConfig);
+                }
+              }
+            },
+            async onBeforeCreateCompiler({ bundlerConfigs }) {
+              const hookRunners2 = api.useHookRunners();
+              await hookRunners2.beforeCreateCompiler({
+                bundlerConfigs
+              });
+            },
+            async onAfterCreateCompiler({ compiler }) {
+              const hookRunners2 = api.useHookRunners();
+              await hookRunners2.afterCreateCompiler({
+                compiler
+              });
+            }
+          });
+          builder.addPlugins(resolvedConfig.builderPlugins);
+          appContext = {
+            ...appContext,
+            builder
+          };
+          api.setAppContext(appContext);
+        }
+      },
+      watchFiles() {
+        return pagesDir;
+      },
+      config() {
+        return {
+          tools: {
+            webpackChain: (chain, { name }) => {
+              const appContext = api.useAppContext();
+              const resolvedConfig = api.useResolvedConfigContext();
+              const { entrypoints, internalDirectory, packageName } = appContext;
+              entrypoints.forEach((entrypoint) => {
+                const { entryName } = entrypoint;
+                const ssr = getEntryOptions(
+                  entryName,
+                  resolvedConfig.server.ssr,
+                  resolvedConfig.server.ssrByEntries,
+                  packageName
+                );
+                if (entrypoint.nestedRoutesEntry && ssr && name === "server") {
+                  const serverLoadersFile = getServerLoadersFile(
+                    internalDirectory,
+                    entryName
+                  );
+                  chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+                }
+              });
+            }
+          }
+        };
+      },
+      resolvedConfig({ resolved }) {
+        const appContext = api.useAppContext();
+        const config = initialNormalizedConfig(resolved, appContext, bundler);
+        return {
+          resolved: config
+        };
+      },
+      async modifyEntryImports({ entrypoint, imports }) {
+        const appContext = api.useAppContext();
+        const { srcDirectory, internalSrcAlias } = appContext;
+        const { fileSystemRoutes, nestedRoutesEntry } = entrypoint;
+        if (fileSystemRoutes && nestedRoutesEntry) {
+          const rootLayoutPath = path.join(nestedRoutesEntry, "layout");
+          const rootLayoutFile = findExists(
+            [".js", ".ts", ".jsx", ".tsx"].map(
+              (ext) => `${rootLayoutPath}${ext}`
+            )
+          );
+          if (rootLayoutFile) {
+            const rootLayoutBuffer = await fs.readFile(rootLayoutFile);
+            const rootLayout = rootLayoutBuffer.toString();
+            const [, moduleExports] = await parseModule({
+              source: rootLayout.toString(),
+              filename: rootLayoutFile
+            });
+            const hasAppConfig = moduleExports.some(
+              (e) => e.n === APP_CONFIG_NAME
+            );
+            const generateLayoutPath = replaceWithAlias(
+              srcDirectory,
+              rootLayoutFile,
+              internalSrcAlias
+            );
+            if (hasAppConfig) {
+              imports.push({
+                value: generateLayoutPath,
+                specifiers: [{ imported: APP_CONFIG_NAME }]
+              });
+            }
+            const hasAppInit = moduleExports.some(
+              (e) => e.n === APP_INIT_EXPORTED
+            );
+            if (hasAppInit) {
+              imports.push({
+                value: generateLayoutPath,
+                specifiers: [
+                  { imported: APP_INIT_EXPORTED, local: APP_INIT_IMPORTED }
+                ]
+              });
+            }
+          }
+        }
+        return {
+          entrypoint,
+          imports
+        };
+      },
+      async fileChange(e) {
+        const appContext = api.useAppContext();
+        const { appDirectory } = appContext;
+        const { filename, eventType } = e;
+        const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
+        const absoluteFilePath = path.resolve(appDirectory, filename);
+        const isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
+        if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
+          const resolvedConfig = api.useResolvedConfigContext();
+          const { generateCode } = await import("./generateCode");
+          const entrypoints = cloneDeep(originEntrypoints);
+          generateCode(appContext, resolvedConfig, entrypoints, api);
+        }
+      }
+    };
+  }
+});
+export {
+  analyze_default as default
+};

package/dist/{js/modern → esm-node}/analyze/nestedRoutes.js

@@ -1,42 +1,3 @@
-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 * as path from "path";
 import { fs, getRouteId } from "@modern-js/utils";
 import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
@@ -47,10 +8,11 @@ const replaceDynamicPath = (routePath) => {
 };
 const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
   return createRoute(
-    __spreadProps(__spreadValues({}, routeInfo), {
+    {
+      ...routeInfo,
       index: true,
       children: void 0
-    }),
+    },
     rootDir,
     filename,
     entryName
@@ -58,17 +20,18 @@ const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
 };
 const createRoute = (routeInfo, rootDir, filename, entryName) => {
   const id = getRouteId(filename, rootDir, entryName);
-  return __spreadProps(__spreadValues({}, routeInfo), {
+  return {
+    ...routeInfo,
     id,
     type: "nested"
-  });
+  };
 };
-const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
+const walk = async (dirname, rootDir, alias, entryName) => {
   var _a, _b, _c, _d;
-  if (!(yield fs.pathExists(dirname))) {
+  if (!await fs.pathExists(dirname)) {
     return null;
   }
-  const isDirectory = (yield fs.stat(dirname)).isDirectory();
+  const isDirectory = (await fs.stat(dirname)).isDirectory();
   if (!isDirectory) {
     return null;
   }
@@ -92,14 +55,14 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   let pageRoute = null;
   let splatLoaderFile = "";
   let splatRoute = null;
-  const items = yield fs.readdir(dirname);
+  const items = await fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
-    const isDirectory2 = (yield fs.stat(itemPath)).isDirectory();
+    const isDirectory2 = (await fs.stat(itemPath)).isDirectory();
     if (isDirectory2) {
-      const childRoute = yield walk(itemPath, rootDir, alias, entryName);
+      const childRoute = await walk(itemPath, rootDir, alias, entryName);
       if (childRoute) {
         (_a = route.children) == null ? void 0 : _a.push(childRoute);
       }
@@ -174,13 +137,14 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
     const childRoute = finalRoute.children[0];
     if (childRoute.path === "*") {
       const path2 = `${finalRoute.path || ""}/${childRoute.path || ""}`;
-      finalRoute = __spreadProps(__spreadValues({}, childRoute), {
+      finalRoute = {
+        ...childRoute,
         path: path2
-      });
+      };
     }
   }
   return finalRoute;
-});
+};
 export {
   walk
 };

package/dist/{js/modern → esm-node}/analyze/templates.js

@@ -1,42 +1,3 @@
-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 path from "path";
 import { fs, slash } from "@modern-js/utils";
 import { APP_CONFIG_NAME, TEMP_LOADERS_DIR } from "./constants";
@@ -69,6 +30,7 @@ const renderFunction = ({
   customBootstrap,
   fileSystemRoutes: fileSystemRoutes2
 }) => {
+  const bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
   return `
   const finalAppConfig = {
     ...App.config,
@@ -90,7 +52,7 @@ const renderFunction = ({
 
 
   if (IS_BROWSER) {
-    ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);`}
+    ${customBootstrap ? `customBootstrap(AppWrapper, () => ${bootstrap});` : `${bootstrap};`}
   }
 
   return AppWrapper
@@ -143,10 +105,11 @@ const routesForServer = ({
         loader = `loader_${loaders.length - 1}`;
       }
     }
-    const finalRoute = __spreadProps(__spreadValues({}, route), {
+    const finalRoute = {
+      ...route,
       loader,
       children
-    });
+    };
     return finalRoute;
   };
   let routesCode = `
@@ -176,13 +139,13 @@ const routesForServer = ({
     ${routesCode}
   `;
 };
-const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
+const fileSystemRoutes = async ({
   routes,
   ssrMode,
   nestedRoutesEntry,
   entryName,
   internalDirectory
-}) {
+}) => {
   const loadings = [];
   const errors = [];
   const loaders = [];
@@ -256,13 +219,14 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
       lazyImport = `() => import('${route._component}')`;
       component = `loadable(${lazyImport})`;
     }
-    const finalRoute = __spreadProps(__spreadValues({}, route), {
+    const finalRoute = {
+      ...route,
       lazyImport,
       loading,
       loader,
       error,
       children
-    });
+    };
     if (route._component) {
       finalRoute.component = component;
     }
@@ -277,9 +241,10 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
       routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
     } else {
       const component = `loadable(() => import('${route._component}'))`;
-      const finalRoute = __spreadProps(__spreadValues({}, route), {
+      const finalRoute = {
+        ...route,
         component
-      });
+      };
       routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
     }
   }
@@ -307,8 +272,8 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
 `;
     }
   }
-  yield fs.ensureFile(loadersMapFile);
-  yield fs.writeJSON(loadersMapFile, loadersMap);
+  await fs.ensureFile(loadersMapFile);
+  await fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
     ${rootLayoutCode}
@@ -317,7 +282,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     ${importLoadersCode}
     ${routeComponentsCode}
   `;
-});
+};
 export {
   fileSystemRoutes,
   html,

package/dist/{js/modern → esm-node}/analyze/utils.js

@@ -1,23 +1,3 @@
-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 fs from "fs";
 import path from "path";
 import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
@@ -105,28 +85,28 @@ const isPageComponentFile = (filePath) => {
   return false;
 };
 const replaceWithAlias = (base, filePath, alias) => normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
-const parseModule = (_0) => __async(void 0, [_0], function* ({
+const parseModule = async ({
   source,
   filename
-}) {
+}) => {
   let content = source;
   if (JS_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
-    const result = yield transform(content, {
+    const result = await transform(content, {
       loader: path.extname(filename).slice(1),
       format: "esm"
     });
     content = result.code;
   }
-  return yield parse(content);
-});
-const hasLoader = (filename) => __async(void 0, null, function* () {
-  const source = yield fse.readFile(filename);
-  const [, moduleExports] = yield parseModule({
+  return await parse(content);
+};
+const hasLoader = async (filename) => {
+  const source = await fse.readFile(filename);
+  const [, moduleExports] = await parseModule({
     source: source.toString(),
     filename
   });
   return moduleExports.some((e) => e.n === LOADER_EXPORT_NAME);
-});
+};
 const getServerLoadersFile = (internalDirectory, entryName) => {
   return path.join(internalDirectory, entryName, "route-server-loaders.js");
 };

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

@@ -0,0 +1,51 @@
+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);
+    },
+    async modifyBuilderInstance(builder) {
+      await 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 {
+      ...config2.output,
+      copy: builderCopy
+    };
+  }
+}
+async function applyBuilderPlugins(builder, options) {
+  const { normalizedConfig } = options;
+  if (!normalizedConfig.output.disableNodePolyfill) {
+    const { PluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
+    builder.addPlugins([PluginNodePolyfill()]);
+  }
+  if (normalizedConfig.tools.esbuild) {
+    const { esbuild: esbuildOptions } = normalizedConfig.tools;
+    const { PluginEsbuild } = await import("@modern-js/builder-plugin-esbuild");
+    builder.addPlugins([
+      PluginEsbuild({
+        loader: false,
+        minimize: applyOptionsChain({}, esbuildOptions)
+      })
+    ]);
+  }
+  builder.addPlugins([PluginCompatModern(options)]);
+}
+export {
+  createWebpackBuilderForModern
+};