@modern-js/plugin-bff 1.6.2 → 1.15.1-beta.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @modern-js/plugin-bff
 
+## 1.15.0
+
+### Patch Changes
+
+- c0d8dac: fix: remove package adapter-helpers and bff runtime export
+- Updated dependencies [c0d8dac]
+- Updated dependencies [8658a78]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [7bfaaf9]
+- Updated dependencies [b1f7000]
+- Updated dependencies [ad05af9]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [37cd159]
+  - @modern-js/bff-core@1.15.0
+  - @modern-js/utils@1.15.0
+  - @modern-js/create-request@1.15.0
+  - @modern-js/server-utils@1.15.0
+  - @modern-js/babel-compiler@1.15.0
+
 ## 1.6.2
 
 ### Patch Changes

package/dist/js/modern/cli.js

@@ -1,50 +1,9 @@
 import path from 'path';
-import { compiler } from '@modern-js/babel-compiler';
 import { fs, API_DIR, PLUGIN_SCHEMAS, normalizeOutputPath, SHARED_DIR, isProd } from '@modern-js/utils';
-import { resolveBabelConfig } from '@modern-js/server-utils';
+import { compile } from '@modern-js/server-utils';
 import { registerModernRuntimePath } from "./helper";
 const DEFAULT_API_PREFIX = '/api';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
-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 => {
@@ -145,27 +104,21 @@ export default (() => ({
         const apiDir = path.resolve(appDirectory, API_DIR);
         const sharedDir = path.resolve(appDirectory, SHARED_DIR);
         const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-        const patterns = [];
+        const sourceDirs = [];
 
         if (fs.existsSync(apiDir)) {
-          patterns.push({
-            from: apiDir,
-            to: distDir,
-            tsconfigPath
-          });
+          sourceDirs.push(apiDir);
         }
 
         if (fs.existsSync(sharedDir)) {
-          patterns.push({
-            from: sharedDir,
-            to: distDir,
-            tsconfigPath
-          });
+          sourceDirs.push(sharedDir);
         }
 
-        if (patterns.length > 0) {
+        if (sourceDirs.length > 0) {
           await compile(appDirectory, modernConfig, {
-            patterns
+            sourceDirs,
+            distDir,
+            tsconfigPath
           });
         }
       }

package/dist/js/node/cli.js

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _babelCompiler = require("@modern-js/babel-compiler");
-
 var _utils = require("@modern-js/utils");
 
 var _serverUtils = require("@modern-js/server-utils");
@@ -19,47 +17,6 @@ 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']; // 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',
@@ -168,27 +125,21 @@ var _default = () => ({
 
         const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
 
-        const patterns = [];
+        const sourceDirs = [];
 
         if (_utils.fs.existsSync(apiDir)) {
-          patterns.push({
-            from: apiDir,
-            to: distDir,
-            tsconfigPath
-          });
+          sourceDirs.push(apiDir);
         }
 
         if (_utils.fs.existsSync(sharedDir)) {
-          patterns.push({
-            from: sharedDir,
-            to: distDir,
-            tsconfigPath
-          });
+          sourceDirs.push(sharedDir);
         }
 
-        if (patterns.length > 0) {
-          await compile(appDirectory, modernConfig, {
-            patterns
+        if (sourceDirs.length > 0) {
+          await (0, _serverUtils.compile)(appDirectory, modernConfig, {
+            sourceDirs,
+            distDir,
+            tsconfigPath
           });
         }
       }

package/dist/js/treeshaking/cli.js

@@ -0,0 +1,160 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import path from 'path';
+import { fs, API_DIR, PLUGIN_SCHEMAS, normalizeOutputPath, SHARED_DIR, isProd } from '@modern-js/utils';
+import { compile } from '@modern-js/server-utils';
+import { registerModernRuntimePath } from "./helper";
+var DEFAULT_API_PREFIX = '/api';
+var TS_CONFIG_FILENAME = 'tsconfig.json';
+export default (function () {
+  return {
+    name: '@modern-js/plugin-bff',
+    setup: function setup(api) {
+      var unRegisterResolveRuntimePath = null;
+      return {
+        validateSchema: function validateSchema() {
+          return PLUGIN_SCHEMAS['@modern-js/plugin-bff'];
+        },
+        config: function config() {
+          return {
+            tools: {
+              webpackChain: function webpackChain(chain, _ref) {
+                var name = _ref.name,
+                    CHAIN_ID = _ref.CHAIN_ID;
+
+                var _api$useAppContext = api.useAppContext(),
+                    appDirectory = _api$useAppContext.appDirectory,
+                    port = _api$useAppContext.port;
+
+                var modernConfig = api.useResolvedConfigContext();
+
+                var _ref2 = modernConfig || {},
+                    bff = _ref2.bff;
+
+                var _ref3 = bff || {},
+                    fetcher = _ref3.fetcher;
+
+                var prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
+                var rootDir = path.resolve(appDirectory, API_DIR);
+                chain.resolve.alias.set('@api', rootDir);
+                var apiRegexp = new RegExp(normalizeOutputPath("".concat(appDirectory).concat(path.sep, "api").concat(path.sep, ".*(.[tj]s)$")));
+                chain.module.rule(CHAIN_ID.RULE.LOADERS).oneOf(CHAIN_ID.ONE_OF.BFF_CLIENT).before(CHAIN_ID.ONE_OF.FALLBACK).test(apiRegexp).use('custom-loader').loader(require.resolve("./loader").replace(/\\/g, '/')).options({
+                  prefix: prefix,
+                  apiDir: rootDir,
+                  port: port,
+                  fetcher: fetcher,
+                  target: name,
+                  requestCreator: bff === null || bff === void 0 ? void 0 : bff.requestCreator
+                });
+              }
+            },
+            source: {
+              moduleScopes: ["./".concat(API_DIR), /create-request/]
+            }
+          };
+        },
+        modifyServerRoutes: function modifyServerRoutes(_ref4) {
+          var routes = _ref4.routes;
+          var modernConfig = api.useResolvedConfigContext();
+
+          var _ref5 = modernConfig || {},
+              bff = _ref5.bff;
+
+          var prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
+          var prefixList = [];
+
+          if (Array.isArray(prefix)) {
+            prefixList.push.apply(prefixList, _toConsumableArray(prefix));
+          } else {
+            prefixList.push(prefix);
+          }
+
+          var apiServerRoutes = prefixList.map(function (pre) {
+            return {
+              urlPath: pre,
+              isApi: true,
+              entryPath: '',
+              isSPA: false,
+              isSSR: false // FIXME: })) as IAppContext[`serverRoutes`];
+
+            };
+          });
+          return {
+            routes: routes.concat(apiServerRoutes)
+          };
+        },
+        beforeBuild: function beforeBuild() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+            var _api$useAppContext2, internalDirectory;
+
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    // help esbuild-register resolve @modern-js/server/runtime
+                    if (isProd()) {
+                      _api$useAppContext2 = api.useAppContext(), internalDirectory = _api$useAppContext2.internalDirectory;
+                      unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
+                    }
+
+                  case 1:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }))();
+        },
+        afterBuild: function afterBuild() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+            var _api$useAppContext3, appDirectory, distDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, sourceDirs;
+
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    if (unRegisterResolveRuntimePath) {
+                      unRegisterResolveRuntimePath();
+                    }
+
+                    _api$useAppContext3 = api.useAppContext(), appDirectory = _api$useAppContext3.appDirectory, distDirectory = _api$useAppContext3.distDirectory;
+                    modernConfig = api.useResolvedConfigContext();
+                    distDir = path.resolve(distDirectory);
+                    apiDir = path.resolve(appDirectory, API_DIR);
+                    sharedDir = path.resolve(appDirectory, SHARED_DIR);
+                    tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+                    sourceDirs = [];
+
+                    if (fs.existsSync(apiDir)) {
+                      sourceDirs.push(apiDir);
+                    }
+
+                    if (fs.existsSync(sharedDir)) {
+                      sourceDirs.push(sharedDir);
+                    }
+
+                    if (!(sourceDirs.length > 0)) {
+                      _context2.next = 13;
+                      break;
+                    }
+
+                    _context2.next = 13;
+                    return compile(appDirectory, modernConfig, {
+                      sourceDirs: sourceDirs,
+                      distDir: distDir,
+                      tsconfigPath: tsconfigPath
+                    });
+
+                  case 13:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }))();
+        }
+      };
+    }
+  };
+});

package/dist/js/treeshaking/constants.js

@@ -0,0 +1,2 @@
+export var API_APP_NAME = '_app';
+export var BUILD_FILES = ['**/*.[tj]sx?', '!**/*.test.jsx?', '!**/*.test.tsx?', '!**/*.spec.jsx?', '!**/*.spec.tsx?', '!__tests__/*.tsx?', '!__tests__/*.jsx?'];

package/dist/js/treeshaking/helper.js

@@ -0,0 +1,14 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import * as path from 'path';
+import { registerPaths } from '@modern-js/bff-core';
+var serverRuntimeAlias = '@modern-js/runtime/server';
+var serverRuntimePath = '.runtime-exports/server';
+
+var registerModernRuntimePath = function registerModernRuntimePath(internalDirectory) {
+  var paths = _defineProperty({}, serverRuntimeAlias, path.join(internalDirectory, serverRuntimePath));
+
+  var unRegister = registerPaths(paths);
+  return unRegister;
+};
+
+export { registerModernRuntimePath };

package/dist/js/treeshaking/index.js

@@ -0,0 +1 @@
+export * from "./constants";

package/dist/js/treeshaking/loader.js

@@ -0,0 +1,63 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { generateClient } from '@modern-js/bff-core';
+
+function loader(_x) {
+  return _loader.apply(this, arguments);
+}
+
+function _loader() {
+  _loader = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(source) {
+    var callback, draftOptions, options, result;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            // eslint-disable-next-line @babel/no-invalid-this
+            this.cacheable(); // eslint-disable-next-line @babel/no-invalid-this
+
+            callback = this.async(); // eslint-disable-next-line @babel/no-invalid-this
+
+            draftOptions = this.getOptions();
+            options = {
+              prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
+              apiDir: draftOptions.apiDir,
+              target: draftOptions.target,
+              port: Number(draftOptions.port),
+              source: source,
+              // eslint-disable-next-line @babel/no-invalid-this
+              resourcePath: this.resourcePath
+            };
+
+            if (draftOptions.fetcher) {
+              options.fetcher = draftOptions.fetcher;
+            }
+
+            if (draftOptions.requestCreator) {
+              options.requestCreator = draftOptions.requestCreator;
+            }
+
+            options.requireResolve = require.resolve;
+            _context.next = 9;
+            return generateClient(options);
+
+          case 9:
+            result = _context.sent;
+
+            if (result.isOk) {
+              callback(undefined, result.value);
+            } else {
+              callback(undefined, "throw new Error('".concat(result.value, "')"));
+            }
+
+          case 11:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, this);
+  }));
+  return _loader.apply(this, arguments);
+}
+
+export default loader;

package/dist/js/treeshaking/server.js

@@ -0,0 +1,90 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import path from 'path';
+import { ApiRouter } from '@modern-js/bff-core';
+import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
+import { API_APP_NAME } from "./constants";
+
+var Storage = /*#__PURE__*/function () {
+  function Storage() {
+    _classCallCheck(this, Storage);
+
+    _defineProperty(this, "middlewares", []);
+  }
+
+  _createClass(Storage, [{
+    key: "reset",
+    value: function reset() {
+      this.middlewares = [];
+    }
+  }]);
+
+  return Storage;
+}();
+
+var createTransformAPI = function createTransformAPI(storage) {
+  return {
+    addMiddleware: function addMiddleware(fn) {
+      storage.middlewares.push(fn);
+    }
+  };
+};
+
+export default (function () {
+  return {
+    name: '@modern-js/plugin-bff',
+    setup: function setup(api) {
+      var storage = new Storage();
+      var transformAPI = createTransformAPI(storage);
+      var apiAppPath = '';
+      return {
+        prepare: function prepare() {
+          var _api$useAppContext = api.useAppContext(),
+              appDirectory = _api$useAppContext.appDirectory,
+              distDirectory = _api$useAppContext.distDirectory;
+
+          var root = isProd() ? distDirectory : appDirectory;
+          var apiPath = path.resolve(root || process.cwd(), API_DIR);
+          apiAppPath = path.resolve(apiPath, API_APP_NAME);
+          var apiMod = requireExistModule(apiAppPath);
+
+          if (apiMod && typeof apiMod === 'function') {
+            apiMod(transformAPI);
+          }
+        },
+        reset: function reset() {
+          storage.reset();
+          var newApiModule = requireExistModule(apiAppPath);
+
+          if (newApiModule && typeof newApiModule === 'function') {
+            newApiModule(transformAPI);
+          }
+        },
+        gather: function gather(_ref) {
+          var addAPIMiddleware = _ref.addAPIMiddleware;
+          storage.middlewares.forEach(function (mid) {
+            addAPIMiddleware(mid);
+          });
+        },
+        prepareApiServer: function prepareApiServer(props, next) {
+          var pwd = props.pwd,
+              prefix = props.prefix;
+          var apiDir = path.resolve(pwd, API_DIR);
+          var appContext = api.useAppContext();
+          var apiRouter = new ApiRouter({
+            apiDir: apiDir,
+            prefix: prefix
+          });
+          var apiHandlerInfos = apiRouter.getApiHandlers();
+          api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+            apiRouter: apiRouter,
+            apiHandlerInfos: apiHandlerInfos
+          }));
+          return next(props);
+        }
+      };
+    }
+  };
+});

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.2",
+  "version": "1.15.1-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,20 +55,20 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "^1.2.6",
-    "@modern-js/bff-core": "^1.1.2",
-    "@modern-js/create-request": "^1.3.0",
-    "@modern-js/server-utils": "^1.2.11",
-    "@modern-js/utils": "^1.7.12"
+    "@modern-js/babel-compiler": "1.15.0",
+    "@modern-js/bff-core": "1.15.0",
+    "@modern-js/create-request": "1.15.0",
+    "@modern-js/server-utils": "1.15.1-beta.1",
+    "@modern-js/utils": "1.15.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.13.0",
-    "@modern-js/plugin-analyze": "1.5.0",
-    "@modern-js/runtime": "1.3.5",
-    "@modern-js/server-core": "1.4.1",
-    "@modern-js/types": "1.6.0",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "@modern-js/core": "1.15.0",
+    "@modern-js/bff-runtime": "1.15.0",
+    "@modern-js/runtime": "1.15.0",
+    "@modern-js/server-core": "1.15.0",
+    "@modern-js/types": "1.15.0",
+    "@scripts/build": "1.15.0",
+    "@scripts/jest-config": "1.15.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
@@ -82,7 +82,8 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "wireit": {
     "build": {