@modern-js/plugin-express 1.0.0 → 1.1.2

package/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['@modern-js'],
+  parserOptions: {
+    project: require.resolve('./tsconfig.json'),
+  },
+  ignorePatterns: ['types.d.ts'],
+};

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @modern-js/plugin-express
 
+## 1.1.2
+
+### Patch Changes
+
+- 0fa83663: support more .env files
+- Updated dependencies [6f7fe574]
+- Updated dependencies [0fa83663]
+- Updated dependencies [f594fbc8]
+  - @modern-js/core@1.1.2
+  - @modern-js/adapter-helpers@1.1.1
+  - @modern-js/bff-runtime@1.1.1
+  - @modern-js/bff-utils@1.1.1
+  - @modern-js/server-plugin@1.1.1
+  - @modern-js/utils@1.1.2
+
+## 1.1.1
+
+### Patch Changes
+
+- 6ffd1a50: Refactor to base on farrow-pipeline
+- Updated dependencies [687c92c7]
+- Updated dependencies [c0fc0700]
+  - @modern-js/core@1.1.1
+  - @modern-js/utils@1.1.1
+
+## 1.1.0
+
+### Minor Changes
+
+- 96119db2: Relese v1.1.0
+
+### Patch Changes
+
+- Updated dependencies [96119db2]
+  - @modern-js/core@1.1.0
+  - @modern-js/adapter-helpers@1.1.0
+  - @modern-js/bff-runtime@1.1.0
+  - @modern-js/bff-utils@1.1.0
+  - @modern-js/server-plugin@1.1.0
+  - @modern-js/utils@1.1.0
+
 ## 1.0.0
 
 ### Patch Changes

package/README.md

@@ -17,10 +17,7 @@
 
 > The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
 
-- 介绍 Modern.js (即将上线)
-- [迈入现代 Web 开发](https://zhuanlan.zhihu.com/p/386607009)
-- [现代 Web 开发者问卷调查报告](https://zhuanlan.zhihu.com/p/403206195)
-- [字节跳动是如何落地微前端的](https://mp.weixin.qq.com/s/L9wbfNG5fTXF5bx7dcgj4Q)
+- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
 
 ## Getting Started
 

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

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { useAppContext, createPlugin } from '@modern-js/core';
-import { createRuntimeExportsUtils, upath } from '@modern-js/utils';
+import { createRuntimeExportsUtils } from '@modern-js/utils';
 export default createPlugin(() => {
   let bffExportsUtils;
   const runtimeModulePath = path.resolve(__dirname, '../runtime');
@@ -18,13 +18,16 @@ export default createPlugin(() => {
       };
     },
 
-    modifyEntryImports() {
+    modifyEntryImports(input) {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
       const {
         appDirectory
       } = useAppContext();
-      const runtimePath = upath.normalizeSafe(require.resolve(`@modern-js/runtime`, {
+
+      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'));
@@ -39,6 +42,7 @@ export default createPlugin(() => {
              ...pluginRuntime
            }
           `);
+      return input;
     }
 
   };

package/dist/js/modern/plugin.js

@@ -11,7 +11,7 @@ const debug = createDebugger('express');
 
 const findAppModule = async apiDir => {
   const exts = ['.ts', '.js'];
-  const paths = exts.map(ext => path.join(apiDir, `app${ext}`));
+  const paths = exts.map(ext => path.resolve(apiDir, `app${ext}`));
 
   for (const filename of paths) {
     if (await fs.pathExists(filename)) {
@@ -62,6 +62,7 @@ export default createPlugin(() => ({
       app = await findAppModule(apiDir);
 
       if (!app || !app.use) {
+        console.warn('There is not api/app.ts.');
         app = express();
       }
 
@@ -99,10 +100,10 @@ export default createPlugin(() => ({
       const handler = err => {
         if (err) {
           return reject(err);
-        }
+        } // finalhanlder will trigger 'finish' event
 
-        finalhandler(req, res, {})(null);
-        return resolve();
+
+        return finalhandler(req, res, {})(null); // return resolve();
       };
 
       res.on('finish', err => {

package/dist/js/modern/registerRoutes.js

@@ -23,7 +23,6 @@ const registerRoutes = app => {
     method,
     name
   }) => {
-    // eslint-disable-next-line max-statements
     const wrapedHandler = async (req, res, next) => {
       const input = await getInputFromRequest(req);
 
@@ -48,11 +47,16 @@ const registerRoutes = app => {
         try {
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-expect-error
-          const body = await handler(...args);
+          const body = await handler(...args); // this should never happen
+
+          if (res.headersSent) {
+            return await Promise.resolve();
+          }
+
           res.status(200);
           return res.json(body);
         } catch (e) {
-          next(e);
+          return next(e);
         }
       }
     };

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

@@ -32,14 +32,15 @@ var _default = (0, _core.createPlugin)(() => {
       };
     },
 
-    modifyEntryImports() {
+    modifyEntryImports(input) {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
       const {
         appDirectory
       } = (0, _core.useAppContext)();
 
-      const runtimePath = _utils.upath.normalizeSafe(require.resolve(`@modern-js/runtime`, {
+      const runtimePath = require.resolve(`@modern-js/runtime`, {
         paths: [appDirectory]
-      }));
+      });
 
       const currentFile = bffExportsUtils.getPath();
       const runtimeDir = path.dirname(runtimePath);
@@ -55,6 +56,7 @@ var _default = (0, _core.createPlugin)(() => {
              ...pluginRuntime
            }
           `);
+      return input;
     }
 
   };

package/dist/js/node/plugin.js

@@ -33,7 +33,7 @@ const debug = (0, _utils.createDebugger)('express');
 
 const findAppModule = async apiDir => {
   const exts = ['.ts', '.js'];
-  const paths = exts.map(ext => path.join(apiDir, `app${ext}`));
+  const paths = exts.map(ext => path.resolve(apiDir, `app${ext}`));
 
   for (const filename of paths) {
     if (await _utils.fs.pathExists(filename)) {
@@ -84,6 +84,7 @@ var _default = (0, _serverPlugin.createPlugin)(() => ({
       app = await findAppModule(apiDir);
 
       if (!app || !app.use) {
+        console.warn('There is not api/app.ts.');
         app = (0, _express.default)();
       }
 
@@ -121,10 +122,10 @@ var _default = (0, _serverPlugin.createPlugin)(() => ({
       const handler = err => {
         if (err) {
           return reject(err);
-        }
+        } // finalhanlder will trigger 'finish' event
 
-        (0, _finalhandler.default)(req, res, {})(null);
-        return resolve();
+
+        return (0, _finalhandler.default)(req, res, {})(null); // return resolve();
       };
 
       res.on('finish', err => {

package/dist/js/node/registerRoutes.js

@@ -38,7 +38,6 @@ const registerRoutes = app => {
     method,
     name
   }) => {
-    // eslint-disable-next-line max-statements
     const wrapedHandler = async (req, res, next) => {
       const input = await getInputFromRequest(req);
 
@@ -63,11 +62,16 @@ const registerRoutes = app => {
         try {
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-expect-error
-          const body = await handler(...args);
+          const body = await handler(...args); // this should never happen
+
+          if (res.headersSent) {
+            return await Promise.resolve();
+          }
+
           res.status(200);
           return res.json(body);
         } catch (e) {
-          next(e);
+          return next(e);
         }
       }
     };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.0",
+  "version": "1.1.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.15.3",
-    "@modern-js/adapter-helpers": "^1.0.0",
-    "@modern-js/utils": "^1.0.0",
+    "@modern-js/adapter-helpers": "^1.1.1",
+    "@modern-js/utils": "^1.1.2",
     "cookie-parser": "^1.4.5",
     "finalhandler": "^1.1.2",
     "formidable": "^1.2.2",
@@ -38,8 +38,8 @@
   },
   "devDependencies": {
     "express": "^4.17.1",
-    "@modern-js/server-utils": "^1.0.0",
-    "@modern-js/bff-runtime": "^1.0.0",
+    "@modern-js/server-utils": "^1.1.1",
+    "@modern-js/bff-runtime": "^1.1.1",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.13",
     "@types/finalhandler": "^1.1.1",
@@ -50,11 +50,11 @@
     "@types/type-is": "^1.6.3",
     "supertest": "^6.1.6",
     "typescript": "^4",
-    "@modern-js/bff-utils": "^1.0.0",
-    "@modern-js/core": "^1.0.0",
-    "@modern-js/server-plugin": "^1.0.0",
-    "@modern-js/plugin-testing": "^1.0.0",
-    "@modern-js/module-tools": "^1.0.0"
+    "@modern-js/bff-utils": "^1.1.1",
+    "@modern-js/core": "^1.1.2",
+    "@modern-js/server-plugin": "^1.1.1",
+    "@modern-js/plugin-testing": "^1.1.0",
+    "@modern-js/module-tools": "^1.1.0"
   },
   "modernConfig": {
     "output": {
@@ -62,10 +62,10 @@
     }
   },
   "peerDependencies": {
-    "@modern-js/bff-utils": "^1.0.0",
-    "@modern-js/core": "^1.0.0",
-    "@modern-js/server-plugin": "^1.0.0",
-    "@modern-js/bff-runtime": "^1.0.0",
+    "@modern-js/bff-utils": "^1.1.1",
+    "@modern-js/core": "^1.1.2",
+    "@modern-js/server-plugin": "^1.1.1",
+    "@modern-js/bff-runtime": "^1.1.1",
     "express": "^4.17.1"
   },
   "publishConfig": {

package/src/cli/index.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { useAppContext, createPlugin } from '@modern-js/core';
-import { createRuntimeExportsUtils, upath } from '@modern-js/utils';
+import { createRuntimeExportsUtils } from '@modern-js/utils';
 
 export default createPlugin(
   () => {
@@ -22,11 +22,12 @@ export default createPlugin(
           },
         };
       },
-      modifyEntryImports() {
+      modifyEntryImports(input) {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
         const { appDirectory } = useAppContext();
-        const runtimePath = upath.normalizeSafe(require.resolve(`@modern-js/runtime`, {
+        const runtimePath = require.resolve(`@modern-js/runtime`, {
           paths: [appDirectory],
-        }));
+        });
 
         const currentFile = bffExportsUtils.getPath();
 
@@ -55,6 +56,7 @@ export default createPlugin(
              ...pluginRuntime
            }
           `);
+        return input;
       },
     };
   },

package/src/plugin.ts

@@ -4,7 +4,7 @@ import type { Request, Response } from 'express';
 import cookieParser from 'cookie-parser';
 import { createPlugin } from '@modern-js/server-plugin';
 import { requireModule } from '@modern-js/bff-utils';
-import { fs, createDebugger, logger } from '@modern-js/utils';
+import { fs, createDebugger } from '@modern-js/utils';
 import finalhandler from 'finalhandler';
 import { run } from './context';
 import registerRoutes from './registerRoutes';
@@ -19,7 +19,7 @@ export type Mode = 'function' | 'framework';
 
 const findAppModule = async (apiDir: string) => {
   const exts = ['.ts', '.js'];
-  const paths = exts.map(ext => path.join(apiDir, `app${ext}`));
+  const paths = exts.map(ext => path.resolve(apiDir, `app${ext}`));
 
   for (const filename of paths) {
     if (await fs.pathExists(filename)) {
@@ -67,6 +67,7 @@ export default createPlugin(
         app = await findAppModule(apiDir);
 
         if (!app || !app.use) {
+          console.warn('There is not api/app.ts.');
           app = express();
         }
         initApp(app);
@@ -102,8 +103,9 @@ export default createPlugin(
             if (err) {
               return reject(err);
             }
-            finalhandler(req, res, {})(null);
-            return resolve();
+            // finalhanlder will trigger 'finish' event
+            return finalhandler(req, res, {})(null);
+            // return resolve();
           };
 
           res.on('finish', (err: Error) => {

package/src/registerRoutes.ts

@@ -21,7 +21,6 @@ const registerRoutes = (app: Express) => {
   debug('handlerInfos', handlerInfos);
 
   handlerInfos.forEach(({ path, handler, method, name }) => {
-    // eslint-disable-next-line max-statements
     const wrapedHandler: RequestHandler = async (
       req: Request,
       res: Response,
@@ -49,10 +48,16 @@ const registerRoutes = (app: Express) => {
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-expect-error
           const body = await handler(...args);
+
+          // this should never happen
+          if (res.headersSent) {
+            return await Promise.resolve();
+          }
+
           res.status(200);
           return res.json(body);
         } catch (e) {
-          next(e);
+          return next(e);
         }
       }
     };

package/tests/.eslintrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  extends: ['@modern-js'],
+  parserOptions: {
+    project: require.resolve('./tsconfig.json'),
+  },
+};

package/tests/fixtures/lambda-mode/api/lambda/hello.ts

@@ -1,2 +1 @@
-// eslint-disable-next-line @typescript-eslint/require-await
 export const get = async () => ({ message: 'hello' });

package/tests/helpers.ts

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import { createPlugin } from '@modern-js/server-plugin';
 import { injectAPIHandlerInfos, API_DIR } from '@modern-js/bff-utils';
 

package/tests/lambdaMode.test.ts

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import express, { Request, Response } from 'express';
 import request from 'supertest';
 import { serverManager } from '@modern-js/server-plugin';
@@ -281,6 +281,7 @@ describe('support app.ts in lambda mode', () => {
         const app = mock_express();
         app.get('/hello', (req, res) => {
           res.send(`foo`);
+          res.end();
         });
 
         return app;