@modern-js/server 1.2.2-beta.0 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @modern-js/server
 
+## 1.3.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- 146dcd85: modify server framework plugin hook types and hook context
+- c3d46ee4: fix: test config invalid
+- 146dcd85: modify server framework plugin hook types
+- 146dcd85: fix test case in babel compiler
+- 1ebc7ee2: fix: @babel/core version
+- Updated dependencies [2da09c69]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [146dcd85]
+- Updated dependencies [74ce3bb7]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+- Updated dependencies [146dcd85]
+- Updated dependencies [8e7603ee]
+- Updated dependencies [146dcd85]
+- Updated dependencies [1ebc7ee2]
+  - @modern-js/utils@1.2.0
+  - @modern-js/core@1.3.0
+  - @modern-js/server-utils@1.2.0
+  - @modern-js/hmr-client@1.2.0
+  - @modern-js/bff-utils@1.2.0
+  - @modern-js/server-plugin@1.2.0
+
 ## 1.2.1
 
 ### Patch Changes

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

@@ -19,11 +19,13 @@ export default class Watcher {
     this.watcher = void 0;
   }
 
-  listen(files, options, callback) {
+  listen(files, callback) {
     const watched = files.filter(Boolean);
-    const filenames = watched.map(filename => filename.replace(/\\/g, '/'));
     const cache = new StatsCache();
-    const watcher = chokidar.watch(filenames, options);
+    const watcher = chokidar.watch(watched, {
+      // 初始化的时候不触发 add、addDir 事件
+      ignoreInitial: true
+    });
     watcher.on('ready', () => {
       cache.add(getWatchedFiles(watcher));
     });

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

@@ -239,22 +239,16 @@ export class ModernDevServer extends ModernServer {
     const {
       mock
     } = AGGRED_DIR;
-    const defaultWatched = [`${mock}/**/*`, `${SERVER_DIR}/**/*`, `${API_DIR}/**`, `${SHARED_DIR}/**/*`];
-    const defaultWatchedPaths = defaultWatched.map(p => path.normalize(path.join(pwd, p)));
-    const mockPath = path.normalize(path.join(pwd, mock));
+    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${SERVER_DIR}/**/*`, `${pwd}/${API_DIR}/!(typings)/**`, `${pwd}/${SHARED_DIR}/**/*`];
     const watcher = new Watcher();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 
-    watcher.listen(defaultWatchedPaths, {
-      // 初始化的时候不触发 add、addDir 事件
-      ignoreInitial: true,
-      ignored: /api\/typings\/**/
-    }, filepath => {
+    watcher.listen(defaultWatched, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
       this.runner.reset();
 
-      if (filepath.startsWith(mockPath)) {
+      if (filepath.startsWith(`${pwd}/${mock}`)) {
         this.mockHandler = createMockHandler({
           pwd
         });

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

@@ -30,12 +30,14 @@ class Watcher {
     this.watcher = void 0;
   }
 
-  listen(files, options, callback) {
+  listen(files, callback) {
     const watched = files.filter(Boolean);
-    const filenames = watched.map(filename => filename.replace(/\\/g, '/'));
     const cache = new _statsCache.StatsCache();
 
-    const watcher = _chokidar.default.watch(filenames, options);
+    const watcher = _chokidar.default.watch(watched, {
+      // 初始化的时候不触发 add、addDir 事件
+      ignoreInitial: true
+    });
 
     watcher.on('ready', () => {
       cache.add(getWatchedFiles(watcher));

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

@@ -268,24 +268,16 @@ class ModernDevServer extends _modernServer.ModernServer {
     const {
       mock
     } = _constants.AGGRED_DIR;
-    const defaultWatched = [`${mock}/**/*`, `${_utils.SERVER_DIR}/**/*`, `${_utils.API_DIR}/**`, `${_utils.SHARED_DIR}/**/*`];
-    const defaultWatchedPaths = defaultWatched.map(p => _path.default.normalize(_path.default.join(pwd, p)));
-
-    const mockPath = _path.default.normalize(_path.default.join(pwd, mock));
-
+    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${_utils.SERVER_DIR}/**/*`, `${pwd}/${_utils.API_DIR}/!(typings)/**`, `${pwd}/${_utils.SHARED_DIR}/**/*`];
     const watcher = new _watcher.default();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 
-    watcher.listen(defaultWatchedPaths, {
-      // 初始化的时候不触发 add、addDir 事件
-      ignoreInitial: true,
-      ignored: /api\/typings\/**/
-    }, filepath => {
+    watcher.listen(defaultWatched, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
       this.runner.reset();
 
-      if (filepath.startsWith(mockPath)) {
+      if (filepath.startsWith(`${pwd}/${mock}`)) {
         this.mockHandler = (0, _mock.createMockHandler)({
           pwd
         });

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

@@ -1,8 +1,7 @@
-import { WatchOptions } from 'chokidar';
 export default class Watcher {
   private dependencyTree;
   private watcher;
-  listen(files: string[], options: WatchOptions, callback: (changed: string) => void): void;
+  listen(files: string[], callback: (changed: string) => void): void;
   createDepTree(): void;
   updateDepTree(): void;
   cleanDepCache(filepath: string): void;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.2-beta.0",
+  "version": "1.3.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,18 +28,18 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.15.0",
+    "@babel/core": "7.16.7",
     "@babel/compat-data": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.2.0",
-    "@modern-js/hmr-client": "^1.1.1",
-    "@modern-js/server-plugin": "^1.1.4",
-    "@modern-js/server-utils": "^1.1.2",
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/utils": "^1.1.6",
+    "@modern-js/core": "^1.3.0",
+    "@modern-js/hmr-client": "^1.2.0",
+    "@modern-js/server-plugin": "^1.2.0",
+    "@modern-js/server-utils": "^1.2.0",
+    "@modern-js/bff-utils": "^1.2.0",
+    "@modern-js/utils": "^1.2.0",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.1.5",
+    "@modern-js/types": "^1.2.0",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",

package/src/dev-tools/watcher/index.ts

@@ -1,5 +1,4 @@
-import path from 'path';
-import chokidar, { FSWatcher, WatchOptions } from 'chokidar';
+import chokidar, { FSWatcher } from 'chokidar';
 import { DependencyTree } from './dependency-tree';
 import { StatsCache } from './stats-cache';
 
@@ -19,16 +18,14 @@ export default class Watcher {
 
   private watcher!: FSWatcher;
 
-  public listen(
-    files: string[],
-    options: WatchOptions,
-    callback: (changed: string) => void,
-  ) {
+  public listen(files: string[], callback: (changed: string) => void) {
     const watched = files.filter(Boolean);
-    const filenames = watched.map(filename => filename.replace(/\\/g, '/'));
 
     const cache = new StatsCache();
-    const watcher = chokidar.watch(filenames, options);
+    const watcher = chokidar.watch(watched, {
+      // 初始化的时候不触发 add、addDir 事件
+      ignoreInitial: true,
+    });
 
     watcher.on('ready', () => {
       cache.add(getWatchedFiles(watcher));

package/src/server/dev-server/dev-server.ts

@@ -252,45 +252,32 @@ export class ModernDevServer extends ModernServer {
     const { pwd } = this;
     const { mock } = AGGRED_DIR;
     const defaultWatched = [
-      `${mock}/**/*`,
-      `${SERVER_DIR}/**/*`,
-      `${API_DIR}/**`,
-      `${SHARED_DIR}/**/*`,
+      `${pwd}/${mock}/**/*`,
+      `${pwd}/${SERVER_DIR}/**/*`,
+      `${pwd}/${API_DIR}/!(typings)/**`,
+      `${pwd}/${SHARED_DIR}/**/*`,
     ];
 
-    const defaultWatchedPaths = defaultWatched.map(p =>
-      path.normalize(path.join(pwd, p)),
-    );
-    const mockPath = path.normalize(path.join(pwd, mock));
-
     const watcher = new Watcher();
     watcher.createDepTree();
 
     // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
-    watcher.listen(
-      defaultWatchedPaths,
-      {
-        // 初始化的时候不触发 add、addDir 事件
-        ignoreInitial: true,
-        ignored: /api\/typings\/**/,
-      },
-      (filepath: string) => {
-        watcher.updateDepTree();
-        watcher.cleanDepCache(filepath);
-
-        this.runner.reset();
-
-        if (filepath.startsWith(mockPath)) {
-          this.mockHandler = createMockHandler({ pwd });
-        } else {
-          try {
-            this.prepareFrameHandler();
-          } catch (e) {
-            this.logger.error(e as Error);
-          }
+    watcher.listen(defaultWatched, (filepath: string) => {
+      watcher.updateDepTree();
+      watcher.cleanDepCache(filepath);
+
+      this.runner.reset();
+
+      if (filepath.startsWith(`${pwd}/${mock}`)) {
+        this.mockHandler = createMockHandler({ pwd });
+      } else {
+        try {
+          this.prepareFrameHandler();
+        } catch (e) {
+          this.logger.error(e as Error);
         }
-      },
-    );
+      }
+    });
 
     this.watcher = watcher;
   }