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

package/CHANGELOG.md

@@ -1,5 +1,64 @@
 # @modern-js/server
 
+## 1.3.2
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/core@1.3.2
+  - @modern-js/bff-utils@1.2.2
+  - @modern-js/hmr-client@1.2.1
+  - @modern-js/server-plugin@1.2.1
+  - @modern-js/server-utils@1.2.1
+  - @modern-js/utils@1.2.2
+
+## 1.3.1
+
+### Patch Changes
+
+- e2d3a575: fix extending core config interface
+- 823809c6: fix: hot reload not working on windows
+- e2d3a575: fix extending core config interface
+- Updated dependencies [823809c6]
+- Updated dependencies [4584cc04]
+- Updated dependencies [7c19fd94]
+  - @modern-js/bff-utils@1.2.1
+  - @modern-js/utils@1.2.1
+  - @modern-js/core@1.3.1
+
+## 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/server/dev-server/dev-server.js

@@ -121,9 +121,13 @@ export class ModernDevServer extends ModernServer {
     super.close();
     await this.watcher.close();
     await new Promise(resolve => {
-      this.devMiddleware.close(() => {
+      if (this.devMiddleware) {
+        this.devMiddleware.close(() => {
+          resolve();
+        });
+      } else {
         resolve();
-      });
+      }
     });
   }
 
@@ -248,7 +252,7 @@ export class ModernDevServer extends ModernServer {
     watcher.listen(defaultWatchedPaths, {
       // 初始化的时候不触发 add、addDir 事件
       ignoreInitial: true,
-      ignored: /api\/typings\/**/
+      ignored: /api\/typings\/.*/
     }, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);

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

@@ -150,9 +150,13 @@ class ModernDevServer extends _modernServer.ModernServer {
     super.close();
     await this.watcher.close();
     await new Promise(resolve => {
-      this.devMiddleware.close(() => {
+      if (this.devMiddleware) {
+        this.devMiddleware.close(() => {
+          resolve();
+        });
+      } else {
         resolve();
-      });
+      }
     });
   }
 
@@ -279,7 +283,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     watcher.listen(defaultWatchedPaths, {
       // 初始化的时候不触发 add、addDir 事件
       ignoreInitial: true,
-      ignored: /api\/typings\/**/
+      ignored: /api\/typings\/.*/
     }, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);

package/dist/types/type.d.ts

@@ -12,7 +12,7 @@ declare module 'http' {
 }
 declare module '@modern-js/core' {
   interface UserConfig {
-    bff: {
+    bff?: {
       proxy: Record<string, any>;
     };
   }

package/jest.config.js

@@ -4,5 +4,6 @@ const sharedConfig = require('@scripts/jest-config');
 module.exports = {
   // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
+  testEnvironment: 'node',
   rootDir: __dirname,
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.2-beta.0",
+  "version": "1.3.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,19 +28,19 @@
     }
   },
   "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",
-    "axios": "^0.21.4",
+    "@modern-js/core": "^1.3.2",
+    "@modern-js/hmr-client": "^1.2.1",
+    "@modern-js/server-plugin": "^1.2.1",
+    "@modern-js/server-utils": "^1.2.1",
+    "@modern-js/bff-utils": "^1.2.2",
+    "@modern-js/utils": "^1.2.2",
+    "axios": "^0.24.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
     "compare-versions": "^3.6.0",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.1.5",
+    "@modern-js/types": "^1.2.1",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",

package/tests/dev.test.ts

@@ -1,11 +1,16 @@
 import http from 'http';
 import SocketServer from '../src/dev-tools/socket-server';
 
+function getRandomPort() {
+  return Math.floor(Math.random() * (8000 - 1024)) + 1024;
+}
+
 describe('test dev tools', () => {
   test('should socket server work correctly', () => {
+    const port = getRandomPort();
     const socketServer: any = new SocketServer({
       client: {
-        port: '8080',
+        port: port.toString(),
         overlay: false,
         logging: 'error',
         path: '/',
@@ -22,7 +27,7 @@ describe('test dev tools', () => {
       .createServer((req, res) => {
         res.end();
       })
-      .listen(8080);
+      .listen(port);
 
     socketServer.prepare(app);
     expect(socketServer.app).toBe(app);

package/tests/fixtures/pure/tsconfig.json

@@ -5,7 +5,6 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "paths": {
-      ,
       "@shared/*": ["./shared/*"]
     }
   },

package/tests/server.test.ts

@@ -3,6 +3,7 @@ import { defaultsConfig, NormalizedConfig } from '@modern-js/core';
 import { ModernServerContext, NextFunction } from '@modern-js/types';
 import createServer, { Server } from '../src';
 import { ModernServer } from '../src/server/modern-server';
+import Watcher from '../src/dev-tools/watcher';
 
 describe('test server', () => {
   test('should throw error when ', resolve => {
@@ -99,3 +100,21 @@ describe('test server', () => {
     });
   });
 });
+
+describe('dev server', () => {
+  const pwd = path.join(__dirname, './fixtures/pure');
+  let devServer: Server;
+
+  test('watch', async () => {
+    devServer = await createServer({
+      config: defaultsConfig as NormalizedConfig,
+      pwd,
+      dev: true,
+    });
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
+    expect(devServer.server.watcher).toBeInstanceOf(Watcher);
+    await devServer.close();
+  });
+});

package/tests/watcher.test.ts

@@ -0,0 +1,98 @@
+import * as path from 'path';
+import { fs } from '@modern-js/utils';
+import Watcher from '../src/dev-tools/watcher';
+
+jest.useRealTimers();
+
+describe('watcher', () => {
+  let watcher: Watcher;
+  jest.setTimeout(25000);
+  beforeAll(() => {
+    watcher = new Watcher();
+  });
+
+  test('should emit change', done => {
+    const pwd = path.join(__dirname, './fixtures/pure');
+    const serverDir = path.normalize(path.join(pwd, './tmp-server'));
+
+    const callback = jest.fn();
+    if (fs.pathExistsSync(serverDir)) {
+      fs.removeSync(serverDir);
+    }
+    const writeFiles = () => {
+      fs.writeFileSync(
+        path.normalize(path.join(serverDir, 'index.js')),
+        'test',
+        'utf8',
+      );
+    };
+
+    const clear = () => {
+      fs.removeSync(serverDir);
+    };
+
+    fs.mkdirSync(serverDir);
+
+    watcher.listen(
+      [`${serverDir}/**/*`],
+      {
+        ignoreInitial: true,
+        ignored: /api\/typings\/.*/,
+      },
+      async () => {
+        callback();
+        expect(callback).toHaveBeenCalledTimes(1);
+        await watcher.close();
+        clear();
+        done();
+      },
+    );
+
+    setTimeout(writeFiles, 100);
+  });
+
+  test('should not emit change when typings file changed', done => {
+    const pwd = path.join(__dirname, './fixtures/pure');
+    const apiDir = path.normalize(path.join(pwd, './api'));
+
+    const callback = jest.fn();
+
+    if (fs.pathExistsSync(apiDir)) {
+      fs.removeSync(apiDir);
+    }
+
+    const writeFiles = () => {
+      fs.writeFileSync(
+        path.normalize(path.join(apiDir, 'typings/index.js')),
+        'test',
+        'utf8',
+      );
+    };
+
+    const clear = () => {
+      fs.removeSync(apiDir);
+    };
+
+    fs.mkdirSync(path.normalize(path.join(apiDir, 'typings')), {
+      recursive: true,
+    });
+
+    watcher.listen(
+      [`${apiDir}/**/*`],
+      {
+        ignoreInitial: true,
+        ignored: /api\/typings\/.*/,
+      },
+      callback,
+    );
+
+    setTimeout(async () => {
+      expect(callback).toHaveBeenCalledTimes(0);
+      await watcher.close();
+      clear();
+      done();
+    }, 1000);
+
+    setTimeout(writeFiles);
+  });
+});

package/src/constants.ts

@@ -1,26 +0,0 @@
-export const AGGRED_DIR = {
-  mock: 'config/mock',
-  server: 'server',
-  api: 'api',
-  shared: 'shared',
-  lambda: 'lambda',
-};
-
-export enum ApiServerMode {
-  func = 'function',
-  frame = 'framework',
-}
-
-export const ERROR_DIGEST = {
-  INIT: 'Server init error',
-  ENOTF: 'Page could not be found',
-  WARMUP: 'SSR warmup failed',
-  EINTER: 'Internal server error',
-  ERENDER: 'SSR render failed',
-  EMICROINJ: 'Get micro-frontend info failed',
-};
-
-export const ERROR_PAGE_TEXT: Record<number, string> = {
-  404: 'This page could not be found.',
-  500: 'Internal Server Error.',
-};

package/src/dev-tools/babel/register.ts

@@ -1,37 +0,0 @@
-import path from 'path';
-import { resolveBabelConfig } from '@modern-js/server-utils';
-import { ModernServerOptions } from '../../type';
-
-const registerDirs = ['./api', './server', './config/mock', './shared'];
-
-export const enableRegister = (
-  projectRoot: string,
-  config: ModernServerOptions['config'],
-) => {
-  const TS_CONFIG_FILENAME = `tsconfig.json`;
-  const tsconfigPath = path.resolve(projectRoot, TS_CONFIG_FILENAME);
-
-  const babelConfig = resolveBabelConfig(projectRoot, config, {
-    tsconfigPath,
-    syntax: 'es6+',
-    type: 'commonjs',
-  });
-
-  return require('@babel/register')({
-    ...babelConfig,
-    only: [
-      function (filePath: string) {
-        // TODO: wait params
-        if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
-          return true;
-        }
-        return registerDirs.some(registerDir =>
-          filePath.startsWith(path.join(projectRoot, registerDir)),
-        );
-      },
-    ],
-    extensions: ['.js', '.ts'],
-    babelrc: false,
-    root: projectRoot,
-  });
-};

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

@@ -1,48 +0,0 @@
-import Webpack from 'webpack';
-import { DevServerOptions } from '../type';
-
-const { EntryPlugin } = Webpack;
-export default class DevServerPlugin {
-  private readonly options: DevServerOptions;
-
-  constructor(options: DevServerOptions) {
-    this.options = options;
-  }
-
-  apply(compiler: Webpack.Compiler) {
-    const { options } = this;
-
-    const host = `&host=${options.client.host || 'localhost'}`;
-    const path = `&path=${options.client.path}`;
-    const port = `&port=${options.client.port}`;
-
-    // Todo @songzhenwei
-    const clientEntry = `${require.resolve(
-      '@modern-js/hmr-client',
-    )}?${host}${path}${port}`;
-    const hotEntry = require.resolve('webpack/hot/dev-server');
-    const additionalEntries = [clientEntry, hotEntry];
-
-    // use a hook to add entries if available
-    for (const additionalEntry of additionalEntries) {
-      new EntryPlugin(compiler.context, additionalEntry, {
-        name: undefined,
-      }).apply(compiler);
-    }
-
-    // Todo remove, client must inject.
-    const compilerOptions = compiler.options;
-    compilerOptions.plugins = compilerOptions.plugins || [];
-    if (
-      hotEntry &&
-      !compilerOptions.plugins.find(
-        p => p.constructor === Webpack.HotModuleReplacementPlugin,
-      )
-    ) {
-      // apply the HMR plugin, if it didn't exist before.
-      const plugin = new Webpack.HotModuleReplacementPlugin();
-
-      plugin.apply(compiler);
-    }
-  }
-}

package/src/dev-tools/https/global.d.ts

@@ -1,3 +0,0 @@
-declare module 'selfsigned' {
-  function generate(attributes: any, opt: any): { private: any; cert: any };
-}

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

@@ -1,12 +0,0 @@
-import * as devcert from 'devcert';
-
-export const genHttpsOptions = async (userOptions: any) => {
-  const httpsOptions = userOptions === true ? {} : userOptions;
-
-  if (!httpsOptions.key || !httpsOptions.cert) {
-    const selfsign = await devcert.certificateFor(['localhost']);
-    return selfsign;
-  }
-
-  return httpsOptions;
-};

package/src/dev-tools/launch-editor/index.ts

@@ -1,29 +0,0 @@
-import { LAUNCH_EDITOR_ENDPOINT, logger } from '@modern-js/utils';
-import { ModernServerContext } from '../../libs/context';
-import { NextFunction } from '../../type';
-
-export const createLaunchEditorHandler =
-  // eslint-disable-next-line consistent-return
-  () => (ctx: ModernServerContext, next: NextFunction) => {
-    if (ctx.url.startsWith(LAUNCH_EDITOR_ENDPOINT)) {
-      const { filename, line = 1, column = 1 } = ctx.query;
-      if (!filename) {
-        ctx.status = 500;
-        ctx.res.end(
-          `launch-editor-middleware: required query param "filename" is missing.`,
-        );
-      } else {
-        require('launch-editor')(
-          `${filename as string}:${line as string}:${column as string}`,
-          'code',
-          (file: string, errorMessage: string) => {
-            logger.error(`Launch ${file} in editor failed.\n${errorMessage}`);
-          },
-        );
-        ctx.status = 200;
-        ctx.res.end();
-      }
-    } else {
-      return next();
-    }
-  };

package/src/dev-tools/mock/getMockData.ts

@@ -1,109 +0,0 @@
-import { IncomingMessage, ServerResponse } from 'http';
-import { compatRequire } from '@modern-js/utils';
-import { NextFunction } from '../../type';
-import { ModernServerContext } from '../../libs/context';
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const VALID_METHODS = ['get', 'post', 'put', 'delete', 'patch'];
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const BODY_PARSED_METHODS = ['post', 'put', 'delete', 'patch'];
-
-export type MockConfig = Record<
-  string,
-  | {
-      data: any;
-    }
-  | ((
-      req: IncomingMessage,
-      res: ServerResponse,
-      next: NextFunction,
-    ) => Promise<void>)
->;
-
-export type MockApi = {
-  method: string;
-  path: string;
-  handler: ReturnType<
-    typeof createFunctionDataHandler | typeof createStaticDataHandler
-  >;
-};
-
-const createFunctionDataHandler =
-  (
-    method: string,
-    handler: (
-      req: IncomingMessage,
-      res: ServerResponse,
-      next: NextFunction,
-    ) => void,
-  ) =>
-  async (context: ModernServerContext, next: NextFunction) => {
-    const { req, res } = context;
-    return handler(req, res, next);
-  };
-
-const createStaticDataHandler =
-  (method: string, handler: Record<string, any>) =>
-  (context: ModernServerContext) => {
-    const { res } = context;
-    res.setHeader('Content-Type', 'application/json');
-    res.end(JSON.stringify(handler));
-  };
-
-const allowTypes = ['object', 'function'];
-const normalizeConfig = (mockConfig: MockConfig) =>
-  Object.keys(mockConfig).reduce((acc, key) => {
-    const handler = mockConfig[key];
-    const type = typeof handler;
-
-    if (!allowTypes.includes(type)) {
-      throw new Error(
-        `mock value of ${key} should be object or function, but got ${type}`,
-      );
-    }
-
-    const meta = parseKey(key);
-    if (type === 'object') {
-      acc.push({
-        ...meta,
-        handler: createStaticDataHandler(meta.method, handler),
-      });
-    } else {
-      acc.push({
-        ...meta,
-        handler: createFunctionDataHandler(meta.method, handler as any),
-      });
-    }
-
-    return acc;
-  }, [] as MockApi[]);
-
-const _blank = ' ';
-const parseKey = (key: string) => {
-  // 'Method /pathname' | '/pathname'
-  const splited = key.split(_blank).filter(Boolean);
-  if (splited.length > 1) {
-    const [method, pathname] = splited;
-    return {
-      method: method.toLowerCase(),
-      path: pathname,
-    };
-  }
-
-  // default return get method
-  return {
-    method: 'get',
-    path: key,
-  };
-};
-
-export default (filepath: string) => {
-  const mockModule = compatRequire(filepath);
-
-  if (!mockModule) {
-    throw new Error(`Mock file ${filepath} parsed failed!`);
-  }
-
-  const data = normalizeConfig(mockModule);
-  return data;
-};

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

@@ -1,63 +0,0 @@
-import path from 'path';
-import { fs } from '@modern-js/utils';
-import { match } from 'path-to-regexp';
-import { NextFunction } from '../../type';
-import { ModernServerContext } from '../../libs/context';
-import { AGGRED_DIR } from '../../constants';
-import getMockData, { MockApi } from './getMockData';
-
-const getMatched = (context: ModernServerContext, mockApiList: MockApi[]) => {
-  const { path: targetPathname, method: targetMethod } = context;
-
-  const matched = mockApiList.find(mockApi => {
-    const { method, path: pathname } = mockApi;
-    if (method.toLowerCase() === targetMethod.toLowerCase()) {
-      return match(pathname, {
-        encode: encodeURI,
-        decode: decodeURIComponent,
-      })(targetPathname);
-    }
-
-    return false;
-  });
-
-  return matched;
-};
-
-export const createMockHandler = ({ pwd }: { pwd: string }) => {
-  const exts = ['.ts', '.js'];
-  let filepath = '';
-
-  for (const ext of exts) {
-    const maybeMatch = path.join(pwd, `${AGGRED_DIR.mock}/index${ext}`);
-    if (fs.existsSync(maybeMatch)) {
-      filepath = maybeMatch;
-      break;
-    }
-  }
-
-  if (!filepath) {
-    return null;
-  }
-
-  const apiList = getMockData(filepath);
-  if (!apiList || apiList.length === 0) {
-    return null;
-  }
-
-  return async (context: ModernServerContext, next: NextFunction) => {
-    const { res } = context;
-    const matched = getMatched(context, apiList);
-
-    if (!matched) {
-      return next();
-    }
-
-    if (matched) {
-      res.setHeader('Access-Control-Allow-Origin', '*');
-      return matched.handler(context, next);
-    } else {
-      return next();
-    }
-  };
-};