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

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

@@ -181,9 +181,10 @@ import { setServer, createServer, injectDataLoaderPlugin } from "../utils/create
 import { generateRoutes } from "../utils/routes";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
+import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 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;
+        var ref, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, checkedEntries, serverInternalPlugins, serverOptions, app, server;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -197,7 +198,7 @@ var dev = function() {
                         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;
+                    appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, entrypoints = appContext.entrypoints, serverConfigFile = appContext.serverConfigFile;
                     return [
                         4,
                         getSpecifiedEntries(options.entry || false, entrypoints)
@@ -232,30 +233,23 @@ var dev = function() {
                     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()
+                        generateRoutes(appContext)
                     ];
                 case 4:
-                    compiler = _state.sent();
-                    _state.label = 5;
-                case 5:
+                    _state.sent();
                     return [
                         4,
-                        generateRoutes(appContext)
+                        getServerInternalPlugins(api)
                     ];
-                case 6:
-                    _state.sent();
+                case 5:
+                    serverInternalPlugins = _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,
@@ -263,13 +257,15 @@ var dev = function() {
                     };
                     if (!apiOnly) return [
                         3,
-                        8
+                        7
                     ];
                     return [
                         4,
-                        createServer(serverOptions)
+                        createServer(_objectSpreadProps(_objectSpread({}, serverOptions), {
+                            compiler: null
+                        }))
                     ];
-                case 7:
+                case 6:
                     app = _state.sent();
                     app.listen(port, function() {
                         var _ref = _asyncToGenerator(function(err) {
@@ -289,27 +285,26 @@ var dev = function() {
                     }());
                     return [
                         3,
-                        10
+                        9
                     ];
-                case 8:
+                case 7:
                     return [
                         4,
                         appContext.builder.startDevServer({
-                            compiler: compiler,
                             printURLs: false,
                             serverOptions: serverOptions
                         })
                     ];
-                case 9:
+                case 8:
                     server = _state.sent().server;
                     setServer(server);
-                    _state.label = 10;
-                case 10:
+                    _state.label = 9;
+                case 9:
                     return [
                         4,
                         createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners)
                     ];
-                case 11:
+                case 10:
                     _state.sent();
                     return [
                         2

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

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

package/dist/js/treeshaking/commands/{start.js → serve.js}

@@ -126,9 +126,10 @@ 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, app;
+        var ref, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, serverInternalPlugins, app;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -143,17 +144,23 @@ var start = function() {
                     ];
                 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(appContext.serverInternalPlugins),
+                            internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
                             apiOnly: apiOnly
                         })
                     ];
-                case 2:
+                case 3:
                     app = _state.sent();
                     app.listen(port, function() {
                         var _ref = _asyncToGenerator(function(err) {

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

@@ -11,45 +11,64 @@ function _defineProperty(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;
+}
+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 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 = {
+    var source = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.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 = {
+        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: "",
-        titleByEntries: void 0,
         meta: {
             charset: {
                 charset: "utf-8"
@@ -64,17 +83,8 @@ function createDefaultConfig(appContext) {
             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,
@@ -83,20 +93,6 @@ function createDefaultConfig(appContext) {
         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,
@@ -105,6 +101,7 @@ function createDefaultConfig(appContext) {
         html: html,
         tools: tools,
         plugins: [],
+        builderPlugins: [],
         runtime: {},
         runtimeByEntries: {}
     };

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

@@ -19,6 +19,7 @@ function createOutputConfig(config) {
             font: dataUriLimit,
             media: dataUriLimit
         },
+        cssModuleLocalIdentName: cssModuleLocalIdentName,
         disableCssExtract: disableCssExtract,
         disableCssModuleExtension: disableCssModuleExtension,
         disableInlineRuntimeChunk: disableInlineRuntimeChunk,
@@ -31,9 +32,6 @@ function createOutputConfig(config) {
         polyfill: polyfill,
         disableFilenameHash: disableAssetsCache,
         enableLatestDecorators: enableLatestDecorators,
-        filename: {
-            css: cssModuleLocalIdentName
-        },
         ssg: ssg,
         enableAssetFallback: true,
         enableAssetManifest: true,

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

@@ -32,7 +32,11 @@ function createSourceConfig(config) {
         enableAsyncEntry: enableAsyncEntry,
         disableDefaultEntries: disableDefaultEntries,
         entriesDir: entriesDir,
-        configDir: configDir
+        configDir: configDir,
+        resolveExtensionPrefix: {
+            web: ".web",
+            node: ".node"
+        }
     };
 }
 export { createSourceConfig };

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

@@ -21,11 +21,15 @@ function transformNormalizedConfig(config) {
         server: server,
         cliOptions: cliOptions,
         testing: testing,
+        builderPlugins: [],
         plugins: plugins,
         security: {},
         _raw: {},
         experiments: {},
-        performance: {}
+        autoLoadPlugins: true,
+        performance: {
+            removeMomentLocale: true
+        }
     };
 }
 export { transformNormalizedConfig };

package/dist/js/treeshaking/hooks.js

@@ -10,6 +10,7 @@ var hooks = {
     htmlPartials: createAsyncWaterfall(),
     beforeGenerateRoutes: createAsyncWaterfall(),
     addDefineTypes: createAsyncWaterfall(),
+    collectServerPlugins: createAsyncWaterfall(),
     beforeDev: createAsyncWorkflow(),
     afterDev: createAsyncWorkflow(),
     beforeCreateCompiler: createAsyncWorkflow(),

package/dist/js/treeshaking/index.js

@@ -201,7 +201,7 @@ var devCommand = function() {
                     ];
                 case 1:
                     devToolMetas = _state.sent();
-                    devProgram = 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() {
+                    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) {
@@ -449,7 +449,7 @@ var src_default = function() {
             "@modern-js/plugin-document",
             "@modern-js/plugin-state",
             "@modern-js/plugin-router",
-            "@modern-js/plugin-router-legacy",
+            "@modern-js/plugin-router-v5",
             "@modern-js/plugin-polyfill"
         ],
         registerHook: hooks,
@@ -482,14 +482,14 @@ var src_default = function() {
                                     ];
                                 case 2:
                                     _state.sent();
-                                    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() {
+                                    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/start")
+                                                        import("./commands/serve")
                                                     ];
                                                 case 1:
                                                     start = _state.sent().start;
@@ -614,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
                                     ];

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"
@@ -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 };

package/dist/js/treeshaking/schema/legacy.js

@@ -33,9 +33,6 @@ var source = {
                     },
                     disableMount: {
                         type: "boolean"
-                    },
-                    enableFileSystemRoutes: {
-                        type: "boolean"
                     }
                 },
                 additionalProperties: false

package/dist/js/treeshaking/utils/commands.js

@@ -3,4 +3,8 @@ var getCommand = function() {
     var command = args[0];
     return command;
 };
-export { getCommand };
+var isDevCommand = function() {
+    var command = getCommand();
+    return command === "dev" || command === "start";
+};
+export { getCommand, isDevCommand };