npm - @modern-js/app-tools - Versions diffs - 2.54.6 → 2.56.0 - Mend

@modern-js/app-tools 2.54.6 → 2.56.0

Files changed (88) hide show

package/dist/cjs/plugins/analyze/templates.js CHANGED Viewed

@@ -18,60 +18,9 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var templates_exports = {};
 __export(templates_exports, {
-  html: () => html,
-  index: () => index,
-  renderFunction: () => renderFunction
+  html: () => html
 });
 module.exports = __toCommonJS(templates_exports);
-var import_constants = require("./constants");
-const index = ({ mountId, imports, renderFunction: renderFunction2, exportStatement }) => `
-const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
-const IS_REACT18 = process.env.IS_REACT18 === 'true';
-const MOUNT_ID = '${mountId}';
-${imports}
-let AppWrapper = null;
-let root = null;
-function render() {
-  ${renderFunction2}
-}
-AppWrapper = render();
-${exportStatement};
-`;
-const renderFunction = ({ plugins, customBootstrap, fileSystemRoutes, customRuntimeConfig }) => {
-  const bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
-  const runtimePlugins = `...(runtimeConfig?.plugins || []),`;
-  return `
-  const finalAppConfig = {
-    ...App.config,
-    ...typeof ${import_constants.APP_CONFIG_NAME} === 'function' ? ${import_constants.APP_CONFIG_NAME}() : {},
-  }
-  AppWrapper = createApp({
-    plugins: [
-     ${plugins.map(({ name, options, args }) => `${name}({...${options}, ...finalAppConfig?.${args || name}}),`).join("\n")}
-       ${customRuntimeConfig ? runtimePlugins : ""}
-    ]
-  })(${fileSystemRoutes ? "" : `App`})
-  if(!AppWrapper.init && typeof appInit !== 'undefined') {
-    AppWrapper.init = appInit;
-  }
-  if (IS_BROWSER) {
-    ${customBootstrap ? `customBootstrap(AppWrapper, () => ${bootstrap});` : `${bootstrap};`}
-  }
-  return AppWrapper
-`;
-};
 const html = (partials) => `
 <!DOCTYPE html>
 <html>
@@ -95,7 +44,5 @@ const html = (partials) => `
 `;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  html,
-  index,
-  renderFunction
+  html
 });

package/dist/cjs/plugins/analyze/utils.js CHANGED Viewed

@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkIsBuildCommands: () => checkIsBuildCommands,
-  getDefaultImports: () => getDefaultImports,
   getServerCombinedModueFile: () => getServerCombinedModueFile,
   isSubDirOrEqual: () => isSubDirOrEqual,
   parseModule: () => parseModule,
@@ -42,7 +41,6 @@ var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_esbuild = require("esbuild");
 var import_es_module_lexer = require("es-module-lexer");
-var import_constants = require("./constants");
 const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previous, filename) => {
   const filePath = import_path.default.join(dir, filename);
   if (import_fs.default.statSync(filePath).isDirectory()) {
@@ -57,89 +55,6 @@ const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previo
     ];
   }
 }, []);
-const getDefaultImports = ({ entrypoint, srcDirectory, appDirectory, internalSrcAlias, internalDirAlias, runtimeConfigFile, customRuntimeConfig }) => {
-  const { entryName, fileSystemRoutes, customBootstrap, entry } = entrypoint;
-  const imports = [
-    {
-      specifiers: [
-        {
-          local: "React"
-        }
-      ],
-      value: "react"
-    },
-    {
-      specifiers: [
-        {
-          local: "ReactDOM"
-        }
-      ],
-      value: (0, import_utils.isReact18)(import_path.default.join(appDirectory)) ? "react-dom/client" : "react-dom"
-    },
-    {
-      specifiers: [
-        {
-          imported: "createApp"
-        },
-        {
-          imported: "bootstrap"
-        }
-      ],
-      value: "@modern-js/runtime"
-    },
-    customBootstrap && {
-      specifiers: [
-        {
-          local: "customBootstrap"
-        }
-      ],
-      value: (0, import_utils.normalizeToPosixPath)(customBootstrap.replace(srcDirectory, internalSrcAlias))
-    }
-  ].filter(Boolean);
-  if (fileSystemRoutes) {
-    const route = {
-      specifiers: [
-        {
-          imported: "routes"
-        }
-      ],
-      value: (0, import_utils.normalizeToPosixPath)(`${internalDirAlias}/${entryName}/${import_constants.FILE_SYSTEM_ROUTES_FILE_NAME.replace(".js", "")}`)
-    };
-    if (fileSystemRoutes.globalApp) {
-      imports.push({
-        specifiers: [
-          {
-            local: "App"
-          }
-        ],
-        value: (0, import_utils.normalizeToPosixPath)(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
-      });
-    } else {
-      route.initialize = "const App = false;";
-    }
-    imports.push(route);
-  } else {
-    imports.push({
-      specifiers: [
-        {
-          local: "App"
-        }
-      ],
-      value: (0, import_utils.normalizeToPosixPath)(entry.replace(srcDirectory, internalSrcAlias))
-    });
-  }
-  if (customRuntimeConfig) {
-    imports.push({
-      specifiers: [
-        {
-          local: "runtimeConfig"
-        }
-      ],
-      value: import_path.default.join(internalSrcAlias, runtimeConfigFile || "")
-    });
-  }
-  return imports;
-};
 const replaceWithAlias = (base, filePath, alias) => {
   if (filePath.includes(base)) {
     return (0, import_utils.normalizeToPosixPath)(import_path.default.join(alias, import_path.default.relative(base, filePath)));
@@ -184,7 +99,6 @@ const isSubDirOrEqual = (parent, child) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkIsBuildCommands,
-  getDefaultImports,
   getServerCombinedModueFile,
   isSubDirOrEqual,
   parseModule,

package/dist/esm/builder/generator/{createBuilderOptions.js → getBuilderEnvironments.js} RENAMED Viewed

@@ -1,4 +1,6 @@
-function createBuilderOptions(target, appContext) {
+import { isProd, isServiceWorker, isSSR, isUseSSRBundle } from "@modern-js/utils";
+import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/uni-builder";
+function getBuilderEnvironments(normalizedConfig, appContext) {
   var entries = {};
   var _appContext_entrypoints = appContext.entrypoints, entrypoints = _appContext_entrypoints === void 0 ? [] : _appContext_entrypoints, checkedEntries = appContext.checkedEntries;
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
@@ -31,13 +33,47 @@ function createBuilderOptions(target, appContext) {
       }
     }
   }
-  return {
-    cwd: appContext.appDirectory,
-    target,
-    frameworkConfigPath: appContext.configFile || void 0,
-    entry: entries
+  var serverEntries = {};
+  for (var entry1 in entries) {
+    var v = entries[entry1];
+    serverEntries[entry1] = v.map(function(entry2) {
+      return entry2.replace("index.jsx", "index.server.jsx");
+    });
+  }
+  var environments = {
+    web: {
+      output: {
+        target: "web"
+      },
+      source: {
+        entry: entries
+      }
+    }
   };
+  var useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
+  if (useNodeTarget) {
+    environments.node = {
+      output: {
+        target: "node"
+      },
+      source: {
+        entry: serverEntries
+      }
+    };
+  }
+  var useWorkerTarget = isServiceWorker(normalizedConfig);
+  if (useWorkerTarget) {
+    environments[SERVICE_WORKER_ENVIRONMENT_NAME] = {
+      output: {
+        target: "web-worker"
+      },
+      source: {
+        entry: serverEntries
+      }
+    };
+  }
+  return environments;
 }
 export {
-  createBuilderOptions
+  getBuilderEnvironments
 };

package/dist/esm/builder/generator/index.js CHANGED Viewed

@@ -1,30 +1,30 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createUniBuilder } from "@modern-js/uni-builder";
+import { mergeRsbuildConfig } from "@rsbuild/core";
 import { createBuilderProviderConfig } from "./createBuilderProviderConfig";
-import { getBuilderTargets } from "./getBuilderTargets";
-import { createBuilderOptions } from "./createBuilderOptions";
+import { getBuilderEnvironments } from "./getBuilderEnvironments";
 function generateBuilder(options, bundlerType) {
   return _generateBuilder.apply(this, arguments);
 }
 function _generateBuilder() {
   _generateBuilder = _async_to_generator(function(options, bundlerType) {
-    var normalizedConfig, appContext, builderConfig, target, builderOptions, builder;
+    var normalizedConfig, appContext, builderConfig, environments, builder;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           normalizedConfig = options.normalizedConfig, appContext = options.appContext;
           builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
-          target = getBuilderTargets(normalizedConfig);
-          builderOptions = createBuilderOptions(target, appContext);
+          environments = getBuilderEnvironments(normalizedConfig, appContext);
+          builderConfig.environments = builderConfig.environments ? mergeRsbuildConfig(environments, builderConfig.environments) : environments;
           return [
             4,
-            createUniBuilder(_object_spread_props(_object_spread({}, builderOptions), {
+            createUniBuilder({
+              cwd: appContext.appDirectory,
+              frameworkConfigPath: appContext.configFile || void 0,
               bundlerType,
               config: builderConfig
-            }))
+            })
           ];
         case 1:
           builder = _state.sent();

package/dist/esm/builder/shared/builderPlugins/adapterBasic.js CHANGED Viewed

@@ -1,21 +1,14 @@
 import path from "path";
+import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/uni-builder";
 var builderPluginAdapterBasic = function() {
   return {
     name: "builder-plugin-adapter-modern-basic",
     setup: function setup(api) {
       api.modifyBundlerChain(function(chain, param) {
-        var target = param.target, CHAIN_ID = param.CHAIN_ID;
-        if (target === "node") {
-          chain.name("server");
-        } else if (target === "service-worker") {
-          chain.name("service-worker");
-        } else if (target === "web-worker") {
-          chain.name("worker");
-        } else {
-          chain.name("client");
-        }
-        if (target === "node" || target === "service-worker") {
-          applyNodeCompat(target, chain);
+        var target = param.target, CHAIN_ID = param.CHAIN_ID, environment = param.environment;
+        var isServiceWorker = environment.name === SERVICE_WORKER_ENVIRONMENT_NAME;
+        if (target === "node" || isServiceWorker) {
+          applyNodeCompat(isServiceWorker, chain);
         }
         if (target === "web") {
           var bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
@@ -27,7 +20,7 @@ var builderPluginAdapterBasic = function() {
     }
   };
 };
-function applyNodeCompat(target, chain) {
+function applyNodeCompat(isServiceWorker, chain) {
   var nodeExts = [
     ".node.js",
     ".node.jsx",
@@ -64,7 +57,7 @@ function applyNodeCompat(target, chain) {
       }
     }
   }
-  if (target === "service-worker") {
+  if (isServiceWorker) {
     var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
     try {
       for (var _iterator1 = webWorkerExts[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {

package/dist/esm/builder/shared/builderPlugins/adapterHtml.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { isHtmlDisabled } from "@rsbuild/shared";
+import { isHtmlDisabled } from "@modern-js/uni-builder";
 import { MAIN_ENTRY_NAME, getEntryOptions, removeTailSlash } from "@modern-js/utils";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { BottomTemplatePlugin } from "../bundlerPlugins";
@@ -15,23 +15,23 @@ var builderPluginAdapterHtml = function(options) {
     setup: function setup(api) {
       api.modifyBundlerChain(function() {
         var _ref = _async_to_generator(function(chain, param) {
-          var CHAIN_ID, target, HtmlBundlerPlugin, builderConfig;
+          var CHAIN_ID, target, HtmlBundlerPlugin, environment, builderConfig;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
-                CHAIN_ID = param.CHAIN_ID, target = param.target, HtmlBundlerPlugin = param.HtmlPlugin;
-                builderConfig = api.getNormalizedConfig();
+                CHAIN_ID = param.CHAIN_ID, target = param.target, HtmlBundlerPlugin = param.HtmlPlugin, environment = param.environment;
+                builderConfig = environment.config;
                 if (!!isHtmlDisabled(builderConfig, target))
                   return [
                     3,
                     2
                   ];
                 applyBottomHtmlPlugin({
-                  api,
                   options,
                   chain,
                   CHAIN_ID,
-                  HtmlBundlerPlugin
+                  HtmlBundlerPlugin,
+                  htmlPaths: environment.htmlPaths
                 });
                 return [
                   4,
@@ -79,7 +79,7 @@ function _injectAssetPrefix() {
   return _injectAssetPrefix.apply(this, arguments);
 }
 function applyBottomHtmlPlugin(param) {
-  var api = param.api, chain = param.chain, options = param.options, CHAIN_ID = param.CHAIN_ID, HtmlBundlerPlugin = param.HtmlBundlerPlugin;
+  var chain = param.chain, options = param.options, CHAIN_ID = param.CHAIN_ID, HtmlBundlerPlugin = param.HtmlBundlerPlugin, htmlPaths = param.htmlPaths;
   var modernConfig = options.normalizedConfig, appContext = options.appContext;
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
@@ -101,7 +101,7 @@ function applyBottomHtmlPlugin(param) {
         ];
       });
     };
-    for (var _iterator = Object.keys(api.context.entry)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)
+    for (var _iterator = Object.keys(htmlPaths)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)
       _loop();
   } catch (err) {
     _didIteratorError = true;

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js CHANGED Viewed

@@ -1,9 +1,9 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
-import { isHtmlDisabled } from "@rsbuild/shared";
 import { mergeRsbuildConfig } from "@rsbuild/core";
 import { fs, isUseSSRBundle } from "@modern-js/utils";
+import { isHtmlDisabled, SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/uni-builder";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
 import { getServerCombinedModueFile } from "../../../plugins/analyze/utils";
 var builderPluginAdapterSSR = function(options) {
@@ -25,12 +25,12 @@ var builderPluginAdapterSSR = function(options) {
       });
       api.modifyBundlerChain(function() {
         var _ref = _async_to_generator(function(chain, param) {
-          var target, isProd, HtmlBundlerPlugin, isServer, builderConfig, normalizedConfig2;
+          var target, isProd, HtmlBundlerPlugin, isServer, environment, builderConfig, normalizedConfig2, isServiceWorker;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
-                target = param.target, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer;
-                builderConfig = api.getNormalizedConfig();
+                target = param.target, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer, environment = param.environment;
+                builderConfig = environment.config;
                 normalizedConfig2 = options.normalizedConfig;
                 applyRouterPlugin(chain, "route-plugin", options, HtmlBundlerPlugin);
                 if (!isUseSSRBundle(normalizedConfig2))
@@ -47,10 +47,8 @@ var builderPluginAdapterSSR = function(options) {
                 applySSRDataLoader(chain, options);
                 _state.label = 2;
               case 2:
-                if ([
-                  "node",
-                  "service-worker"
-                ].includes(target)) {
+                isServiceWorker = environment.name === SERVICE_WORKER_ENVIRONMENT_NAME;
+                if (target === "node" || isServiceWorker) {
                   applyFilterEntriesBySSRConfig({
                     isProd,
                     chain,

package/dist/esm/builder/shared/builderPlugins/adapterWorker.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { posix } from "path";
+import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/uni-builder";
 var getDistPath = function(outputConfig, type) {
   var distPath = outputConfig.distPath;
   var ret = distPath[type];
@@ -15,12 +16,13 @@ var builderPluginAdapterWorker = function() {
     setup: function setup(api) {
       api.modifyBundlerChain(function() {
         var _ref = _async_to_generator(function(chain, param) {
-          var isServiceWorker, config, workerPath, filename;
+          var environment, config, name, isServiceWorker, workerPath, filename;
           return _ts_generator(this, function(_state) {
-            isServiceWorker = param.isServiceWorker;
-            config = api.getNormalizedConfig();
+            environment = param.environment;
+            config = environment.config, name = environment.name;
+            isServiceWorker = name === SERVICE_WORKER_ENVIRONMENT_NAME;
             if (isServiceWorker) {
-              workerPath = getDistPath(config.output, "worker");
+              workerPath = getDistPath(config.output, "root");
               filename = posix.join(workerPath, "[name].js");
               chain.output.filename(filename).chunkFilename(filename).libraryTarget("commonjs2");
             }

package/dist/esm/commands/index.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { newAction, upgradeAction } from "@modern-js/utils";
-import { castArray } from "@rsbuild/shared";
+import { castArray } from "@modern-js/uni-builder";
 import { i18n, localeKeys } from "../locale";
 var devCommand = function() {
   var _ref = _async_to_generator(function(program, api) {

package/dist/esm/commands/inspect.js CHANGED Viewed

@@ -1,6 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { join } from "path";
 var inspect = function() {
   var _ref = _async_to_generator(function(api, options) {
     var appContext;
@@ -14,7 +13,7 @@ var inspect = function() {
         appContext.builder.inspectConfig({
           env: options.env,
           verbose: options.verbose,
-          outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
+          outputPath: options.output,
           writeToDisk: true
         })
       ];

package/dist/esm/commands/serve.js CHANGED Viewed

@@ -42,6 +42,7 @@ var start = function() {
               pwd: distDirectory,
               config: _object_spread_props(_object_spread({}, userConfig), {
                 dev: userConfig.dev,
+                // server-core can't get RegExp & Function output.enableInlineScripts by JSON.stringy;
                 output: _object_spread({
                   path: (_userConfig_output_distPath = userConfig.output.distPath) === null || _userConfig_output_distPath === void 0 ? void 0 : _userConfig_output_distPath.root
                 }, userConfig.output || {})

package/dist/esm/config/default.js CHANGED Viewed

@@ -16,11 +16,6 @@ function createDefaultConfig(appContext) {
       server: "bundles",
       worker: "worker"
     },
-    // no need to emit assets for SSR bundles
-    emitAssets: function(param) {
-      var target = param.target;
-      return target !== "node";
-    },
     cleanDistPath: true,
     disableNodePolyfill: true,
     enableInlineRouteManifests: true,
@@ -31,6 +26,7 @@ function createDefaultConfig(appContext) {
     entries: void 0,
     mainEntryName: MAIN_ENTRY_NAME,
     enableAsyncEntry: false,
+    enableCustomEntry: false,
     disableDefaultEntries: false,
     entriesDir: "./src",
     configDir: "./config",
@@ -94,6 +90,7 @@ function createLegacyDefaultConfig(appContext) {
     entries: void 0,
     mainEntryName: MAIN_ENTRY_NAME,
     enableAsyncEntry: false,
+    enableCustomEntry: false,
     disableDefaultEntries: false,
     entriesDir: "./src",
     configDir: "./config",

package/dist/esm/config/legacy/createSourceConfig.js CHANGED Viewed

@@ -1,5 +1,5 @@
 function createSourceConfig(config) {
-  var _config_source = config.source, alias = _config_source.alias, envVars = _config_source.envVars, globalVars = _config_source.globalVars, include = _config_source.include, moduleScopes = _config_source.moduleScopes, preEntry = _config_source.preEntry, entries = _config_source.entries, mainEntryName = _config_source.mainEntryName, enableAsyncEntry = _config_source.enableAsyncEntry, disableDefaultEntries = _config_source.disableDefaultEntries, entriesDir = _config_source.entriesDir, configDir = _config_source.configDir;
+  var _config_source = config.source, alias = _config_source.alias, envVars = _config_source.envVars, globalVars = _config_source.globalVars, include = _config_source.include, moduleScopes = _config_source.moduleScopes, preEntry = _config_source.preEntry, entries = _config_source.entries, mainEntryName = _config_source.mainEntryName, enableAsyncEntry = _config_source.enableAsyncEntry, enableCustomEntry = _config_source.enableCustomEntry, disableDefaultEntries = _config_source.disableDefaultEntries, entriesDir = _config_source.entriesDir, configDir = _config_source.configDir;
   var builderGlobalVars = globalVars || {};
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
@@ -31,6 +31,7 @@ function createSourceConfig(config) {
     entries,
     mainEntryName,
     enableAsyncEntry,
+    enableCustomEntry,
     disableDefaultEntries,
     entriesDir,
     configDir,

package/dist/esm/config/legacy/index.js CHANGED Viewed

@@ -27,6 +27,7 @@ function transformNormalizedConfig(config) {
     security: {},
     _raw: {},
     experiments: {},
+    environments: {},
     autoLoadPlugins,
     performance: {
       removeMomentLocale: true

package/dist/esm/hooks.js CHANGED Viewed

@@ -1,16 +1,13 @@
 import { createAsyncWaterfall, createAsyncWorkflow, createParallelWorkflow } from "@modern-js/plugin";
 var hooks = {
-  modifyEntryExport: createAsyncWaterfall(),
-  modifyEntryImports: createAsyncWaterfall(),
-  modifyEntryRuntimePlugins: createAsyncWaterfall(),
-  modifyEntryRenderFunction: createAsyncWaterfall(),
-  modifyAsyncEntry: createAsyncWaterfall(),
+  _internalRuntimePlugins: createAsyncWaterfall(),
   modifyFileSystemRoutes: createAsyncWaterfall(),
   modifyServerRoutes: createAsyncWaterfall(),
   /** add entry point info to entrypoints array */
   modifyEntrypoints: createAsyncWaterfall(),
   /** add entry type */
   checkEntryPoint: createAsyncWaterfall(),
+  generateEntryCode: createAsyncWorkflow(),
   htmlPartials: createAsyncWaterfall(),
   beforeGenerateRoutes: createAsyncWaterfall(),
   addDefineTypes: createAsyncWaterfall(),

package/dist/esm/plugins/analyze/constants.js CHANGED Viewed

@@ -1,23 +1,13 @@
 var INDEX_FILE_NAME = "index";
-var FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
-var ENTRY_POINT_FILE_NAME = "index.jsx";
-var ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+var ENTRY_FILE_NAME = "entry";
 var HTML_PARTIALS_FOLDER = "html";
 var HTML_PARTIALS_EXTENSIONS = [
   ".htm",
   ".html",
   ".ejs"
 ];
-var APP_CONFIG_NAME = "config";
-var APP_INIT_EXPORTED = "init";
-var APP_INIT_IMPORTED = "appInit";
 export {
-  APP_CONFIG_NAME,
-  APP_INIT_EXPORTED,
-  APP_INIT_IMPORTED,
-  ENTRY_BOOTSTRAP_FILE_NAME,
-  ENTRY_POINT_FILE_NAME,
-  FILE_SYSTEM_ROUTES_FILE_NAME,
+  ENTRY_FILE_NAME,
   HTML_PARTIALS_EXTENSIONS,
   HTML_PARTIALS_FOLDER,
   INDEX_FILE_NAME

package/dist/esm/plugins/analyze/getBundleEntry.js CHANGED Viewed

@@ -67,7 +67,8 @@ var getBundleEntry = function() {
                 absoluteEntryDir: isDirectory(ensureAbsolutePath(appDirectory, entryName)) ? ensureAbsolutePath(appDirectory, entryName) : path.dirname(ensureAbsolutePath(appDirectory, entryName)),
                 isAutoMount,
                 customBootstrap: typeof value === "string" ? false : value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
-                fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, entryName)).isDirectory() ? {} : void 0
+                fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, entryName)).isDirectory() ? {} : void 0,
+                isCustomSourceEntry: true
               };
               if (!ifAlreadyExists(defaults, entrypoint)) {
                 defaults.push(entrypoint);