@modern-js/plugin-express 1.7.2 → 1.16.0

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @modern-js/plugin-express
 
+## 1.16.0
+
+### Minor Changes
+
+- 1100dd58c: chore: support react 18
+
+  chore: 支持 React 18
+
+### Patch Changes
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+- Updated dependencies [020b9bd52]
+  - @modern-js/utils@1.16.0
+  - @modern-js/bff-runtime@1.16.0
+  - @modern-js/types@1.16.0
+  - @modern-js/bff-core@1.16.0
+
+## 1.15.0
+
+### Minor Changes
+
+- 1f8b492: feat: support afterLambdaRegisted hook
+
+### Patch Changes
+
+- c0d8dac: fix: remove package adapter-helpers and bff runtime export
+- 4524de6: fix: add server hook and types
+  fix: 增加 server hook API
+- Updated dependencies [c0d8dac]
+- Updated dependencies [8658a78]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [7bfaaf9]
+- Updated dependencies [b1f7000]
+- Updated dependencies [ad05af9]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [37cd159]
+  - @modern-js/bff-core@1.15.0
+  - @modern-js/utils@1.15.0
+  - @modern-js/types@1.15.0
+  - @modern-js/bff-runtime@1.15.0
+
 ## 1.7.2
 
 ### Patch Changes

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

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { createRuntimeExportsUtils } from '@modern-js/utils';
-import { getRelativeRuntimePath } from '@modern-js/adapter-helpers';
+import { getRelativeRuntimePath } from '@modern-js/bff-core';
 export default (() => ({
   name: '@modern-js/plugin-express',
   setup: api => {
@@ -39,25 +39,13 @@ export default (() => ({
       },
 
       addRuntimeExports(input) {
-        const {
-          appDirectory
-        } = useAppContext();
-
-        const runtimePath = require.resolve(`@modern-js/runtime`, {
-          paths: [appDirectory]
-        });
-
         const currentFile = bffExportsUtils.getPath();
-        const runtimeDir = path.dirname(runtimePath);
-        const relativeBffPath = path.relative(path.dirname(currentFile), path.join(runtimeDir, './exports/server'));
         const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
         const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve('express'));
-        bffExportsUtils.addExport(`const bffRuntime = require('${relativeBffPath}');
-           const pluginRuntime = require('${relativeRuntimeModulePath}');
+        bffExportsUtils.addExport(`const pluginRuntime = require('${relativeRuntimeModulePath}');
            const express = require('${relativeFramePath}')
            module.exports = {
             express: express,
-             ...bffRuntime,
              ...pluginRuntime
            }
           `);

package/dist/js/modern/context.js

@@ -1,4 +1,4 @@
-import { createStorage } from '@modern-js/adapter-helpers';
+import { createStorage } from '@modern-js/bff-core';
 const {
   run,
   useContext

package/dist/js/modern/plugin.js

@@ -15,11 +15,11 @@ const findAppModule = async apiDir => {
     if (await fs.pathExists(filename)) {
       // 每次获取 app.ts 的时候，避免使用缓存的 app.ts
       delete require.cache[filename];
-      return compatRequire(filename);
+      return [compatRequire(filename), require(filename)];
     }
   }
 
-  return null;
+  return [];
 };
 
 const initMiddlewares = (middleware, app) => {
@@ -63,7 +63,9 @@ export default (() => ({
       const apiHandlerInfos = appContext.apiHandlerInfos;
 
       if (mode === 'framework') {
-        app = await findAppModule(apiDir);
+        const appModule = await findAppModule(apiDir);
+        app = appModule[0];
+        const hooks = appModule[1];
 
         if (!app || !app.use) {
           // console.warn('There is not api/app.ts.');
@@ -81,6 +83,13 @@ export default (() => ({
 
         useRun(app);
         registerRoutes(app, apiHandlerInfos);
+        const {
+          afterLambdaRegisted
+        } = hooks;
+
+        if (afterLambdaRegisted) {
+          afterLambdaRegisted(app);
+        }
       } else if (mode === 'function') {
         app = express();
         initApp(app);

package/dist/js/modern/runtime/hook.js

@@ -0,0 +1 @@
+export const hook = attacher => attacher;

package/dist/js/modern/runtime/index.js

@@ -1,3 +1,4 @@
 export * from '@modern-js/bff-core';
 export { useContext } from "../context";
+export { hook } from "./hook";
 export * from "./operators";

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

@@ -9,7 +9,7 @@ var path = _interopRequireWildcard(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _adapterHelpers = require("@modern-js/adapter-helpers");
+var _bffCore = require("@modern-js/bff-core");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -31,7 +31,7 @@ var _default = () => ({
         } = appContext;
         bffExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'server');
         const serverRuntimePath = bffExportsUtils.getPath();
-        const relativeRuntimePath = (0, _adapterHelpers.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
+        const relativeRuntimePath = (0, _bffCore.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
 
         if (process.env.NODE_ENV === 'production') {
           return {
@@ -53,25 +53,13 @@ var _default = () => ({
       },
 
       addRuntimeExports(input) {
-        const {
-          appDirectory
-        } = useAppContext();
-
-        const runtimePath = require.resolve(`@modern-js/runtime`, {
-          paths: [appDirectory]
-        });
-
         const currentFile = bffExportsUtils.getPath();
-        const runtimeDir = path.dirname(runtimePath);
-        const relativeBffPath = path.relative(path.dirname(currentFile), path.join(runtimeDir, './exports/server'));
         const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
         const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve('express'));
-        bffExportsUtils.addExport(`const bffRuntime = require('${relativeBffPath}');
-           const pluginRuntime = require('${relativeRuntimeModulePath}');
+        bffExportsUtils.addExport(`const pluginRuntime = require('${relativeRuntimeModulePath}');
            const express = require('${relativeFramePath}')
            module.exports = {
             express: express,
-             ...bffRuntime,
              ...pluginRuntime
            }
           `);

package/dist/js/node/context.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useContext = exports.run = void 0;
 
-var _adapterHelpers = require("@modern-js/adapter-helpers");
+var _bffCore = require("@modern-js/bff-core");
 
 const {
   run,
   useContext
-} = (0, _adapterHelpers.createStorage)();
+} = (0, _bffCore.createStorage)();
 exports.useContext = useContext;
 exports.run = run;

package/dist/js/node/plugin.js

@@ -35,11 +35,11 @@ const findAppModule = async apiDir => {
     if (await _utils.fs.pathExists(filename)) {
       // 每次获取 app.ts 的时候，避免使用缓存的 app.ts
       delete require.cache[filename];
-      return (0, _utils.compatRequire)(filename);
+      return [(0, _utils.compatRequire)(filename), require(filename)];
     }
   }
 
-  return null;
+  return [];
 };
 
 const initMiddlewares = (middleware, app) => {
@@ -83,7 +83,9 @@ var _default = () => ({
       const apiHandlerInfos = appContext.apiHandlerInfos;
 
       if (mode === 'framework') {
-        app = await findAppModule(apiDir);
+        const appModule = await findAppModule(apiDir);
+        app = appModule[0];
+        const hooks = appModule[1];
 
         if (!app || !app.use) {
           // console.warn('There is not api/app.ts.');
@@ -101,6 +103,13 @@ var _default = () => ({
 
         useRun(app);
         (0, _registerRoutes.default)(app, apiHandlerInfos);
+        const {
+          afterLambdaRegisted
+        } = hooks;
+
+        if (afterLambdaRegisted) {
+          afterLambdaRegisted(app);
+        }
       } else if (mode === 'function') {
         app = (0, _express.default)();
         initApp(app);

package/dist/js/node/runtime/hook.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hook = void 0;
+
+const hook = attacher => attacher;
+
+exports.hook = hook;

package/dist/js/node/runtime/index.js

@@ -4,8 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  useContext: true
+  useContext: true,
+  hook: true
 };
+Object.defineProperty(exports, "hook", {
+  enumerable: true,
+  get: function () {
+    return _hook.hook;
+  }
+});
 Object.defineProperty(exports, "useContext", {
   enumerable: true,
   get: function () {
@@ -29,6 +36,8 @@ Object.keys(_bffCore).forEach(function (key) {
 
 var _context = require("../context");
 
+var _hook = require("./hook");
+
 var _operators = require("./operators");
 
 Object.keys(_operators).forEach(function (key) {

package/dist/types/runtime/hook.d.ts

@@ -0,0 +1,2 @@
+import type { Request, Response, NextFunction } from 'express';
+export declare const hook: (attacher: (req: Request, res: Response, next: NextFunction) => void | Promise<void>) => (req: Request, res: Response, next: NextFunction) => void | Promise<void>;

package/dist/types/runtime/index.d.ts

@@ -1,3 +1,4 @@
 export * from '@modern-js/bff-core';
 export { useContext } from '../context';
+export { hook } from './hook';
 export * from './operators';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.7.2",
+  "version": "1.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,11 +34,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/adapter-helpers": "^1.3.0",
-    "@modern-js/bff-core": "^1.2.2",
-    "@modern-js/bff-runtime": "^1.4.0",
-    "@modern-js/types": "^1.6.2",
-    "@modern-js/utils": "^1.9.0",
+    "@modern-js/bff-core": "1.16.0",
+    "@modern-js/bff-runtime": "1.16.0",
+    "@modern-js/types": "1.16.0",
+    "@modern-js/utils": "1.16.0",
     "cookie-parser": "^1.4.5",
     "finalhandler": "^1.1.2",
     "formidable": "^1.2.2",
@@ -46,10 +45,10 @@
     "type-is": "^1.6.18"
   },
   "devDependencies": {
-    "@modern-js/core": "1.14.0",
-    "@modern-js/server-core": "1.4.1",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "@modern-js/core": "1.16.0",
+    "@modern-js/server-core": "1.16.0",
+    "@scripts/build": "1.15.0",
+    "@scripts/jest-config": "1.15.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.13",
     "@types/finalhandler": "^1.1.1",

package/types.d.ts

@@ -19,6 +19,4 @@ declare module '@modern-js/runtime/server' {
   export function hook(attacher: ExpressAttacher): ExpressAttacher;
 
   export * from '@modern-js/bff-core';
-
-  export * from '@modern-js/bff-runtime';
 }