@modern-js/plugin-bff 1.5.1 → 1.5.3-beta.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/plugin-bff
 
+## 1.5.2
+
+### Patch Changes
+
+- a1198d509: feat: bump babel 7.18.0
+- c1a4ead09: fix: plugin-bff should compile shared directory
+- Updated dependencies [a1198d509]
+  - @modern-js/bff-utils@1.2.9
+  - @modern-js/create-request@1.2.11
+  - @modern-js/server-utils@1.2.10
+  - @modern-js/babel-compiler@1.2.6
+
 ## 1.5.1
 
 ### Patch Changes

package/dist/js/modern/cli.js

@@ -1,10 +1,49 @@
 import path from 'path';
 import { compiler } from '@modern-js/babel-compiler';
-import { fs, API_DIR, PLUGIN_SCHEMAS, normalizeOutputPath } from '@modern-js/utils';
+import { fs, API_DIR, PLUGIN_SCHEMAS, normalizeOutputPath, SHARED_DIR } from '@modern-js/utils';
 import { resolveBabelConfig } from '@modern-js/server-utils';
 const DEFAULT_API_PREFIX = '/api';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
+const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // TODO: 封装服务端编译函数
+
+const compile = async (appDirectory, modernConfig, compileOptions) => {
+  const {
+    patterns
+  } = compileOptions;
+  const results = await Promise.all(patterns.map(async pattern => {
+    const {
+      from,
+      to,
+      tsconfigPath
+    } = pattern;
+    const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
+      tsconfigPath: tsconfigPath ? tsconfigPath : '',
+      syntax: 'es6+',
+      type: 'commonjs'
+    });
+
+    if (await fs.pathExists(from)) {
+      const basename = path.basename(from);
+      const targetDir = path.join(to, basename);
+      await fs.copy(from, targetDir, {
+        filter: src => !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath
+      });
+    }
+
+    return compiler({
+      rootDir: appDirectory,
+      distDir: to,
+      sourceDir: from,
+      extensions: FILE_EXTENSIONS
+    }, babelConfig);
+  }));
+  results.forEach(result => {
+    if (result.code === 1) {
+      throw new Error(result.message);
+    }
+  });
+};
+
 export default (() => ({
   name: '@modern-js/plugin-bff',
   setup: api => ({
@@ -85,33 +124,32 @@ export default (() => ({
         distDirectory
       } = api.useAppContext();
       const modernConfig = api.useResolvedConfigContext();
-      const rootDir = path.resolve(appDirectory, API_DIR);
-      const distDir = path.resolve(distDirectory, API_DIR);
-      const sourceAbsDir = path.resolve(appDirectory, API_DIR);
+      const distDir = path.resolve(distDirectory);
+      const apiDir = path.resolve(appDirectory, API_DIR);
+      const sharedDir = path.resolve(appDirectory, SHARED_DIR);
       const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-      const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-        tsconfigPath,
-        syntax: 'es6+',
-        type: 'commonjs'
-      });
-      const result = await compiler({
-        rootDir,
-        distDir,
-        sourceDir: sourceAbsDir,
-        extensions: FILE_EXTENSIONS,
-        ignore: [`**/__tests__/**`, '*.d.ts', '*.test.ts']
-      }, babelConfig);
+      const patterns = [];
 
-      if (await fs.pathExists(rootDir)) {
-        await fs.copy(rootDir, distDir, {
-          filter: src => !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath
+      if (fs.existsSync(apiDir)) {
+        patterns.push({
+          from: apiDir,
+          to: distDir,
+          tsconfigPath
         });
       }
 
-      if (result.code === 1) {
-        var _result$messageDetail;
+      if (fs.existsSync(sharedDir)) {
+        patterns.push({
+          from: sharedDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
 
-        throw new Error((result === null || result === void 0 ? void 0 : (_result$messageDetail = result.messageDetails) === null || _result$messageDetail === void 0 ? void 0 : _result$messageDetail[0].content) || result.message);
+      if (patterns.length > 0) {
+        await compile(appDirectory, modernConfig, {
+          patterns
+        });
       }
     }
 

package/dist/js/modern/loader.js

@@ -1,4 +1,4 @@
-import { generateClient } from '@modern-js/bff-utils';
+import { generateClient } from '@modern-js/bff-core';
 
 async function loader(source) {
   // eslint-disable-next-line @babel/no-invalid-this

package/dist/js/modern/server.js

@@ -1,7 +1,11 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import path from 'path';
-import { injectAPIHandlerInfos } from '@modern-js/bff-utils';
+import { ApiRouter } from '@modern-js/bff-core';
 import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
 import { API_APP_NAME } from "./constants";
 
@@ -68,7 +72,15 @@ export default (() => ({
           prefix
         } = props;
         const apiDir = path.resolve(pwd, API_DIR);
-        injectAPIHandlerInfos(apiDir, prefix);
+        const appContext = api.useAppContext();
+        const apiRouter = new ApiRouter({
+          apiDir,
+          prefix
+        });
+        const apiHandlerInfos = apiRouter.getApiHandlers();
+        api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+          apiHandlerInfos
+        }));
         return next(props);
       }
 

package/dist/js/node/cli.js

@@ -17,7 +17,47 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const DEFAULT_API_PREFIX = '/api';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
+const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // TODO: 封装服务端编译函数
+
+const compile = async (appDirectory, modernConfig, compileOptions) => {
+  const {
+    patterns
+  } = compileOptions;
+  const results = await Promise.all(patterns.map(async pattern => {
+    const {
+      from,
+      to,
+      tsconfigPath
+    } = pattern;
+    const babelConfig = (0, _serverUtils.resolveBabelConfig)(appDirectory, modernConfig, {
+      tsconfigPath: tsconfigPath ? tsconfigPath : '',
+      syntax: 'es6+',
+      type: 'commonjs'
+    });
+
+    if (await _utils.fs.pathExists(from)) {
+      const basename = _path.default.basename(from);
+
+      const targetDir = _path.default.join(to, basename);
+
+      await _utils.fs.copy(from, targetDir, {
+        filter: src => !['.ts', '.js'].includes(_path.default.extname(src)) && src !== tsconfigPath
+      });
+    }
+
+    return (0, _babelCompiler.compiler)({
+      rootDir: appDirectory,
+      distDir: to,
+      sourceDir: from,
+      extensions: FILE_EXTENSIONS
+    }, babelConfig);
+  }));
+  results.forEach(result => {
+    if (result.code === 1) {
+      throw new Error(result.message);
+    }
+  });
+};
 
 var _default = () => ({
   name: '@modern-js/plugin-bff',
@@ -102,37 +142,36 @@ var _default = () => ({
       } = api.useAppContext();
       const modernConfig = api.useResolvedConfigContext();
 
-      const rootDir = _path.default.resolve(appDirectory, _utils.API_DIR);
+      const distDir = _path.default.resolve(distDirectory);
 
-      const distDir = _path.default.resolve(distDirectory, _utils.API_DIR);
+      const apiDir = _path.default.resolve(appDirectory, _utils.API_DIR);
 
-      const sourceAbsDir = _path.default.resolve(appDirectory, _utils.API_DIR);
+      const sharedDir = _path.default.resolve(appDirectory, _utils.SHARED_DIR);
 
       const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
 
-      const babelConfig = (0, _serverUtils.resolveBabelConfig)(appDirectory, modernConfig, {
-        tsconfigPath,
-        syntax: 'es6+',
-        type: 'commonjs'
-      });
-      const result = await (0, _babelCompiler.compiler)({
-        rootDir,
-        distDir,
-        sourceDir: sourceAbsDir,
-        extensions: FILE_EXTENSIONS,
-        ignore: [`**/__tests__/**`, '*.d.ts', '*.test.ts']
-      }, babelConfig);
-
-      if (await _utils.fs.pathExists(rootDir)) {
-        await _utils.fs.copy(rootDir, distDir, {
-          filter: src => !['.ts', '.js'].includes(_path.default.extname(src)) && src !== tsconfigPath
+      const patterns = [];
+
+      if (_utils.fs.existsSync(apiDir)) {
+        patterns.push({
+          from: apiDir,
+          to: distDir,
+          tsconfigPath
         });
       }
 
-      if (result.code === 1) {
-        var _result$messageDetail;
+      if (_utils.fs.existsSync(sharedDir)) {
+        patterns.push({
+          from: sharedDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
 
-        throw new Error((result === null || result === void 0 ? void 0 : (_result$messageDetail = result.messageDetails) === null || _result$messageDetail === void 0 ? void 0 : _result$messageDetail[0].content) || result.message);
+      if (patterns.length > 0) {
+        await compile(appDirectory, modernConfig, {
+          patterns
+        });
       }
     }
 

package/dist/js/node/loader.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _bffUtils = require("@modern-js/bff-utils");
+var _bffCore = require("@modern-js/bff-core");
 
 async function loader(source) {
   // eslint-disable-next-line @babel/no-invalid-this
@@ -33,7 +33,7 @@ async function loader(source) {
   }
 
   options.requireResolve = require.resolve;
-  const result = await (0, _bffUtils.generateClient)(options);
+  const result = await (0, _bffCore.generateClient)(options);
 
   if (result.isOk) {
     callback(undefined, result.value);

package/dist/js/node/server.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _bffUtils = require("@modern-js/bff-utils");
+var _bffCore = require("@modern-js/bff-core");
 
 var _utils = require("@modern-js/utils");
 
@@ -15,6 +15,10 @@ var _constants = require("./constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class Storage {
@@ -84,7 +88,15 @@ var _default = () => ({
 
         const apiDir = _path.default.resolve(pwd, _utils.API_DIR);
 
-        (0, _bffUtils.injectAPIHandlerInfos)(apiDir, prefix);
+        const appContext = api.useAppContext();
+        const apiRouter = new _bffCore.ApiRouter({
+          apiDir,
+          prefix
+        });
+        const apiHandlerInfos = apiRouter.getApiHandlers();
+        api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+          apiHandlerInfos
+        }));
         return next(props);
       }
 

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.1",
+  "version": "1.5.3-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -56,15 +56,15 @@
     "@babel/core": "^7.17.0",
     "@babel/runtime": "^7",
     "@modern-js/babel-compiler": "^1.2.5",
-    "@modern-js/bff-utils": "^1.2.8",
+    "@modern-js/bff-core": "^1.0.0",
     "@modern-js/create-request": "^1.2.10",
     "@modern-js/server-utils": "^1.2.9",
     "@modern-js/utils": "^1.7.6"
   },
   "devDependencies": {
-    "@modern-js/core": "1.11.1",
-    "@modern-js/plugin-analyze": "1.4.5",
-    "@modern-js/runtime": "1.3.0",
+    "@modern-js/core": "1.11.2",
+    "@modern-js/plugin-analyze": "1.4.6",
+    "@modern-js/runtime": "1.3.2",
     "@modern-js/server-core": "1.3.5",
     "@modern-js/types": "1.5.4",
     "@scripts/build": "0.0.0",
@@ -82,7 +82,8 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "wireit": {
     "build": {