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

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @modern-js/plugin-koa
 
+## 1.4.7
+
+### Patch Changes
+
+- 69a728375: fix: remove exports.jsnext:source after publish
+- Updated dependencies [cd7346b0d]
+- Updated dependencies [69a728375]
+  - @modern-js/utils@1.7.2
+  - @modern-js/bff-utils@1.2.5
+
+## 1.4.6
+
+### Patch Changes
+
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- befd9e5b: fix: compatible with babel-plugin-resolver's handling of relative paths on windows
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [befd9e5b]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/adapter-helpers@1.2.3
+  - @modern-js/bff-runtime@1.2.2
+  - @modern-js/bff-utils@1.2.3
+
 ## 1.4.5
 
 ### Patch Changes

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

@@ -1,5 +1,6 @@
 import * as path from 'path';
-import { createRuntimeExportsUtils } from '@modern-js/utils';
+import { createRuntimeExportsUtils, TEST_ENV } from '@modern-js/utils';
+import { getRelativeRuntimePath } from '@modern-js/adapter-helpers';
 export default (() => ({
   name: '@modern-js/plugin-koa',
   setup: api => {
@@ -10,31 +11,27 @@ export default (() => ({
     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(); // Look up one level, because the artifacts after build have dist directories
+        let serverRuntimePath = bffExportsUtils.getPath(); // Basedir is not a fixed path when the test is executed,so server runtime path must be absolute path.
 
-        let relativeRuntimePath = path.join('../', path.relative(appDirectory, serverRuntimePath));
-
-        if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
-          relativeRuntimePath = `./${path.relative(appDirectory, serverRuntimePath)}`;
+        if (process.env.NODE_ENV !== TEST_ENV) {
+          serverRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
         }
 
         return {
           source: {
             alias: {
-              '@modern-js/runtime/server': relativeRuntimePath
+              '@modern-js/runtime/server': serverRuntimePath
             }
           }
         };
       },
 
       addRuntimeExports(input) {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
         const {
           appDirectory
         } = useAppContext();

package/dist/js/modern/registerRoutes.js

@@ -20,7 +20,7 @@ const registerRoutes = (router, prefix) => {
     method,
     name
   }) => {
-    const wrapedHandler = async ctx => {
+    const wrappedHandler = async ctx => {
       const input = await getInputFromRequest(ctx);
 
       if (isSchemaHandler(handler)) {
@@ -45,11 +45,11 @@ const registerRoutes = (router, prefix) => {
       }
     };
 
-    Object.defineProperties(wrapedHandler, Object.getOwnPropertyDescriptors(handler));
+    Object.defineProperties(wrappedHandler, Object.getOwnPropertyDescriptors(handler));
 
     if (isNormalMethod(method)) {
       const routeName = method.toLowerCase();
-      router[routeName](name, wrapedHandler);
+      router[routeName](name, wrappedHandler);
     } else {
       throw new Error(`Unknown HTTP Method: ${method}`);
     }

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

@@ -9,6 +9,8 @@ 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; }
@@ -23,31 +25,27 @@ var _default = () => ({
     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(); // Look up one level, because the artifacts after build have dist directories
-
-        let relativeRuntimePath = path.join('../', path.relative(appDirectory, serverRuntimePath));
+        let serverRuntimePath = bffExportsUtils.getPath(); // Basedir is not a fixed path when the test is executed,so server runtime path must be absolute path.
 
-        if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
-          relativeRuntimePath = `./${path.relative(appDirectory, serverRuntimePath)}`;
+        if (process.env.NODE_ENV !== _utils.TEST_ENV) {
+          serverRuntimePath = (0, _adapterHelpers.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
         }
 
         return {
           source: {
             alias: {
-              '@modern-js/runtime/server': relativeRuntimePath
+              '@modern-js/runtime/server': serverRuntimePath
             }
           }
         };
       },
 
       addRuntimeExports(input) {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
         const {
           appDirectory
         } = useAppContext();

package/dist/js/node/registerRoutes.js

@@ -34,7 +34,7 @@ const registerRoutes = (router, prefix) => {
     method,
     name
   }) => {
-    const wrapedHandler = async ctx => {
+    const wrappedHandler = async ctx => {
       const input = await getInputFromRequest(ctx);
 
       if ((0, _bffRuntime.isSchemaHandler)(handler)) {
@@ -59,11 +59,11 @@ const registerRoutes = (router, prefix) => {
       }
     };
 
-    Object.defineProperties(wrapedHandler, Object.getOwnPropertyDescriptors(handler));
+    Object.defineProperties(wrappedHandler, Object.getOwnPropertyDescriptors(handler));
 
     if (isNormalMethod(method)) {
       const routeName = method.toLowerCase();
-      router[routeName](name, wrapedHandler);
+      router[routeName](name, wrappedHandler);
     } else {
       throw new Error(`Unknown HTTP Method: ${method}`);
     }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.5",
+  "version": "1.4.8-canary.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.15.3",
-    "@modern-js/adapter-helpers": "^1.2.1",
-    "@modern-js/bff-runtime": "^1.2.1",
-    "@modern-js/bff-utils": "^1.2.2",
-    "@modern-js/utils": "^1.3.7",
+    "@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",
     "koa-body": "^4.2.0",
     "koa-router": "^10.0.0",
     "type-is": "^1.6.18"
@@ -52,8 +52,8 @@
     "@types/supertest": "^2.0.11",
     "@types/type-is": "^1.6.3",
     "jest": "^27",
-    "@modern-js/server-core": "1.2.5",
-    "@modern-js/core": "1.6.1",
+    "@modern-js/server-core": "1.3.4",
+    "@modern-js/core": "1.10.1",
     "supertest": "^6.1.6",
     "koa": "^2.13.3",
     "typescript": "^4"
@@ -68,12 +68,36 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
+  },
+  "wireit": {
+    "build": {
+      "command": "modern build",
+      "files": [
+        "src/**/*.ts",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": [
+        "dist/**/*.js"
+      ]
+    },
+    "test": {
+      "command": "jest --passWithNoTests",
+      "files": [
+        "src/**/*.ts",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": []
+    }
   },
   "scripts": {
     "new": "modern new",
-    "build": "modern build",
-    "test": "jest --passWithNoTests"
+    "dev": "modern build --watch",
+    "build": "wireit",
+    "test": "wireit"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> 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.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/.eslintrc.js

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

package/jest.config.js

@@ -1,7 +0,0 @@
-const sharedConfig = require('@scripts/jest-config');
-
-/** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = {
-  ...sharedConfig,
-  rootDir: __dirname,
-};

package/modern.config.js

@@ -1,2 +0,0 @@
-/** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {};

package/tests/.eslintrc.js

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

package/tests/common.ts

@@ -1,9 +0,0 @@
-// globby needs setImmediate
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
-global.setImmediate = setTimeout;
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
-global.clearImmediate = clearTimeout;
-
-export const INTROSPECTION_ROUTE_PATH = '/__introspection__';

package/tests/fixtures/assets/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Document</title>
-</head>
-<body>
-  hello koa plugin
-</body>
-</html>

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

@@ -1 +0,0 @@
-export const get = () => ({ message: 'hello koa' });

package/tests/fixtures/function-mode/api/nest/user.ts

@@ -1,33 +0,0 @@
-import { match } from '@modern-js/bff-runtime';
-import { useContext } from '../../../../../src/context';
-
-export const get = ({ query }: { query: Record<string, unknown> }) => ({
-  query,
-});
-
-export const post = ({ data }: { data: Record<string, unknown> }) => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const ctx = useContext();
-  const { cookies } = ctx;
-  return {
-    query: ctx.query,
-    data,
-    cookies: {
-      id: cookies.get('id'),
-      name: cookies.get('name'),
-    },
-  };
-};
-
-export const patch = match(
-  {
-    request: {
-      data: {
-        id: Number,
-        name: String,
-      },
-    },
-    response: { id: Number },
-  },
-  ({ data: { id } }) => ({ id }),
-);

package/tests/fixtures/function-mode/api/upload.ts

@@ -1,4 +0,0 @@
-export const post = ({ formData }) => ({
-  message: 'success',
-  formData,
-});

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

@@ -1 +0,0 @@
-// used by the test, empty file

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

@@ -1 +0,0 @@
-export const get = () => ({ message: 'hello koa' });

package/tests/fixtures/lambda-mode/api/lambda/nest/[id].ts

@@ -1 +0,0 @@
-export const post = (id: string) => ({ id });

package/tests/fixtures/lambda-mode/api/lambda/nest/user.ts

@@ -1,33 +0,0 @@
-import { match } from '@modern-js/bff-runtime';
-import { useContext } from '../../../../../../src/context';
-
-export const get = ({ query }: { query: Record<string, unknown> }) => ({
-  query,
-});
-
-export const post = ({ data }: { data: Record<string, unknown> }) => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const ctx = useContext();
-  const { cookies } = ctx;
-  return {
-    query: ctx.query,
-    data,
-    cookies: {
-      id: cookies.get('id'),
-      name: cookies.get('name'),
-    },
-  };
-};
-
-export const patch = match(
-  {
-    request: {
-      data: {
-        id: Number,
-        name: String,
-      },
-    },
-    response: { id: Number },
-  },
-  ({ data: { id } }) => ({ id }),
-);

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

@@ -1,4 +0,0 @@
-export const post = ({ formData }) => ({
-  message: 'success',
-  formData,
-});

package/tests/functionMode.test.ts

@@ -1,69 +0,0 @@
-import * as path from 'path';
-import request from 'supertest';
-import { serverManager } from '@modern-js/server-core';
-import plugin from '../src/plugin';
-import { APIPlugin } from './helpers';
-import './common';
-
-const pwd = path.join(__dirname, './fixtures/function-mode');
-
-describe('function-mode', () => {
-  const id = '666';
-  const name = 'foo';
-  const foo = { id, name };
-  let apiHandler: any;
-
-  beforeAll(async () => {
-    const runner = await serverManager
-      .clone()
-      .usePlugin(APIPlugin, plugin)
-      .init();
-    apiHandler = await runner.prepareApiServer({
-      pwd,
-      mode: 'function',
-    });
-  });
-
-  test('should works with body', async () => {
-    const res = await request(apiHandler).post('/nest/user').send(foo);
-    expect(res.status).toBe(200);
-    expect(res.body.data).toEqual(foo);
-  });
-
-  test('should works with schema', async () => {
-    const res = await request(apiHandler).patch('/nest/user').send({
-      id: 777,
-      name: 'xxx',
-    });
-    expect(res.status).toBe(200);
-    expect(res.body.id).toBe(777);
-
-    const res2 = await request(apiHandler).patch('/nest/user').send({
-      id: 'aaa',
-      name: 'xxx',
-    });
-    expect(res2.status).toBe(400);
-
-    const res3 = await request(apiHandler).patch('/nest/user').send({
-      id: '777',
-      name: 'xxx',
-    });
-    expect(res3.status).toBe(500);
-  });
-
-  test('should support upload file', done => {
-    request(apiHandler)
-      .post('/upload')
-      .field('my_field', 'value')
-      .attach('file', path.join(__dirname, './fixtures/assets/index.html'))
-      .end(async (err, res) => {
-        if (err) {
-          throw err;
-        }
-        expect(res.statusCode).toBe(200);
-        expect(res.body.message).toBe('success');
-        expect(res.body.formData).not.toBeUndefined();
-        done();
-      });
-  });
-});

package/tests/helpers.ts

@@ -1,14 +0,0 @@
-import path from 'path';
-import { createPlugin } from '@modern-js/server-core';
-import { injectAPIHandlerInfos, API_DIR } from '@modern-js/bff-utils';
-
-export const APIPlugin = createPlugin(() => ({
-  prepareApiServer(props, next) {
-    const { pwd, prefix } = props;
-    const apiDir = path.resolve(pwd, API_DIR);
-
-    injectAPIHandlerInfos(apiDir, prefix);
-
-    return next(props);
-  },
-}));