@modern-js/app-tools 2.4.0 → 3.0.0-beta.0

package/dist/js/treeshaking/analyze/nestedRoutes.js

@@ -197,7 +197,7 @@ var createRoute = function(routeInfo, rootDir, filename, entryName) {
 };
 var walk = function() {
     var _ref = _asyncToGenerator(function(dirname, rootDir, alias, entryName) {
-        var ref, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref1, ref2, ref3, err, finalRoute, childRoute1, path2;
+        var _route_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, _route_children1, _route_children2, _route_children3, err, finalRoute, childRoute1, path2;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -288,7 +288,7 @@ var walk = function() {
                     childRoute = _state.sent();
                     if (childRoute) {
                         ;
-                        (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(childRoute);
+                        (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(childRoute);
                     }
                     _state.label = 8;
                 case 8:
@@ -317,7 +317,7 @@ var walk = function() {
                         if (pageLoaderFile) {
                             pageRoute.loader = pageLoaderFile;
                         }
-                        (ref2 = route.children) === null || ref2 === void 0 ? void 0 : ref2.push(pageRoute);
+                        (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(pageRoute);
                     }
                     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
                         splatLoaderFile = itemPath;
@@ -331,7 +331,7 @@ var walk = function() {
                         if (splatLoaderFile) {
                             splatRoute.loader = splatLoaderFile;
                         }
-                        (ref3 = route.children) === null || ref3 === void 0 ? void 0 : ref3.push(splatRoute);
+                        (_route_children3 = route.children) === null || _route_children3 === void 0 ? void 0 : _route_children3.push(splatRoute);
                     }
                     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
                         route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
@@ -377,7 +377,7 @@ var walk = function() {
                     if (isPathlessLayout) {
                         delete finalRoute.path;
                     }
-                    route.children = (ref = route.children) === null || ref === void 0 ? void 0 : ref.filter(function(childRoute) {
+                    route.children = (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.filter(function(childRoute) {
                         return childRoute;
                     });
                     if (route.children && route.children.length === 0 && !route.index) {

package/dist/js/treeshaking/analyze/templates.js

@@ -243,8 +243,8 @@ var routesForServer = function(param) {
     var traverseRouteTree = function(route) {
         var children;
         if ("children" in route && route.children) {
-            var ref;
-            children = route === null || route === void 0 ? void 0 : (ref = route.children) === null || ref === void 0 ? void 0 : ref.map(traverseRouteTree);
+            var _route_children;
+            children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
         }
         var loader;
         if (route.type === "nested") {
@@ -296,7 +296,7 @@ var routesForServer = function(param) {
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value, key, loaderInfo;
+        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -321,8 +321,8 @@ var fileSystemRoutes = function() {
                     traverseRouteTree = function(route) {
                         var children;
                         if ("children" in route && route.children) {
-                            var ref;
-                            children = route === null || route === void 0 ? void 0 : (ref = route.children) === null || ref === void 0 ? void 0 : ref.map(traverseRouteTree);
+                            var _route_children;
+                            children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
                         }
                         var loading;
                         var error;
@@ -417,7 +417,7 @@ var fileSystemRoutes = function() {
                     _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
                     try {
                         for(_iterator1 = Object.entries(loadersMap)[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-                            _value = _slicedToArray(_step1.value, 2), key = _value[0], loaderInfo = _value[1];
+                            _step_value = _slicedToArray(_step1.value, 2), key = _step_value[0], loaderInfo = _step_value[1];
                             if (loaderInfo.inline) {
                                 importLoadersCode += "import { loader as ".concat(key, ' } from "').concat(getDataLoaderPath(key)).concat(slash(loaderInfo.filePath), '";\n');
                             } else {

package/dist/js/treeshaking/analyze/utils.js

@@ -333,7 +333,7 @@ var parseModule = function() {
 }();
 var hasLoader = function() {
     var _ref = _asyncToGenerator(function(filename) {
-        var source, ref, moduleExports;
+        var source, _ref, moduleExports;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -351,10 +351,10 @@ var hasLoader = function() {
                         })
                     ];
                 case 2:
-                    ref = _slicedToArray.apply(void 0, [
+                    _ref = _slicedToArray.apply(void 0, [
                         _state.sent(),
                         2
-                    ]), moduleExports = ref[1];
+                    ]), moduleExports = _ref[1];
                     return [
                         2,
                         moduleExports.some(function(e) {

package/dist/js/treeshaking/builder/builder-webpack/builderPlugins/compatModern.js

@@ -33,15 +33,15 @@ var PluginCompatModern = function(options) {
             var modernConfig = options.normalizedConfig, appContext = options.appContext;
             api.modifyWebpackChain(function(chain, param) {
                 var CHAIN_ID = param.CHAIN_ID;
-                var ref;
+                var _modernConfig_runtime;
                 chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
                 if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
                     var defaultCopyPattern = createCopyPattern(appContext, modernConfig, "public", chain);
                     chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function(args) {
-                        var ref;
+                        var _args_;
                         return [
                             {
-                                patterns: _toConsumableArray(((ref = args[0]) === null || ref === void 0 ? void 0 : ref.patterns) || []).concat([
+                                patterns: _toConsumableArray(((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || []).concat([
                                     defaultCopyPattern
                                 ])
                             }
@@ -52,7 +52,7 @@ var PluginCompatModern = function(options) {
                 var existNestedRoutes = entrypoints.some(function(entrypoint) {
                     return entrypoint.nestedRoutesEntry;
                 });
-                var routerConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (ref = modernConfig.runtime) === null || ref === void 0 ? void 0 : ref.router;
+                var routerConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_runtime = modernConfig.runtime) === null || _modernConfig_runtime === void 0 ? void 0 : _modernConfig_runtime.router;
                 var routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
                 if (existNestedRoutes || routerManifest) {
                     chain.plugin("route-plugin").use(RouterPlugin);

package/dist/js/treeshaking/builder/builder-webpack/index.js

@@ -248,7 +248,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
     _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
-        var normalizedConfig, PluginNodePolyfill, _tools, esbuildOptions, PluginEsbuild;
+        var normalizedConfig, PluginNodePolyfill, _normalizedConfig_tools, esbuildOptions, PluginEsbuild;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -272,7 +272,7 @@ function _applyBuilderPlugins() {
                         3,
                         4
                     ];
-                    _tools = normalizedConfig.tools, esbuildOptions = _tools.esbuild;
+                    _normalizedConfig_tools = normalizedConfig.tools, esbuildOptions = _normalizedConfig_tools.esbuild;
                     return [
                         4,
                         import("@modern-js/builder-plugin-esbuild")

package/dist/js/treeshaking/builder/builder-webpack/webpackPlugins/RouterPlugin.js

@@ -215,6 +215,9 @@ var RouterPlugin = /*#__PURE__*/ function() {
                 if (target === "node" || Array.isArray(target) && target.includes("node")) {
                     return;
                 }
+                if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
+                    return;
+                }
                 var webpack = compiler.webpack;
                 var Compilation = webpack.Compilation, sources = webpack.sources;
                 var RawSource = sources.RawSource;
@@ -232,7 +235,7 @@ var RouterPlugin = /*#__PURE__*/ function() {
                         name: PLUGIN_NAME,
                         stage: PROCESS_ASSETS_STAGE_REPORT
                     }, /*#__PURE__*/ _asyncToGenerator(function() {
-                        var stats, publicPath, routeAssets, namedChunkGroups, assetsByChunkName, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, name, chunkGroup, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, file, asset, newContent, filename;
+                        var stats, publicPath, routeAssets, namedChunkGroups, assetsByChunkName, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, file, asset, newContent, filename;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -252,7 +255,7 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                     _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                     try {
                                         for(_iterator = Object.entries(namedChunkGroups)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                            _value = _slicedToArray(_step.value, 2), name = _value[0], chunkGroup = _value[1];
+                                            _step_value = _slicedToArray(_step.value, 2), name = _step_value[0], chunkGroup = _step_value[1];
                                             if (assetsByChunkName[name]) {
                                                 routeAssets[name] = {
                                                     chunkIds: chunkGroup.chunks,

package/dist/js/treeshaking/builder/generator/createBuilderOptions.js

@@ -1,10 +1,10 @@
 function createBuilderOptions(target, appContext) {
     var entries = {};
-    var _entrypoints = appContext.entrypoints, entrypoints = _entrypoints === void 0 ? [] : _entrypoints, checkedEntries = appContext.checkedEntries;
+    var _appContext_entrypoints = appContext.entrypoints, entrypoints = _appContext_entrypoints === void 0 ? [] : _appContext_entrypoints, checkedEntries = appContext.checkedEntries;
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = entrypoints[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _value = _step.value, entryName = _value.entryName, entry = _value.entry;
+            var _step_value = _step.value, entryName = _step_value.entryName, entry = _step_value.entry;
             if (checkedEntries && !checkedEntries.includes(entryName)) {
                 continue;
             }

package/dist/js/treeshaking/builder/generator/getBuilderTargets.js

@@ -1,4 +1,4 @@
-import { isProd, isSSR, isUseSSRBundle } from "@modern-js/utils";
+import { isProd, isServiceWorker, isSSR, isUseSSRBundle } from "@modern-js/utils";
 function getBuilderTargets(normalizedConfig) {
     var targets = [
         "web"
@@ -7,6 +7,10 @@ function getBuilderTargets(normalizedConfig) {
     if (useNodeTarget) {
         targets.push("node");
     }
+    var useWorkerTarget = isProd() ? isServiceWorker(normalizedConfig) : false;
+    if (useWorkerTarget) {
+        targets.push("service-worker");
+    }
     return targets;
 }
 export { getBuilderTargets };

package/dist/js/treeshaking/builder/generator/index.js

@@ -131,12 +131,12 @@ function generateBuilder(options, generateProvider, utils) {
 }
 function _generateBuilder() {
     _generateBuilder = _asyncToGenerator(function(options, generateProvider, utils) {
-        var normalizedConfig, appContext, ref, modifyBuilderConfig, modifyBuilderInstance, builderConfig, provider, target, builderOptions, builder;
+        var normalizedConfig, appContext, _ref, modifyBuilderConfig, modifyBuilderInstance, builderConfig, provider, target, builderOptions, builder;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     normalizedConfig = options.normalizedConfig, appContext = options.appContext;
-                    ref = utils || {}, modifyBuilderConfig = ref.modifyBuilderConfig, modifyBuilderInstance = ref.modifyBuilderInstance;
+                    _ref = utils || {}, modifyBuilderConfig = _ref.modifyBuilderConfig, modifyBuilderInstance = _ref.modifyBuilderInstance;
                     builderConfig = createBuilderProviderConfig(normalizedConfig, appContext, modifyBuilderConfig);
                     provider = generateProvider({
                         builderConfig: builderConfig

package/dist/js/treeshaking/builder/shared/builderPlugins/adapterModern.js

@@ -95,8 +95,8 @@ var builderPluginAdapterModern = function(options) {
         name: "builder-plugin-adapter-modern",
         setup: function setup(api) {
             var isHtmlEnabled = function isHtmlEnabled(config, target) {
-                var ref;
-                return ((ref = config.tools) === null || ref === void 0 ? void 0 : ref.htmlPlugin) !== false && target !== "node" && target !== "web-worker";
+                var _config_tools;
+                return ((_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
             };
             var normalizedConfig = options.normalizedConfig, appContext = options.appContext;
             api.modifyBuilderConfig(function(config) {
@@ -114,13 +114,17 @@ var builderPluginAdapterModern = function(options) {
                 var builderConfig = api.getNormalizedConfig();
                 if (target === "node") {
                     chain.name("server");
+                } else if (target === "service-worker") {
+                    chain.name("service-worker");
+                } else if (target === "web-worker") {
+                    chain.name("worker");
                 } else if (target === "modern-web") {
                     chain.name("modern");
                 } else {
                     chain.name("client");
                 }
-                if (target === "node") {
-                    applyNodeCompat(chain, normalizedConfig, isProd);
+                if (target === "node" || target === "service-worker") {
+                    applyNodeCompat(target, chain, normalizedConfig, isProd);
                 }
                 if (isHtmlEnabled(builderConfig, target)) {
                     applyBottomHtmlPlugin({
@@ -136,7 +140,7 @@ var builderPluginAdapterModern = function(options) {
                         CHAIN_ID: CHAIN_ID
                     });
                 }
-                if (target !== "node") {
+                if (target !== "node" && target !== "web-worker" && target !== "service-worker") {
                     var bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
                     chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
                     chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
@@ -203,11 +207,11 @@ function applyAsyncChunkHtmlPlugin(param) {
         ]);
     }
 }
-function applyNodeCompat(chain, modernConfig, isProd) {
+function applyNodeCompat(target, chain, modernConfig, isProd) {
     var filterEntriesBySSRConfig = function filterEntriesBySSRConfig(isProd2, chain2, serverConfig, outputConfig) {
-        var ref;
+        var _outputConfig_ssg;
         var entries = chain2.entryPoints.entries();
-        if (isProd2 && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof (outputConfig === null || outputConfig === void 0 ? void 0 : (ref = outputConfig.ssg) === null || ref === void 0 ? void 0 : ref[0]) === "function")) {
+        if (isProd2 && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof (outputConfig === null || outputConfig === void 0 ? void 0 : (_outputConfig_ssg = outputConfig.ssg) === null || _outputConfig_ssg === void 0 ? void 0 : _outputConfig_ssg[0]) === "function")) {
             return;
         }
         if (typeof entries === "undefined") {
@@ -226,14 +230,14 @@ function applyNodeCompat(chain, modernConfig, isProd) {
                 }
             });
         }
-        var ref1 = serverConfig || {}, ssr = ref1.ssr, ssrByEntries = ref1.ssrByEntries;
+        var _ref = serverConfig || {}, ssr = _ref.ssr, ssrByEntries = _ref.ssrByEntries;
         entryNames.forEach(function(name) {
             if (!ssgEntries.includes(name) && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
                 chain2.entryPoints.delete(name);
             }
         });
     };
-    for(var _i = 0, _iter = [
+    var nodeExts = [
         ".node.js",
         ".node.jsx",
         ".node.ts",
@@ -242,9 +246,54 @@ function applyNodeCompat(chain, modernConfig, isProd) {
         ".server.ts",
         ".server.ts",
         ".server.tsx"
-    ]; _i < _iter.length; _i++){
-        var ext = _iter[_i];
-        chain.resolve.extensions.prepend(ext);
+    ];
+    var webWorkerExts = [
+        ".worker.js",
+        ".worker.jsx",
+        ".worker.ts",
+        ".worker.tsx"
+    ];
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = nodeExts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var ext = _step.value;
+            chain.resolve.extensions.prepend(ext);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    if (target === "service-worker") {
+        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+        try {
+            for(var _iterator1 = webWorkerExts[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                var ext1 = _step1.value;
+                chain.resolve.extensions.prepend(ext1);
+            }
+        } catch (err) {
+            _didIteratorError1 = true;
+            _iteratorError1 = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                    _iterator1.return();
+                }
+            } finally{
+                if (_didIteratorError1) {
+                    throw _iteratorError1;
+                }
+            }
+        }
     }
     filterEntriesBySSRConfig(isProd, chain, modernConfig.server, modernConfig.output);
 }

package/dist/js/treeshaking/builder/shared/bundlerPlugins/HtmlBottomTemplate.js

@@ -48,8 +48,8 @@ var BottomTemplatePlugin = /*#__PURE__*/ function() {
                 var _this = this;
                 compiler.hooks.compilation.tap(this.name, function(compilation) {
                     _this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(_this.name, function(data) {
-                        var ref;
-                        if (!((ref = data.plugin.options) === null || ref === void 0 ? void 0 : ref.__internal__)) {
+                        var _data_plugin_options;
+                        if (!((_data_plugin_options = data.plugin.options) === null || _data_plugin_options === void 0 ? void 0 : _data_plugin_options.__internal__)) {
                             return data;
                         }
                         if (_this.bottomTemplateReg.test(data.html)) {

package/dist/js/treeshaking/commands/dev.js

@@ -182,7 +182,7 @@ import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var dev = function() {
     var _ref = _asyncToGenerator(function(api, options) {
-        var ref, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, serverInternalPlugins, serverOptions, app, server;
+        var _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, serverInternalPlugins, serverOptions, app, server;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -237,7 +237,7 @@ var dev = function() {
                         dev: _objectSpread({
                             port: port,
                             https: normalizedConfig.dev.https
-                        }, (ref = normalizedConfig.tools) === null || ref === void 0 ? void 0 : ref.devServer),
+                        }, (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer),
                         pwd: appDirectory,
                         config: normalizedConfig,
                         serverConfigFile: serverConfigFile,

package/dist/js/treeshaking/commands/serve.js

@@ -129,7 +129,7 @@ import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var start = function() {
     var _ref = _asyncToGenerator(function(api) {
-        var ref, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, serverInternalPlugins, app;
+        var _userConfig_source, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, serverInternalPlugins, app;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -140,7 +140,7 @@ var start = function() {
                     logger.log(chalk.cyan("Starting the modern server..."));
                     return [
                         4,
-                        isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.source) === null || ref === void 0 ? void 0 : ref.entriesDir)
+                        isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir)
                     ];
                 case 1:
                     apiOnly = _state.sent();

package/dist/js/treeshaking/config/initialize/inits.js

@@ -107,7 +107,7 @@ function initHtmlConfig(config, appContext) {
 }
 function initSourceConfig(config, appContext, bundler) {
     var createBuilderGlobalVars = function createBuilderGlobalVars(config2, appContext2) {
-        var _source = config2.source, _globalVars = _source.globalVars, globalVars = _globalVars === void 0 ? {} : _globalVars;
+        var _config2_source = config2.source, _config2_source_globalVars = _config2_source.globalVars, globalVars = _config2_source_globalVars === void 0 ? {} : _config2_source_globalVars;
         var publicEnv = getAutoInjectEnv(appContext2);
         return _objectSpread({}, globalVars, publicEnv);
     };
@@ -199,7 +199,7 @@ function initToolsConfig(config) {
             ]
         }
     };
-    var _tools = config.tools, tsChecker = _tools.tsChecker, tsLoader = _tools.tsLoader;
+    var _config_tools = config.tools, tsChecker = _config_tools.tsChecker, tsLoader = _config_tools.tsLoader;
     config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
     tsLoader && (config.tools.tsLoader = function(tsLoaderConfig, utils) {
         applyOptionsChain(_objectSpreadProps(_objectSpread({}, tsLoaderConfig), {

package/dist/js/treeshaking/config/legacy/createHtmlConfig.js

@@ -1,5 +1,5 @@
 function createHtmlConfig(config) {
-    var _output = config.output, disableHtmlFolder = _output.disableHtmlFolder, favicon = _output.favicon, faviconByEntries = _output.faviconByEntries, inject = _output.inject, injectByEntries = _output.injectByEntries, meta = _output.meta, metaByEntries = _output.metaByEntries, mountId = _output.mountId, title = _output.title, titleByEntries = _output.titleByEntries, templateParameters = _output.templateParameters, templateParametersByEntries = _output.templateParametersByEntries, crossorigin = _output.crossorigin;
+    var _config_output = config.output, disableHtmlFolder = _config_output.disableHtmlFolder, favicon = _config_output.favicon, faviconByEntries = _config_output.faviconByEntries, inject = _config_output.inject, injectByEntries = _config_output.injectByEntries, meta = _config_output.meta, metaByEntries = _config_output.metaByEntries, mountId = _config_output.mountId, title = _config_output.title, titleByEntries = _config_output.titleByEntries, templateParameters = _config_output.templateParameters, templateParametersByEntries = _config_output.templateParametersByEntries, crossorigin = _config_output.crossorigin;
     return {
         disableHtmlFolder: disableHtmlFolder,
         favicon: favicon,

package/dist/js/treeshaking/config/legacy/createOutputConfig.js

@@ -1,5 +1,5 @@
 function createOutputConfig(config) {
-    var _output = config.output, assetPrefix = _output.assetPrefix, copy = _output.copy, cssModuleLocalIdentName = _output.cssModuleLocalIdentName, cssPath = _output.cssPath, jsPath = _output.jsPath, htmlPath = _output.htmlPath, mediaPath = _output.mediaPath, enableTsLoader = _output.enableTsLoader, path = _output.path, disableInlineRuntimeChunk = _output.disableInlineRuntimeChunk, disableCssExtract = _output.disableCssExtract, disableMinimize = _output.disableMinimize, disableSourceMap = _output.disableSourceMap, disableTsChecker = _output.disableTsChecker, enableCssModuleTSDeclaration = _output.enableCssModuleTSDeclaration, enableInlineScripts = _output.enableInlineScripts, enableInlineStyles = _output.enableInlineStyles, polyfill = _output.polyfill, dataUriLimit = _output.dataUriLimit, disableAssetsCache = _output.disableAssetsCache, enableLatestDecorators = _output.enableLatestDecorators, disableCssModuleExtension = _output.disableCssModuleExtension, ssg = _output.ssg, disableNodePolyfill = _output.disableNodePolyfill;
+    var _config_output = config.output, assetPrefix = _config_output.assetPrefix, copy = _config_output.copy, cssModuleLocalIdentName = _config_output.cssModuleLocalIdentName, cssPath = _config_output.cssPath, jsPath = _config_output.jsPath, htmlPath = _config_output.htmlPath, mediaPath = _config_output.mediaPath, enableTsLoader = _config_output.enableTsLoader, path = _config_output.path, disableInlineRuntimeChunk = _config_output.disableInlineRuntimeChunk, disableCssExtract = _config_output.disableCssExtract, disableMinimize = _config_output.disableMinimize, disableSourceMap = _config_output.disableSourceMap, disableTsChecker = _config_output.disableTsChecker, enableCssModuleTSDeclaration = _config_output.enableCssModuleTSDeclaration, enableInlineScripts = _config_output.enableInlineScripts, enableInlineStyles = _config_output.enableInlineStyles, polyfill = _config_output.polyfill, dataUriLimit = _config_output.dataUriLimit, disableAssetsCache = _config_output.disableAssetsCache, enableLatestDecorators = _config_output.enableLatestDecorators, disableCssModuleExtension = _config_output.disableCssModuleExtension, ssg = _config_output.ssg, disableNodePolyfill = _config_output.disableNodePolyfill;
     return {
         assetPrefix: assetPrefix,
         copy: copy,

package/dist/js/treeshaking/config/legacy/createSourceConfig.js

@@ -1,5 +1,5 @@
 function createSourceConfig(config) {
-    var _source = config.source, alias = _source.alias, envVars = _source.envVars, globalVars = _source.globalVars, include = _source.include, moduleScopes = _source.moduleScopes, preEntry = _source.preEntry, entries = _source.entries, enableAsyncEntry = _source.enableAsyncEntry, disableDefaultEntries = _source.disableDefaultEntries, entriesDir = _source.entriesDir, configDir = _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, enableAsyncEntry = _config_source.enableAsyncEntry, disableDefaultEntries = _config_source.disableDefaultEntries, entriesDir = _config_source.entriesDir, configDir = _config_source.configDir;
     var builderGlobalVars = globalVars || {};
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {

package/dist/js/treeshaking/config/legacy/createToolsConfig.js

@@ -1,5 +1,5 @@
 function createToolsConfig(config) {
-    var _tools = config.tools, autoprefixer = _tools.autoprefixer, babel = _tools.babel, minifyCss = _tools.minifyCss, terser = _tools.terser, webpack = _tools.webpack, webpackChain = _tools.webpackChain, tsLoader = _tools.tsLoader, styledComponents = _tools.styledComponents, sass = _tools.sass, postcss = _tools.postcss, less = _tools.less, htmlPlugin = _tools.htmlPlugin, devServer = _tools.devServer, tailwindcss = _tools.tailwindcss, jest = _tools.jest, esbuild = _tools.esbuild;
+    var _config_tools = config.tools, autoprefixer = _config_tools.autoprefixer, babel = _config_tools.babel, minifyCss = _config_tools.minifyCss, terser = _config_tools.terser, webpack = _config_tools.webpack, webpackChain = _config_tools.webpackChain, tsLoader = _config_tools.tsLoader, styledComponents = _config_tools.styledComponents, sass = _config_tools.sass, postcss = _config_tools.postcss, less = _config_tools.less, htmlPlugin = _config_tools.htmlPlugin, devServer = _config_tools.devServer, tailwindcss = _config_tools.tailwindcss, jest = _config_tools.jest, esbuild = _config_tools.esbuild;
     var enableTsLoader = config.output.enableTsLoader;
     return {
         tsLoader: enableTsLoader ? tsLoader : void 0,

package/dist/js/treeshaking/initialize/index.js

@@ -198,7 +198,7 @@ var initialize_default = function(param) {
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     return _asyncToGenerator(function() {
-                        var ref, appContext, userConfig, port, normalizedConfig;
+                        var _resolved_output_distPath, appContext, userConfig, port, normalizedConfig;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -212,7 +212,7 @@ var initialize_default = function(param) {
                                     port = _state.sent();
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         port: port,
-                                        distDirectory: ensureAbsolutePath(appContext.distDirectory, ((ref = resolved.output.distPath) === null || ref === void 0 ? void 0 : ref.root) || "dist")
+                                        distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
                                     });
                                     api.setAppContext(appContext);
                                     normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;

package/dist/js/treeshaking/utils/config.js

@@ -275,11 +275,11 @@ var safeReplacer = function() {
 };
 var emitResolvedConfig = function() {
     var _ref = _asyncToGenerator(function(appDirectory, resolvedConfig) {
-        var ref, outputPath;
+        var _resolvedConfig_output_distPath, outputPath;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    outputPath = path.join(appDirectory, ((ref = resolvedConfig.output.distPath) === null || ref === void 0 ? void 0 : ref.root) || "./dist", OUTPUT_CONFIG_FILE);
+                    outputPath = path.join(appDirectory, ((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", OUTPUT_CONFIG_FILE);
                     return [
                         4,
                         fs.writeJSON(outputPath, resolvedConfig, {

package/dist/js/treeshaking/utils/getServerInternalPlugins.js

@@ -179,7 +179,7 @@ function getServerInternalPlugins(api) {
 }
 function _getServerInternalPlugins() {
     _getServerInternalPlugins = _asyncToGenerator(function(api) {
-        var hookRunners, ref, serverPlugins, serverInternalPlugins;
+        var hookRunners, _ref, serverPlugins, serverInternalPlugins;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -191,7 +191,7 @@ function _getServerInternalPlugins() {
                         })
                     ];
                 case 1:
-                    ref = _state.sent(), serverPlugins = ref.plugins;
+                    _ref = _state.sent(), serverPlugins = _ref.plugins;
                     serverInternalPlugins = serverPlugins.reduce(function(result, plugin) {
                         return Object.assign(result, plugin);
                     }, {});

package/dist/types/types/hooks.d.ts

@@ -4,6 +4,7 @@ import type { Entrypoint, HtmlPartials, NestedRoute, PageRoute, RouteLegacy, Ser
 import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
 import type { Stats, MultiStats } from '@modern-js/builder-shared';
 import type { Rspack } from '@modern-js/builder-rspack-provider';
+import { Bundler } from './utils';
 export interface ImportSpecifier {
   local?: string;
   imported?: string;
@@ -18,7 +19,7 @@ export interface RuntimePlugin {
   options: string;
   args?: string;
 }
-export type AppToolsHooks = {
+export type AppToolsHooks<B extends Bundler = 'webpack'> = {
   modifyEntryExport: AsyncWaterfall<{
     entrypoint: Entrypoint;
     exportStatement: string;
@@ -61,16 +62,16 @@ export type AppToolsHooks = {
   beforeDev: AsyncWorkflow<void, unknown>;
   afterDev: AsyncWorkflow<void, unknown>;
   beforeCreateCompiler: AsyncWorkflow<{
-    bundlerConfigs: webpack.Configuration[] | Rspack.Configuration[];
+    bundlerConfigs?: B extends 'rspack' ? Rspack.Configuration[] : webpack.Configuration[];
   }, unknown>;
   afterCreateCompiler: AsyncWorkflow<{
-    compiler?: webpack.Compiler | webpack.MultiCompiler | Rspack.Compiler;
+    compiler?: B extends 'rspack' ? Rspack.Compiler : webpack.Compiler | webpack.MultiCompiler;
   }, unknown>;
   beforePrintInstructions: AsyncWaterfall<{
     instructions: string;
   }>;
   beforeBuild: AsyncWorkflow<{
-    bundlerConfigs?: webpack.Configuration[] | Rspack.Configuration[];
+    bundlerConfigs?: B extends 'rspack' ? Rspack.Configuration[] : webpack.Configuration[];
   }, unknown>;
   afterBuild: AsyncWorkflow<{
     stats?: Stats | MultiStats;

package/dist/types/types/index.d.ts

@@ -6,11 +6,13 @@ import { Bundler, FromConfig } from './utils';
 export * from './hooks';
 export * from './config';
 export * from './legacyConfig';
+export type { webpack } from '@modern-js/builder-webpack-provider';
+export type { Rspack } from '@modern-js/builder-rspack-provider';
 export type { Bundler } from './utils';
 export type { ServerUserConfig, ServerNormalizedConfig, BffUserConfig, BffNormalizedConfig, SSR, SSRByEntries } from '@modern-js/server-core';
 export type { IAppContext, PluginAPI, CliPlugin, NormalizedConfig, UserConfig } from '@modern-js/core';
 export type AppTools<B extends Bundler = 'webpack'> = {
-  hooks: AppToolsHooks;
+  hooks: AppToolsHooks<B>;
   userConfig: FromConfig<B, {
     rspack: RsAppToolsUserConfig;
     webpack: AppToolsUserConfig;