@modern-js/app-tools 2.53.1-alpha.3 → 2.54.0

package/dist/esm/{analyze → plugins/analyze}/index.js

@@ -5,14 +5,13 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
 import { createDebugger, findExists, fs, isApiOnly, minimist, isDevCommand, getArgv } from "@modern-js/utils";
-import { cloneDeep } from "@modern-js/utils/lodash";
-import { printInstructions } from "../utils/printInstructions";
-import { generateRoutes, getPathWithoutExt } from "../utils/routes";
-import { emitResolvedConfig } from "../utils/config";
-import { getSelectedEntries } from "../utils/getSelectedEntries";
-import { initialNormalizedConfig } from "../config";
-import { createBuilderGenerator } from "../builder";
-import { checkIsBuildCommands, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
+import { printInstructions } from "../../utils/printInstructions";
+import { generateRoutes, getPathWithoutExt } from "../../utils/routes";
+import { emitResolvedConfig } from "../../utils/config";
+import { getSelectedEntries } from "../../utils/getSelectedEntries";
+import { initialNormalizedConfig } from "../../config";
+import { createBuilderGenerator } from "../../builder";
+import { checkIsBuildCommands, parseModule, replaceWithAlias } from "./utils";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 import { generateIndexCode } from "./generateCode";
 var debug = createDebugger("plugin-analyze");
@@ -23,11 +22,10 @@ function analyze_default(param) {
     setup: function(api) {
       var pagesDir = [];
       var nestedRouteEntries = [];
-      var originEntrypoints = [];
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, routes, _ref, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, initialRoutes, routes1, importsStatemets, htmlTemplates, checkedEntries, entry, normalizedConfig, createBuilderForModern, builder;
+            var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, routes, _ref, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, _, _tmp, initialRoutes, routes1, importsStatemets, htmlTemplates, checkedEntries, entry, normalizedConfig, createBuilderForModern, builder;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -89,7 +87,21 @@ function analyze_default(param) {
                     _state.sent(),
                     4
                   ]), getBundleEntry = _ref[0].getBundleEntry, getServerRoutes = _ref[1].getServerRoutes, generateCode = _ref[2].generateCode, getHtmlTemplate = _ref[3].getHtmlTemplate;
-                  entrypoints = getBundleEntry(appContext, resolvedConfig);
+                  _ = hookRunners.modifyEntrypoints;
+                  _tmp = {};
+                  return [
+                    4,
+                    getBundleEntry(hookRunners, appContext, resolvedConfig)
+                  ];
+                case 6:
+                  return [
+                    4,
+                    _.apply(hookRunners, [
+                      (_tmp.entrypoints = _state.sent(), _tmp)
+                    ])
+                  ];
+                case 7:
+                  entrypoints = _state.sent().entrypoints;
                   debug("entrypoints: %o", entrypoints);
                   initialRoutes = getServerRoutes(entrypoints, {
                     appContext,
@@ -101,7 +113,7 @@ function analyze_default(param) {
                       routes: initialRoutes
                     })
                   ];
-                case 6:
+                case 8:
                   routes1 = _state.sent().routes;
                   debug("server routes: %o", routes1);
                   appContext = _object_spread_props(_object_spread({}, api.useAppContext()), {
@@ -117,12 +129,11 @@ function analyze_default(param) {
                   }).filter(function(entry2) {
                     return entry2 && !path.extname(entry2);
                   }).concat(nestedRouteEntries);
-                  originEntrypoints = cloneDeep(entrypoints);
                   return [
                     4,
                     generateCode(appContext, resolvedConfig, entrypoints, api)
                   ];
-                case 7:
+                case 9:
                   importsStatemets = _state.sent().importsStatemets;
                   return [
                     4,
@@ -131,14 +142,14 @@ function analyze_default(param) {
                       config: resolvedConfig
                     })
                   ];
-                case 8:
+                case 10:
                   htmlTemplates = _state.sent();
                   debug("html templates: %o", htmlTemplates);
                   return [
                     4,
                     hookRunners.addDefineTypes()
                   ];
-                case 9:
+                case 11:
                   _state.sent();
                   debug("add Define Types");
                   checkedEntries = entrypoints.map(function(point) {
@@ -147,17 +158,17 @@ function analyze_default(param) {
                   if (!isDevCommand())
                     return [
                       3,
-                      11
+                      13
                     ];
                   entry = minimist(getArgv()).entry;
                   return [
                     4,
                     getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints)
                   ];
-                case 10:
+                case 12:
                   checkedEntries = _state.sent();
-                  _state.label = 11;
-                case 11:
+                  _state.label = 13;
+                case 13:
                   appContext = _object_spread_props(_object_spread({}, api.useAppContext()), {
                     entrypoints,
                     checkedEntries,
@@ -169,14 +180,14 @@ function analyze_default(param) {
                   if (!checkIsBuildCommands())
                     return [
                       3,
-                      14
+                      16
                     ];
                   normalizedConfig = api.useResolvedConfigContext();
                   return [
                     4,
                     createBuilderGenerator(bundler)
                   ];
-                case 12:
+                case 14:
                   createBuilderForModern = _state.sent();
                   return [
                     4,
@@ -185,7 +196,7 @@ function analyze_default(param) {
                       appContext
                     })
                   ];
-                case 13:
+                case 15:
                   builder = _state.sent();
                   builder.onBeforeBuild(function() {
                     var _ref2 = _async_to_generator(function(param2) {
@@ -215,7 +226,7 @@ function analyze_default(param) {
                         }
                       });
                     });
-                    return function(_) {
+                    return function(_2) {
                       return _ref2.apply(this, arguments);
                     };
                   }());
@@ -247,7 +258,7 @@ function analyze_default(param) {
                         }
                       });
                     });
-                    return function(_) {
+                    return function(_2) {
                       return _ref2.apply(this, arguments);
                     };
                   }());
@@ -268,7 +279,7 @@ function analyze_default(param) {
                         ];
                       });
                     });
-                    return function(_) {
+                    return function(_2) {
                       return _ref2.apply(this, arguments);
                     };
                   }());
@@ -307,7 +318,7 @@ function analyze_default(param) {
                         }
                       });
                     });
-                    return function(_) {
+                    return function(_2) {
                       return _ref2.apply(this, arguments);
                     };
                   }());
@@ -333,7 +344,7 @@ function analyze_default(param) {
                         }
                       });
                     });
-                    return function(_) {
+                    return function(_2) {
                       return _ref2.apply(this, arguments);
                     };
                   }());
@@ -342,8 +353,8 @@ function analyze_default(param) {
                     builder
                   });
                   api.setAppContext(appContext);
-                  _state.label = 14;
-                case 14:
+                  _state.label = 16;
+                case 16:
                   return [
                     2
                   ];
@@ -456,46 +467,7 @@ function analyze_default(param) {
               });
             })();
           }
-        ),
-        fileChange: function fileChange(e) {
-          return _async_to_generator(function() {
-            var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, generateCode, entrypoints;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  appContext = api.useAppContext();
-                  appDirectory = appContext.appDirectory;
-                  filename = e.filename, eventType = e.eventType;
-                  isPageFile = function(name) {
-                    return pagesDir.some(function(pageDir) {
-                      return name.includes(pageDir);
-                    });
-                  };
-                  absoluteFilePath = path.resolve(appDirectory, filename);
-                  isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
-                  if (!(isRouteComponent && (eventType === "add" || eventType === "unlink")))
-                    return [
-                      3,
-                      2
-                    ];
-                  resolvedConfig = api.useResolvedConfigContext();
-                  return [
-                    4,
-                    import("./generateCode")
-                  ];
-                case 1:
-                  generateCode = _state.sent().generateCode;
-                  entrypoints = cloneDeep(originEntrypoints);
-                  generateCode(appContext, resolvedConfig, entrypoints, api);
-                  _state.label = 2;
-                case 2:
-                  return [
-                    2
-                  ];
-              }
-            });
-          })();
-        }
+        )
       };
     }
   };

package/dist/esm/plugins/analyze/templates.js

@@ -0,0 +1,22 @@
+import { APP_CONFIG_NAME } from "./constants";
+var index = function(param) {
+  var mountId = param.mountId, imports = param.imports, renderFunction2 = param.renderFunction, exportStatement = param.exportStatement;
+  return "\nconst IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';\nconst IS_REACT18 = process.env.IS_REACT18 === 'true';\nconst MOUNT_ID = '".concat(mountId, "';\n\n").concat(imports, "\n\nlet AppWrapper = null;\n\nlet root = null;\n\nfunction render() {\n  ").concat(renderFunction2, "\n}\n\nAppWrapper = render();\n\n").concat(exportStatement, ";\n");
+};
+var renderFunction = function(param) {
+  var plugins = param.plugins, customBootstrap = param.customBootstrap, fileSystemRoutes = param.fileSystemRoutes, customRuntimeConfig = param.customRuntimeConfig;
+  var bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
+  var runtimePlugins = "...(runtimeConfig?.plugins || []),";
+  return "\n  const finalAppConfig = {\n    ...App.config,\n    ...typeof ".concat(APP_CONFIG_NAME, " === 'function' ? ").concat(APP_CONFIG_NAME, "() : {},\n  }\n\n  AppWrapper = createApp({\n    plugins: [\n     ").concat(plugins.map(function(param2) {
+    var name = param2.name, options = param2.options, args = param2.args;
+    return "".concat(name, "({...").concat(options, ", ...finalAppConfig?.").concat(args || name, "}),");
+  }).join("\n"), "\n       ").concat(customRuntimeConfig ? runtimePlugins : "", "\n    ]\n  })(").concat(fileSystemRoutes ? "" : "App", ")\n\n\n  if(!AppWrapper.init && typeof appInit !== 'undefined') {\n    AppWrapper.init = appInit;\n  }\n\n\n  if (IS_BROWSER) {\n    ").concat(customBootstrap ? "customBootstrap(AppWrapper, () => ".concat(bootstrap, ");") : "".concat(bootstrap, ";"), "\n  }\n\n  return AppWrapper\n");
+};
+var html = function(partials) {
+  return "\n<!DOCTYPE html>\n<html>\n<head>\n\n  ".concat(partials.top.join("\n"), "\n\n  ").concat(partials.head.join("\n"), '\n\n</head>\n\n<body>\n  <div id="<%= mountId %>"><!--<?- html ?>--></div>\n  ').concat(partials.body.join("\n"), "\n  <!--<?- chunksMap.js ?>-->\n  <!--<?- SSRDataScript ?>-->\n  <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
+};
+export {
+  html,
+  index,
+  renderFunction
+};

package/dist/esm/{analyze → plugins/analyze}/utils.js

@@ -1,13 +1,12 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import fs from "fs";
 import path from "path";
-import { isReact18, normalizeToPosixPath, fs as fse, getCommand } from "@modern-js/utils";
+import { isReact18, normalizeToPosixPath, getCommand, JS_EXTENSIONS } from "@modern-js/utils";
 import { transform } from "esbuild";
 import { parse } from "es-module-lexer";
-import { ACTION_EXPORT_NAME, FILE_SYSTEM_ROUTES_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME } from "./constants";
+import { FILE_SYSTEM_ROUTES_FILE_NAME } from "./constants";
 var walkDirectory = function(dir) {
   return fs.readdirSync(dir).reduce(function(previous, filename) {
     var filePath = path.join(dir, filename);
@@ -21,7 +20,7 @@ var walkDirectory = function(dir) {
   }, []);
 };
 var getDefaultImports = function(param) {
-  var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, appDirectory = param.appDirectory, internalSrcAlias = param.internalSrcAlias, internalDirAlias = param.internalDirAlias;
+  var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, appDirectory = param.appDirectory, internalSrcAlias = param.internalSrcAlias, internalDirAlias = param.internalDirAlias, runtimeConfigFile = param.runtimeConfigFile, customRuntimeConfig = param.customRuntimeConfig;
   var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes, customBootstrap = entrypoint.customBootstrap, entry = entrypoint.entry;
   var imports = [
     {
@@ -92,21 +91,17 @@ var getDefaultImports = function(param) {
       value: normalizeToPosixPath(entry.replace(srcDirectory, internalSrcAlias))
     });
   }
-  return imports;
-};
-var isPageComponentFile = function(filePath) {
-  if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
-    return false;
-  }
-  if ([
-    ".js",
-    ".jsx",
-    ".ts",
-    ".tsx"
-  ].includes(path.extname(filePath))) {
-    return true;
+  if (customRuntimeConfig) {
+    imports.push({
+      specifiers: [
+        {
+          local: "runtimeConfig"
+        }
+      ],
+      value: path.join(internalSrcAlias, runtimeConfigFile || "")
+    });
   }
-  return false;
+  return imports;
 };
 var replaceWithAlias = function(base, filePath, alias) {
   if (filePath.includes(base)) {
@@ -158,119 +153,6 @@ var parseModule = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var hasLoader = function() {
-  var _ref = _async_to_generator(function(filename, source) {
-    var content, _ref2, moduleExports;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          content = source;
-          if (!!source)
-            return [
-              3,
-              2
-            ];
-          return [
-            4,
-            fse.readFile(filename, "utf-8")
-          ];
-        case 1:
-          content = _state.sent().toString();
-          _state.label = 2;
-        case 2:
-          if (!content)
-            return [
-              3,
-              4
-            ];
-          return [
-            4,
-            parseModule({
-              source: content.toString(),
-              filename
-            })
-          ];
-        case 3:
-          _ref2 = _sliced_to_array.apply(void 0, [
-            _state.sent(),
-            2
-          ]), moduleExports = _ref2[1];
-          return [
-            2,
-            moduleExports.some(function(e) {
-              return e.n === LOADER_EXPORT_NAME;
-            })
-          ];
-        case 4:
-          return [
-            2,
-            false
-          ];
-      }
-    });
-  });
-  return function hasLoader2(filename, source) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var hasAction = function() {
-  var _ref = _async_to_generator(function(filename, source) {
-    var content, _ref2, moduleExports;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          content = source;
-          if (!!source)
-            return [
-              3,
-              2
-            ];
-          return [
-            4,
-            fse.readFile(filename, "utf-8")
-          ];
-        case 1:
-          content = _state.sent().toString();
-          _state.label = 2;
-        case 2:
-          if (!content)
-            return [
-              3,
-              4
-            ];
-          return [
-            4,
-            parseModule({
-              source: content.toString(),
-              filename
-            })
-          ];
-        case 3:
-          _ref2 = _sliced_to_array.apply(void 0, [
-            _state.sent(),
-            2
-          ]), moduleExports = _ref2[1];
-          return [
-            2,
-            moduleExports.some(function(e) {
-              return e.n === ACTION_EXPORT_NAME;
-            })
-          ];
-        case 4:
-          return [
-            2,
-            false
-          ];
-      }
-    });
-  });
-  return function hasAction2(filename, source) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var getServerLoadersFile = function(internalDirectory, entryName) {
-  return path.join(internalDirectory, entryName, "route-server-loaders.js");
-};
 var getServerCombinedModueFile = function(internalDirectory, entryName) {
   return path.join(internalDirectory, entryName, "server-loader-combined.js");
 };
@@ -298,10 +180,6 @@ export {
   checkIsBuildCommands,
   getDefaultImports,
   getServerCombinedModueFile,
-  getServerLoadersFile,
-  hasAction,
-  hasLoader,
-  isPageComponentFile,
   isSubDirOrEqual,
   parseModule,
   replaceWithAlias,