@modern-js/app-tools 2.4.0 → 2.5.0

package/package.json

@@ -11,23 +11,22 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm/index.js",
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/index.ts",
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     },
     "./types": {
       "jsnext:source": "./lib/types.d.ts",
@@ -35,7 +34,7 @@
     },
     "./server": {
       "jsnext:source": "./src/exports/server.ts",
-      "default": "./dist/js/node/exports/server.js"
+      "default": "./dist/cjs/exports/server.js"
     }
   },
   "engines": {
@@ -65,23 +64,23 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "2.4.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.4.0",
-    "@modern-js/builder-shared": "2.4.0",
-    "@modern-js/builder-webpack-provider": "2.4.0",
-    "@modern-js/builder-plugin-esbuild": "2.4.0",
-    "@modern-js/core": "2.4.0",
-    "@modern-js/new-action": "2.4.0",
-    "@modern-js/node-bundle-require": "2.4.0",
-    "@modern-js/plugin": "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/server": "2.4.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/upgrade": "2.4.0",
-    "@modern-js/utils": "2.4.0"
+    "@modern-js/builder": "2.5.0",
+    "@modern-js/builder-plugin-esbuild": "2.5.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.5.0",
+    "@modern-js/builder-shared": "2.5.0",
+    "@modern-js/builder-webpack-provider": "2.5.0",
+    "@modern-js/core": "2.5.0",
+    "@modern-js/new-action": "2.5.0",
+    "@modern-js/node-bundle-require": "2.5.0",
+    "@modern-js/plugin": "2.5.0",
+    "@modern-js/plugin-data-loader": "2.5.0",
+    "@modern-js/plugin-i18n": "2.5.0",
+    "@modern-js/plugin-lint": "2.5.0",
+    "@modern-js/prod-server": "2.5.0",
+    "@modern-js/server": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@modern-js/upgrade": "2.5.0",
+    "@modern-js/utils": "2.5.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -90,14 +89,14 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "2.4.0",
-    "@modern-js/builder-rspack-provider": "2.4.0",
-    "@modern-js/server-core": "2.4.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@modern-js/builder-plugin-swc": "2.5.0",
+    "@modern-js/builder-rspack-provider": "2.5.0",
+    "@modern-js/server-core": "2.5.0",
+    "@scripts/jest-config": "2.5.0",
+    "@scripts/build": "2.5.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.4.0"
+    "@modern-js/builder-rspack-provider": "^2.5.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {

package/dist/js/modern/analyze/generateCode.js

@@ -1,247 +0,0 @@
-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, getEntryOptions, logger } from "@modern-js/utils";
-import {
-  useResolvedConfigContext
-} from "@modern-js/core";
-import * as templates from "./templates";
-import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
-import {
-  FILE_SYSTEM_ROUTES_FILE_NAME,
-  ENTRY_POINT_FILE_NAME,
-  ENTRY_BOOTSTRAP_FILE_NAME
-} from "./constants";
-import { getDefaultImports, getServerLoadersFile } from "./utils";
-import { walk } from "./nestedRoutes";
-const createImportSpecifier = (specifiers) => {
-  let defaults = "";
-  const named = [];
-  for (const { local, imported } of specifiers) {
-    if (local && imported) {
-      named.push(`${imported} as ${local}`);
-    } else if (local) {
-      defaults = local;
-    } else {
-      named.push(imported);
-    }
-  }
-  if (defaults && named.length) {
-    return `${defaults}, { ${named.join(", ")} }`;
-  } else if (defaults) {
-    return defaults;
-  } else {
-    return `{ ${named.join(", ")} }`;
-  }
-};
-const createImportStatements = (statements) => {
-  var _a, _b;
-  const deDuplicated = [];
-  const seen = /* @__PURE__ */ new Map();
-  for (const { value, specifiers, initialize } of statements) {
-    if (!seen.has(value)) {
-      deDuplicated.push({
-        value,
-        specifiers,
-        initialize
-      });
-      seen.set(value, specifiers);
-    } else {
-      seen.get(value).push(...specifiers);
-      const modifyIndex = deDuplicated.findIndex((v) => v.value === value);
-      const originInitialize = (_b = (_a = deDuplicated[modifyIndex]) == null ? void 0 : _a.initialize) != null ? _b : "";
-      deDuplicated[modifyIndex].initialize = originInitialize.concat(
-        `
-${initialize || ""}`
-      );
-    }
-  }
-  return deDuplicated.map(
-    ({ value, specifiers, initialize }) => `import ${createImportSpecifier(specifiers)} from '${value}';
-${initialize || ""}`
-  ).join("\n");
-};
-const generateCode = (appContext, config, entrypoints, api) => __async(void 0, null, function* () {
-  var _a, _b, _c;
-  const {
-    internalDirectory,
-    srcDirectory,
-    internalDirAlias,
-    internalSrcAlias,
-    packageName
-  } = appContext;
-  const hookRunners = api.useHookRunners();
-  const isV5 = typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
-  const { mountId } = config.html;
-  const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
-  yield Promise.all(entrypoints.map(generateEntryCode));
-  function generateEntryCode(entrypoint) {
-    return __async(this, null, function* () {
-      const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
-      if (isAutoMount) {
-        if (fileSystemRoutes) {
-          let initialRoutes = [];
-          let nestedRoute = null;
-          if (entrypoint.entry) {
-            initialRoutes = getRoutes({
-              entrypoint,
-              srcDirectory,
-              srcAlias: internalSrcAlias,
-              internalDirectory,
-              internalDirAlias
-            });
-          }
-          if (entrypoint.nestedRoutesEntry) {
-            if (!isV5) {
-              nestedRoute = yield walk(
-                entrypoint.nestedRoutesEntry,
-                entrypoint.nestedRoutesEntry,
-                {
-                  name: internalSrcAlias,
-                  basename: srcDirectory
-                },
-                entrypoint.entryName
-              );
-              if (nestedRoute) {
-                initialRoutes.unshift(nestedRoute);
-              }
-            } else {
-              logger.error("Nested routes is not supported in legacy mode.");
-              process.exit(1);
-            }
-          }
-          const { routes } = yield hookRunners.modifyFileSystemRoutes({
-            entrypoint,
-            routes: initialRoutes
-          });
-          const config2 = useResolvedConfigContext();
-          const ssr = getEntryOptions(
-            entryName,
-            config2.server.ssr,
-            config2.server.ssrByEntries,
-            packageName
-          );
-          let mode;
-          if (ssr) {
-            mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
-          } else {
-            mode = false;
-          }
-          if (mode === "stream") {
-            const hasPageRoute = routes.some(
-              (route) => "type" in route && route.type === "page"
-            );
-            if (hasPageRoute) {
-              logger.error(
-                "Streaming ssr is not supported when pages dir exists"
-              );
-              process.exit(1);
-            }
-          }
-          const { code: code2 } = yield hookRunners.beforeGenerateRoutes({
-            entrypoint,
-            code: yield templates.fileSystemRoutes({
-              routes,
-              ssrMode: mode,
-              nestedRoutesEntry: entrypoint.nestedRoutesEntry,
-              entryName: entrypoint.entryName,
-              internalDirectory
-            })
-          });
-          if (entrypoint.nestedRoutesEntry && mode) {
-            const routesServerFile = getServerLoadersFile(
-              internalDirectory,
-              entryName
-            );
-            const code3 = templates.routesForServer({
-              routes
-            });
-            yield fs.ensureFile(routesServerFile);
-            yield fs.writeFile(routesServerFile, code3);
-          }
-          fs.outputFileSync(
-            path.resolve(
-              internalDirectory,
-              `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`
-            ),
-            code2,
-            "utf8"
-          );
-        }
-        const { imports: importStatements } = yield hookRunners.modifyEntryImports({
-          entrypoint,
-          imports: getDefaultImports({
-            entrypoint,
-            srcDirectory,
-            internalSrcAlias,
-            internalDirAlias,
-            internalDirectory
-          })
-        });
-        const { plugins } = yield hookRunners.modifyEntryRuntimePlugins({
-          entrypoint,
-          plugins: []
-        });
-        const { code: renderFunction } = yield hookRunners.modifyEntryRenderFunction({
-          entrypoint,
-          code: templates.renderFunction({
-            plugins,
-            customBootstrap,
-            fileSystemRoutes
-          })
-        });
-        const { exportStatement } = yield hookRunners.modifyEntryExport({
-          entrypoint,
-          exportStatement: "export default AppWrapper;"
-        });
-        const code = templates.index({
-          mountId,
-          imports: createImportStatements(importStatements),
-          renderFunction,
-          exportStatement
-        });
-        const entryFile = path.resolve(
-          internalDirectory,
-          `./${entryName}/${ENTRY_POINT_FILE_NAME}`
-        );
-        entrypoint.entry = entryFile;
-        if (config.source.enableAsyncEntry) {
-          const { code: asyncEntryCode } = yield hookRunners.modifyAsyncEntry({
-            entrypoint,
-            code: `import('./${ENTRY_BOOTSTRAP_FILE_NAME}');`
-          });
-          fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
-          const bootstrapFile = path.resolve(
-            internalDirectory,
-            `./${entryName}/${ENTRY_BOOTSTRAP_FILE_NAME}`
-          );
-          fs.outputFileSync(bootstrapFile, code, "utf8");
-        } else {
-          fs.outputFileSync(entryFile, code, "utf8");
-        }
-      }
-    });
-  }
-});
-export {
-  createImportStatements,
-  generateCode
-};

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

@@ -1,329 +0,0 @@
-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 {
-  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 {
-      prepare() {
-        return __async(this, null, function* () {
-          var _a2;
-          let appContext = api.useAppContext();
-          const resolvedConfig = api.useResolvedConfigContext();
-          const hookRunners = api.useHookRunners();
-          try {
-            fs.emptydirSync(appContext.internalDirectory);
-          } catch (e) {
-          }
-          const apiOnly = yield isApiOnly(
-            appContext.appDirectory,
-            (_a2 = resolvedConfig.source) == null ? void 0 : _a2.entriesDir
-          );
-          yield hookRunners.addRuntimeExports();
-          if (apiOnly) {
-            const { routes: routes2 } = yield hookRunners.modifyServerRoutes({
-              routes: []
-            });
-            debug(`server routes: %o`, routes2);
-            appContext = __spreadProps(__spreadValues({}, appContext), {
-              apiOnly,
-              serverRoutes: routes2
-            });
-            api.setAppContext(appContext);
-            return;
-          }
-          const [
-            { getBundleEntry },
-            { getServerRoutes },
-            { generateCode },
-            { getHtmlTemplate }
-          ] = yield 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 } = yield hookRunners.modifyServerRoutes({
-            routes: initialRoutes
-          });
-          debug(`server routes: %o`, routes);
-          appContext = __spreadProps(__spreadValues({}, 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);
-          yield generateCode(appContext, resolvedConfig, entrypoints, api);
-          const htmlTemplates = yield getHtmlTemplate(entrypoints, api, {
-            appContext,
-            config: resolvedConfig
-          });
-          debug(`html templates: %o`, htmlTemplates);
-          yield hookRunners.addDefineTypes();
-          debug(`add Define Types`);
-          let checkedEntries = entrypoints.map((point) => point.entryName);
-          if (isDevCommand()) {
-            const { entry } = minimist(process.argv.slice(2));
-            checkedEntries = yield getSelectedEntries(
-              typeof entry === "string" ? entry.split(",") : entry,
-              entrypoints
-            );
-          }
-          appContext = __spreadProps(__spreadValues({}, appContext), {
-            entrypoints,
-            checkedEntries,
-            apiOnly,
-            serverRoutes: routes,
-            htmlTemplates
-          });
-          api.setAppContext(appContext);
-          const command = getCommand();
-          const buildCommands = ["dev", "start", "build", "inspect", "deploy"];
-          if (buildCommands.includes(command)) {
-            let _b;
-            const normalizedConfig = api.useResolvedConfigContext();
-            const createBuilderForModern = yield createBuilderGenerator(bundler);
-            const builder = yield createBuilderForModern({
-              normalizedConfig,
-              appContext,
-              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
-                  });
-                });
-              },
-              onAfterCreateCompiler(_0) {
-                return __async(this, arguments, function* ({ compiler }) {
-                  const hookRunners2 = api.useHookRunners();
-                  yield hookRunners2.afterCreateCompiler({ compiler });
-                });
-              }
-            });
-            builder.addPlugins(resolvedConfig.builderPlugins);
-            appContext = __spreadProps(__spreadValues({}, 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
-        };
-      },
-      modifyEntryImports(_0) {
-        return __async(this, arguments, function* ({ 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 = yield fs.readFile(rootLayoutFile);
-              const rootLayout = rootLayoutBuffer.toString();
-              const [, moduleExports] = yield 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
-          };
-        });
-      },
-      fileChange(e) {
-        return __async(this, null, function* () {
-          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 } = yield import("./generateCode");
-            const entrypoints = cloneDeep(originEntrypoints);
-            generateCode(appContext, resolvedConfig, entrypoints, api);
-          }
-        });
-      }
-    };
-  }
-});
-export {
-  analyze_default as default
-};