@modern-js/app-tools 2.5.1-alpha.0 → 2.6.0

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

@@ -15,6 +15,7 @@ function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderCon
     html: htmlConfig,
     output: {
       ...resolveConfig.output,
+      // We need to do this in the app-tools prepare hook because some files will be generated into the dist directory in the analyze process
       cleanDistPath: false
     }
   };

package/dist/esm-node/builder/shared/createCopyPattern.js

@@ -9,6 +9,9 @@ function createCopyPattern(appContext, config, patternsType, chain) {
   const publicDir = path.posix.join(configDir.replace(/\\/g, "/"), "public");
   const minifiedJsRexExp = /\.min\.js/;
   const info = (file) => ({
+    // If the file name ends with `.min.js`, we assume it's a compressed file.
+    // So we don't want copy-webpack-plugin to minify it.
+    // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
     minimized: minifiedJsRexExp.test(file.sourceFilename)
   });
   if (patternsType === "public") {
@@ -21,6 +24,7 @@ function createCopyPattern(appContext, config, patternsType, chain) {
       to: "public",
       context: publicDir,
       noErrorOnMissing: true,
+      // eslint-disable-next-line node/prefer-global/buffer
       transform: (content, absoluteFrom) => {
         if (!/\.html?$/.test(absoluteFrom)) {
           return content;

package/dist/esm-node/commands/build.js

@@ -13,6 +13,7 @@ const build = async (api, options) => {
   if (apiOnly) {
     const { appDirectory: appDirectory2, distDirectory: distDirectory2, serverConfigFile: serverConfigFile2 } = appContext;
     await hookRunners.beforeBuild({
+      // "null" bundlerConfigs
       bundlerConfigs: void 0
     });
     await buildServerConfig({
@@ -22,6 +23,7 @@ const build = async (api, options) => {
     });
     await generateRoutes(appContext);
     await hookRunners.afterBuild({
+      // "null" stats
       stats: void 0
     });
     return;

package/dist/esm-node/commands/dev.js

@@ -1,4 +1,5 @@
 import { ResolvedConfigContext } from "@modern-js/core";
+import { DEFAULT_DEV_HOST } from "@modern-js/utils";
 import { printInstructions } from "../utils/printInstructions";
 import {
   setServer,
@@ -54,7 +55,7 @@ const dev = async (api, options) => {
       ...serverOptions,
       compiler: null
     });
-    const host = ((_b = normalizedConfig.dev) == null ? void 0 : _b.host) || "localhost";
+    const host = ((_b = normalizedConfig.dev) == null ? void 0 : _b.host) || DEFAULT_DEV_HOST;
     app.listen(
       {
         port,

package/dist/esm-node/config/default.js

@@ -3,6 +3,8 @@ function createDefaultConfig(appContext, bundler) {
   const defaultBuilderConfig = createDefaultBuilderConfig();
   const dev = {
     ...defaultBuilderConfig.dev,
+    // `dev.port` should not have a default value
+    // because we will use `server.port` by default
     port: void 0
   };
   const output = {

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

@@ -33,6 +33,7 @@ function createOutputConfig(config) {
       css: cssPath,
       js: jsPath,
       html: htmlPath,
+      // modern.js v1 output all media files to `dist/media` by default
       svg: mediaPath || "media",
       image: mediaPath || "media",
       font: mediaPath || "media",
@@ -58,6 +59,7 @@ function createOutputConfig(config) {
     disableFilenameHash: disableAssetsCache,
     enableLatestDecorators,
     ssg,
+    // set `true`, only in legacy config
     enableAssetFallback: true,
     enableAssetManifest: true,
     disableNodePolyfill

package/dist/esm-node/index.js

@@ -148,6 +148,7 @@ var src_default = (options = {
         const config = api.useResolvedConfigContext();
         return generateWatchFiles(appContext, config.source.configDir);
       },
+      // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
       async fileChange(e) {
         const { filename, eventType } = e;
         const appContext = api.useAppContext();

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.1-alpha.0",
+  "version": "2.6.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -62,41 +62,41 @@
     "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.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.1-alpha.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",
     "es-module-lexer": "^1.1.0",
-    "esbuild": "0.15.7"
+    "esbuild": "0.15.7",
+    "@modern-js/builder": "2.6.0",
+    "@modern-js/builder-plugin-esbuild": "2.6.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.6.0",
+    "@modern-js/builder-shared": "2.6.0",
+    "@modern-js/builder-webpack-provider": "2.6.0",
+    "@modern-js/core": "2.6.0",
+    "@modern-js/new-action": "2.6.0",
+    "@modern-js/node-bundle-require": "2.6.0",
+    "@modern-js/plugin": "2.6.0",
+    "@modern-js/plugin-data-loader": "2.6.0",
+    "@modern-js/plugin-i18n": "2.6.0",
+    "@modern-js/plugin-lint": "2.6.0",
+    "@modern-js/prod-server": "2.6.0",
+    "@modern-js/server": "2.6.0",
+    "@modern-js/types": "2.6.0",
+    "@modern-js/upgrade": "2.6.0",
+    "@modern-js/utils": "2.6.0"
   },
   "devDependencies": {
-    "@modern-js/builder-plugin-swc": "2.5.0",
-    "@modern-js/builder-rspack-provider": "2.5.0",
-    "@modern-js/server-core": "2.5.0",
-    "@scripts/build": "2.5.0",
-    "@scripts/jest-config": "2.5.0",
     "@types/babel__traverse": "^7.14.2",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "webpack": "^5.75.0"
+    "webpack": "^5.75.0",
+    "@modern-js/builder-plugin-swc": "2.6.0",
+    "@modern-js/builder-rspack-provider": "2.6.0",
+    "@modern-js/server-core": "2.6.0",
+    "@scripts/jest-config": "2.6.0",
+    "@scripts/build": "2.6.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.5.0"
+    "@modern-js/builder-rspack-provider": "^2.6.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {

package/dist/js/modern/analyze/constants.js

@@ -1,54 +0,0 @@
-const JS_EXTENSIONS = [".js", ".ts", ".jsx", ".tsx"];
-const INDEX_FILE_NAME = "index";
-const APP_FILE_NAME = "App";
-const PAGES_DIR_NAME = "pages";
-const NESTED_ROUTES_DIR = "routes";
-const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
-const LOADER_EXPORT_NAME = "loader";
-const TEMP_LOADERS_DIR = "__loaders__";
-const ENTRY_POINT_FILE_NAME = "index.js";
-const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
-const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
-const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
-const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
-const FILE_SYSTEM_ROUTES_INDEX = "index";
-const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
-const HTML_PARTIALS_FOLDER = "html";
-const HTML_PARTIALS_EXTENSIONS = [".htm", ".html", ".ejs"];
-const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
-const NESTED_ROUTE = {
-  LAYOUT_FILE: "layout",
-  LAYOUT_LOADER_FILE: "layout.loader",
-  PAGE_FILE: "page",
-  PAGE_LOADER_FILE: "page.loader",
-  LOADING_FILE: "loading",
-  ERROR_FILE: "error",
-  LOADER_FILE: "loader"
-};
-const APP_CONFIG_NAME = "config";
-const APP_INIT_EXPORTED = "init";
-const APP_INIT_IMPORTED = "appInit";
-export {
-  APP_CONFIG_NAME,
-  APP_FILE_NAME,
-  APP_INIT_EXPORTED,
-  APP_INIT_IMPORTED,
-  ENTRY_BOOTSTRAP_FILE_NAME,
-  ENTRY_POINT_FILE_NAME,
-  FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
-  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
-  FILE_SYSTEM_ROUTES_FILE_NAME,
-  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
-  FILE_SYSTEM_ROUTES_IGNORED_REGEX,
-  FILE_SYSTEM_ROUTES_INDEX,
-  FILE_SYSTEM_ROUTES_LAYOUT,
-  HTML_PARTIALS_EXTENSIONS,
-  HTML_PARTIALS_FOLDER,
-  INDEX_FILE_NAME,
-  JS_EXTENSIONS,
-  LOADER_EXPORT_NAME,
-  NESTED_ROUTE,
-  NESTED_ROUTES_DIR,
-  PAGES_DIR_NAME,
-  TEMP_LOADERS_DIR
-};

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/getBundleEntry.js

@@ -1,71 +0,0 @@
-import path from "path";
-import {
-  ensureAbsolutePath,
-  fs,
-  findExists,
-  MAIN_ENTRY_NAME
-} from "@modern-js/utils";
-import { getFileSystemEntry } from "./getFileSystemEntry";
-import { JS_EXTENSIONS } from "./constants";
-const ensureExtensions = (file) => {
-  if (!path.extname(file)) {
-    return findExists(JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
-  }
-  return file;
-};
-const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
-  if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
-    checked.entryName = entrypoint.entryName;
-    return true;
-  }
-  if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
-    throw new Error(
-      `Entry configuration conflicts
- Your configuration: ${checked.entry}.
- Default entrypoint: ${entrypoint.entry}
- Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`
-    );
-  }
-  return false;
-});
-const getBundleEntry = (appContext, config) => {
-  const { appDirectory, packageName } = appContext;
-  const {
-    source: { disableDefaultEntries, entries, entriesDir }
-  } = config;
-  const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
-  if (entries) {
-    Object.keys(entries).forEach((name) => {
-      const value = entries[name];
-      const entrypoint = typeof value === "string" ? {
-        entryName: name,
-        entry: ensureAbsolutePath(appDirectory, value),
-        isAutoMount: true,
-        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
-      } : {
-        entryName: name,
-        entry: ensureAbsolutePath(appDirectory, value.entry),
-        isAutoMount: !value.disableMount,
-        customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
-        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
-      };
-      if (entrypoint.fileSystemRoutes) {
-        entrypoint.nestedRoutesEntry = entrypoint.entry;
-      }
-      if (!ifAlreadyExists(defaults, entrypoint)) {
-        defaults.push(entrypoint);
-      }
-    });
-  }
-  if (!disableDefaultEntries) {
-    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
-    const found = defaults.find(
-      ({ entryName, entry, nestedRoutesEntry = "" }) => entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs
-    );
-    found && (found.entryName = MAIN_ENTRY_NAME);
-  }
-  return defaults;
-};
-export {
-  getBundleEntry
-};