@modern-js/plugin-bff 2.0.0-beta.3 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,103 @@
 # @modern-js/plugin-bff
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- df7ee2d: feat: runtime user config types extends
+  feat: runtime 用户配置类型扩展
+
+### Patch Changes
+
+- 8ff2cf4c71: fix: bff api loader should run before babel loader
+  fix: bff 一体化调用的 loader 应该在 babel loader 前执行
+- ea7cf06257: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [7879e8f711]
+- Updated dependencies [d4e8e6fb90]
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [2344eb26ed]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [c2bb0f1745]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.6
+  - @modern-js/utils@2.0.0-beta.6
+  - @modern-js/bff-core@2.0.0-beta.6
+  - @modern-js/create-request@2.0.0-beta.6
+  - @modern-js/babel-compiler@2.0.0-beta.6
+
+## 2.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 8ff2cf4c71: fix: bff api loader should run before babel loader
+  fix: bff 一体化调用的 loader 应该在 babel loader 前执行
+- ea7cf06: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [7879e8f]
+- Updated dependencies [d4e8e6fb90]
+- Updated dependencies [6aca875]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [2344eb26ed]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [7b7d12c]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [c2bb0f1745]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.4
+  - @modern-js/utils@2.0.0-beta.4
+  - @modern-js/bff-core@2.0.0-beta.4
+  - @modern-js/create-request@2.0.0-beta.4
+  - @modern-js/babel-compiler@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Major Changes

package/dist/js/modern/cli.js

@@ -1,45 +1,66 @@
-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 { ApiRouter } from '@modern-js/bff-core';
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+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 { ApiRouter } from "@modern-js/bff-core";
 import { registerModernRuntimePath } from "./helper";
-const DEFAULT_API_PREFIX = '/api';
-const TS_CONFIG_FILENAME = 'tsconfig.json';
-export default (() => ({
-  name: '@modern-js/plugin-bff',
-  setup: api => {
+const DEFAULT_API_PREFIX = "/api";
+const TS_CONFIG_FILENAME = "tsconfig.json";
+var cli_default = () => ({
+  name: "@modern-js/plugin-bff",
+  setup: (api) => {
     let unRegisterResolveRuntimePath = null;
     return {
       validateSchema() {
-        return PLUGIN_SCHEMAS['@modern-js/plugin-bff'];
+        return PLUGIN_SCHEMAS["@modern-js/plugin-bff"];
       },
       config() {
         return {
           tools: {
-            webpackChain: (chain, {
-              name,
-              CHAIN_ID
-            }) => {
-              const {
-                appDirectory,
-                port
-              } = api.useAppContext();
+            webpackChain: (chain, { name, CHAIN_ID }) => {
+              const { appDirectory, port } = api.useAppContext();
               const modernConfig = api.useResolvedConfigContext();
-              const {
-                bff
-              } = modernConfig || {};
-              const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
+              const { bff } = modernConfig || {};
+              const prefix = (bff == null ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
               const rootDir = path.resolve(appDirectory, API_DIR);
-              chain.resolve.alias.set('@api', rootDir);
+              chain.resolve.alias.set("@api", rootDir);
               const apiRouter = new ApiRouter({
                 apiDir: rootDir,
                 prefix
               });
               const lambdaDir = apiRouter.getLambdaDir();
               const existLambda = apiRouter.isExistLambda();
-              const apiRegexp = new RegExp(normalizeOutputPath(`${rootDir}${path.sep}.*(.[tj]s)$`));
+              const apiRegexp = new RegExp(
+                normalizeOutputPath(`${rootDir}${path.sep}.*(.[tj]s)$`)
+              );
               chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(apiRegexp);
-              chain.module.rule(CHAIN_ID.RULE.JS_BFF_API).test(apiRegexp).use('custom-loader').loader(require.resolve("./loader").replace(/\\/g, '/')).options({
+              chain.module.rule(CHAIN_ID.RULE.JS_BFF_API).test(apiRegexp).use("custom-loader").loader(require.resolve("./loader").replace(/\\/g, "/")).options({
                 prefix,
                 apiDir: rootDir,
                 lambdaDir,
@@ -50,91 +71,89 @@ export default (() => ({
             }
           },
           source: {
-            moduleScopes: [`./${API_DIR}`, /create-request/]
+            moduleScopes: [`./${API_DIR}`, /create-request/],
+            define: {
+              "process.env.PORT": JSON.stringify(process.env.PORT)
+            }
           }
         };
       },
-      modifyServerRoutes({
-        routes
-      }) {
+      modifyServerRoutes({ routes }) {
         const modernConfig = api.useResolvedConfigContext();
-        const {
-          bff
-        } = modernConfig || {};
-        const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
+        const { bff } = modernConfig || {};
+        const prefix = (bff == null ? void 0 : bff.prefix) || "/api";
         const prefixList = [];
         if (Array.isArray(prefix)) {
           prefixList.push(...prefix);
         } else {
           prefixList.push(prefix);
         }
-        const apiServerRoutes = prefixList.map(pre => ({
+        const apiServerRoutes = prefixList.map((pre) => ({
           urlPath: pre,
           isApi: true,
-          entryPath: '',
+          entryPath: "",
           isSPA: false,
           isSSR: false
-          // FIXME: })) as IAppContext[`serverRoutes`];
         }));
-
-        return {
-          routes: routes.concat(apiServerRoutes)
-        };
+        return { routes: routes.concat(apiServerRoutes) };
       },
-      async beforeBuild() {
-        // help esbuild-register resolve @modern-js/server/runtime
-        if (isProd()) {
-          const {
-            internalDirectory
-          } = api.useAppContext();
-          unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
-        }
+      collectServerPlugins({ plugins }) {
+        plugins.push({
+          "@modern-js/plugin-bff": "@modern-js/plugin-bff/server"
+        });
+        return { plugins };
       },
-      async afterBuild() {
-        if (unRegisterResolveRuntimePath) {
-          unRegisterResolveRuntimePath();
-        }
-        const {
-          appDirectory,
-          distDirectory
-        } = api.useAppContext();
-        const modernConfig = api.useResolvedConfigContext();
-        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 sourceDirs = [];
-        if (fs.existsSync(apiDir)) {
-          sourceDirs.push(apiDir);
-        }
-        if (fs.existsSync(sharedDir)) {
-          sourceDirs.push(sharedDir);
-        }
-        const {
-          server
-        } = modernConfig;
-        const {
-          alias,
-          define,
-          globalVars
-        } = modernConfig.source;
-        const {
-          babel
-        } = modernConfig.tools;
-        if (sourceDirs.length > 0) {
-          await compile(appDirectory, {
-            server,
-            alias,
-            define,
-            globalVars,
-            babelConfig: babel
-          }, {
-            sourceDirs,
-            distDir,
-            tsconfigPath
-          });
-        }
+      beforeBuild() {
+        return __async(this, null, function* () {
+          if (isProd()) {
+            const { internalDirectory } = api.useAppContext();
+            unRegisterResolveRuntimePath = registerModernRuntimePath(internalDirectory);
+          }
+        });
+      },
+      afterBuild() {
+        return __async(this, null, function* () {
+          if (unRegisterResolveRuntimePath) {
+            unRegisterResolveRuntimePath();
+          }
+          const { appDirectory, distDirectory } = api.useAppContext();
+          const modernConfig = api.useResolvedConfigContext();
+          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 sourceDirs = [];
+          if (fs.existsSync(apiDir)) {
+            sourceDirs.push(apiDir);
+          }
+          if (fs.existsSync(sharedDir)) {
+            sourceDirs.push(sharedDir);
+          }
+          const { server } = modernConfig;
+          const { alias, define, globalVars } = modernConfig.source;
+          const { babel } = modernConfig.tools;
+          if (sourceDirs.length > 0) {
+            yield compile(
+              appDirectory,
+              {
+                server,
+                alias,
+                define,
+                globalVars,
+                babelConfig: babel
+              },
+              {
+                sourceDirs,
+                distDir,
+                tsconfigPath
+              }
+            );
+          }
+        });
       }
     };
   }
-}));
+});
+export {
+  cli_default as default
+};

package/dist/js/modern/constants.js

@@ -1,2 +1,14 @@
-export const API_APP_NAME = '_app';
-export const BUILD_FILES = ['**/*.[tj]sx?', '!**/*.test.jsx?', '!**/*.test.tsx?', '!**/*.spec.jsx?', '!**/*.spec.tsx?', '!__tests__/*.tsx?', '!__tests__/*.jsx?'];
+const API_APP_NAME = "_app";
+const BUILD_FILES = [
+  "**/*.[tj]sx?",
+  "!**/*.test.jsx?",
+  "!**/*.test.tsx?",
+  "!**/*.spec.jsx?",
+  "!**/*.spec.tsx?",
+  "!__tests__/*.tsx?",
+  "!__tests__/*.jsx?"
+];
+export {
+  API_APP_NAME,
+  BUILD_FILES
+};

package/dist/js/modern/helper.js

@@ -1,12 +1,14 @@
-import * as path from 'path';
-import { registerPaths } from '@modern-js/bff-core';
-const serverRuntimeAlias = '@modern-js/runtime/server';
-const serverRuntimePath = '.runtime-exports/server';
-const registerModernRuntimePath = internalDirectory => {
+import * as path from "path";
+import { registerPaths } from "@modern-js/bff-core";
+const serverRuntimeAlias = "@modern-js/runtime/server";
+const serverRuntimePath = ".runtime-exports/server";
+const registerModernRuntimePath = (internalDirectory) => {
   const paths = {
     [serverRuntimeAlias]: path.join(internalDirectory, serverRuntimePath)
   };
   const unRegister = registerPaths(paths);
   return unRegister;
 };
-export { registerModernRuntimePath };
+export {
+  registerModernRuntimePath
+};

package/dist/js/modern/index.js

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

package/dist/js/modern/loader.js

@@ -1,51 +1,67 @@
-import { generateClient } from '@modern-js/bff-core';
-import { logger } from '@modern-js/utils';
-async function loader(source) {
-  // eslint-disable-next-line @babel/no-invalid-this
-  this.cacheable();
-  // eslint-disable-next-line @babel/no-invalid-this
-  const callback = this.async();
-  // eslint-disable-next-line @babel/no-invalid-this
-  const draftOptions = this.getOptions();
-
-  // eslint-disable-next-line @babel/no-invalid-this
-  const {
-    resourcePath
-  } = this;
-  const warning = `The file ${resourcePath} is not allowd to be imported in src directory, only API definition files are allowed.`;
-  if (!draftOptions.existLambda) {
-    logger.warn(warning);
-    callback(null, `throw new Error('${warning}')`);
-    return;
-  }
-  const options = {
-    prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
-    apiDir: draftOptions.apiDir,
-    target: draftOptions.target,
-    port: Number(draftOptions.port),
-    source,
-    resourcePath
-  };
-  const {
-    lambdaDir
-  } = draftOptions;
-  if (!resourcePath.startsWith(lambdaDir)) {
-    logger.warn(warning);
-    callback(null, `throw new Error('${warning}')`);
-    return;
-  }
-  if (draftOptions.fetcher) {
-    options.fetcher = draftOptions.fetcher;
-  }
-  if (draftOptions.requestCreator) {
-    options.requestCreator = draftOptions.requestCreator;
-  }
-  options.requireResolve = require.resolve;
-  const result = await generateClient(options);
-  if (result.isOk) {
-    callback(undefined, result.value);
-  } else {
-    callback(undefined, `throw new Error('${result.value}')`);
-  }
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { generateClient } from "@modern-js/bff-core";
+import { logger } from "@modern-js/utils";
+function loader(source) {
+  return __async(this, null, function* () {
+    this.cacheable();
+    const callback = this.async();
+    const draftOptions = this.getOptions();
+    const { resourcePath } = this;
+    const warning = `The file ${resourcePath} is not allowd to be imported in src directory, only API definition files are allowed.`;
+    if (!draftOptions.existLambda) {
+      logger.warn(warning);
+      callback(null, `throw new Error('${warning}')`);
+      return;
+    }
+    const options = {
+      prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
+      apiDir: draftOptions.apiDir,
+      target: draftOptions.target,
+      port: Number(draftOptions.port),
+      source,
+      resourcePath
+    };
+    const { lambdaDir } = draftOptions;
+    if (!resourcePath.startsWith(lambdaDir)) {
+      logger.warn(warning);
+      callback(null, `throw new Error('${warning}')`);
+      return;
+    }
+    if (draftOptions.fetcher) {
+      options.fetcher = draftOptions.fetcher;
+    }
+    if (draftOptions.requestCreator) {
+      options.requestCreator = draftOptions.requestCreator;
+    }
+    options.requireResolve = require.resolve;
+    const result = yield generateClient(options);
+    if (result.isOk) {
+      callback(void 0, result.value);
+    } else {
+      callback(void 0, `throw new Error('${result.value}')`);
+    }
+  });
 }
-export default loader;
+var loader_default = loader;
+export {
+  loader_default as default
+};

package/dist/js/modern/server.js

@@ -1,62 +1,70 @@
-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 { ApiRouter } from '@modern-js/bff-core';
-import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+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";
 class Storage {
   constructor() {
-    _defineProperty(this, "middlewares", []);
+    this.middlewares = [];
   }
   reset() {
     this.middlewares = [];
   }
 }
-const createTransformAPI = storage => ({
+const createTransformAPI = (storage) => ({
   addMiddleware(fn) {
     storage.middlewares.push(fn);
   }
 });
-export default (() => ({
-  name: '@modern-js/plugin-bff',
-  setup: api => {
+var server_default = () => ({
+  name: "@modern-js/plugin-bff",
+  setup: (api) => {
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
-    let apiAppPath = '';
+    let apiAppPath = "";
     return {
       prepare() {
-        const {
-          appDirectory,
-          distDirectory
-        } = api.useAppContext();
+        const { appDirectory, distDirectory } = api.useAppContext();
         const root = isProd() ? distDirectory : appDirectory;
         const apiPath = path.resolve(root || process.cwd(), API_DIR);
         apiAppPath = path.resolve(apiPath, API_APP_NAME);
         const apiMod = requireExistModule(apiAppPath);
-        if (apiMod && typeof apiMod === 'function') {
+        if (apiMod && typeof apiMod === "function") {
           apiMod(transformAPI);
         }
       },
       reset() {
         storage.reset();
         const newApiModule = requireExistModule(apiAppPath);
-        if (newApiModule && typeof newApiModule === 'function') {
+        if (newApiModule && typeof newApiModule === "function") {
           newApiModule(transformAPI);
         }
       },
-      gather({
-        addAPIMiddleware
-      }) {
-        storage.middlewares.forEach(mid => {
+      gather({ addAPIMiddleware }) {
+        storage.middlewares.forEach((mid) => {
           addAPIMiddleware(mid);
         });
       },
       prepareApiServer(props, next) {
-        const {
-          pwd,
-          prefix
-        } = props;
+        const { pwd, prefix } = props;
         const apiDir = path.resolve(pwd, API_DIR);
         const appContext = api.useAppContext();
         const apiRouter = new ApiRouter({
@@ -65,7 +73,7 @@ export default (() => ({
         });
         const apiMode = apiRouter.getApiMode();
         const apiHandlerInfos = apiRouter.getApiHandlers();
-        api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+        api.setAppContext(__spreadProps(__spreadValues({}, appContext), {
           apiRouter,
           apiHandlerInfos,
           apiMode
@@ -74,4 +82,7 @@ export default (() => ({
       }
     };
   }
-}));
+});
+export {
+  server_default as default
+};