@modern-js/app-tools 2.0.0-canary.0 → 2.0.1

package/dist/js/treeshaking/index.js

@@ -177,6 +177,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import path from "path";
 import LintPlugin from "@modern-js/plugin-lint";
 import { cleanRequireCache, emptyDir, Import } from "@modern-js/utils";
+import { castArray } from "@modern-js/utils/lodash";
 import AnalyzePlugin from "./analyze";
 import InitializePlugin from "./initialize";
 import { hooks } from "./hooks";
@@ -187,34 +188,20 @@ import { restart } from "./utils/restart";
 export * from "./defineConfig";
 export * from "./types";
 var upgradeModel = Import.lazy("@modern-js/upgrade", require);
-var src_default = function() {
-    return {
-        name: "@modern-js/app-tools",
-        post: [
-            "@modern-js/plugin-initialize",
-            "@modern-js/plugin-analyze",
-            "@modern-js/plugin-ssr",
-            "@modern-js/plugin-document",
-            "@modern-js/plugin-state",
-            "@modern-js/plugin-router",
-            "@modern-js/plugin-router-legacy",
-            "@modern-js/plugin-polyfill"
-        ],
-        registerHook: hooks,
-        usePlugins: [
-            InitializePlugin(),
-            AnalyzePlugin(),
-            LintPlugin()
-        ],
-        setup: function(api) {
-            var locale = getLocaleLanguage();
-            i18n.changeLanguage({
-                locale: locale
-            });
-            return {
-                commands: function commands(param) {
-                    var program = param.program;
-                    program.command("dev").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).action(function() {
+var devCommand = function() {
+    var _ref = _asyncToGenerator(function(program, api) {
+        var runner, devToolMetas, devProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, meta, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, subCmd;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    runner = api.useHookRunners();
+                    return [
+                        4,
+                        runner.registerDev()
+                    ];
+                case 1:
+                    devToolMetas = _state.sent();
+                    devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).action(function() {
                         var _ref = _asyncToGenerator(function(options) {
                             var dev;
                             return __generator(this, function(_state) {
@@ -242,7 +229,105 @@ var src_default = function() {
                             return _ref.apply(this, arguments);
                         };
                     }());
-                    program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(function() {
+                    _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(_iterator = devToolMetas[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            meta = _step.value;
+                            if (!meta.subCommands) {
+                                continue;
+                            }
+                            _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                            try {
+                                for(_iterator1 = meta.subCommands[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                                    subCmd = _step1.value;
+                                    devProgram.command(subCmd).action(/*#__PURE__*/ _asyncToGenerator(function() {
+                                        var options, appDirectory, isTypescript;
+                                        var _arguments = arguments;
+                                        return __generator(this, function(_state) {
+                                            switch(_state.label){
+                                                case 0:
+                                                    options = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {};
+                                                    appDirectory = api.useAppContext().appDirectory;
+                                                    return [
+                                                        4,
+                                                        import("@modern-js/utils")
+                                                    ];
+                                                case 1:
+                                                    isTypescript = _state.sent().isTypescript;
+                                                    return [
+                                                        4,
+                                                        runner.beforeDevTask(meta)
+                                                    ];
+                                                case 2:
+                                                    _state.sent();
+                                                    return [
+                                                        4,
+                                                        meta.action(options, {
+                                                            isTsProject: isTypescript(appDirectory)
+                                                        })
+                                                    ];
+                                                case 3:
+                                                    _state.sent();
+                                                    return [
+                                                        2
+                                                    ];
+                                            }
+                                        });
+                                    }));
+                                }
+                            } catch (err) {
+                                _didIteratorError1 = true;
+                                _iteratorError1 = err;
+                            } finally{
+                                try {
+                                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                                        _iterator1.return();
+                                    }
+                                } finally{
+                                    if (_didIteratorError1) {
+                                        throw _iteratorError1;
+                                    }
+                                }
+                            }
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function devCommand(program, api) {
+        return _ref.apply(this, arguments);
+    };
+}();
+var buildCommand = function() {
+    var _ref = _asyncToGenerator(function(program, api) {
+        var runner, platformBuilders, buildProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    runner = api.useHookRunners();
+                    return [
+                        4,
+                        runner.registerBuildPlatform()
+                    ];
+                case 1:
+                    platformBuilders = _state.sent();
+                    buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(function() {
                         var _ref = _asyncToGenerator(function(options) {
                             var build;
                             return __generator(this, function(_state) {
@@ -271,124 +356,256 @@ var src_default = function() {
                             return _ref.apply(this, arguments);
                         };
                     }());
-                    program.command("start").usage("[options]").description(i18n.t(localeKeys.command.start.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(/*#__PURE__*/ _asyncToGenerator(function() {
-                        var start;
+                    _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        _loop = function() {
+                            var platformBuilder = _step.value;
+                            var platforms = castArray(platformBuilder.platform);
+                            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                            try {
+                                var _loop = function() {
+                                    var platform = _step1.value;
+                                    buildProgram.command(platform).action(/*#__PURE__*/ _asyncToGenerator(function() {
+                                        var appDirectory, isTypescript;
+                                        return __generator(this, function(_state) {
+                                            switch(_state.label){
+                                                case 0:
+                                                    appDirectory = api.useAppContext().appDirectory;
+                                                    return [
+                                                        4,
+                                                        import("@modern-js/utils")
+                                                    ];
+                                                case 1:
+                                                    isTypescript = _state.sent().isTypescript;
+                                                    return [
+                                                        4,
+                                                        runner.beforeBuildPlatform(platformBuilders)
+                                                    ];
+                                                case 2:
+                                                    _state.sent();
+                                                    return [
+                                                        4,
+                                                        platformBuilder.build(platform, {
+                                                            isTsProject: isTypescript(appDirectory)
+                                                        })
+                                                    ];
+                                                case 3:
+                                                    _state.sent();
+                                                    return [
+                                                        2
+                                                    ];
+                                            }
+                                        });
+                                    }));
+                                };
+                                for(var _iterator = platforms[Symbol.iterator](), _step1; !(_iteratorNormalCompletion = (_step1 = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
+                            } catch (err) {
+                                _didIteratorError = true;
+                                _iteratorError = err;
+                            } finally{
+                                try {
+                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                        _iterator.return();
+                                    }
+                                } finally{
+                                    if (_didIteratorError) {
+                                        throw _iteratorError;
+                                    }
+                                }
+                            }
+                        };
+                        for(_iterator = platformBuilders[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function buildCommand(program, api) {
+        return _ref.apply(this, arguments);
+    };
+}();
+var src_default = function() {
+    return {
+        name: "@modern-js/app-tools",
+        post: [
+            "@modern-js/plugin-initialize",
+            "@modern-js/plugin-analyze",
+            "@modern-js/plugin-ssr",
+            "@modern-js/plugin-document",
+            "@modern-js/plugin-state",
+            "@modern-js/plugin-router",
+            "@modern-js/plugin-router-v5",
+            "@modern-js/plugin-polyfill"
+        ],
+        registerHook: hooks,
+        usePlugins: [
+            InitializePlugin(),
+            AnalyzePlugin(),
+            LintPlugin()
+        ],
+        setup: function(api) {
+            var locale = getLocaleLanguage();
+            i18n.changeLanguage({
+                locale: locale
+            });
+            return {
+                commands: function commands(param) {
+                    var program = param.program;
+                    return _asyncToGenerator(function() {
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
                                     return [
                                         4,
-                                        import("./commands/start")
+                                        devCommand(program, api)
                                     ];
                                 case 1:
-                                    start = _state.sent().start;
+                                    _state.sent();
                                     return [
                                         4,
-                                        start(api)
+                                        buildCommand(program, api)
                                     ];
                                 case 2:
                                     _state.sent();
+                                    program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(/*#__PURE__*/ _asyncToGenerator(function() {
+                                        var start;
+                                        return __generator(this, function(_state) {
+                                            switch(_state.label){
+                                                case 0:
+                                                    return [
+                                                        4,
+                                                        import("./commands/serve")
+                                                    ];
+                                                case 1:
+                                                    start = _state.sent().start;
+                                                    return [
+                                                        4,
+                                                        start(api)
+                                                    ];
+                                                case 2:
+                                                    _state.sent();
+                                                    return [
+                                                        2
+                                                    ];
+                                            }
+                                        });
+                                    }));
+                                    program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).description(i18n.t(localeKeys.command.deploy.describe)).action(function() {
+                                        var _ref = _asyncToGenerator(function(options) {
+                                            var build, deploy;
+                                            return __generator(this, function(_state) {
+                                                switch(_state.label){
+                                                    case 0:
+                                                        return [
+                                                            4,
+                                                            import("./commands/build")
+                                                        ];
+                                                    case 1:
+                                                        build = _state.sent().build;
+                                                        return [
+                                                            4,
+                                                            build(api)
+                                                        ];
+                                                    case 2:
+                                                        _state.sent();
+                                                        return [
+                                                            4,
+                                                            import("./commands/deploy")
+                                                        ];
+                                                    case 3:
+                                                        deploy = _state.sent().deploy;
+                                                        return [
+                                                            4,
+                                                            deploy(api, options)
+                                                        ];
+                                                    case 4:
+                                                        _state.sent();
+                                                        process.exit(0);
+                                                        return [
+                                                            2
+                                                        ];
+                                                }
+                                            });
+                                        });
+                                        return function(options) {
+                                            return _ref.apply(this, arguments);
+                                        };
+                                    }());
+                                    program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action(function() {
+                                        var _ref = _asyncToGenerator(function(options) {
+                                            var MWANewAction;
+                                            return __generator(this, function(_state) {
+                                                switch(_state.label){
+                                                    case 0:
+                                                        return [
+                                                            4,
+                                                            import("@modern-js/new-action")
+                                                        ];
+                                                    case 1:
+                                                        MWANewAction = _state.sent().MWANewAction;
+                                                        return [
+                                                            4,
+                                                            MWANewAction(_objectSpreadProps(_objectSpread({}, options), {
+                                                                locale: locale
+                                                            }))
+                                                        ];
+                                                    case 2:
+                                                        _state.sent();
+                                                        return [
+                                                            2
+                                                        ];
+                                                }
+                                            });
+                                        });
+                                        return function(options) {
+                                            return _ref.apply(this, arguments);
+                                        };
+                                    }());
+                                    program.command("inspect").description("inspect internal webpack config").option("--env <env>", i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(function() {
+                                        var _ref = _asyncToGenerator(function(options) {
+                                            var inspect;
+                                            return __generator(this, function(_state) {
+                                                switch(_state.label){
+                                                    case 0:
+                                                        return [
+                                                            4,
+                                                            import("./commands/inspect")
+                                                        ];
+                                                    case 1:
+                                                        inspect = _state.sent().inspect;
+                                                        inspect(api, options);
+                                                        return [
+                                                            2
+                                                        ];
+                                                }
+                                            });
+                                        });
+                                        return function(options) {
+                                            return _ref.apply(this, arguments);
+                                        };
+                                    }());
+                                    upgradeModel.defineCommand(program.command("upgrade"));
                                     return [
                                         2
                                     ];
                             }
                         });
-                    }));
-                    program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).description(i18n.t(localeKeys.command.deploy.describe)).action(function() {
-                        var _ref = _asyncToGenerator(function(options) {
-                            var build, deploy;
-                            return __generator(this, function(_state) {
-                                switch(_state.label){
-                                    case 0:
-                                        return [
-                                            4,
-                                            import("./commands/build")
-                                        ];
-                                    case 1:
-                                        build = _state.sent().build;
-                                        return [
-                                            4,
-                                            build(api)
-                                        ];
-                                    case 2:
-                                        _state.sent();
-                                        return [
-                                            4,
-                                            import("./commands/deploy")
-                                        ];
-                                    case 3:
-                                        deploy = _state.sent().deploy;
-                                        return [
-                                            4,
-                                            deploy(api, options)
-                                        ];
-                                    case 4:
-                                        _state.sent();
-                                        process.exit(0);
-                                        return [
-                                            2
-                                        ];
-                                }
-                            });
-                        });
-                        return function(options) {
-                            return _ref.apply(this, arguments);
-                        };
-                    }());
-                    program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action(function() {
-                        var _ref = _asyncToGenerator(function(options) {
-                            var MWANewAction;
-                            return __generator(this, function(_state) {
-                                switch(_state.label){
-                                    case 0:
-                                        return [
-                                            4,
-                                            import("@modern-js/new-action")
-                                        ];
-                                    case 1:
-                                        MWANewAction = _state.sent().MWANewAction;
-                                        return [
-                                            4,
-                                            MWANewAction(_objectSpreadProps(_objectSpread({}, options), {
-                                                locale: locale
-                                            }))
-                                        ];
-                                    case 2:
-                                        _state.sent();
-                                        return [
-                                            2
-                                        ];
-                                }
-                            });
-                        });
-                        return function(options) {
-                            return _ref.apply(this, arguments);
-                        };
-                    }());
-                    program.command("inspect").description("inspect internal webpack config").option("--env <env>", i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(function() {
-                        var _ref = _asyncToGenerator(function(options) {
-                            var inspect;
-                            return __generator(this, function(_state) {
-                                switch(_state.label){
-                                    case 0:
-                                        return [
-                                            4,
-                                            import("./commands/inspect")
-                                        ];
-                                    case 1:
-                                        inspect = _state.sent().inspect;
-                                        inspect(api, options);
-                                        return [
-                                            2
-                                        ];
-                                }
-                            });
-                        });
-                        return function(options) {
-                            return _ref.apply(this, arguments);
-                        };
-                    }());
-                    upgradeModel.defineCommand(program.command("upgrade"));
+                    })();
                 },
                 prepare: function prepare() {
                     return _asyncToGenerator(function() {
@@ -397,7 +614,7 @@ var src_default = function() {
                             switch(_state.label){
                                 case 0:
                                     command = getCommand();
-                                    if (!(command === "dev" || command === "build")) return [
+                                    if (!(command === "dev" || command === "start" || command === "build")) return [
                                         3,
                                         2
                                     ];
@@ -474,4 +691,4 @@ var src_default = function() {
         }
     };
 };
-export { src_default as default };
+export { buildCommand, src_default as default, devCommand };

package/dist/js/treeshaking/initialize/index.js

@@ -176,7 +176,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import { ensureAbsolutePath, getPort, isDev } from "@modern-js/utils";
 import { legacySchema, schema } from "../schema";
-import { getCommand } from "../utils/commands";
+import { isDevCommand } from "../utils/commands";
 import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
 import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig } from "../config";
 var initialize_default = function() {
@@ -234,11 +234,13 @@ var initialize_default = function() {
                                                 tools: normalizedConfig.tools || {},
                                                 testing: normalizedConfig.testing || {},
                                                 plugins: normalizedConfig.plugins || [],
+                                                builderPlugins: normalizedConfig.builderPlugins || [],
                                                 runtime: normalizedConfig.runtime || {},
                                                 runtimeByEntries: normalizedConfig.runtimeByEntries || {},
                                                 deploy: normalizedConfig.deploy || {},
                                                 performance: normalizedConfig.performance || {},
-                                                experiments: normalizedConfig.experiments || {}
+                                                experiments: normalizedConfig.experiments || {},
+                                                autoLoadPlugins: normalizedConfig.autoLoadPlugins || false
                                             }
                                         }
                                     ];
@@ -255,12 +257,11 @@ function getDevServerPort(appContext, resolved) {
 }
 function _getDevServerPort() {
     _getDevServerPort = _asyncToGenerator(function(appContext, resolved) {
-        var command, _port, _tmp;
+        var _port, _tmp;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    command = getCommand();
-                    if (!(isDev() && command === "dev")) return [
+                    if (!(isDev() && isDevCommand())) return [
                         3,
                         4
                     ];

package/dist/js/treeshaking/locale/en.js

@@ -12,7 +12,7 @@ var EN_LOCALE = {
         build: {
             describe: "build application"
         },
-        start: {
+        serve: {
             describe: "start server"
         },
         deploy: {

package/dist/js/treeshaking/locale/zh.js

@@ -12,7 +12,7 @@ var ZH_LOCALE = {
         build: {
             describe: "构建应用命令"
         },
-        start: {
+        serve: {
             describe: "应用启动命令"
         },
         deploy: {

package/dist/js/treeshaking/schema/index.js

@@ -34,8 +34,8 @@ var source = {
                     disableMount: {
                         type: "boolean"
                     },
-                    enableFileSystemRoutes: {
-                        type: "boolean"
+                    customBootstrap: {
+                        type: "string"
                     }
                 },
                 additionalProperties: false
@@ -57,6 +57,9 @@ var source = {
     entriesDir: {
         type: "string"
     },
+    disableEntryDirs: {
+        type: "array"
+    },
     configDir: {
         type: "string"
     },
@@ -87,14 +90,7 @@ var output = {
         type: "boolean"
     }
 };
-var dev = {
-    proxy: {
-        type: [
-            "boolean",
-            "object"
-        ]
-    }
-};
+var dev = {};
 var server = {
     routes: {
         type: "object"
@@ -148,7 +144,7 @@ var server = {
     compiler: {
         type: "string"
     },
-    disableFrameworkExt: {
+    enableFrameworkExt: {
         type: "boolean"
     }
 };
@@ -176,7 +172,10 @@ var deploy = {
         ]
     }
 };
+var builderPlugins = {
+    type: "array"
+};
 var schema = new Schema();
-schema.setSchema("bff", bff).setSchema("dev", dev).setSchema("server", server).setSchema("source", source).setSchema("output", output).setSchema("tools", tools).setSchema("deploy", deploy);
+schema.setSchema("bff", bff).setSchema("dev", dev).setSchema("server", server).setSchema("source", source).setSchema("output", output).setSchema("tools", tools).setSchema("deploy", deploy).set("builderPlugin", builderPlugins);
 import { default as default2 } from "./legacy";
 export { default2 as legacySchema, schema };