@modern-js/plugin-bff 1.5.2-canary.0 → 1.5.3-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @modern-js/plugin-bff
2
2
 
3
+ ## 1.5.2
4
+
5
+ ### Patch Changes
6
+
7
+ - a1198d509: feat: bump babel 7.18.0
8
+ - c1a4ead09: fix: plugin-bff should compile shared directory
9
+ - Updated dependencies [a1198d509]
10
+ - @modern-js/bff-utils@1.2.9
11
+ - @modern-js/create-request@1.2.11
12
+ - @modern-js/server-utils@1.2.10
13
+ - @modern-js/babel-compiler@1.2.6
14
+
3
15
  ## 1.5.1
4
16
 
5
17
  ### Patch Changes
@@ -4,7 +4,7 @@ import { fs, API_DIR, PLUGIN_SCHEMAS, normalizeOutputPath, SHARED_DIR } from '@m
4
4
  import { resolveBabelConfig } from '@modern-js/server-utils';
5
5
  const DEFAULT_API_PREFIX = '/api';
6
6
  const TS_CONFIG_FILENAME = 'tsconfig.json';
7
- const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
7
+ const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // TODO: 封装服务端编译函数
8
8
 
9
9
  const compile = async (appDirectory, modernConfig, compileOptions) => {
10
10
  const {
@@ -1,4 +1,4 @@
1
- import { generateClient } from '@modern-js/bff-utils';
1
+ import { generateClient } from '@modern-js/bff-core';
2
2
 
3
3
  async function loader(source) {
4
4
  // eslint-disable-next-line @babel/no-invalid-this
@@ -1,7 +1,11 @@
1
+ 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; }
2
+
3
+ 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; }
4
+
1
5
  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; }
2
6
 
3
7
  import path from 'path';
4
- import { injectAPIHandlerInfos } from '@modern-js/bff-utils';
8
+ import { ApiRouter } from '@modern-js/bff-core';
5
9
  import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
6
10
  import { API_APP_NAME } from "./constants";
7
11
 
@@ -68,7 +72,15 @@ export default (() => ({
68
72
  prefix
69
73
  } = props;
70
74
  const apiDir = path.resolve(pwd, API_DIR);
71
- injectAPIHandlerInfos(apiDir, prefix);
75
+ const appContext = api.useAppContext();
76
+ const apiRouter = new ApiRouter({
77
+ apiDir,
78
+ prefix
79
+ });
80
+ const apiHandlerInfos = apiRouter.getApiHandlers();
81
+ api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
82
+ apiHandlerInfos
83
+ }));
72
84
  return next(props);
73
85
  }
74
86
 
@@ -17,7 +17,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
17
17
 
18
18
  const DEFAULT_API_PREFIX = '/api';
19
19
  const TS_CONFIG_FILENAME = 'tsconfig.json';
20
- const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
20
+ const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // TODO: 封装服务端编译函数
21
21
 
22
22
  const compile = async (appDirectory, modernConfig, compileOptions) => {
23
23
  const {
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
- var _bffUtils = require("@modern-js/bff-utils");
8
+ var _bffCore = require("@modern-js/bff-core");
9
9
 
10
10
  async function loader(source) {
11
11
  // eslint-disable-next-line @babel/no-invalid-this
@@ -33,7 +33,7 @@ async function loader(source) {
33
33
  }
34
34
 
35
35
  options.requireResolve = require.resolve;
36
- const result = await (0, _bffUtils.generateClient)(options);
36
+ const result = await (0, _bffCore.generateClient)(options);
37
37
 
38
38
  if (result.isOk) {
39
39
  callback(undefined, result.value);
@@ -7,7 +7,7 @@ exports.default = void 0;
7
7
 
8
8
  var _path = _interopRequireDefault(require("path"));
9
9
 
10
- var _bffUtils = require("@modern-js/bff-utils");
10
+ var _bffCore = require("@modern-js/bff-core");
11
11
 
12
12
  var _utils = require("@modern-js/utils");
13
13
 
@@ -15,6 +15,10 @@ var _constants = require("./constants");
15
15
 
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
17
 
18
+ 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; }
19
+
20
+ 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; }
21
+
18
22
  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; }
19
23
 
20
24
  class Storage {
@@ -84,7 +88,15 @@ var _default = () => ({
84
88
 
85
89
  const apiDir = _path.default.resolve(pwd, _utils.API_DIR);
86
90
 
87
- (0, _bffUtils.injectAPIHandlerInfos)(apiDir, prefix);
91
+ const appContext = api.useAppContext();
92
+ const apiRouter = new _bffCore.ApiRouter({
93
+ apiDir,
94
+ prefix
95
+ });
96
+ const apiHandlerInfos = apiRouter.getApiHandlers();
97
+ api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
98
+ apiHandlerInfos
99
+ }));
88
100
  return next(props);
89
101
  }
90
102
 
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "modern",
12
12
  "modern.js"
13
13
  ],
14
- "version": "1.5.2-canary.0",
14
+ "version": "1.5.3-beta.1",
15
15
  "jsnext:source": "./src/index.ts",
16
16
  "types": "./dist/types/index.d.ts",
17
17
  "main": "./dist/js/node/index.js",
@@ -56,15 +56,15 @@
56
56
  "@babel/core": "^7.17.0",
57
57
  "@babel/runtime": "^7",
58
58
  "@modern-js/babel-compiler": "^1.2.5",
59
- "@modern-js/bff-utils": "^1.2.8",
59
+ "@modern-js/bff-core": "^1.0.0",
60
60
  "@modern-js/create-request": "^1.2.10",
61
61
  "@modern-js/server-utils": "^1.2.9",
62
62
  "@modern-js/utils": "^1.7.6"
63
63
  },
64
64
  "devDependencies": {
65
- "@modern-js/core": "1.11.1",
66
- "@modern-js/plugin-analyze": "1.4.5",
67
- "@modern-js/runtime": "1.3.1",
65
+ "@modern-js/core": "1.11.2",
66
+ "@modern-js/plugin-analyze": "1.4.6",
67
+ "@modern-js/runtime": "1.3.2",
68
68
  "@modern-js/server-core": "1.3.5",
69
69
  "@modern-js/types": "1.5.4",
70
70
  "@scripts/build": "0.0.0",