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

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/inits.js

@@ -77,6 +77,7 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 import path, { dirname, isAbsolute, posix, sep } from "path";
 import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
+import { getAutoInjectEnv } from "../../utils/env";
 function initHtmlConfig(config, appContext) {
     var createBuilderAppIcon = function createBuilderAppIcon(config2, appContext2) {
         var configDir = config2.source.configDir;
@@ -105,6 +106,11 @@ function initHtmlConfig(config, appContext) {
     return config.html;
 }
 function initSourceConfig(config, appContext) {
+    var createBuilderGlobalVars = function createBuilderGlobalVars(config2, appContext2) {
+        var _source = config2.source, _globalVars = _source.globalVars, globalVars = _globalVars === void 0 ? {} : _globalVars;
+        var publicEnv = getAutoInjectEnv(appContext2);
+        return _objectSpread({}, globalVars, publicEnv);
+    };
     var createBuilderInclude = function createBuilderInclude(config2, appContext2) {
         var include = config2.source.include;
         var defaultInclude = [
@@ -171,6 +177,7 @@ function initSourceConfig(config, appContext) {
     };
     config.source.include = createBuilderInclude(config, appContext);
     config.source.moduleScopes = createBuilderModuleScope(config);
+    config.source.globalVars = createBuilderGlobalVars(config, appContext);
 }
 function initToolsConfig(config) {
     var defaultTsChecker = {

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(),
@@ -21,6 +22,10 @@ var hooks = {
     afterDeploy: createAsyncWorkflow(),
     watchFiles: createParallelWorkflow(),
     fileChange: createAsyncWorkflow(),
-    beforeRestart: createAsyncWorkflow()
+    beforeRestart: createAsyncWorkflow(),
+    registerDev: createParallelWorkflow(),
+    beforeDevTask: createParallelWorkflow(),
+    registerBuildPlatform: createParallelWorkflow(),
+    beforeBuildPlatform: createParallelWorkflow()
 };
 export { hooks };