@modern-js/app-tools 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/js/node/analyze/utils.js

@@ -4,29 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.walkDirectory = exports.replaceWithAlias = exports.isRouteComponentFile = exports.getDefaultImports = void 0;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _constants = require("./constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const walkDirectory = dir => _fs.default.readdirSync(dir).reduce((previous, filename) => {
   const filePath = _path.default.join(dir, filename);
-
   if (_fs.default.statSync(filePath).isDirectory()) {
     return [...previous, ...walkDirectory(filePath)];
   } else {
     return [...previous, filePath];
   }
 }, []);
-
 exports.walkDirectory = walkDirectory;
-
 const getDefaultImports = ({
   entrypoint,
   srcDirectory,
@@ -63,7 +54,6 @@ const getDefaultImports = ({
     }],
     value: (0, _utils.normalizeToPosixPath)(customBootstrap.replace(srcDirectory, internalSrcAlias))
   }].filter(Boolean);
-
   if (fileSystemRoutes) {
     const route = {
       specifiers: [{
@@ -71,7 +61,6 @@ const getDefaultImports = ({
       }],
       value: (0, _utils.normalizeToPosixPath)(`${internalDirAlias}/${entryName}/${_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`)
     };
-
     if (fileSystemRoutes.globalApp) {
       imports.push({
         specifiers: [{
@@ -82,7 +71,6 @@ const getDefaultImports = ({
     } else {
       route.initialize = 'const App = false;';
     }
-
     imports.push(route);
   } else {
     imports.push({
@@ -92,26 +80,18 @@ const getDefaultImports = ({
       value: (0, _utils.normalizeToPosixPath)(entry.replace(srcDirectory, internalSrcAlias))
     });
   }
-
   return imports;
 };
-
 exports.getDefaultImports = getDefaultImports;
-
 const isRouteComponentFile = filePath => {
   if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
     return false;
   }
-
   if (['.js', '.jsx', '.ts', '.tsx'].includes(_path.default.extname(filePath))) {
     return true;
   }
-
   return false;
 };
-
 exports.isRouteComponentFile = isRouteComponentFile;
-
 const replaceWithAlias = (base, filePath, alias) => (0, _utils.normalizeToPosixPath)(_path.default.join(alias, _path.default.relative(base, filePath)));
-
 exports.replaceWithAlias = replaceWithAlias;

package/dist/js/node/builder/builderPlugins/compatModern.js

@@ -4,37 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PluginCompatModern = void 0;
-
 var _path = require("path");
-
 var _builderShared = require("@modern-js/builder-shared");
-
 var _lodash = require("@modern-js/utils/lodash");
-
 var _htmlWebpackPlugin = _interopRequireDefault(require("@modern-js/builder-webpack-provider/html-webpack-plugin"));
-
 var _utils = require("@modern-js/utils");
-
 var _htmlBottomTemplate = require("../webpackPlugins/htmlBottomTemplate");
-
 var _htmlAsyncChunkPlugin = require("../webpackPlugins/htmlAsyncChunkPlugin");
-
 var _share = require("../share");
-
+var _routerPlugin = _interopRequireDefault(require("../webpackPlugins/routerPlugin"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 /**
  * Provides default configuration consistent with `@modern-js/webpack`
  */
 const PluginCompatModern = (appContext, modernConfig, options) => ({
   name: 'builder-plugin-compat-modern',
-
   setup(api) {
     api.modifyBuilderConfig(config => {
       if (isStreamingSSR(modernConfig)) {
@@ -44,7 +31,6 @@ const PluginCompatModern = (appContext, modernConfig, options) => ({
           }
         });
       }
-
       return config;
     });
     api.modifyWebpackChain((chain, {
@@ -52,8 +38,8 @@ const PluginCompatModern = (appContext, modernConfig, options) => ({
       CHAIN_ID,
       isProd
     }) => {
-      const builderNormalizedConfig = api.getNormalizedConfig(); // set webpack config name
-
+      const builderNormalizedConfig = api.getNormalizedConfig();
+      // set webpack config name
       if (target === 'node') {
         chain.name('server');
       } else if (target === 'modern-web') {
@@ -61,13 +47,12 @@ const PluginCompatModern = (appContext, modernConfig, options) => ({
       } else {
         chain.name('client');
       }
+      chain.resolve.modules.add('node_modules').add((0, _path.join)(api.context.rootPath, 'node_modules'));
 
-      chain.resolve.modules.add('node_modules').add((0, _path.join)(api.context.rootPath, 'node_modules')); // apply node compat
-
+      // apply node compat
       if (target === 'node') {
         applyNodeCompat(chain, modernConfig, isProd);
       }
-
       if (isHtmlEnabled(builderNormalizedConfig, target)) {
         applyBottomHtmlWebpackPlugin({
           api,
@@ -81,39 +66,40 @@ const PluginCompatModern = (appContext, modernConfig, options) => ({
           CHAIN_ID,
           modernConfig
         });
-      } // apply copy plugin
-      // const copyPatterns = createCopyPatterns(chain, appContext, modernConfig);
-
-
-      const defaultCopyPattern = (0, _share.createCopyPattern)(appContext, modernConfig, 'public', chain);
-      chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(args => {
-        var _args$;
-
-        return [{
-          patterns: [...(((_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.patterns) || []), defaultCopyPattern]
-        }];
-      });
+      }
 
+      // apply copy plugin
+      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+        const defaultCopyPattern = (0, _share.createCopyPattern)(appContext, modernConfig, 'public', chain);
+        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(args => {
+          var _args$;
+          return [{
+            patterns: [...(((_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.patterns) || []), defaultCopyPattern]
+          }];
+        });
+      }
+      const {
+        entrypoints
+      } = appContext;
+      const existNestedRoutes = entrypoints.some(entrypoint => entrypoint.nestedRoutesEntry);
+      chain.plugin('route-plugin').use(_routerPlugin.default, [{
+        existNestedRoutes
+      }]);
       function isHtmlEnabled(config, target) {
         var _config$tools;
-
         return ((_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : _config$tools.htmlPlugin) !== false && target !== 'node' && target !== 'web-worker';
       }
     });
-
     if (options) {
       applyCallbacks(api, options);
     }
   }
-
 });
+
 /**
  * register builder hooks callback
  */
-
-
 exports.PluginCompatModern = PluginCompatModern;
-
 function applyCallbacks(api, options) {
   options.onAfterBuild && api.onAfterBuild(options.onAfterBuild);
   options.onAfterCreateCompiler && api.onAfterCreateCompiler(options.onAfterCreateCompiler);
@@ -124,40 +110,35 @@ function applyCallbacks(api, options) {
   options.onDevCompileDone && api.onDevCompileDone(options.onDevCompileDone);
   options.onExit && api.onExit(options.onExit);
 }
+
 /**
  * compat some config, if target is `node`
  */
-
-
 function applyNodeCompat(chain, modernConfig, isProd) {
   // apply node resolve extensions
   for (const ext of ['.node.js', '.node.jsx', '.node.ts', '.node.tsx']) {
     chain.resolve.extensions.prepend(ext);
-  } // apply filterEntriesBySSRConfig
-
+  }
 
+  // apply filterEntriesBySSRConfig
   filterEntriesBySSRConfig(isProd, chain, modernConfig.server, modernConfig.output);
-
   function filterEntriesBySSRConfig(isProd, chain, serverConfig, outputConfig) {
     var _outputConfig$ssg;
-
-    const entries = chain.entryPoints.entries(); // if prod and ssg config is true or function
-
+    const entries = chain.entryPoints.entries();
+    // if prod and ssg config is true or function
     if (isProd && ((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 single entry has ssg config
-    // `ssg: {}` is not allowed if multi entry
-
+    }
 
+    // if single entry has ssg config
+    // `ssg: {}` is not allowed if multi entry
     const entryNames = Object.keys(entries);
-
     if (isProd && entryNames.length === 1 && outputConfig !== null && outputConfig !== void 0 && outputConfig.ssg) {
       return;
-    } // collect all ssg entries
-
+    }
 
+    // collect all ssg entries
     const ssgEntries = [];
-
     if (isProd && outputConfig !== null && outputConfig !== void 0 && outputConfig.ssg) {
       const {
         ssg
@@ -168,7 +149,6 @@ function applyNodeCompat(chain, modernConfig, isProd) {
         }
       });
     }
-
     const {
       ssr,
       ssrByEntries
@@ -180,11 +160,10 @@ function applyNodeCompat(chain, modernConfig, isProd) {
     });
   }
 }
+
 /**
  * inject bottom template
  */
-
-
 function applyBottomHtmlWebpackPlugin({
   api,
   chain,
@@ -197,32 +176,27 @@ function applyBottomHtmlWebpackPlugin({
     // FIXME: the only need necessary
     const baseTemplateParams = _objectSpread({
       entryName,
-      title: (0, _utils.getEntryOptions)(entryName, modernConfig.output.title, modernConfig.output.titleByEntries, appContext.packageName),
-      mountId: modernConfig.output.mountId
-    }, (0, _utils.getEntryOptions)(entryName, modernConfig.output.templateParameters, modernConfig.output.templateParametersByEntries, appContext.packageName));
-
+      title: (0, _utils.getEntryOptions)(entryName, modernConfig.html.title, modernConfig.html.titleByEntries, appContext.packageName),
+      mountId: modernConfig.html.mountId
+    }, (0, _utils.getEntryOptions)(entryName, modernConfig.html.templateParameters, modernConfig.html.templateParametersByEntries, appContext.packageName));
     chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap(args => [_objectSpread(_objectSpread({}, args[0] || {}), {}, {
       __internal__: true,
       bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && (0, _lodash.template)(appContext.htmlTemplates[`__${entryName}-bottom__`])(baseTemplateParams)
     })]);
   }
-
   chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(_htmlBottomTemplate.BottomTemplatePlugin, [_htmlWebpackPlugin.default]);
 }
-
 const isStreamingSSR = userConfig => {
   const isStreaming = ssr => ssr && typeof ssr === 'object' && ssr.mode === 'stream';
-
   const {
     server
   } = userConfig;
-
   if (isStreaming(server.ssr)) {
     return true;
-  } // Since we cannot apply different plugins for different entries,
-  // we regard the whole app as streaming ssr only if one entry meets the requirement.
-
+  }
 
+  // Since we cannot apply different plugins for different entries,
+  // we regard the whole app as streaming ssr only if one entry meets the requirement.
   if (server !== null && server !== void 0 && server.ssrByEntries && typeof server.ssrByEntries === 'object') {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (isStreaming(server.ssrByEntries[name])) {
@@ -230,10 +204,8 @@ const isStreamingSSR = userConfig => {
       }
     }
   }
-
   return false;
 };
-
 function applyAsyncChunkHtmlPlugin({
   chain,
   modernConfig,

package/dist/js/node/builder/index.js

@@ -3,79 +3,90 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.createBuilderForEdenX = createBuilderForEdenX;
 exports.createBuilderOptions = createBuilderOptions;
-exports.default = void 0;
-
+exports.createBuilderProviderConfig = createBuilderProviderConfig;
 var _builder = require("@modern-js/builder");
-
 var _builderWebpackProvider = require("@modern-js/builder-webpack-provider");
-
 var _utils = require("@modern-js/utils");
-
 var _compatModern = require("./builderPlugins/compatModern");
-
-var _createHtmlConfig = require("./createHtmlConfig");
-
-var _createOutputConfig = require("./createOutputConfig");
-
-var _createSourceConfig = require("./createSourceConfig");
-
-var _createToolsConfig = require("./createToolsConfig");
-
+var _share = require("./share");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var _default = async ({
-  target: _target = 'web',
-  normalizedConfig,
-  appContext,
-  compatPluginConfig
-}) => {
-  const targets = Array.isArray(_target) ? _target : [_target];
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function getBuilderTargets(normalizedConfig) {
+  const targets = ['web'];
   if (normalizedConfig.output.enableModernMode && !targets.includes('modern-web')) {
     targets.push('modern-web');
   }
-
-  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext); // create webpack provider
-
+  if ((0, _utils.isUseSSRBundle)(normalizedConfig)) {
+    targets.push('node');
+  }
+  return targets;
+}
+async function createBuilderForEdenX({
+  normalizedConfig,
+  appContext,
+  compatPluginConfig
+}) {
+  // create webpack provider
+  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
   const webpackProvider = (0, _builderWebpackProvider.builderWebpackProvider)({
     builderConfig
   });
-  const builderOptions = createBuilderOptions(_target, appContext);
+  const target = getBuilderTargets(normalizedConfig);
+  const builderOptions = createBuilderOptions(target, appContext);
   const builder = await (0, _builder.createBuilder)(webpackProvider, builderOptions);
   await applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig);
   return builder;
-};
-
-exports.default = _default;
-
+}
 function createBuilderProviderConfig(normalizedConfig, appContext) {
-  const source = (0, _createSourceConfig.createSourceConfig)(normalizedConfig, appContext);
-  const html = (0, _createHtmlConfig.createHtmlConfig)(normalizedConfig, appContext);
-  const output = (0, _createOutputConfig.createOutputConfig)(normalizedConfig, appContext);
-  const tools = (0, _createToolsConfig.createToolsConfig)(normalizedConfig);
-  return {
-    source,
-    html,
+  const output = createOutputConfig(normalizedConfig, appContext);
+  return _objectSpread(_objectSpread({}, normalizedConfig), {}, {
+    source: _objectSpread(_objectSpread({}, normalizedConfig.source), {}, {
+      resolveExtensionPrefix: '.web'
+    }),
     output,
-    tools,
-    performance: {
+    dev: {
+      https: normalizedConfig.dev.https,
+      assetPrefix: normalizedConfig.dev.assetPrefix
+    },
+    html: _objectSpread(_objectSpread({}, normalizedConfig.html), {}, {
+      templateByEntries: normalizedConfig.html.templateByEntries || appContext.htmlTemplates
+    }),
+    performance: _objectSpread(_objectSpread({}, normalizedConfig.performance), {}, {
       // `@modern-js/webpack` used to remove moment locale by default
       removeMomentLocale: true
-    }
-  };
+    })
+  });
+  function createOutputConfig(config, appContext) {
+    const defaultCopyPattern = (0, _share.createCopyPattern)(appContext, config, 'upload');
+    const {
+      copy
+    } = config.output;
+    const copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
+    const builderCopy = [...(copyOptions || []), defaultCopyPattern];
+    return _objectSpread(_objectSpread({}, config.output), {}, {
+      copy: builderCopy,
+      // 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,
+      // `@modern-js/webpack` used to generate asset manifest by default
+      enableAssetManifest: true,
+      // compatible the modern-js with fallback behavior
+      enableAssetFallback: true
+    });
+  }
 }
-
 function createBuilderOptions(target, appContext) {
   // create entries
+
   const entries = {};
   const {
     entrypoints = [],
     checkedEntries
   } = appContext;
-
   for (const {
     entryName,
     entry
@@ -83,14 +94,12 @@ function createBuilderOptions(target, appContext) {
     if (checkedEntries && !checkedEntries.includes(entryName)) {
       continue;
     }
-
     if (entryName in entries) {
       entries[entryName].push(entry);
     } else {
       entries[entryName] = [entry];
     }
   }
-
   return {
     cwd: appContext.appDirectory,
     target,
@@ -99,11 +108,10 @@ function createBuilderOptions(target, appContext) {
     framework: appContext.metaName
   };
 }
+
 /**
  * register builder Plugin by condition
  */
-
-
 async function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
   if (!normalizedConfig.output.disableNodePolyfill) {
     const {
@@ -111,7 +119,6 @@ async function applyBuilderPlugins(builder, normalizedConfig, appContext, compat
     } = await Promise.resolve().then(() => _interopRequireWildcard(require('@modern-js/builder-plugin-node-polyfill')));
     builder.addPlugins([PluginNodePolyfill()]);
   }
-
   if (normalizedConfig.tools.esbuild) {
     const {
       esbuild: esbuildOptions
@@ -124,6 +131,5 @@ async function applyBuilderPlugins(builder, normalizedConfig, appContext, compat
       minimize: (0, _utils.applyOptionsChain)({}, esbuildOptions)
     })]);
   }
-
   builder.addPlugins([(0, _compatModern.PluginCompatModern)(appContext, normalizedConfig, compatPluginConfig)]);
 }

package/dist/js/node/builder/share.js

@@ -4,36 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createCopyPattern = createCopyPattern;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _lodash = require("@modern-js/utils/lodash");
-
 var _utils = require("@modern-js/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function createCopyPattern(appContext, config, patternsType, chain) {
-  const configDir = _path.default.resolve(appContext.appDirectory, config.source.configDir);
-
+  const configDir = _path.default.resolve(appContext.appDirectory, config.source.configDir || './config');
   const uploadDir = _path.default.posix.join(configDir.replace(/\\/g, '/'), 'upload');
-
   const publicDir = _path.default.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') {
     if (!chain) {
       throw new Error("expect get a webpackChain, but receive 'undefined'");
     }
-
     return {
       info,
       from: '**/*',
@@ -45,7 +34,6 @@ function createCopyPattern(appContext, config, patternsType, chain) {
         if (!/\.html?$/.test(absoluteFrom)) {
           return content;
         }
-
         return (0, _lodash.template)(content.toString('utf8'))({
           assetPrefix: (0, _utils.removeTailSlash)(chain.output.get('publicPath'))
         });

package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js

@@ -4,43 +4,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HtmlAsyncChunkPlugin = void 0;
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class HtmlAsyncChunkPlugin {
   constructor(htmlWebpackPlugin) {
     _defineProperty(this, "name", void 0);
-
     _defineProperty(this, "htmlWebpackPlugin", void 0);
-
     this.name = 'HtmlAsyncChunkPlugin';
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }
-
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, compilation => {
       const hooks = this.htmlWebpackPlugin.getHooks(compilation);
       hooks.alterAssetTagGroups.tap(this.name, assets => {
         const tags = [...assets.headTags, ...assets.bodyTags];
-
         for (const tag of tags) {
           if (tag.tagName === 'script') {
             const {
               attributes
             } = tag;
-
             if (attributes && attributes.defer === true) {
               attributes.async = true;
               delete attributes.defer;
             }
           }
         }
-
         return assets;
       });
     });
   }
-
 }
-
 exports.HtmlAsyncChunkPlugin = HtmlAsyncChunkPlugin;

package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js

@@ -4,50 +4,37 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BottomTemplatePlugin = void 0;
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class BottomTemplatePlugin {
   constructor(htmlWebpackPlugin) {
     _defineProperty(this, "htmlWebpackPlugin", void 0);
-
     _defineProperty(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
-
     _defineProperty(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
-
     _defineProperty(this, "name", void 0);
-
     this.htmlWebpackPlugin = htmlWebpackPlugin;
     this.name = 'bottom-template';
   }
-
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, compilation => {
       this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, data => {
         var _data$plugin$options;
-
         if (!((_data$plugin$options = data.plugin.options) !== null && _data$plugin$options !== void 0 && _data$plugin$options.__internal__)) {
           return data;
-        } // 含有 <!--<?- bottomTemplate ?>--> 占位符时才需要注入 bottom.html
-
-
+        }
+        // 含有 <!--<?- bottomTemplate ?>--> 占位符时才需要注入 bottom.html
         if (this.bottomTemplateReg.test(data.html)) {
           // 清空占位符
           data.html = data.html.replace(this.bottomTemplateReg, '');
           const {
             bottomTemplate
           } = data.plugin.options;
-
           if (bottomTemplate) {
             data.html = data.html.replace(this.bodyRegExp, match => `\n${bottomTemplate}\n${match}`);
           }
         }
-
         return data;
       });
     });
   }
-
 }
-
 exports.BottomTemplatePlugin = BottomTemplatePlugin;