@modern-js/app-tools 2.15.0 → 2.17.0

package/dist/esm/builder/generator/createBuilderProviderConfig.js

@@ -1,71 +1,70 @@
-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 _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
 }
-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]);
-        });
+function _object_spread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+    var ownKeys2 = Object.keys(source);
+    if (typeof Object.getOwnPropertySymbols === "function") {
+      ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+      }));
     }
-    return target;
+    ownKeys2.forEach(function(key) {
+      _define_property(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);
+  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;
+      });
     }
-    return keys;
+    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 createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderConfig) {
-    var htmlConfig = _objectSpread({}, resolveConfig.html);
-    if (!htmlConfig.template) {
-        htmlConfig.templateByEntries = _objectSpread({}, htmlConfig.templateByEntries, appContext.htmlTemplates);
-    }
-    var config = _objectSpreadProps(_objectSpread({}, resolveConfig), {
-        dev: _objectSpreadProps(_objectSpread({}, resolveConfig.dev), {
-            port: appContext.port
-        }),
-        html: htmlConfig,
-        output: _objectSpreadProps(_objectSpread({}, resolveConfig.output), {
-            // 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
-        })
+function _object_spread_props(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));
     });
-    modifyBuilderConfig === null || modifyBuilderConfig === void 0 ? void 0 : modifyBuilderConfig(config);
-    return config;
+  }
+  return target;
+}
+export function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderConfig) {
+  var htmlConfig = _object_spread({}, resolveConfig.html);
+  if (!htmlConfig.template) {
+    htmlConfig.templateByEntries = _object_spread({}, htmlConfig.templateByEntries, appContext.htmlTemplates);
+  }
+  var config = _object_spread_props(_object_spread({}, resolveConfig), {
+    dev: _object_spread_props(_object_spread({}, resolveConfig.dev), {
+      port: appContext.port
+    }),
+    html: htmlConfig,
+    output: _object_spread_props(_object_spread({}, resolveConfig.output), {
+      // 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
+    })
+  });
+  modifyBuilderConfig === null || modifyBuilderConfig === void 0 ? void 0 : modifyBuilderConfig(config);
+  return config;
 }
-export { createBuilderProviderConfig };

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

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

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

@@ -1,217 +1,224 @@
 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);
-    }
+  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 _async_to_generator(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(void 0);
+    });
+  };
 }
-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: []
+var __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
+      ]);
     };
-    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) {
+  }
+  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 = [
-                6,
-                e
+              0
             ];
-            y = 0;
-        } finally{
-            f = t = 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;
         }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
+        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 { createBuilderProviderConfig } from "./createBuilderProviderConfig";
 import { getBuilderTargets } from "./getBuilderTargets";
 import { createBuilderOptions } from "./createBuilderOptions";
-function generateBuilder(options, generateProvider, utils) {
-    return _generateBuilder.apply(this, arguments);
+export function generateBuilder(options, generateProvider, utils) {
+  return _generateBuilder.apply(this, arguments);
 }
 function _generateBuilder() {
-    _generateBuilder = _asyncToGenerator(function(options, generateProvider, utils) {
-        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;
-                    builderConfig = createBuilderProviderConfig(normalizedConfig, appContext, modifyBuilderConfig);
-                    provider = generateProvider({
-                        builderConfig: builderConfig
-                    });
-                    target = getBuilderTargets(normalizedConfig);
-                    builderOptions = createBuilderOptions(target, appContext);
-                    return [
-                        4,
-                        createBuilder(provider, builderOptions)
-                    ];
-                case 1:
-                    builder = _state.sent();
-                    return [
-                        4,
-                        applyBuilderPlugins(builder, options)
-                    ];
-                case 2:
-                    _state.sent();
-                    return [
-                        4,
-                        modifyBuilderInstance === null || modifyBuilderInstance === void 0 ? void 0 : modifyBuilderInstance(builder)
-                    ];
-                case 3:
-                    _state.sent();
-                    return [
-                        2,
-                        builder
-                    ];
-            }
-        });
+  _generateBuilder = _async_to_generator(function(options, generateProvider, utils) {
+    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;
+          builderConfig = createBuilderProviderConfig(normalizedConfig, appContext, modifyBuilderConfig);
+          provider = generateProvider({
+            builderConfig
+          });
+          target = getBuilderTargets(normalizedConfig);
+          builderOptions = createBuilderOptions(target, appContext);
+          return [
+            4,
+            createBuilder(provider, builderOptions)
+          ];
+        case 1:
+          builder = _state.sent();
+          return [
+            4,
+            applyBuilderPlugins(builder, options)
+          ];
+        case 2:
+          _state.sent();
+          return [
+            4,
+            modifyBuilderInstance === null || modifyBuilderInstance === void 0 ? void 0 : modifyBuilderInstance(builder)
+          ];
+        case 3:
+          _state.sent();
+          return [
+            2,
+            builder
+          ];
+      }
     });
-    return _generateBuilder.apply(this, arguments);
+  });
+  return _generateBuilder.apply(this, arguments);
 }
 function applyBuilderPlugins(builder, options) {
-    return _applyBuilderPlugins.apply(this, arguments);
+  return _applyBuilderPlugins.apply(this, arguments);
 }
 function _applyBuilderPlugins() {
-    _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
-        var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, builderPluginNodePolyfill;
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        import("../shared/builderPlugins")
-                    ];
-                case 1:
-                    _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR;
-                    builder.addPlugins([
-                        builderPluginAdapterBasic(options),
-                        builderPluginAdapterSSR(options),
-                        builderPluginAdapterHtml(options)
-                    ]);
-                    normalizedConfig = options.normalizedConfig;
-                    if (!!normalizedConfig.output.disableNodePolyfill) return [
-                        3,
-                        3
-                    ];
-                    return [
-                        4,
-                        import("@modern-js/builder-plugin-node-polyfill")
-                    ];
-                case 2:
-                    builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
-                    builder.addPlugins([
-                        builderPluginNodePolyfill()
-                    ]);
-                    _state.label = 3;
-                case 3:
-                    return [
-                        2
-                    ];
-            }
-        });
+  _applyBuilderPlugins = _async_to_generator(function(builder, options) {
+    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, builderPluginNodePolyfill;
+    return __generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          return [
+            4,
+            import("../shared/builderPlugins")
+          ];
+        case 1:
+          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR;
+          builder.addPlugins([
+            builderPluginAdapterBasic(options),
+            builderPluginAdapterSSR(options),
+            builderPluginAdapterHtml(options)
+          ]);
+          normalizedConfig = options.normalizedConfig;
+          if (!!normalizedConfig.output.disableNodePolyfill)
+            return [
+              3,
+              3
+            ];
+          return [
+            4,
+            import("@modern-js/builder-plugin-node-polyfill")
+          ];
+        case 2:
+          builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
+          builder.addPlugins([
+            builderPluginNodePolyfill()
+          ]);
+          _state.label = 3;
+        case 3:
+          return [
+            2
+          ];
+      }
     });
-    return _applyBuilderPlugins.apply(this, arguments);
+  });
+  return _applyBuilderPlugins.apply(this, arguments);
 }
-export { generateBuilder };