@modern-js/server 2.0.0-beta.2 → 2.0.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,74 @@
 # @modern-js/server
 
+## 2.0.0-beta.3
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- b710adb: feat: extract the data loader
+  feat: 提取 data loader
+
+### Patch Changes
+
+- d4e8e6f: fix: modernjs dev server can't start normaly
+  fix: modernjs dev 服务端不能正常启动
+- 15bf09d9c8: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- 61f21d1e77: fix: ignore the entire distPath for pia ssr bundle
+  fix: dist 目录的产物不应该被 ts-node 编译
+- cce8ece: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- ea7cf06: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- ebbeed1ece: chore: dev server default cross origin
+  chore: 开发环境 Server 默认跨域
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [d4e8e6f]
+- Updated dependencies [d032d49e09]
+- Updated dependencies [6aca875]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [2e60319]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [c2bb0f1]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [73cd29dd9f]
+- Updated dependencies [b710adb]
+- Updated dependencies [cce8ece]
+- Updated dependencies [18aaf42249]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.3
+  - @modern-js/prod-server@2.0.0-beta.3
+  - @modern-js/utils@2.0.0-beta.3
+  - @modern-js/types@2.0.0-beta.3
+
 ## 2.0.0-beta.2
 
 ### Major Changes

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

@@ -69,7 +69,6 @@ export const enableRegister = (projectRoot, config
     const babelConfig = resolveBabelConfig(projectRoot, _objectSpread(_objectSpread({}, config.source), {}, {
       babelConfig: (_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : _config$tools.babel,
       server: {
-        // FIXME: the compiler config from ??
         compiler: (_config$server = config.server) === null || _config$server === void 0 ? void 0 : _config$server.compiler
       }
     }), {

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

@@ -4,7 +4,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { createServer } from 'http';
 import path from 'path';
 import { createServer as createHttpsServer } from 'https';
-import { API_DIR, SERVER_DIR, SHARED_DIR } from '@modern-js/utils';
+import { API_DIR, LOADER_ROUTES_DIR, SERVER_DIR, SHARED_DIR } from '@modern-js/utils';
 import { createProxyHandler, ModernServer, AGGRED_DIR } from '@modern-js/prod-server';
 import { LOADABLE_STATS_FILE } from '@modern-js/utils/constants';
 import { getDefaultDevOptions } from "../constants";
@@ -289,16 +289,18 @@ export class ModernDevServer extends ModernServer {
   startWatcher() {
     var _this$conf$server;
     const {
-      pwd
+      pwd,
+      distDir
     } = this;
     const {
       mock
     } = AGGRED_DIR;
-    const defaultWatched = [`${mock}/**/*`, `${SERVER_DIR}/**/*`, `${API_DIR}/**`, `${SHARED_DIR}/**/*`];
-
-    // FIXME: the server config.watchOptions;
+    const defaultWatched = [`${mock}/**/*`, `${SERVER_DIR}/**/*`, `${API_DIR}/**`, `${SHARED_DIR}/**/*`, `${distDir}/${LOADER_ROUTES_DIR}/**`];
     const watchOptions = mergeWatchOptions((_this$conf$server = this.conf.server) === null || _this$conf$server === void 0 ? void 0 : _this$conf$server.watchOptions);
-    const defaultWatchedPaths = defaultWatched.map(p => path.normalize(path.join(pwd, p)));
+    const defaultWatchedPaths = defaultWatched.map(p => {
+      const finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
+      return path.normalize(finalPath);
+    });
     const watcher = new Watcher();
     watcher.createDepTree();
 

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

@@ -76,7 +76,6 @@ const enableRegister = (projectRoot, config
     const babelConfig = (0, _serverUtils.resolveBabelConfig)(projectRoot, _objectSpread(_objectSpread({}, config.source), {}, {
       babelConfig: (_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : _config$tools.babel,
       server: {
-        // FIXME: the compiler config from ??
         compiler: (_config$server = config.server) === null || _config$server === void 0 ? void 0 : _config$server.compiler
       }
     }), {

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

@@ -298,16 +298,18 @@ class ModernDevServer extends _prodServer.ModernServer {
   startWatcher() {
     var _this$conf$server;
     const {
-      pwd
+      pwd,
+      distDir
     } = this;
     const {
       mock
     } = _prodServer.AGGRED_DIR;
-    const defaultWatched = [`${mock}/**/*`, `${_utils.SERVER_DIR}/**/*`, `${_utils.API_DIR}/**`, `${_utils.SHARED_DIR}/**/*`];
-
-    // FIXME: the server config.watchOptions;
+    const defaultWatched = [`${mock}/**/*`, `${_utils.SERVER_DIR}/**/*`, `${_utils.API_DIR}/**`, `${_utils.SHARED_DIR}/**/*`, `${distDir}/${_utils.LOADER_ROUTES_DIR}/**`];
     const watchOptions = (0, _watcher.mergeWatchOptions)((_this$conf$server = this.conf.server) === null || _this$conf$server === void 0 ? void 0 : _this$conf$server.watchOptions);
-    const defaultWatchedPaths = defaultWatched.map(p => _path.default.normalize(_path.default.join(pwd, p)));
+    const defaultWatchedPaths = defaultWatched.map(p => {
+      const finalPath = _path.default.isAbsolute(p) ? p : _path.default.join(pwd, p);
+      return _path.default.normalize(finalPath);
+    });
     const watcher = new _watcher.default();
     watcher.createDepTree();
 

package/dist/types/dev-tools/watcher/index.d.ts

@@ -5,23 +5,7 @@ export declare const defaultWatchOptions: {
   ignored: RegExp;
 };
 export declare const getWatchedFiles: (watcher: FSWatcher) => string[];
-export declare const mergeWatchOptions: (options?: WatchOptions) => {
-  persistent?: boolean | undefined;
-  ignored: import("@modern-js/utils/compiled/chokidar/anymatch").Matcher;
-  ignoreInitial: boolean;
-  followSymlinks?: boolean | undefined;
-  cwd?: string | undefined;
-  disableGlobbing?: boolean | undefined;
-  usePolling?: boolean | undefined;
-  useFsEvents?: boolean | undefined;
-  alwaysStat?: boolean | undefined;
-  depth?: number | undefined;
-  interval?: number | undefined;
-  binaryInterval?: number | undefined;
-  ignorePermissionErrors?: boolean | undefined;
-  atomic?: number | boolean | undefined;
-  awaitWriteFinish?: boolean | import("@modern-js/utils/compiled/chokidar").AwaitWriteFinishOptions | undefined;
-};
+export declare const mergeWatchOptions: (options?: any) => any;
 export default class Watcher {
   private dependencyTree;
   private watcher;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,10 +35,10 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0",
-    "@modern-js/prod-server": "2.0.0-beta.2",
-    "@modern-js/server-utils": "2.0.0-beta.2",
-    "@modern-js/types": "2.0.0-beta.2",
-    "@modern-js/utils": "2.0.0-beta.2"
+    "@modern-js/prod-server": "2.0.0-beta.3",
+    "@modern-js/server-utils": "2.0.0-beta.3",
+    "@modern-js/types": "2.0.0-beta.3",
+    "@modern-js/utils": "2.0.0-beta.3"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -49,17 +49,17 @@
     "jest": "^27",
     "node-mocks-http": "^1.11.0",
     "ts-node": "^10.1.0",
-    "tsconfig-paths": "3.14.1",
+    "tsconfig-paths": "4.1.1",
     "typescript": "^4",
-    "webpack": "^5.74.0",
+    "webpack": "^5.75.0",
     "websocket": "^1",
-    "@modern-js/server-core": "2.0.0-beta.2",
-    "@scripts/build": "2.0.0-beta.2",
-    "@scripts/jest-config": "2.0.0-beta.2"
+    "@modern-js/server-core": "2.0.0-beta.3",
+    "@scripts/build": "2.0.0-beta.3",
+    "@scripts/jest-config": "2.0.0-beta.3"
   },
   "peerDependencies": {
     "ts-node": "^10.1.0",
-    "tsconfig-paths": "3.14.1"
+    "tsconfig-paths": ">= 3.0.0 || >= 4.0.0"
   },
   "sideEffects": false,
   "modernConfig": {