@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/js/modern/builder/index.js

@@ -1,84 +1,120 @@
-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; }
-import { createBuilder } from '@modern-js/builder';
-import { builderWebpackProvider } from '@modern-js/builder-webpack-provider';
-import { applyOptionsChain, isUseSSRBundle } from '@modern-js/utils';
-import { PluginCompatModern } from "./builderPlugins/compatModern";
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import {
+  createBuilder
+} from "@modern-js/builder";
+import {
+  builderWebpackProvider
+} from "@modern-js/builder-webpack-provider";
+import { applyOptionsChain, isUseSSRBundle } from "@modern-js/utils";
+import {
+  PluginCompatModern
+} from "./builderPlugins/compatModern";
 import { createCopyPattern } from "./share";
 function getBuilderTargets(normalizedConfig) {
-  const targets = ['web'];
-  if (normalizedConfig.output.enableModernMode && !targets.includes('modern-web')) {
-    targets.push('modern-web');
-  }
+  const targets = ["web"];
   if (isUseSSRBundle(normalizedConfig)) {
-    targets.push('node');
+    targets.push("node");
   }
   return targets;
 }
-export async function createBuilderForEdenX({
-  normalizedConfig,
-  appContext,
-  compatPluginConfig
-}) {
-  // create webpack provider
-  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
-  const webpackProvider = builderWebpackProvider({
-    builderConfig
+function createBuilderForModern(_0) {
+  return __async(this, arguments, function* ({
+    normalizedConfig,
+    appContext,
+    compatPluginConfig
+  }) {
+    const builderConfig = createBuilderProviderConfig(
+      normalizedConfig,
+      appContext
+    );
+    const webpackProvider = builderWebpackProvider({
+      builderConfig
+    });
+    const target = getBuilderTargets(normalizedConfig);
+    const builderOptions = createBuilderOptions(target, appContext);
+    const builder = yield createBuilder(webpackProvider, builderOptions);
+    yield applyBuilderPlugins(
+      builder,
+      normalizedConfig,
+      appContext,
+      compatPluginConfig
+    );
+    return builder;
   });
-  const target = getBuilderTargets(normalizedConfig);
-  const builderOptions = createBuilderOptions(target, appContext);
-  const builder = await createBuilder(webpackProvider, builderOptions);
-  await applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig);
-  return builder;
 }
-export function createBuilderProviderConfig(normalizedConfig, appContext) {
-  var _normalizedConfig$ser;
+function createBuilderProviderConfig(normalizedConfig, appContext) {
+  var _a;
   const output = createOutputConfig(normalizedConfig, appContext);
-  return _objectSpread(_objectSpread({}, normalizedConfig), {}, {
-    source: _objectSpread(_objectSpread({}, normalizedConfig.source), {}, {
-      resolveExtensionPrefix: '.web'
+  const htmlConfig = __spreadValues({}, normalizedConfig.html);
+  if (!htmlConfig.template) {
+    htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
+  }
+  return __spreadProps(__spreadValues({}, normalizedConfig), {
+    source: __spreadProps(__spreadValues({}, normalizedConfig.source), {
+      resolveExtensionPrefix: ".web"
     }),
     output,
-    dev: {
-      port: (_normalizedConfig$ser = normalizedConfig.server) === null || _normalizedConfig$ser === void 0 ? void 0 : _normalizedConfig$ser.port,
-      https: normalizedConfig.dev.https,
-      assetPrefix: normalizedConfig.dev.assetPrefix
-    },
-    html: _objectSpread(_objectSpread({}, normalizedConfig.html), {}, {
-      templateByEntries: normalizedConfig.html.templateByEntries || appContext.htmlTemplates
+    dev: __spreadProps(__spreadValues({}, normalizedConfig.dev), {
+      port: (_a = normalizedConfig.server) == null ? void 0 : _a.port
     }),
-    performance: _objectSpread(_objectSpread({}, normalizedConfig.performance), {}, {
-      // `@modern-js/webpack` used to remove moment locale by default
+    html: htmlConfig,
+    performance: __spreadProps(__spreadValues({}, normalizedConfig.performance), {
       removeMomentLocale: true
     })
   });
-  function createOutputConfig(config, appContext) {
-    const defaultCopyPattern = 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), {}, {
+  function createOutputConfig(config, appContext2) {
+    const defaultCopyPattern = createCopyPattern(appContext2, config, "upload");
+    const { copy } = config.output;
+    const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
+    const builderCopy = [...copyOptions || [], defaultCopyPattern];
+    return __spreadProps(__spreadValues({}, 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
     });
   }
 }
-export function createBuilderOptions(target, appContext) {
-  // create entries
-
+function createBuilderOptions(target, appContext) {
   const entries = {};
-  const {
-    entrypoints = [],
-    checkedEntries
-  } = appContext;
-  for (const {
-    entryName,
-    entry
-  } of entrypoints) {
+  const { entrypoints = [], checkedEntries } = appContext;
+  for (const { entryName, entry } of entrypoints) {
     if (checkedEntries && !checkedEntries.includes(entryName)) {
       continue;
     }
@@ -91,33 +127,34 @@ export function createBuilderOptions(target, appContext) {
   return {
     cwd: appContext.appDirectory,
     target,
-    configPath: appContext.configFile || undefined,
+    configPath: appContext.configFile || void 0,
     entry: entries,
     framework: appContext.metaName
   };
 }
-
-/**
- * register builder Plugin by condition
- */
-async function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
-  if (!normalizedConfig.output.disableNodePolyfill) {
-    const {
-      PluginNodePolyfill
-    } = await import('@modern-js/builder-plugin-node-polyfill');
-    builder.addPlugins([PluginNodePolyfill()]);
-  }
-  if (normalizedConfig.tools.esbuild) {
-    const {
-      esbuild: esbuildOptions
-    } = normalizedConfig.tools;
-    const {
-      PluginEsbuild
-    } = await import('@modern-js/builder-plugin-esbuild');
-    builder.addPlugins([PluginEsbuild({
-      loader: false,
-      minimize: applyOptionsChain({}, esbuildOptions)
-    })]);
-  }
-  builder.addPlugins([PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)]);
-}
+function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
+  return __async(this, null, function* () {
+    if (!normalizedConfig.output.disableNodePolyfill) {
+      const { PluginNodePolyfill } = yield import("@modern-js/builder-plugin-node-polyfill");
+      builder.addPlugins([PluginNodePolyfill()]);
+    }
+    if (normalizedConfig.tools.esbuild) {
+      const { esbuild: esbuildOptions } = normalizedConfig.tools;
+      const { PluginEsbuild } = yield import("@modern-js/builder-plugin-esbuild");
+      builder.addPlugins([
+        PluginEsbuild({
+          loader: false,
+          minimize: applyOptionsChain({}, esbuildOptions)
+        })
+      ]);
+    }
+    builder.addPlugins([
+      PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)
+    ]);
+  });
+}
+export {
+  createBuilderForModern,
+  createBuilderOptions,
+  createBuilderProviderConfig
+};

package/dist/js/modern/builder/loaders/routerLoader.js

@@ -1,20 +1,17 @@
+import { slash } from "@modern-js/utils";
 function loader(source) {
-  // eslint-disable-next-line @babel/no-invalid-this
   this.cacheable();
-  // eslint-disable-next-line @babel/no-invalid-this
-  const {
-    target
-  } = this._compiler.options;
-  if (target === 'node' || Array.isArray(target) && target.includes('node')) {
+  const { target } = this._compiler.options;
+  if (target === "node" || Array.isArray(target) && target.includes("node")) {
     return source;
   }
-  // eslint-disable-next-line @babel/no-invalid-this
-  const {
-    resourcePath
-  } = this;
+  const { resourcePath } = this;
   const code = `
-    export { default } from "${resourcePath}";
+    export { default } from "${slash(resourcePath)}";
   `;
   return code;
 }
-export default loader;
+var routerLoader_default = loader;
+export {
+  routerLoader_default as default
+};

package/dist/js/modern/builder/loaders/serverModuleLoader.js

@@ -1,4 +1,7 @@
 function loader() {
   return `module.exports = {}`;
 }
-export default loader;
+var serverModuleLoader_default = loader;
+export {
+  serverModuleLoader_default as default
+};

package/dist/js/modern/builder/share.js

@@ -1,44 +1,46 @@
-import path from 'path';
-import { template as lodashTemplate } from '@modern-js/utils/lodash';
-import { removeTailSlash } from '@modern-js/utils';
-export function createCopyPattern(appContext, config, patternsType, chain) {
-  const configDir = path.resolve(appContext.appDirectory, config.source.configDir || './config');
-  const uploadDir = path.posix.join(configDir.replace(/\\/g, '/'), 'upload');
-  const publicDir = path.posix.join(configDir.replace(/\\/g, '/'), 'public');
+import path from "path";
+import { removeTailSlash } from "@modern-js/utils";
+function createCopyPattern(appContext, config, patternsType, chain) {
+  const configDir = path.resolve(
+    appContext.appDirectory,
+    config.source.configDir || "./config"
+  );
+  const uploadDir = path.posix.join(configDir.replace(/\\/g, "/"), "upload");
+  const publicDir = path.posix.join(configDir.replace(/\\/g, "/"), "public");
   const minifiedJsRexExp = /\.min\.js/;
-  const info = file => ({
-    // If the file name ends with `.min.js`, we assume it's a compressed file.
-    // So we don't want copy-webpack-plugin to minify it.
-    // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
+  const info = (file) => ({
     minimized: minifiedJsRexExp.test(file.sourceFilename)
   });
-  if (patternsType === 'public') {
+  if (patternsType === "public") {
     if (!chain) {
       throw new Error("expect get a webpackChain, but receive 'undefined'");
     }
     return {
       info,
-      from: '**/*',
-      to: 'public',
+      from: "**/*",
+      to: "public",
       context: publicDir,
       noErrorOnMissing: true,
-      // eslint-disable-next-line node/prefer-global/buffer
       transform: (content, absoluteFrom) => {
         if (!/\.html?$/.test(absoluteFrom)) {
           return content;
         }
-        return lodashTemplate(content.toString('utf8'))({
-          assetPrefix: removeTailSlash(chain.output.get('publicPath'))
-        });
+        return content.toString("utf8").replace(
+          /<%=\s*assetPrefix\s*%>/g,
+          removeTailSlash(chain.output.get("publicPath"))
+        );
       }
     };
   } else {
     return {
       info,
-      from: '**/*',
-      to: 'upload',
+      from: "**/*",
+      to: "upload",
       context: uploadDir,
       noErrorOnMissing: true
     };
   }
-}
+}
+export {
+  createCopyPattern
+};

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

@@ -1,29 +1,30 @@
-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; }
-export class HtmlAsyncChunkPlugin {
+class HtmlAsyncChunkPlugin {
   constructor(htmlWebpackPlugin) {
-    _defineProperty(this, "name", void 0);
-    _defineProperty(this, "htmlWebpackPlugin", void 0);
-    this.name = 'HtmlAsyncChunkPlugin';
+    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;
+    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;
-      });
-    });
+          return assets;
+        });
+      }
+    );
   }
-}
+}
+export {
+  HtmlAsyncChunkPlugin
+};

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

@@ -1,33 +1,37 @@
-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; }
-export class BottomTemplatePlugin {
+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.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
+    this.bodyRegExp = /(<\/\s*body\s*>)/i;
     this.htmlWebpackPlugin = htmlWebpackPlugin;
-    this.name = 'bottom-template';
+    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
-        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}`);
+    compiler.hooks.compilation.tap(
+      this.name,
+      (compilation) => {
+        this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, (data) => {
+          var _a;
+          if (!((_a = data.plugin.options) == null ? void 0 : _a.__internal__)) {
+            return data;
+          }
+          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) => `
+${bottomTemplate}
+${match}`
+              );
+            }
           }
-        }
-        return data;
-      });
-    });
+          return data;
+        });
+      }
+    );
   }
-}
+}
+export {
+  BottomTemplatePlugin
+};