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

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

@@ -1,176 +1,380 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { createBuilder } from '@modern-js/builder';
-import { builderWebpackProvider } from '@modern-js/builder-webpack-provider';
-import { applyOptionsChain, isUseSSRBundle } from '@modern-js/utils';
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+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 _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+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) {
-  var targets = ['web'];
-  if (normalizedConfig.output.enableModernMode && !targets.includes('modern-web')) {
-    targets.push('modern-web');
-  }
-  if (isUseSSRBundle(normalizedConfig)) {
-    targets.push('node');
-  }
-  return targets;
-}
-export function createBuilderForEdenX(_x) {
-  return _createBuilderForEdenX.apply(this, arguments);
-}
-function _createBuilderForEdenX() {
-  _createBuilderForEdenX = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var normalizedConfig, appContext, compatPluginConfig, builderConfig, webpackProvider, target, builderOptions, builder;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            normalizedConfig = _ref.normalizedConfig, appContext = _ref.appContext, compatPluginConfig = _ref.compatPluginConfig;
-            // create webpack provider
-            builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
-            webpackProvider = builderWebpackProvider({
-              builderConfig: builderConfig
-            });
-            target = getBuilderTargets(normalizedConfig);
-            builderOptions = createBuilderOptions(target, appContext);
-            _context.next = 7;
-            return createBuilder(webpackProvider, builderOptions);
-          case 7:
-            builder = _context.sent;
-            _context.next = 10;
-            return applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig);
-          case 10:
-            return _context.abrupt("return", builder);
-          case 11:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _createBuilderForEdenX.apply(this, arguments);
-}
-export function createBuilderProviderConfig(normalizedConfig, appContext) {
-  var output = createOutputConfig(normalizedConfig, appContext);
-  return _objectSpread(_objectSpread({}, normalizedConfig), {}, {
-    source: _objectSpread(_objectSpread({}, normalizedConfig.source), {}, {
-      resolveExtensionPrefix: '.web'
-    }),
-    output: output,
-    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) {
-    var defaultCopyPattern = createCopyPattern(appContext, config, 'upload');
-    var copy = config.output.copy;
-    var copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
-    var builderCopy = [].concat(_toConsumableArray(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
+    var targets = [
+        "web"
+    ];
+    if (isUseSSRBundle(normalizedConfig)) {
+        targets.push("node");
+    }
+    return targets;
+}
+function createBuilderForModern(_) {
+    return _createBuilderForModern.apply(this, arguments);
+}
+function _createBuilderForModern() {
+    _createBuilderForModern = _asyncToGenerator(function(param) {
+        var normalizedConfig, appContext, compatPluginConfig, builderConfig, webpackProvider, target, builderOptions, builder;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    normalizedConfig = param.normalizedConfig, appContext = param.appContext, compatPluginConfig = param.compatPluginConfig;
+                    builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
+                    webpackProvider = builderWebpackProvider({
+                        builderConfig: builderConfig
+                    });
+                    target = getBuilderTargets(normalizedConfig);
+                    builderOptions = createBuilderOptions(target, appContext);
+                    return [
+                        4,
+                        createBuilder(webpackProvider, builderOptions)
+                    ];
+                case 1:
+                    builder = _state.sent();
+                    return [
+                        4,
+                        applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig)
+                    ];
+                case 2:
+                    _state.sent();
+                    return [
+                        2,
+                        builder
+                    ];
+            }
+        });
     });
-  }
-}
-export function createBuilderOptions(target, appContext) {
-  // create entries
-
-  var entries = {};
-  var _appContext$entrypoin = appContext.entrypoints,
-    entrypoints = _appContext$entrypoin === void 0 ? [] : _appContext$entrypoin,
-    checkedEntries = appContext.checkedEntries;
-  var _iterator = _createForOfIteratorHelper(entrypoints),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _step$value = _step.value,
-        entryName = _step$value.entryName,
-        entry = _step$value.entry;
-      if (checkedEntries && !checkedEntries.includes(entryName)) {
-        continue;
-      }
-      if (entryName in entries) {
-        entries[entryName].push(entry);
-      } else {
-        entries[entryName] = [entry];
-      }
+    return _createBuilderForModern.apply(this, arguments);
+}
+function createBuilderProviderConfig(normalizedConfig, appContext) {
+    var createOutputConfig = function createOutputConfig(config, appContext2) {
+        var defaultCopyPattern = createCopyPattern(appContext2, config, "upload");
+        var copy = config.output.copy;
+        var copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
+        var builderCopy = _toConsumableArray(copyOptions || []).concat([
+            defaultCopyPattern
+        ]);
+        return _objectSpreadProps(_objectSpread({}, config.output), {
+            copy: builderCopy,
+            cleanDistPath: false
+        });
+    };
+    var ref;
+    var output = createOutputConfig(normalizedConfig, appContext);
+    var htmlConfig = _objectSpread({}, normalizedConfig.html);
+    if (!htmlConfig.template) {
+        htmlConfig.templateByEntries = _objectSpread({}, htmlConfig.templateByEntries, appContext.htmlTemplates);
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return {
-    cwd: appContext.appDirectory,
-    target: target,
-    configPath: appContext.configFile || undefined,
-    entry: entries,
-    framework: appContext.metaName
-  };
-}
-
-/**
- * register builder Plugin by condition
- */
-function applyBuilderPlugins(_x2, _x3, _x4, _x5) {
-  return _applyBuilderPlugins.apply(this, arguments);
+    return _objectSpreadProps(_objectSpread({}, normalizedConfig), {
+        source: _objectSpreadProps(_objectSpread({}, normalizedConfig.source), {
+            resolveExtensionPrefix: ".web"
+        }),
+        output: output,
+        dev: _objectSpreadProps(_objectSpread({}, normalizedConfig.dev), {
+            port: (ref = normalizedConfig.server) === null || ref === void 0 ? void 0 : ref.port
+        }),
+        html: htmlConfig,
+        performance: _objectSpreadProps(_objectSpread({}, normalizedConfig.performance), {
+            removeMomentLocale: true
+        })
+    });
 }
-function _applyBuilderPlugins() {
-  _applyBuilderPlugins = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(builder, normalizedConfig, appContext, compatPluginConfig) {
-    var _yield$import, PluginNodePolyfill, esbuildOptions, _yield$import2, PluginEsbuild;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            if (normalizedConfig.output.disableNodePolyfill) {
-              _context2.next = 6;
-              break;
+function createBuilderOptions(target, appContext) {
+    var entries = {};
+    var _entrypoints = appContext.entrypoints, entrypoints = _entrypoints === void 0 ? [] : _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;
+            if (checkedEntries && !checkedEntries.includes(entryName)) {
+                continue;
+            }
+            if (entryName in entries) {
+                entries[entryName].push(entry);
+            } else {
+                entries[entryName] = [
+                    entry
+                ];
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
             }
-            _context2.next = 3;
-            return import('@modern-js/builder-plugin-node-polyfill');
-          case 3:
-            _yield$import = _context2.sent;
-            PluginNodePolyfill = _yield$import.PluginNodePolyfill;
-            builder.addPlugins([PluginNodePolyfill()]);
-          case 6:
-            if (!normalizedConfig.tools.esbuild) {
-              _context2.next = 13;
-              break;
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
             }
-            esbuildOptions = normalizedConfig.tools.esbuild;
-            _context2.next = 10;
-            return import('@modern-js/builder-plugin-esbuild');
-          case 10:
-            _yield$import2 = _context2.sent;
-            PluginEsbuild = _yield$import2.PluginEsbuild;
-            builder.addPlugins([PluginEsbuild({
-              loader: false,
-              minimize: applyOptionsChain({}, esbuildOptions)
-            })]);
-          case 13:
-            builder.addPlugins([PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)]);
-          case 14:
-          case "end":
-            return _context2.stop();
         }
-      }
-    }, _callee2);
-  }));
-  return _applyBuilderPlugins.apply(this, arguments);
-}
+    }
+    return {
+        cwd: appContext.appDirectory,
+        target: target,
+        configPath: appContext.configFile || void 0,
+        entry: entries,
+        framework: appContext.metaName
+    };
+}
+function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
+    return _applyBuilderPlugins.apply(this, arguments);
+}
+function _applyBuilderPlugins() {
+    _applyBuilderPlugins = _asyncToGenerator(function(builder, normalizedConfig, appContext, compatPluginConfig) {
+        var PluginNodePolyfill, _tools, esbuildOptions, PluginEsbuild;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    if (!!normalizedConfig.output.disableNodePolyfill) return [
+                        3,
+                        2
+                    ];
+                    return [
+                        4,
+                        import("@modern-js/builder-plugin-node-polyfill")
+                    ];
+                case 1:
+                    PluginNodePolyfill = _state.sent().PluginNodePolyfill;
+                    builder.addPlugins([
+                        PluginNodePolyfill()
+                    ]);
+                    _state.label = 2;
+                case 2:
+                    if (!normalizedConfig.tools.esbuild) return [
+                        3,
+                        4
+                    ];
+                    _tools = normalizedConfig.tools, esbuildOptions = _tools.esbuild;
+                    return [
+                        4,
+                        import("@modern-js/builder-plugin-esbuild")
+                    ];
+                case 3:
+                    PluginEsbuild = _state.sent().PluginEsbuild;
+                    builder.addPlugins([
+                        PluginEsbuild({
+                            loader: false,
+                            minimize: applyOptionsChain({}, esbuildOptions)
+                        })
+                    ]);
+                    _state.label = 4;
+                case 4:
+                    builder.addPlugins([
+                        PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)
+                    ]);
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return _applyBuilderPlugins.apply(this, arguments);
+}
+export { createBuilderForModern, createBuilderOptions, createBuilderProviderConfig };

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

@@ -0,0 +1,13 @@
+import { slash } from "@modern-js/utils";
+function loader(source) {
+    this.cacheable();
+    var target = this._compiler.options.target;
+    if (target === "node" || Array.isArray(target) && target.includes("node")) {
+        return source;
+    }
+    var resourcePath = this.resourcePath;
+    var code = '\n    export { default } from "'.concat(slash(resourcePath), '";\n  ');
+    return code;
+}
+var routerLoader_default = loader;
+export { routerLoader_default as default };

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

@@ -0,0 +1,5 @@
+function loader() {
+    return "module.exports = {}";
+}
+var serverModuleLoader_default = loader;
+export { serverModuleLoader_default as default };

package/dist/js/treeshaking/builder/share.js

@@ -1,46 +1,40 @@
-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) {
-  var configDir = path.resolve(appContext.appDirectory, config.source.configDir || './config');
-  var uploadDir = path.posix.join(configDir.replace(/\\/g, '/'), 'upload');
-  var publicDir = path.posix.join(configDir.replace(/\\/g, '/'), 'public');
-  var minifiedJsRexExp = /\.min\.js/;
-  var info = function info(file) {
-    return {
-      // 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)
+import path from "path";
+import { removeTailSlash } from "@modern-js/utils";
+function createCopyPattern(appContext, config, patternsType, chain) {
+    var configDir = path.resolve(appContext.appDirectory, config.source.configDir || "./config");
+    var uploadDir = path.posix.join(configDir.replace(/\\/g, "/"), "upload");
+    var publicDir = path.posix.join(configDir.replace(/\\/g, "/"), "public");
+    var minifiedJsRexExp = /\.min\.js/;
+    var info = function(file) {
+        return {
+            minimized: minifiedJsRexExp.test(file.sourceFilename)
+        };
     };
-  };
-  if (patternsType === 'public') {
-    if (!chain) {
-      throw new Error("expect get a webpackChain, but receive 'undefined'");
-    }
-    return {
-      info: info,
-      from: '**/*',
-      to: 'public',
-      context: publicDir,
-      noErrorOnMissing: true,
-      // eslint-disable-next-line node/prefer-global/buffer
-      transform: function transform(content, absoluteFrom) {
-        if (!/\.html?$/.test(absoluteFrom)) {
-          return content;
+    if (patternsType === "public") {
+        if (!chain) {
+            throw new Error("expect get a webpackChain, but receive 'undefined'");
         }
-        return lodashTemplate(content.toString('utf8'))({
-          assetPrefix: removeTailSlash(chain.output.get('publicPath'))
-        });
-      }
-    };
-  } else {
-    return {
-      info: info,
-      from: '**/*',
-      to: 'upload',
-      context: uploadDir,
-      noErrorOnMissing: true
-    };
-  }
-}
+        return {
+            info: info,
+            from: "**/*",
+            to: "public",
+            context: publicDir,
+            noErrorOnMissing: true,
+            transform: function(content, absoluteFrom) {
+                if (!/\.html?$/.test(absoluteFrom)) {
+                    return content;
+                }
+                return content.toString("utf8").replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash(chain.output.get("publicPath")));
+            }
+        };
+    } else {
+        return {
+            info: info,
+            from: "**/*",
+            to: "upload",
+            context: uploadDir,
+            noErrorOnMissing: true
+        };
+    }
+}
+export { createCopyPattern };