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

package/dist/js/treeshaking/commands/serve.js

@@ -0,0 +1,199 @@
+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;
+            }
+            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 { logger, chalk, isApiOnly } from "@modern-js/utils";
+import server from "@modern-js/prod-server";
+import { printInstructions } from "../utils/printInstructions";
+import { injectDataLoaderPlugin } from "../utils/createServer";
+import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+var start = function() {
+    var _ref = _asyncToGenerator(function(api) {
+        var ref, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, serverInternalPlugins, 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,
+                        getServerInternalPlugins(api)
+                    ];
+                case 2:
+                    serverInternalPlugins = _state.sent();
+                    return [
+                        4,
+                        server({
+                            pwd: appDirectory,
+                            config: userConfig,
+                            serverConfigFile: serverConfigFile,
+                            internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
+                            apiOnly: apiOnly
+                        })
+                    ];
+                case 3:
+                    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,199 +1,208 @@
-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',
-    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 _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;
+}
+import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
+function createDefaultConfig(appContext) {
+    var defaultBuilderConfig = createDefaultBuilderConfig();
+    var dev = _objectSpread({}, defaultBuilderConfig.dev);
+    var tools = _objectSpread({}, defaultBuilderConfig.tools);
+    var output = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.output), {
+        disableNodePolyfill: true
+    });
+    var _obj;
+    var source = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.source), {
+        entries: void 0,
+        enableAsyncEntry: false,
+        disableDefaultEntries: false,
+        entriesDir: "./src",
+        configDir: "./config",
+        alias: (_obj = {}, _defineProperty(_obj, appContext.internalDirAlias, appContext.internalDirectory), _defineProperty(_obj, appContext.internalSrcAlias, appContext.srcDirectory), _defineProperty(_obj, "@", appContext.srcDirectory), _defineProperty(_obj, "@shared", appContext.sharedDirectory), _obj)
+    });
+    var html = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.html), {
+        title: "",
+        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"
+        }
+    });
+    var server = {
+        routes: void 0,
+        publicRoutes: void 0,
+        ssr: void 0,
+        ssrByEntries: void 0,
+        baseUrl: "/",
+        port: 8080
+    };
+    return {
+        source: source,
+        output: output,
+        server: server,
+        dev: dev,
+        html: html,
+        tools: tools,
+        plugins: [],
+        builderPlugins: [],
+        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 };

package/dist/js/treeshaking/config/index.js

@@ -1,2 +1,3 @@
-export { createDefaultConfig, createLegacyDefaultConfig } from "./default";
-export { initialNormalizedConfig, checkIsLegacyConfig } from "./initial";
+import { createDefaultConfig, createLegacyDefaultConfig } from "./default";
+import { initialNormalizedConfig, checkIsLegacyConfig } from "./initial";
+export { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig, initialNormalizedConfig };

package/dist/js/treeshaking/config/initial/createHtmlConfig.js

@@ -1,31 +1,19 @@
-export function createHtmlConfig(config) {
-  var _config$output = config.output,
-    disableHtmlFolder = _config$output.disableHtmlFolder,
-    favicon = _config$output.favicon,
-    faviconByEntries = _config$output.faviconByEntries,
-    inject = _config$output.inject,
-    injectByEntries = _config$output.injectByEntries,
-    meta = _config$output.meta,
-    metaByEntries = _config$output.metaByEntries,
-    mountId = _config$output.mountId,
-    title = _config$output.title,
-    titleByEntries = _config$output.titleByEntries,
-    templateParameters = _config$output.templateParameters,
-    templateParametersByEntries = _config$output.templateParametersByEntries,
-    crossorigin = _config$output.crossorigin;
-  return {
-    disableHtmlFolder: disableHtmlFolder,
-    favicon: favicon,
-    faviconByEntries: faviconByEntries,
-    inject: inject,
-    injectByEntries: injectByEntries,
-    meta: meta,
-    metaByEntries: metaByEntries,
-    mountId: mountId,
-    title: title,
-    titleByEntries: titleByEntries,
-    crossorigin: crossorigin,
-    templateParameters: templateParameters,
-    templateParametersByEntries: templateParametersByEntries
-  };
-}
+function createHtmlConfig(config) {
+    var _output = config.output, disableHtmlFolder = _output.disableHtmlFolder, favicon = _output.favicon, faviconByEntries = _output.faviconByEntries, inject = _output.inject, injectByEntries = _output.injectByEntries, meta = _output.meta, metaByEntries = _output.metaByEntries, mountId = _output.mountId, title = _output.title, titleByEntries = _output.titleByEntries, templateParameters = _output.templateParameters, templateParametersByEntries = _output.templateParametersByEntries, crossorigin = _output.crossorigin;
+    return {
+        disableHtmlFolder: disableHtmlFolder,
+        favicon: favicon,
+        faviconByEntries: faviconByEntries,
+        inject: inject,
+        injectByEntries: injectByEntries,
+        meta: meta,
+        metaByEntries: metaByEntries,
+        mountId: mountId,
+        title: title,
+        titleByEntries: titleByEntries,
+        crossorigin: crossorigin,
+        templateParameters: templateParameters,
+        templateParametersByEntries: templateParametersByEntries
+    };
+}
+export { createHtmlConfig };