@modern-js/plugin-koa 2.15.0 → 2.17.0

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

@@ -1,6 +1,6 @@
 import * as path from "path";
 import { createRuntimeExportsUtils } from "@modern-js/utils";
-var cli_default = () => ({
+export default () => ({
   name: "@modern-js/plugin-koa",
   setup: (api) => {
     let bffExportsUtils;
@@ -9,10 +9,7 @@ var cli_default = () => ({
     return {
       config() {
         const appContext = useAppContext();
-        bffExportsUtils = createRuntimeExportsUtils(
-          appContext.internalDirectory,
-          "server"
-        );
+        bffExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "server");
         const runtimePath = "@modern-js/plugin-koa/runtime";
         const alias = process.env.NODE_ENV === "production" ? runtimePath : require.resolve(runtimePath);
         return {
@@ -33,18 +30,14 @@ var cli_default = () => ({
         plugins.push({
           "@modern-js/plugin-koa": "@modern-js/plugin-koa/server"
         });
-        return { plugins };
+        return {
+          plugins
+        };
       },
       addRuntimeExports(input) {
         const currentFile = bffExportsUtils.getPath();
-        const relativeRuntimeModulePath = path.relative(
-          path.dirname(currentFile),
-          runtimeModulePath
-        );
-        const relativeFramePath = path.relative(
-          path.dirname(currentFile),
-          require.resolve("koa")
-        );
+        const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
+        const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve("koa"));
         bffExportsUtils.addExport(`const pluginRuntime = require('${relativeRuntimeModulePath}');
            const Koa = require('${relativeFramePath}')
            module.exports = {
@@ -57,6 +50,3 @@ var cli_default = () => ({
     };
   }
 });
-export {
-  cli_default as default
-};

package/dist/esm-node/context.js

@@ -1,6 +1,3 @@
 import { createStorage } from "@modern-js/bff-core";
 const { run, useContext } = createStorage();
-export {
-  run,
-  useContext
-};
+export { run, useContext };

package/dist/esm-node/index.js

@@ -1,6 +1,3 @@
 import plugin from "./plugin";
 export * from "./context";
-var src_default = plugin;
-export {
-  src_default as default
-};
+export default plugin;

package/dist/esm-node/plugin.js

@@ -6,7 +6,10 @@ import { fs, compatRequire } from "@modern-js/utils";
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 const findAppModule = async (apiDir) => {
-  const exts = [".ts", ".js"];
+  const exts = [
+    ".ts",
+    ".js"
+  ];
   const paths = exts.map((ext) => path.join(apiDir, `app${ext}`));
   for (const filename of paths) {
     if (await fs.pathExists(filename)) {
@@ -22,101 +25,100 @@ const initMiddlewares = (middleware, app) => {
     app.use(middlewareFunc);
   });
 };
-var plugin_default = () => ({
-  name: "@modern-js/plugin-koa",
-  pre: ["@modern-js/plugin-bff"],
-  post: ["@modern-js/plugin-server"],
-  setup: (api) => ({
-    async prepareApiServer({ pwd, config, render }) {
-      var _a;
-      let app;
-      const router = new Router();
-      const apiDir = path.join(pwd, "./api");
-      const appContext = api.useAppContext();
-      const apiHandlerInfos = appContext.apiHandlerInfos;
-      const mode = appContext.apiMode;
-      const userConfig = api.useConfigContext();
-      if (mode === "framework") {
-        app = await findAppModule(apiDir);
-        if (!(app instanceof Koa)) {
-          app = new Koa();
-          app.use(
-            koaBody({
+export default () => {
+  return {
+    name: "@modern-js/plugin-koa",
+    pre: [
+      "@modern-js/plugin-bff"
+    ],
+    post: [
+      "@modern-js/plugin-server"
+    ],
+    setup: (api) => {
+      return {
+        async prepareApiServer({ pwd, config, render }) {
+          var _userConfig_bff;
+          let app;
+          const router = new Router();
+          const apiDir = path.join(pwd, "./api");
+          const appContext = api.useAppContext();
+          const apiHandlerInfos = appContext.apiHandlerInfos;
+          const mode = appContext.apiMode;
+          const userConfig = api.useConfigContext();
+          if (mode === "framework") {
+            app = await findAppModule(apiDir);
+            if (!(app instanceof Koa)) {
+              app = new Koa();
+              app.use(koaBody({
+                multipart: true
+              }));
+            }
+            if (config) {
+              const { middleware } = config;
+              initMiddlewares(middleware, app);
+            }
+            app.use(run);
+            registerRoutes(router, apiHandlerInfos);
+          } else if (mode === "function") {
+            app = new Koa();
+            app.use(koaBody({
               multipart: true
-            })
-          );
-        }
-        if (config) {
-          const { middleware } = config;
-          initMiddlewares(middleware, app);
-        }
-        app.use(run);
-        registerRoutes(router, apiHandlerInfos);
-      } else if (mode === "function") {
-        app = new Koa();
-        app.use(
-          koaBody({
-            multipart: true
-          })
-        );
-        if (config) {
-          const { middleware } = config;
-          initMiddlewares(middleware, app);
-        }
-        app.use(run);
-        registerRoutes(router, apiHandlerInfos);
-      } else {
-        throw new Error(`mode must be function or framework`);
-      }
-      app.use(router.routes());
-      if (((_a = userConfig.bff) == null ? void 0 : _a.enableHandleWeb) && render) {
-        app.use(async (ctx, next) => {
-          const html = await render(ctx.req, ctx.res);
-          if (html) {
-            ctx.body = html;
+            }));
+            if (config) {
+              const { middleware } = config;
+              initMiddlewares(middleware, app);
+            }
+            app.use(run);
+            registerRoutes(router, apiHandlerInfos);
+          } else {
+            throw new Error(`mode must be function or framework`);
           }
-          await next();
-        });
-      }
-      return (req, res) => {
-        return Promise.resolve(app.callback()(req, res));
-      };
-    },
-    prepareWebServer({ config }, next) {
-      var _a;
-      const userConfig = api.useConfigContext();
-      if (!((_a = userConfig == null ? void 0 : userConfig.server) == null ? void 0 : _a.enableFrameworkExt)) {
-        return next();
-      }
-      const app = new Koa();
-      app.use(async (ctx, next2) => {
-        await next2();
-        if (!ctx.body) {
-          if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
-            ctx.res.statusCode = 200;
+          app.use(router.routes());
+          if (((_userConfig_bff = userConfig.bff) === null || _userConfig_bff === void 0 ? void 0 : _userConfig_bff.enableHandleWeb) && render) {
+            app.use(async (ctx, next) => {
+              const html = await render(ctx.req, ctx.res);
+              if (html) {
+                ctx.body = html;
+              }
+              await next();
+            });
           }
-          ctx.respond = false;
-        }
-      });
-      app.use(koaBody());
-      if (config) {
-        const { middleware } = config;
-        initMiddlewares(middleware, app);
-      }
-      return (ctx) => {
-        const {
-          source: { req, res }
-        } = ctx;
-        app.on("error", (err) => {
-          if (err) {
-            throw err;
+          return (req, res) => {
+            return Promise.resolve(app.callback()(req, res));
+          };
+        },
+        prepareWebServer({ config }, next) {
+          var _userConfig_server;
+          const userConfig = api.useConfigContext();
+          if (!(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_server = userConfig.server) === null || _userConfig_server === void 0 ? void 0 : _userConfig_server.enableFrameworkExt)) {
+            return next();
+          }
+          const app = new Koa();
+          app.use(async (ctx, next2) => {
+            await next2();
+            if (!ctx.body) {
+              if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
+                ctx.res.statusCode = 200;
+              }
+              ctx.respond = false;
+            }
+          });
+          app.use(koaBody());
+          if (config) {
+            const { middleware } = config;
+            initMiddlewares(middleware, app);
           }
-        });
-        return Promise.resolve(app.callback()(req, res));
+          return (ctx) => {
+            const { source: { req, res } } = ctx;
+            app.on("error", (err) => {
+              if (err) {
+                throw err;
+              }
+            });
+            return Promise.resolve(app.callback()(req, res));
+          };
+        }
       };
     }
-  })
-});
-export {
-  plugin_default as default
+  };
 };

package/dist/esm-node/registerRoutes.js

@@ -6,7 +6,4 @@ const registerRoutes = (router, handlerInfos) => {
     router[method](routePath, routeHandler);
   });
 };
-var registerRoutes_default = registerRoutes;
-export {
-  registerRoutes_default as default
-};
+export default registerRoutes;

package/dist/esm-node/runtime.js

@@ -1,7 +1,3 @@
-const hook = (attacher) => attacher;
-import { useContext } from "./context";
+export const hook = (attacher) => attacher;
+export { useContext } from "./context";
 export * from "@modern-js/bff-core";
-export {
-  hook,
-  useContext
-};

package/dist/esm-node/utils.js

@@ -1,16 +1,8 @@
-import {
-  httpMethods,
-  isWithMetaHandler,
-  ResponseMetaType,
-  HttpMetadata
-} from "@modern-js/bff-core";
+import { httpMethods, isWithMetaHandler, ResponseMetaType, HttpMetadata } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
 import typeIs from "type-is";
 const handleResponseMeta = (ctx, handler) => {
-  const responseMeta = Reflect.getMetadata(
-    HttpMetadata.Response,
-    handler
-  );
+  const responseMeta = Reflect.getMetadata(HttpMetadata.Response, handler);
   if (Array.isArray(responseMeta)) {
     for (const meta of responseMeta) {
       const metaType = meta.type;
@@ -39,7 +31,7 @@ const handleResponseMeta = (ctx, handler) => {
     }
   }
 };
-const createRouteHandler = (handler) => {
+export const createRouteHandler = (handler) => {
   const apiHandler = async (ctx) => {
     const input = await getInputFromRequest(ctx);
     if (isWithMetaHandler(handler)) {
@@ -82,13 +74,10 @@ const createRouteHandler = (handler) => {
       }
     }
   };
-  Object.defineProperties(
-    apiHandler,
-    Object.getOwnPropertyDescriptors(handler)
-  );
+  Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
-const isNormalMethod = (httpMethod) => httpMethods.includes(httpMethod);
+export const isNormalMethod = (httpMethod) => httpMethods.includes(httpMethod);
 const getInputFromRequest = async (ctx) => {
   const draft = {
     params: ctx.params,
@@ -96,18 +85,20 @@ const getInputFromRequest = async (ctx) => {
     headers: ctx.headers,
     cookies: ctx.headers.cookie
   };
-  if (typeIs.is(ctx.request.type, ["application/json"])) {
+  if (typeIs.is(ctx.request.type, [
+    "application/json"
+  ])) {
     draft.data = ctx.request.body;
-  } else if (typeIs.is(ctx.request.type, ["multipart/form-data"])) {
+  } else if (typeIs.is(ctx.request.type, [
+    "multipart/form-data"
+  ])) {
     draft.formData = ctx.request.files;
-  } else if (typeIs.is(ctx.request.type, ["application/x-www-form-urlencoded"])) {
+  } else if (typeIs.is(ctx.request.type, [
+    "application/x-www-form-urlencoded"
+  ])) {
     draft.formUrlencoded = ctx.request.body;
   } else {
     draft.body = ctx.request.body;
   }
   return draft;
 };
-export {
-  createRouteHandler,
-  isNormalMethod
-};

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/server/plugin-koa"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.0",
+  "version": "2.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -63,10 +67,10 @@
     "koa-body": "^4.2.0",
     "koa-router": "^10.0.0",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.15.0",
-    "@modern-js/bff-runtime": "2.15.0",
-    "@modern-js/utils": "2.15.0",
-    "@modern-js/types": "2.15.0"
+    "@modern-js/bff-core": "2.17.0",
+    "@modern-js/bff-runtime": "2.17.0",
+    "@modern-js/utils": "2.17.0",
+    "@modern-js/types": "2.17.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -80,11 +84,11 @@
     "supertest": "^6.1.6",
     "typescript": "^4",
     "zod": "^3.17.3",
-    "@modern-js/core": "2.15.0",
-    "@modern-js/server-core": "2.15.0",
-    "@modern-js/app-tools": "2.15.0",
-    "@scripts/build": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/core": "2.17.0",
+    "@modern-js/server-core": "2.17.0",
+    "@modern-js/app-tools": "2.17.0",
+    "@scripts/build": "2.17.0",
+    "@scripts/jest-config": "2.17.0"
   },
   "peerDependencies": {
     "koa": "^2.13.3"