@modern-js/server 2.4.1-beta.0 → 2.5.1-alpha.0

package/dist/js/treeshaking/dev-tools/register/index.js

@@ -80,9 +80,9 @@ var enableRegister = function(projectRoot, config) {
         projectRoot
     ]);
     if (isTsProject && existTsNode && existTsConfigPaths) {
-        var _config_output_distPath;
+        var ref;
         debug("use ts-node");
-        var distPath = ((_config_output_distPath = config.output.distPath) === null || _config_output_distPath === void 0 ? void 0 : _config_output_distPath.root) || "dist";
+        var distPath = ((ref = config.output.distPath) === null || ref === void 0 ? void 0 : ref.root) || "dist";
         var tsNode = require("ts-node");
         var tsConfigPaths = require("tsconfig-paths");
         var alias = config.source.alias;
@@ -90,7 +90,7 @@ var enableRegister = function(projectRoot, config) {
             appDirectory: projectRoot,
             tsconfigPath: tsconfigPath
         });
-        var _aliasConfig_paths = aliasConfig.paths, paths = _aliasConfig_paths === void 0 ? {} : _aliasConfig_paths, _aliasConfig_absoluteBaseUrl = aliasConfig.absoluteBaseUrl, absoluteBaseUrl = _aliasConfig_absoluteBaseUrl === void 0 ? "./" : _aliasConfig_absoluteBaseUrl;
+        var _paths = aliasConfig.paths, paths = _paths === void 0 ? {} : _paths, _absoluteBaseUrl = aliasConfig.absoluteBaseUrl, absoluteBaseUrl = _absoluteBaseUrl === void 0 ? "./" : _absoluteBaseUrl;
         var tsPaths = Object.keys(paths).reduce(function(o, key) {
             var tsPath = paths[key];
             if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
@@ -117,12 +117,12 @@ var enableRegister = function(projectRoot, config) {
             ]
         });
     } else {
-        var _config_tools, _config_server;
+        var ref1, ref2;
         debug("use @babel/register");
         var babelConfig = resolveBabelConfig(projectRoot, _objectSpreadProps(_objectSpread({}, config.source), {
-            babelConfig: (_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.babel,
+            babelConfig: (ref1 = config.tools) === null || ref1 === void 0 ? void 0 : ref1.babel,
             server: {
-                compiler: (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.compiler
+                compiler: (ref2 = config.server) === null || ref2 === void 0 ? void 0 : ref2.compiler
             }
         }), {
             tsconfigPath: tsconfigPath,

package/dist/js/treeshaking/dev-tools/watcher/index.js

@@ -154,15 +154,15 @@ var Watcher = /*#__PURE__*/ function() {
         {
             key: "updateDepTree",
             value: function updateDepTree() {
-                var _this_dependencyTree;
-                (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.update(require.cache);
+                var ref;
+                (ref = this.dependencyTree) === null || ref === void 0 ? void 0 : ref.update(require.cache);
             }
         },
         {
             key: "cleanDepCache",
             value: function cleanDepCache(filepath) {
-                var _this_dependencyTree;
-                var node = (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.getNode(filepath);
+                var ref;
+                var node = (ref = this.dependencyTree) === null || ref === void 0 ? void 0 : ref.getNode(filepath);
                 if (node && require.cache[filepath]) {
                     delete require.cache[filepath];
                     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/dist/js/treeshaking/dev-tools/watcher/stats-cache.js

@@ -43,7 +43,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "add",
             value: function add(files) {
-                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
+                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
                 var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                 try {
                     for(var _iterator = files[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -75,7 +75,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "refresh",
             value: function refresh(filename) {
-                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
+                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
                 if (fs.existsSync(filename)) {
                     var stats = fs.statSync(filename);
                     if (stats.isFile()) {
@@ -97,7 +97,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "isDiff",
             value: function isDiff(filename) {
-                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
+                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
                 var stats = fs.statSync(filename);
                 var hash = cachedHash[filename];
                 var size = cachedSize[filename];

package/dist/js/treeshaking/server/dev-server.js

@@ -438,13 +438,13 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                     return _get(_getPrototypeOf(ModernDevServer.prototype), "onInit", _this);
                 };
                 return _asyncToGenerator(function() {
-                    var dev, _this_applySetupMiddlewares, befores, afters, beforeHandlers, afterHandlers;
+                    var dev, ref, befores, afters, beforeHandlers, afterHandlers;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 _this1.runner = runner;
                                 dev = _this1.dev;
-                                _this_applySetupMiddlewares = _this1.applySetupMiddlewares(), befores = _this_applySetupMiddlewares.befores, afters = _this_applySetupMiddlewares.afters;
+                                ref = _this1.applySetupMiddlewares(), befores = ref.befores, afters = ref.afters;
                                 return [
                                     4,
                                     _this1.setupBeforeDevMiddleware()
@@ -474,13 +474,13 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                 if (dev.watch) {
                                     _this1.startWatcher();
                                     app.on("close", /*#__PURE__*/ _asyncToGenerator(function() {
-                                        var _this_watcher;
+                                        var ref;
                                         return __generator(this, function(_state) {
                                             switch(_state.label){
                                                 case 0:
                                                     return [
                                                         4,
-                                                        (_this_watcher = _this1.watcher) === null || _this_watcher === void 0 ? void 0 : _this_watcher.close()
+                                                        (ref = _this1.watcher) === null || ref === void 0 ? void 0 : ref.close()
                                                     ];
                                                 case 1:
                                                     _state.sent();
@@ -504,7 +504,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             value: function applyDefaultMiddlewares(app) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var pwd, dev, devMiddleware, proxyHandlers, _ref, connectHistoryApiFallback, historyApiFallbackMiddleware;
+                    var pwd, dev, devMiddleware, proxyHandlers, ref, connectHistoryApiFallback, historyApiFallbackMiddleware;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -519,7 +519,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                         try {
                                             for(var _iterator = Object.entries(confHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                                var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
+                                                var _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
                                                 ctx.res.setHeader(key, value);
                                             }
                                         } catch (err) {
@@ -582,7 +582,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                     import("connect-history-api-fallback")
                                 ];
                             case 1:
-                                _ref = _state.sent(), connectHistoryApiFallback = _ref.default;
+                                ref = _state.sent(), connectHistoryApiFallback = ref.default;
                                 historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
                                 _this.addHandler(function(ctx, next) {
                                     return historyApiFallbackMiddleware(ctx.req, ctx.res, next);
@@ -765,8 +765,8 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             key: "startWatcher",
             value: function startWatcher() {
                 var _this = this;
-                var _this_conf_server;
-                var _this1 = this, pwd = _this1.pwd, distDir = _this1.distDir;
+                var ref;
+                var ref1 = this, pwd = ref1.pwd, distDir = ref1.distDir;
                 var mock = AGGRED_DIR.mock;
                 var defaultWatched = [
                     "".concat(mock, "/**/*"),
@@ -775,7 +775,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                     "".concat(SHARED_DIR, "/**/*"),
                     "".concat(distDir, "/").concat(SERVER_BUNDLE_DIRECTORY, "/*-server-loaders.js")
                 ];
-                var watchOptions = mergeWatchOptions((_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.watchOptions);
+                var watchOptions = mergeWatchOptions((ref = this.conf.server) === null || ref === void 0 ? void 0 : ref.watchOptions);
                 var defaultWatchedPaths = defaultWatched.map(function(p) {
                     var finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
                     return path.normalize(finalPath);

package/dist/types/dev-tools/mock/getMockData.d.ts

@@ -12,7 +12,7 @@ export type MockApi = {
 declare const createFunctionDataHandler: (method: string, handler: (req: IncomingMessage, res: ServerResponse, next: NextFunction) => void) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
 declare const createStaticDataHandler: (method: string, handler: Record<string, any>) => (context: ModernServerContext) => void;
 
-declare const _default: (filepath: string) => MockApi[];
+declare const _default: (mockConfig: MockConfig) => MockApi[];
 
 export default _default;
 export declare const getMatched: (context: ModernServerContext, mockApiList: MockApi[]) => MockApi | undefined;

package/package.json

@@ -11,35 +11,37 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm-node/index.js",
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/treeshaking/index.js"
+      "default": "./dist/esm/index.js"
     }
   },
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
+    "@modern-js/prod-server": "2.5.0",
+    "@modern-js/server-utils": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@modern-js/utils": "2.5.0",
     "connect-history-api-fallback": "^2.0.0",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
-    "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.4.1-beta.0",
-    "@modern-js/server-utils": "2.4.1-beta.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "ws": "^8.2.0"
   },
   "devDependencies": {
+    "@modern-js/server-core": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/jest": "^27",
     "@types/minimatch": "^3.0.5",
@@ -51,10 +53,7 @@
     "tsconfig-paths": "4.1.1",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "websocket": "^1",
-    "@modern-js/server-core": "2.4.1-beta.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "websocket": "^1"
   },
   "peerDependencies": {
     "devcert": "^1.0.0",