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

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

@@ -1,138 +1,324 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { logger } from '@modern-js/utils';
-import { ResolvedConfigContext } from '@modern-js/core';
+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 _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;
+}
+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 { ResolvedConfigContext } from "@modern-js/core";
 import { createFileWatcher } from "../utils/createFileWatcher";
 import { printInstructions } from "../utils/printInstructions";
-import { createServer, injectDataLoaderPlugin } from "../utils/createServer";
+import { setServer, createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
-export var dev = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(api, options) {
-    var _normalizedConfig$too;
-    var normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, serverInternalPlugins, checkedEntries, compiler, app;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            if (options.analyze) {
-              // Builder will read this env var to enable bundle analyzer
-              process.env.BUNDLE_ANALYZE = 'true';
-            }
-            normalizedConfig = api.useResolvedConfigContext();
-            appContext = api.useAppContext();
-            hookRunners = api.useHookRunners();
-            normalizedConfig = _objectSpread(_objectSpread({}, normalizedConfig), {}, {
-              cliOptions: options
-            });
-            ResolvedConfigContext.set(normalizedConfig);
-            appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, entrypoints = appContext.entrypoints, serverConfigFile = appContext.serverConfigFile, serverInternalPlugins = appContext.serverInternalPlugins;
-            _context2.next = 9;
-            return getSpecifiedEntries(options.entry || false, entrypoints);
-          case 9:
-            checkedEntries = _context2.sent;
-            api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
-              checkedEntries: checkedEntries
-            }));
-            appContext.checkedEntries = checkedEntries;
-            _context2.next = 14;
-            return buildServerConfig({
-              appDirectory: appDirectory,
-              distDirectory: distDirectory,
-              configFile: serverConfigFile,
-              options: {
-                esbuildOptions: {
-                  watch: true
-                }
-              }
-            });
-          case 14:
-            _context2.next = 16;
-            return hookRunners.beforeDev();
-          case 16:
-            compiler = null;
-            if (apiOnly) {
-              _context2.next = 23;
-              break;
-            }
-            if (appContext.builder) {
-              _context2.next = 20;
-              break;
-            }
-            throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
-          case 20:
-            _context2.next = 22;
-            return appContext.builder.createCompiler();
-          case 22:
-            compiler = _context2.sent;
-          case 23:
-            _context2.next = 25;
-            return generateRoutes(appContext);
-          case 25:
-            _context2.next = 27;
-            return createServer({
-              dev: _objectSpread(_objectSpread({}, {
-                client: {
-                  port: port.toString()
-                },
-                devMiddleware: {
-                  writeToDisk: function writeToDisk(file) {
-                    return !file.includes('.hot-update.');
-                  }
-                },
-                hot: true,
-                liveReload: true,
-                port: port,
-                https: normalizedConfig.dev.https
-              }), (_normalizedConfig$too = normalizedConfig.tools) === null || _normalizedConfig$too === void 0 ? void 0 : _normalizedConfig$too.devServer),
-              compiler: compiler,
-              pwd: appDirectory,
-              config: normalizedConfig,
-              serverConfigFile: serverConfigFile,
-              internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
-            });
-          case 27:
-            app = _context2.sent;
-            app.listen(port, /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err) {
-                return _regeneratorRuntime().wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        if (!err) {
-                          _context.next = 2;
-                          break;
-                        }
-                        throw err;
-                      case 2:
-                        if (!apiOnly) {
-                          logger.info("Starting dev server...\n");
-                        } else {
-                          printInstructions(hookRunners, appContext, normalizedConfig);
-                        }
-                      case 3:
-                      case "end":
-                        return _context.stop();
+var dev = function() {
+    var _ref = _asyncToGenerator(function(api, options) {
+        var ref, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, serverInternalPlugins, checkedEntries, compiler, serverOptions, app, server;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    if (options.analyze) {
+                        process.env.BUNDLE_ANALYZE = "true";
                     }
-                  }
-                }, _callee);
-              }));
-              return function (_x3) {
-                return _ref2.apply(this, arguments);
-              };
-            }());
-            _context2.next = 31;
-            return createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners);
-          case 31:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return function dev(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+                    normalizedConfig = api.useResolvedConfigContext();
+                    appContext = api.useAppContext();
+                    hookRunners = api.useHookRunners();
+                    normalizedConfig = _objectSpreadProps(_objectSpread({}, normalizedConfig), {
+                        cliOptions: options
+                    });
+                    ResolvedConfigContext.set(normalizedConfig);
+                    appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, entrypoints = appContext.entrypoints, serverConfigFile = appContext.serverConfigFile, serverInternalPlugins = appContext.serverInternalPlugins;
+                    return [
+                        4,
+                        getSpecifiedEntries(options.entry || false, entrypoints)
+                    ];
+                case 1:
+                    checkedEntries = _state.sent();
+                    api.setAppContext(_objectSpreadProps(_objectSpread({}, appContext), {
+                        checkedEntries: checkedEntries
+                    }));
+                    appContext.checkedEntries = checkedEntries;
+                    return [
+                        4,
+                        buildServerConfig({
+                            appDirectory: appDirectory,
+                            distDirectory: distDirectory,
+                            configFile: serverConfigFile,
+                            options: {
+                                esbuildOptions: {
+                                    watch: true
+                                }
+                            }
+                        })
+                    ];
+                case 2:
+                    _state.sent();
+                    return [
+                        4,
+                        hookRunners.beforeDev()
+                    ];
+                case 3:
+                    _state.sent();
+                    if (!appContext.builder && !apiOnly) {
+                        throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
+                    }
+                    if (!!apiOnly) return [
+                        3,
+                        5
+                    ];
+                    return [
+                        4,
+                        appContext.builder.createCompiler()
+                    ];
+                case 4:
+                    compiler = _state.sent();
+                    _state.label = 5;
+                case 5:
+                    return [
+                        4,
+                        generateRoutes(appContext)
+                    ];
+                case 6:
+                    _state.sent();
+                    serverOptions = {
+                        dev: _objectSpread({
+                            port: port,
+                            https: normalizedConfig.dev.https
+                        }, (ref = normalizedConfig.tools) === null || ref === void 0 ? void 0 : ref.devServer),
+                        compiler: compiler || null,
+                        pwd: appDirectory,
+                        config: normalizedConfig,
+                        serverConfigFile: serverConfigFile,
+                        internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
+                    };
+                    if (!apiOnly) return [
+                        3,
+                        8
+                    ];
+                    return [
+                        4,
+                        createServer(serverOptions)
+                    ];
+                case 7:
+                    app = _state.sent();
+                    app.listen(port, function() {
+                        var _ref = _asyncToGenerator(function(err) {
+                            return __generator(this, function(_state) {
+                                if (err) {
+                                    throw err;
+                                }
+                                printInstructions(hookRunners, appContext, normalizedConfig);
+                                return [
+                                    2
+                                ];
+                            });
+                        });
+                        return function(err) {
+                            return _ref.apply(this, arguments);
+                        };
+                    }());
+                    return [
+                        3,
+                        10
+                    ];
+                case 8:
+                    return [
+                        4,
+                        appContext.builder.startDevServer({
+                            compiler: compiler,
+                            printURLs: false,
+                            serverOptions: serverOptions
+                        })
+                    ];
+                case 9:
+                    server = _state.sent().server;
+                    setServer(server);
+                    _state.label = 10;
+                case 10:
+                    return [
+                        4,
+                        createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners)
+                    ];
+                case 11:
+                    _state.sent();
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function dev(api, options) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export { dev };

package/dist/js/treeshaking/commands/index.js

@@ -1,3 +1,3 @@
 export * from "./dev";
 export * from "./build";
-export * from "./start";
+export * from "./start";

package/dist/js/treeshaking/commands/inspect.js

@@ -1,34 +1,149 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { join } from 'path';
-export var inspect = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, options) {
-    var appContext;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            appContext = api.useAppContext();
-            if (appContext.builder) {
-              _context.next = 3;
-              break;
+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);
+        });
+    };
+}
+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;
             }
-            throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
-          case 3:
-            return _context.abrupt("return", appContext.builder.inspectConfig({
-              env: options.env,
-              verbose: options.verbose,
-              outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
-              writeToDisk: true
-            }));
-          case 4:
-          case "end":
-            return _context.stop();
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
         }
-      }
-    }, _callee);
-  }));
-  return function inspect(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { join } from "path";
+var inspect = function() {
+    var _ref = _asyncToGenerator(function(api, options) {
+        var appContext;
+        return __generator(this, function(_state) {
+            appContext = api.useAppContext();
+            if (!appContext.builder) {
+                throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
+            }
+            return [
+                2,
+                appContext.builder.inspectConfig({
+                    env: options.env,
+                    verbose: options.verbose,
+                    outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
+                    writeToDisk: true
+                })
+            ];
+        });
+    });
+    return function inspect(api, options) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export { inspect };