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

package/dist/js/treeshaking/commands/start.js

@@ -1,70 +1,192 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { logger, chalk, isApiOnly } from '@modern-js/utils';
-import server from '@modern-js/prod-server';
-import { printInstructions } from "../utils/printInstructions";
-import { injectDataLoaderPlugin } from "../utils/createServer";
-export var start = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(api) {
-    var _userConfig$source;
-    var appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, app;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            appContext = api.useAppContext();
-            userConfig = api.useResolvedConfigContext();
-            hookRunners = api.useHookRunners();
-            appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile;
-            logger.log(chalk.cyan("Starting the modern server..."));
-            _context2.next = 7;
-            return isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.entriesDir);
-          case 7:
-            apiOnly = _context2.sent;
-            _context2.next = 10;
-            return server({
-              pwd: appDirectory,
-              // FIXME: remove the `any` type
-              config: userConfig,
-              serverConfigFile: serverConfigFile,
-              internalPlugins: injectDataLoaderPlugin(appContext.serverInternalPlugins),
-              apiOnly: apiOnly
-            });
-          case 10:
-            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:
-                        _context.next = 4;
-                        return printInstructions(hookRunners, appContext, userConfig);
-                      case 4:
-                      case "end":
-                        return _context.stop();
+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;
                     }
-                  }
-                }, _callee);
-              }));
-              return function (_x2) {
-                return _ref2.apply(this, arguments);
-              };
-            }());
-          case 12:
-          case "end":
-            return _context2.stop();
+                    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;
         }
-      }
-    }, _callee2);
-  }));
-  return function start(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { logger, chalk, isApiOnly } from "@modern-js/utils";
+import server from "@modern-js/prod-server";
+import { printInstructions } from "../utils/printInstructions";
+import { injectDataLoaderPlugin } from "../utils/createServer";
+var start = function() {
+    var _ref = _asyncToGenerator(function(api) {
+        var ref, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, app;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    appContext = api.useAppContext();
+                    userConfig = api.useResolvedConfigContext();
+                    hookRunners = api.useHookRunners();
+                    appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile;
+                    logger.log(chalk.cyan("Starting the modern server..."));
+                    return [
+                        4,
+                        isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.source) === null || ref === void 0 ? void 0 : ref.entriesDir)
+                    ];
+                case 1:
+                    apiOnly = _state.sent();
+                    return [
+                        4,
+                        server({
+                            pwd: appDirectory,
+                            config: userConfig,
+                            serverConfigFile: serverConfigFile,
+                            internalPlugins: injectDataLoaderPlugin(appContext.serverInternalPlugins),
+                            apiOnly: apiOnly
+                        })
+                    ];
+                case 2:
+                    app = _state.sent();
+                    app.listen(port, function() {
+                        var _ref = _asyncToGenerator(function(err) {
+                            return __generator(this, function(_state) {
+                                switch(_state.label){
+                                    case 0:
+                                        if (err) {
+                                            throw err;
+                                        }
+                                        return [
+                                            4,
+                                            printInstructions(hookRunners, appContext, userConfig)
+                                        ];
+                                    case 1:
+                                        _state.sent();
+                                        return [
+                                            2
+                                        ];
+                                }
+                            });
+                        });
+                        return function(err) {
+                            return _ref.apply(this, arguments);
+                        };
+                    }());
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function start(api) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export { start };

package/dist/js/treeshaking/config/default.js

@@ -1,200 +1,211 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-export function createDefaultConfig(appContext) {
-  var _ref;
-  var defaultAlias = appContext ? (_ref = {}, _defineProperty(_ref, appContext.internalDirAlias, appContext.internalDirectory), _defineProperty(_ref, appContext.internalSrcAlias, appContext.srcDirectory), _defineProperty(_ref, '@', appContext.srcDirectory), _defineProperty(_ref, '@shared', appContext.sharedDirectory), _ref) : {};
-  var source = {
-    entries: undefined,
-    enableAsyncEntry: false,
-    disableDefaultEntries: false,
-    entriesDir: './src',
-    configDir: './config',
-    globalVars: undefined,
-    moduleScopes: undefined,
-    include: [],
-    alias: defaultAlias
-  };
-  var output = {
-    assetPrefix: '/',
-    distPath: {
-      html: 'html',
-      js: 'static/js',
-      css: 'static/css',
-      media: 'static/media',
-      root: 'dist'
-    },
-    copy: undefined,
-    disableCssModuleExtension: false,
-    enableCssModuleTSDeclaration: false,
-    disableMinimize: false,
-    enableInlineStyles: false,
-    enableInlineScripts: false,
-    disableSourceMap: false,
-    disableInlineRuntimeChunk: false,
-    disableFilenameHash: false,
-    enableLatestDecorators: false,
-    polyfill: 'entry',
-    dataUriLimit: 10000,
-    cssModuleLocalIdentName: undefined
-  };
-  var html = {
-    title: '',
-    titleByEntries: undefined,
-    meta: {
-      charset: {
-        charset: 'utf-8'
-      },
-      viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
-      'http-equiv': {
-        'http-equiv': 'x-ua-compatible',
-        content: 'ie=edge'
-      },
-      renderer: 'webkit',
-      layoutmode: 'standard',
-      imagemode: 'force',
-      'wap-font-scale': 'no',
-      'format-detection': 'telephone=no'
-    },
-    metaByEntries: undefined,
-    inject: 'head',
-    injectByEntries: undefined,
-    mountId: 'root',
-    favicon: '',
-    faviconByEntries: undefined,
-    disableHtmlFolder: false,
-    templateParameters: {},
-    templateParametersByEntries: undefined
-  };
-  var server = {
-    routes: undefined,
-    publicRoutes: undefined,
-    ssr: undefined,
-    ssrByEntries: undefined,
-    baseUrl: '/',
-    port: 8080
-  };
-  var dev = {
-    assetPrefix: false,
-    https: false
-  };
-  var tools = {
-    webpack: undefined,
-    babel: undefined,
-    postcss: undefined,
-    autoprefixer: undefined,
-    devServer: undefined,
-    tsLoader: undefined,
-    terser: undefined,
-    minifyCss: undefined
-  };
-  return {
-    source: source,
-    output: output,
-    server: server,
-    dev: dev,
-    html: html,
-    tools: tools,
-    plugins: [],
-    runtime: {},
-    runtimeByEntries: {}
-  };
+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 function createLegacyDefaultConfig(appContext) {
-  var _ref2;
-  var defaultAlias = appContext ? (_ref2 = {}, _defineProperty(_ref2, appContext.internalDirAlias, appContext.internalDirectory), _defineProperty(_ref2, appContext.internalSrcAlias, appContext.srcDirectory), _defineProperty(_ref2, '@', appContext.srcDirectory), _defineProperty(_ref2, '@shared', appContext.sharedDirectory), _ref2) : {};
-  var sourceDefaults = {
-    entries: undefined,
-    enableAsyncEntry: false,
-    disableDefaultEntries: false,
-    entriesDir: './src',
-    configDir: './config',
-    apiDir: './api',
-    envVars: [],
-    globalVars: undefined,
-    alias: defaultAlias,
-    moduleScopes: undefined,
-    include: []
-  };
-  var outputDefaults = {
-    assetPrefix: '/',
-    htmlPath: 'html',
-    jsPath: 'static/js',
-    cssPath: 'static/css',
-    mediaPath: 'static/media',
-    path: 'dist',
-    title: '',
-    titleByEntries: undefined,
-    meta: {
-      charset: {
-        charset: 'utf-8'
-      },
-      viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
-      'http-equiv': {
-        'http-equiv': 'x-ua-compatible',
-        content: 'ie=edge'
-      },
-      renderer: 'webkit',
-      layoutmode: 'standard',
-      imagemode: 'force',
-      'wap-font-scale': 'no',
-      'format-detection': 'telephone=no'
-    },
-    metaByEntries: undefined,
-    inject: 'head',
-    injectByEntries: undefined,
-    mountId: 'root',
-    favicon: '',
-    faviconByEntries: undefined,
-    copy: undefined,
-    disableHtmlFolder: false,
-    disableCssModuleExtension: false,
-    disableCssExtract: false,
-    enableCssModuleTSDeclaration: false,
-    disableMinimize: false,
-    enableInlineStyles: false,
-    enableInlineScripts: false,
-    disableSourceMap: false,
-    disableInlineRuntimeChunk: false,
-    disableAssetsCache: false,
-    enableLatestDecorators: false,
-    polyfill: 'entry',
-    dataUriLimit: 10000,
-    templateParameters: {},
-    templateParametersByEntries: undefined,
-    cssModuleLocalIdentName: undefined,
-    enableModernMode: false,
-    disableNodePolyfill: false,
-    enableTsLoader: false
-  };
-  var serverDefaults = {
-    routes: undefined,
-    publicRoutes: undefined,
-    ssr: undefined,
-    ssrByEntries: undefined,
-    baseUrl: '/',
-    port: 8080
-  };
-  var devDefaults = {
-    assetPrefix: false,
-    https: false
-  };
-  var toolsDefaults = {
-    webpack: undefined,
-    babel: undefined,
-    postcss: undefined,
-    autoprefixer: undefined,
-    lodash: undefined,
-    devServer: undefined,
-    tsLoader: undefined,
-    terser: undefined,
-    minifyCss: undefined
-  };
-  return {
-    source: sourceDefaults,
-    output: outputDefaults,
-    server: serverDefaults,
-    dev: devDefaults,
-    tools: toolsDefaults,
-    runtime: {},
-    runtimeByEntries: {}
-  };
-}
+function createDefaultConfig(appContext) {
+    var _obj;
+    var defaultAlias = appContext ? (_obj = {}, _defineProperty(_obj, appContext.internalDirAlias, appContext.internalDirectory), _defineProperty(_obj, appContext.internalSrcAlias, appContext.srcDirectory), _defineProperty(_obj, "@", appContext.srcDirectory), _defineProperty(_obj, "@shared", appContext.sharedDirectory), _obj) : {};
+    var source = {
+        entries: void 0,
+        enableAsyncEntry: false,
+        disableDefaultEntries: false,
+        entriesDir: "./src",
+        configDir: "./config",
+        globalVars: void 0,
+        moduleScopes: void 0,
+        include: [],
+        alias: defaultAlias
+    };
+    var output = {
+        assetPrefix: "/",
+        distPath: {
+            html: "html",
+            js: "static/js",
+            css: "static/css",
+            media: "static/media",
+            root: "dist"
+        },
+        copy: void 0,
+        disableCssModuleExtension: false,
+        enableCssModuleTSDeclaration: false,
+        disableMinimize: false,
+        enableInlineStyles: false,
+        enableInlineScripts: false,
+        disableSourceMap: false,
+        disableInlineRuntimeChunk: false,
+        disableFilenameHash: false,
+        enableLatestDecorators: false,
+        polyfill: "entry",
+        cssModuleLocalIdentName: void 0
+    };
+    var html = {
+        title: "",
+        titleByEntries: void 0,
+        meta: {
+            charset: {
+                charset: "utf-8"
+            },
+            viewport: "width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no",
+            "http-equiv": {
+                "http-equiv": "x-ua-compatible",
+                content: "ie=edge"
+            },
+            renderer: "webkit",
+            layoutmode: "standard",
+            imagemode: "force",
+            "wap-font-scale": "no",
+            "format-detection": "telephone=no"
+        },
+        metaByEntries: void 0,
+        inject: "head",
+        injectByEntries: void 0,
+        mountId: "root",
+        favicon: "",
+        faviconByEntries: void 0,
+        disableHtmlFolder: false,
+        templateParameters: {},
+        templateParametersByEntries: void 0
+    };
+    var server = {
+        routes: void 0,
+        publicRoutes: void 0,
+        ssr: void 0,
+        ssrByEntries: void 0,
+        baseUrl: "/",
+        port: 8080
+    };
+    var dev = {
+        assetPrefix: false,
+        https: false
+    };
+    var tools = {
+        webpack: void 0,
+        babel: void 0,
+        postcss: void 0,
+        autoprefixer: void 0,
+        devServer: void 0,
+        tsLoader: void 0,
+        terser: void 0,
+        minifyCss: void 0
+    };
+    return {
+        source: source,
+        output: output,
+        server: server,
+        dev: dev,
+        html: html,
+        tools: tools,
+        plugins: [],
+        runtime: {},
+        runtimeByEntries: {}
+    };
+}
+function createLegacyDefaultConfig(appContext) {
+    var _obj;
+    var defaultAlias = appContext ? (_obj = {}, _defineProperty(_obj, appContext.internalDirAlias, appContext.internalDirectory), _defineProperty(_obj, appContext.internalSrcAlias, appContext.srcDirectory), _defineProperty(_obj, "@", appContext.srcDirectory), _defineProperty(_obj, "@shared", appContext.sharedDirectory), _obj) : {};
+    var sourceDefaults = {
+        entries: void 0,
+        enableAsyncEntry: false,
+        disableDefaultEntries: false,
+        entriesDir: "./src",
+        configDir: "./config",
+        apiDir: "./api",
+        envVars: [],
+        globalVars: void 0,
+        alias: defaultAlias,
+        moduleScopes: void 0,
+        include: []
+    };
+    var outputDefaults = {
+        assetPrefix: "/",
+        htmlPath: "html",
+        jsPath: "static/js",
+        cssPath: "static/css",
+        mediaPath: "static/media",
+        path: "dist",
+        title: "",
+        titleByEntries: void 0,
+        meta: {
+            charset: {
+                charset: "utf-8"
+            },
+            viewport: "width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no",
+            "http-equiv": {
+                "http-equiv": "x-ua-compatible",
+                content: "ie=edge"
+            },
+            renderer: "webkit",
+            layoutmode: "standard",
+            imagemode: "force",
+            "wap-font-scale": "no",
+            "format-detection": "telephone=no"
+        },
+        metaByEntries: void 0,
+        inject: "head",
+        injectByEntries: void 0,
+        mountId: "root",
+        favicon: "",
+        faviconByEntries: void 0,
+        copy: void 0,
+        disableHtmlFolder: false,
+        disableCssModuleExtension: false,
+        disableCssExtract: false,
+        enableCssModuleTSDeclaration: false,
+        disableMinimize: false,
+        enableInlineStyles: false,
+        enableInlineScripts: false,
+        disableSourceMap: false,
+        disableInlineRuntimeChunk: false,
+        disableAssetsCache: false,
+        enableLatestDecorators: false,
+        polyfill: "entry",
+        dataUriLimit: 1e4,
+        templateParameters: {},
+        templateParametersByEntries: void 0,
+        cssModuleLocalIdentName: void 0,
+        disableNodePolyfill: false,
+        enableTsLoader: false
+    };
+    var serverDefaults = {
+        routes: void 0,
+        publicRoutes: void 0,
+        ssr: void 0,
+        ssrByEntries: void 0,
+        baseUrl: "/",
+        port: 8080
+    };
+    var devDefaults = {
+        assetPrefix: false,
+        https: false
+    };
+    var toolsDefaults = {
+        webpack: void 0,
+        babel: void 0,
+        postcss: void 0,
+        autoprefixer: void 0,
+        lodash: void 0,
+        devServer: void 0,
+        tsLoader: void 0,
+        terser: void 0,
+        minifyCss: void 0
+    };
+    return {
+        source: sourceDefaults,
+        output: outputDefaults,
+        server: serverDefaults,
+        dev: devDefaults,
+        tools: toolsDefaults,
+        runtime: {},
+        runtimeByEntries: {}
+    };
+}
+export { createDefaultConfig, createLegacyDefaultConfig };