@modern-js/plugin-express 1.21.3 → 2.0.0-beta.0

package/CHANGELOG.md

@@ -1,13 +1,35 @@
 # @modern-js/plugin-express
 
-## 1.21.3
-
-### Patch Changes
-
-- @modern-js/bff-core@1.21.3
-- @modern-js/bff-runtime@1.21.3
-- @modern-js/types@1.21.3
-- @modern-js/utils@1.21.3
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- 8d24bed25: fix: compat Hook API in /server namespace
+  fix: 在 @modern-js/runtime/server 命名空间下兼容 Hook API
+- 3bbea92b2: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [a2509bf]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [6bda14ed7]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [102d32e4b]
+- Updated dependencies [8b8e1bb57]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/bff-core@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/types@2.0.0-beta.0
+  - @modern-js/bff-runtime@2.0.0-beta.0
 
 ## 1.21.2
 

package/dist/js/modern/cli/index.js

@@ -23,7 +23,8 @@ export default (() => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': relativeRuntimePath
+                '@modern-js/runtime/server': relativeRuntimePath,
+                '@modern-js/runtime/express': relativeRuntimePath
               }
             }
           };
@@ -31,7 +32,8 @@ export default (() => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath
+                '@modern-js/runtime/server': serverRuntimePath,
+                '@modern-js/runtime/express': serverRuntimePath
               }
             }
           };

package/dist/js/modern/plugin.js

@@ -51,6 +51,7 @@ const initApp = app => {
 export default (() => ({
   name: '@modern-js/plugin-express',
   pre: ['@modern-js/plugin-bff'],
+  post: ['@modern-js/plugin-server'],
   setup: api => ({
     async prepareApiServer({
       pwd,
@@ -133,7 +134,15 @@ export default (() => ({
 
     prepareWebServer({
       config
-    }) {
+    }, next) {
+      var _userConfig$server;
+
+      const userConfig = api.useConfigContext();
+
+      if (userConfig !== null && userConfig !== void 0 && (_userConfig$server = userConfig.server) !== null && _userConfig$server !== void 0 && _userConfig$server.disableFrameworkExt) {
+        return next();
+      }
+
       const app = express();
       initApp(app);
 
@@ -145,7 +154,14 @@ export default (() => ({
         initMiddlewares(middleware, app);
       }
 
-      return (req, res) => new Promise((resolve, reject) => {
+      return ctx => new Promise((resolve, reject) => {
+        const {
+          source: {
+            req,
+            res
+          }
+        } = ctx;
+
         const handler = err => {
           if (err) {
             return reject(err);

package/dist/js/node/cli/index.js

@@ -37,7 +37,8 @@ var _default = () => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': relativeRuntimePath
+                '@modern-js/runtime/server': relativeRuntimePath,
+                '@modern-js/runtime/express': relativeRuntimePath
               }
             }
           };
@@ -45,7 +46,8 @@ var _default = () => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath
+                '@modern-js/runtime/server': serverRuntimePath,
+                '@modern-js/runtime/express': serverRuntimePath
               }
             }
           };

package/dist/js/node/plugin.js

@@ -71,6 +71,7 @@ const initApp = app => {
 var _default = () => ({
   name: '@modern-js/plugin-express',
   pre: ['@modern-js/plugin-bff'],
+  post: ['@modern-js/plugin-server'],
   setup: api => ({
     async prepareApiServer({
       pwd,
@@ -153,7 +154,15 @@ var _default = () => ({
 
     prepareWebServer({
       config
-    }) {
+    }, next) {
+      var _userConfig$server;
+
+      const userConfig = api.useConfigContext();
+
+      if (userConfig !== null && userConfig !== void 0 && (_userConfig$server = userConfig.server) !== null && _userConfig$server !== void 0 && _userConfig$server.disableFrameworkExt) {
+        return next();
+      }
+
       const app = (0, _express.default)();
       initApp(app);
 
@@ -165,7 +174,14 @@ var _default = () => ({
         initMiddlewares(middleware, app);
       }
 
-      return (req, res) => new Promise((resolve, reject) => {
+      return ctx => new Promise((resolve, reject) => {
+        const {
+          source: {
+            req,
+            res
+          }
+        } = ctx;
+
         const handler = err => {
           if (err) {
             return reject(err);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.3",
+  "version": "2.0.0-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,10 +34,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/bff-core": "1.21.3",
-    "@modern-js/bff-runtime": "1.21.3",
-    "@modern-js/types": "1.21.3",
-    "@modern-js/utils": "1.21.3",
+    "@modern-js/bff-core": "2.0.0-beta.0",
+    "@modern-js/bff-runtime": "2.0.0-beta.0",
+    "@modern-js/types": "2.0.0-beta.0",
+    "@modern-js/utils": "2.0.0-beta.0",
     "cookie-parser": "^1.4.5",
     "finalhandler": "^1.1.2",
     "formidable": "^1.2.2",
@@ -45,10 +45,10 @@
     "type-is": "^1.6.18"
   },
   "devDependencies": {
-    "@modern-js/core": "1.21.3",
-    "@modern-js/server-core": "1.21.3",
-    "@scripts/build": "1.21.3",
-    "@scripts/jest-config": "1.21.3",
+    "@modern-js/core": "2.0.0-beta.0",
+    "@modern-js/server-core": "2.0.0-beta.0",
+    "@scripts/build": "2.0.0-beta.0",
+    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.13",
     "@types/finalhandler": "^1.1.1",
@@ -75,32 +75,9 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
-    "test": "wireit"
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }

package/types.d.ts

@@ -1,10 +1,40 @@
 /// <reference path="./dist/types/index.d.ts" />
 
+declare module '@modern-js/runtime/express' {
+  import { Request, Response, RequestHandler } from 'express';
+
+  type Context = { req: Request; res: Response };
+
+  export const Pipe: import('./src/runtime').Pipe;
+  export const Middleware: import('./src/runtime').Middleware;
+
+  export function useContext(): Context;
+
+  export type { RequestHandler };
+
+  export * from '@modern-js/bff-core';
+}
+
+// Todo: remove on next version
 declare module '@modern-js/runtime/server' {
   import { Request, Response, RequestHandler } from 'express';
 
+  import type { AfterMatchContext, AfterRenderContext, NextFunction } from '@modern-js/types';
+
+  export type AfterRenderHook = (
+    context: AfterRenderContext,
+    next: NextFunction,
+  ) => void;
+
+  export type AfterMatchHook = (
+    context: AfterMatchContext,
+    next: NextFunction,
+  ) => void;
+
   type ExpressOptions = {
     addMiddleware: (...input: RequestHandler[]) => void;
+    afterRender: (hook: AfterRenderHook) => void;
+    afterMatch: (hook: AfterMatchHook) => void;
   };
 
   type ExpressAttacher = (options: ExpressOptions) => void;
@@ -18,5 +48,7 @@ declare module '@modern-js/runtime/server' {
 
   export function hook(attacher: ExpressAttacher): ExpressAttacher;
 
+  export type { RequestHandler };
+
   export * from '@modern-js/bff-core';
 }