@modern-js/plugin-bff 1.17.1-beta.0 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @modern-js/plugin-bff
 
+## 1.18.0
+
+### Patch Changes
+
+- 3d5e3a5: chore: get api mode from bff core
+  chore: 从 bff core 中获取 api mode
+- 2b7406d: feat: use typescript instead of babel as typescript compiler in server
+  feat: 服务端，增加 typescript 作为 typescipt 编译器
+- Updated dependencies [8280920]
+- Updated dependencies [3d5e3a5]
+- Updated dependencies [2b7406d]
+- Updated dependencies [0a4d622]
+- Updated dependencies [60a2e3a]
+- Updated dependencies [5227370]
+- Updated dependencies [7928bae]
+  - @modern-js/utils@1.18.0
+  - @modern-js/bff-core@1.18.0
+  - @modern-js/server-utils@1.18.0
+  - @modern-js/create-request@1.18.0
+  - @modern-js/babel-compiler@1.18.0
+
 ## 1.17.0
 
 ### Patch Changes

package/dist/js/modern/cli.js

@@ -1,51 +1,10 @@
 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 { ApiRouter } from '@modern-js/bff-core';
 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 => {
@@ -154,27 +113,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");
@@ -21,47 +19,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',
@@ -178,27 +135,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

@@ -1,98 +1,13 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 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 { 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 { ApiRouter } from '@modern-js/bff-core';
 import { registerModernRuntimePath } from "./helper";
 var DEFAULT_API_PREFIX = '/api';
 var TS_CONFIG_FILENAME = 'tsconfig.json';
-var FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs']; // TODO: 封装服务端编译函数
-
-var compile = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, modernConfig, compileOptions) {
-    var patterns, results;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            patterns = compileOptions.patterns;
-            _context2.next = 3;
-            return Promise.all(patterns.map( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(pattern) {
-                var from, to, tsconfigPath, babelConfig, basename, targetDir;
-                return _regeneratorRuntime().wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        from = pattern.from, to = pattern.to, tsconfigPath = pattern.tsconfigPath;
-                        babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-                          tsconfigPath: tsconfigPath ? tsconfigPath : '',
-                          syntax: 'es6+',
-                          type: 'commonjs'
-                        });
-                        _context.next = 4;
-                        return fs.pathExists(from);
-
-                      case 4:
-                        if (!_context.sent) {
-                          _context.next = 9;
-                          break;
-                        }
-
-                        basename = path.basename(from);
-                        targetDir = path.join(to, basename);
-                        _context.next = 9;
-                        return fs.copy(from, targetDir, {
-                          filter: function filter(src) {
-                            return !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath;
-                          }
-                        });
-
-                      case 9:
-                        return _context.abrupt("return", compiler({
-                          rootDir: appDirectory,
-                          distDir: to,
-                          sourceDir: from,
-                          extensions: FILE_EXTENSIONS
-                        }, babelConfig));
-
-                      case 10:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }
-                }, _callee);
-              }));
-
-              return function (_x4) {
-                return _ref2.apply(this, arguments);
-              };
-            }()));
-
-          case 3:
-            results = _context2.sent;
-            results.forEach(function (result) {
-              if (result.code === 1) {
-                throw new Error(result.message);
-              }
-            });
-
-          case 5:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-
-  return function compile(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 export default (function () {
   return {
     name: '@modern-js/plugin-bff',
@@ -105,9 +20,9 @@ export default (function () {
         config: function config() {
           return {
             tools: {
-              webpackChain: function webpackChain(chain, _ref3) {
-                var name = _ref3.name,
-                    CHAIN_ID = _ref3.CHAIN_ID;
+              webpackChain: function webpackChain(chain, _ref) {
+                var name = _ref.name,
+                    CHAIN_ID = _ref.CHAIN_ID;
 
                 var _api$useAppContext = api.useAppContext(),
                     appDirectory = _api$useAppContext.appDirectory,
@@ -115,11 +30,11 @@ export default (function () {
 
                 var modernConfig = api.useResolvedConfigContext();
 
-                var _ref4 = modernConfig || {},
-                    bff = _ref4.bff;
+                var _ref2 = modernConfig || {},
+                    bff = _ref2.bff;
 
-                var _ref5 = bff || {},
-                    fetcher = _ref5.fetcher;
+                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);
@@ -148,12 +63,12 @@ export default (function () {
             }
           };
         },
-        modifyServerRoutes: function modifyServerRoutes(_ref6) {
-          var routes = _ref6.routes;
+        modifyServerRoutes: function modifyServerRoutes(_ref4) {
+          var routes = _ref4.routes;
           var modernConfig = api.useResolvedConfigContext();
 
-          var _ref7 = modernConfig || {},
-              bff = _ref7.bff;
+          var _ref5 = modernConfig || {},
+              bff = _ref5.bff;
 
           var prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
           var prefixList = [];
@@ -179,12 +94,12 @@ export default (function () {
           };
         },
         beforeBuild: function beforeBuild() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
             var _api$useAppContext2, internalDirectory;
 
-            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context.prev = _context.next) {
                   case 0:
                     // help esbuild-register resolve @modern-js/server/runtime
                     if (isProd()) {
@@ -194,19 +109,19 @@ export default (function () {
 
                   case 1:
                   case "end":
-                    return _context3.stop();
+                    return _context.stop();
                 }
               }
-            }, _callee3);
+            }, _callee);
           }))();
         },
         afterBuild: function afterBuild() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-            var _api$useAppContext3, appDirectory, distDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, patterns;
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+            var _api$useAppContext3, appDirectory, distDirectory, modernConfig, distDir, apiDir, sharedDir, tsconfigPath, sourceDirs;
 
-            return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context4.prev = _context4.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
                     if (unRegisterResolveRuntimePath) {
                       unRegisterResolveRuntimePath();
@@ -218,40 +133,34 @@ export default (function () {
                     apiDir = path.resolve(appDirectory, API_DIR);
                     sharedDir = path.resolve(appDirectory, SHARED_DIR);
                     tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-                    patterns = [];
+                    sourceDirs = [];
 
                     if (fs.existsSync(apiDir)) {
-                      patterns.push({
-                        from: apiDir,
-                        to: distDir,
-                        tsconfigPath: tsconfigPath
-                      });
+                      sourceDirs.push(apiDir);
                     }
 
                     if (fs.existsSync(sharedDir)) {
-                      patterns.push({
-                        from: sharedDir,
-                        to: distDir,
-                        tsconfigPath: tsconfigPath
-                      });
+                      sourceDirs.push(sharedDir);
                     }
 
-                    if (!(patterns.length > 0)) {
-                      _context4.next = 13;
+                    if (!(sourceDirs.length > 0)) {
+                      _context2.next = 13;
                       break;
                     }
 
-                    _context4.next = 13;
+                    _context2.next = 13;
                     return compile(appDirectory, modernConfig, {
-                      patterns: patterns
+                      sourceDirs: sourceDirs,
+                      distDir: distDir,
+                      tsconfigPath: tsconfigPath
                     });
 
                   case 13:
                   case "end":
-                    return _context4.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee4);
+            }, _callee2);
           }))();
         }
       };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.17.1-beta.0",
+  "version": "1.18.0",
   "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.17.0",
-    "@modern-js/bff-core": "1.17.1-beta.0",
-    "@modern-js/create-request": "1.17.0",
-    "@modern-js/server-utils": "1.17.0",
-    "@modern-js/utils": "1.17.0"
+    "@modern-js/babel-compiler": "1.18.0",
+    "@modern-js/bff-core": "1.18.0",
+    "@modern-js/create-request": "1.18.0",
+    "@modern-js/server-utils": "1.18.0",
+    "@modern-js/utils": "1.18.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.17.1",
-    "@modern-js/bff-runtime": "1.17.0",
-    "@modern-js/runtime": "1.17.0",
-    "@modern-js/server-core": "1.17.0",
-    "@modern-js/types": "1.17.0",
-    "@scripts/build": "1.17.0",
-    "@scripts/jest-config": "1.17.0",
+    "@modern-js/core": "1.18.0",
+    "@modern-js/bff-runtime": "1.18.0",
+    "@modern-js/runtime": "1.18.0",
+    "@modern-js/server-core": "1.18.0",
+    "@modern-js/types": "1.18.0",
+    "@scripts/build": "1.18.0",
+    "@scripts/jest-config": "1.18.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
@@ -82,8 +82,7 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "wireit": {
     "build": {