@modern-js/plugin-koa 1.4.8-canary.0 → 1.4.9

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/plugin-koa
 
+## 1.4.9
+
+### Patch Changes
+
+- bfccb4c8: fix: bff runtime path not found in development
+- Updated dependencies [d57e7622]
+- Updated dependencies [6451a098]
+- Updated dependencies [d5a2cfd8]
+- Updated dependencies [437367c6]
+  - @modern-js/bff-utils@1.2.8
+  - @modern-js/utils@1.7.6
+
+## 1.4.8
+
+### Patch Changes
+
+- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
+- Updated dependencies [d32f35134]
+- Updated dependencies [6ae4a34ae]
+- Updated dependencies [b80229c79]
+- Updated dependencies [948cc4436]
+  - @modern-js/adapter-helpers@1.2.4
+  - @modern-js/bff-runtime@1.2.3
+  - @modern-js/bff-utils@1.2.6
+  - @modern-js/utils@1.7.3
+
 ## 1.4.7
 
 ### Patch Changes

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

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { createRuntimeExportsUtils, TEST_ENV } from '@modern-js/utils';
+import { createRuntimeExportsUtils } from '@modern-js/utils';
 import { getRelativeRuntimePath } from '@modern-js/adapter-helpers';
 export default (() => ({
   name: '@modern-js/plugin-koa',
@@ -16,19 +16,26 @@ export default (() => ({
           appDirectory
         } = appContext;
         bffExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'server');
-        let serverRuntimePath = bffExportsUtils.getPath(); // Basedir is not a fixed path when the test is executed,so server runtime path must be absolute path.
+        const serverRuntimePath = bffExportsUtils.getPath();
+        const relativeRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
 
-        if (process.env.NODE_ENV !== TEST_ENV) {
-          serverRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
-        }
-
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/server': serverRuntimePath
+        if (process.env.NODE_ENV === 'production') {
+          return {
+            source: {
+              alias: {
+                '@modern-js/runtime/server': relativeRuntimePath
+              }
             }
-          }
-        };
+          };
+        } else {
+          return {
+            source: {
+              alias: {
+                '@modern-js/runtime/server': serverRuntimePath
+              }
+            }
+          };
+        }
       },
 
       addRuntimeExports(input) {

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

@@ -30,19 +30,26 @@ var _default = () => ({
           appDirectory
         } = appContext;
         bffExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'server');
-        let serverRuntimePath = bffExportsUtils.getPath(); // Basedir is not a fixed path when the test is executed,so server runtime path must be absolute path.
+        const serverRuntimePath = bffExportsUtils.getPath();
+        const relativeRuntimePath = (0, _adapterHelpers.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
 
-        if (process.env.NODE_ENV !== _utils.TEST_ENV) {
-          serverRuntimePath = (0, _adapterHelpers.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
-        }
-
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/server': serverRuntimePath
+        if (process.env.NODE_ENV === 'production') {
+          return {
+            source: {
+              alias: {
+                '@modern-js/runtime/server': relativeRuntimePath
+              }
             }
-          }
-        };
+          };
+        } else {
+          return {
+            source: {
+              alias: {
+                '@modern-js/runtime/server': serverRuntimePath
+              }
+            }
+          };
+        }
       },
 
       addRuntimeExports(input) {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.8-canary.0",
+  "version": "1.4.9",
   "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.15.3",
-    "@modern-js/adapter-helpers": "^1.2.3",
-    "@modern-js/bff-runtime": "^1.2.2",
-    "@modern-js/bff-utils": "^1.2.5",
-    "@modern-js/utils": "^1.7.2",
+    "@modern-js/adapter-helpers": "^1.2.4",
+    "@modern-js/bff-runtime": "^1.2.3",
+    "@modern-js/bff-utils": "^1.2.8",
+    "@modern-js/utils": "^1.7.6",
     "koa-body": "^4.2.0",
     "koa-router": "^10.0.0",
     "type-is": "^1.6.18"
@@ -45,15 +45,15 @@
   "devDependencies": {
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^27",
     "@types/koa": "^2.13.4",
     "@types/koa-router": "^7.4.4",
     "@types/node": "^14",
     "@types/supertest": "^2.0.11",
     "@types/type-is": "^1.6.3",
     "jest": "^27",
-    "@modern-js/server-core": "1.3.4",
-    "@modern-js/core": "1.10.1",
+    "@modern-js/server-core": "1.3.5",
+    "@modern-js/core": "1.11.1",
     "supertest": "^6.1.6",
     "koa": "^2.13.3",
     "typescript": "^4"
@@ -68,34 +68,33 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "wireit": {
     "build": {
       "command": "modern build",
       "files": [
-        "src/**/*.ts",
+        "src/**/*",
         "tsconfig.json",
         "package.json"
       ],
       "output": [
-        "dist/**/*.js"
+        "dist/**/*"
       ]
     },
     "test": {
       "command": "jest --passWithNoTests",
       "files": [
-        "src/**/*.ts",
+        "src/**/*",
         "tsconfig.json",
-        "package.json"
+        "package.json",
+        "tests/**/*"
       ],
       "output": []
     }
   },
   "scripts": {
     "new": "modern new",
-    "dev": "modern build --watch",
     "build": "wireit",
     "test": "wireit"
   },

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/.wireit/6275696c64/stdout

@@ -1,9 +0,0 @@
-Compiling in progress...
-Run `tsc` log:
-[TSC Compiler]: Successfully
-
-
-Run babel compiler code log:
-[Babel Compiler]: Successfully
-
-

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/modern/cli/index.js

@@ -1,60 +0,0 @@
-import * as path from 'path';
-import { createRuntimeExportsUtils } from '@modern-js/utils';
-import { getRelativeRuntimePath } from '@modern-js/adapter-helpers';
-export default (() => ({
-  name: '@modern-js/plugin-koa',
-  setup: api => {
-    let bffExportsUtils;
-    const {
-      useAppContext
-    } = api;
-    const runtimeModulePath = path.resolve(__dirname, '../runtime');
-    return {
-      config() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const appContext = useAppContext();
-        const {
-          appDirectory
-        } = appContext;
-        bffExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, 'server');
-        const serverRuntimePath = bffExportsUtils.getPath();
-        const relativeRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/server': relativeRuntimePath
-            }
-          }
-        };
-      },
-
-      addRuntimeExports(input) {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        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('koa'));
-        bffExportsUtils.addExport(`const bffRuntime = require('${relativeBffPath}');
-           const pluginRuntime = require('${relativeRuntimeModulePath}');
-           const Koa = require('${relativeFramePath}')
-           module.exports = {
-            Koa: Koa,
-             ...bffRuntime,
-             ...pluginRuntime
-           }
-          `);
-        return input;
-      }
-
-    };
-  }
-}));

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/modern/context.js

@@ -1,6 +0,0 @@
-import { createStorage } from '@modern-js/adapter-helpers';
-const {
-  run,
-  useContext
-} = createStorage();
-export { run, useContext };

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/modern/index.js

@@ -1,3 +0,0 @@
-import plugin from "./plugin";
-export * from "./context";
-export default plugin;

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/modern/plugin.js

@@ -1,129 +0,0 @@
-import * as path from 'path';
-import Koa from 'koa';
-import Router from 'koa-router';
-import koaBody from 'koa-body';
-import { requireModule } from '@modern-js/bff-utils';
-import { fs } from '@modern-js/utils';
-import { run } from "./context";
-import registerRoutes from "./registerRoutes";
-
-const findAppModule = async apiDir => {
-  const exts = ['.ts', '.js'];
-  const paths = exts.map(ext => path.join(apiDir, `app${ext}`));
-
-  for (const filename of paths) {
-    if (await fs.pathExists(filename)) {
-      return requireModule(filename);
-    }
-  }
-
-  return null;
-};
-
-const initMiddlewares = (middleware, app) => {
-  middleware.forEach(middlewareItem => {
-    const middlewareFunc = typeof middlewareItem === 'string' ? requireModule(middlewareItem) : middlewareItem;
-    app.use(middlewareFunc);
-  });
-};
-
-export default (() => ({
-  name: '@modern-js/plugin-koa',
-  pre: ['@modern-js/plugin-bff'],
-  setup: () => ({
-    async prepareApiServer({
-      pwd,
-      mode,
-      config,
-      prefix
-    }) {
-      let app;
-      const router = new Router();
-      const apiDir = path.join(pwd, './api');
-
-      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, prefix);
-      } 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, prefix);
-      } else {
-        throw new Error(`mode must be function or framework`);
-      }
-
-      app.use(router.routes());
-      return (req, res) => {
-        app.on('error', err => {
-          if (err) {
-            throw err;
-          }
-        });
-        return Promise.resolve(app.callback()(req, res));
-      };
-    },
-
-    prepareWebServer({
-      config
-    }) {
-      const app = new Koa();
-      app.use(async (ctx, next) => {
-        await next();
-
-        if (!ctx.body) {
-          // restore statusCode
-          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 (req, res) => {
-        app.on('error', err => {
-          if (err) {
-            throw err;
-          }
-        });
-        return Promise.resolve(app.callback()(req, res));
-      };
-    }
-
-  })
-}));

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/modern/registerRoutes.js

@@ -1,82 +0,0 @@
-import { HttpMethod, useAPIHandlerInfos } from '@modern-js/bff-utils';
-import { isSchemaHandler } from '@modern-js/bff-runtime';
-import typeIs from 'type-is';
-import { sortDynamicRoutes } from '@modern-js/adapter-helpers';
-import { createDebugger } from '@modern-js/utils';
-const debug = createDebugger('koa');
-
-const registerRoutes = (router, prefix) => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const handlerInfos = useAPIHandlerInfos();
-  sortDynamicRoutes(handlerInfos);
-  debug('handlerInfos', handlerInfos);
-
-  if (prefix) {
-    router.prefix(prefix);
-  }
-
-  handlerInfos.forEach(({
-    handler,
-    method,
-    name
-  }) => {
-    const wrappedHandler = async ctx => {
-      const input = await getInputFromRequest(ctx);
-
-      if (isSchemaHandler(handler)) {
-        const result = await handler(input);
-
-        if (result.type !== 'HandleSuccess') {
-          if (result.type === 'InputValidationError') {
-            ctx.status = 400;
-          } else {
-            ctx.status = 500;
-          }
-
-          ctx.body = result.message;
-        } else {
-          ctx.body = result.value;
-        }
-      } else {
-        const args = Object.values(input.params).concat(input); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
-
-        ctx.body = await handler(...args);
-      }
-    };
-
-    Object.defineProperties(wrappedHandler, Object.getOwnPropertyDescriptors(handler));
-
-    if (isNormalMethod(method)) {
-      const routeName = method.toLowerCase();
-      router[routeName](name, wrappedHandler);
-    } else {
-      throw new Error(`Unknown HTTP Method: ${method}`);
-    }
-  });
-};
-
-const isNormalMethod = method => Object.keys(HttpMethod).includes(method);
-
-export default registerRoutes;
-
-const getInputFromRequest = async ctx => {
-  const draft = {
-    params: ctx.params,
-    query: ctx.query,
-    headers: ctx.headers,
-    cookies: ctx.headers.cookie
-  };
-
-  if (typeIs.is(ctx.request.type, ['application/json'])) {
-    draft.data = ctx.request.body;
-  } 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'])) {
-    draft.formUrlencoded = ctx.request.body;
-  } else {
-    draft.body = ctx.request.body;
-  }
-
-  return draft;
-};

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/modern/runtime.js

@@ -1 +0,0 @@
-export { useContext } from "./context";

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/node/cli/index.js

@@ -1,76 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var path = _interopRequireWildcard(require("path"));
-
-var _utils = require("@modern-js/utils");
-
-var _adapterHelpers = require("@modern-js/adapter-helpers");
-
-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); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var _default = () => ({
-  name: '@modern-js/plugin-koa',
-  setup: api => {
-    let bffExportsUtils;
-    const {
-      useAppContext
-    } = api;
-    const runtimeModulePath = path.resolve(__dirname, '../runtime');
-    return {
-      config() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const appContext = useAppContext();
-        const {
-          appDirectory
-        } = appContext;
-        bffExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'server');
-        const serverRuntimePath = bffExportsUtils.getPath();
-        const relativeRuntimePath = (0, _adapterHelpers.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/server': relativeRuntimePath
-            }
-          }
-        };
-      },
-
-      addRuntimeExports(input) {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        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('koa'));
-        bffExportsUtils.addExport(`const bffRuntime = require('${relativeBffPath}');
-           const pluginRuntime = require('${relativeRuntimeModulePath}');
-           const Koa = require('${relativeFramePath}')
-           module.exports = {
-            Koa: Koa,
-             ...bffRuntime,
-             ...pluginRuntime
-           }
-          `);
-        return input;
-      }
-
-    };
-  }
-});
-
-exports.default = _default;

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/node/context.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useContext = exports.run = void 0;
-
-var _adapterHelpers = require("@modern-js/adapter-helpers");
-
-const {
-  run,
-  useContext
-} = (0, _adapterHelpers.createStorage)();
-exports.useContext = useContext;
-exports.run = run;

package/.wireit/6275696c64/cache/5a7fd1190b57f273bbfc05fc04fa99ef67c54e4eac07712cccd97346c9903534/dist/js/node/index.js

@@ -1,28 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {};
-exports.default = void 0;
-
-var _plugin = _interopRequireDefault(require("./plugin"));
-
-var _context = require("./context");
-
-Object.keys(_context).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _context[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _context[key];
-    }
-  });
-});
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _default = _plugin.default;
-exports.default = _default;