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

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @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

package/dist/js/modern/cli.js

@@ -71,7 +71,10 @@ var cli_default = () => ({
             }
           },
           source: {
-            moduleScopes: [`./${API_DIR}`, /create-request/]
+            moduleScopes: [`./${API_DIR}`, /create-request/],
+            define: {
+              "process.env.PORT": JSON.stringify(process.env.PORT)
+            }
           }
         };
       },
@@ -94,6 +97,12 @@ var cli_default = () => ({
         }));
         return { routes: routes.concat(apiServerRoutes) };
       },
+      collectServerPlugins({ plugins }) {
+        plugins.push({
+          "@modern-js/plugin-bff": "@modern-js/plugin-bff/server"
+        });
+        return { plugins };
+      },
       beforeBuild() {
         return __async(this, null, function* () {
           if (isProd()) {

package/dist/js/node/cli.js

@@ -21,16 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  default: () => cli_default
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_server_utils = require("@modern-js/server-utils");
-var import_bff_core = require("@modern-js/bff-core");
-var import_helper = require("./helper");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -51,6 +41,16 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var cli_exports = {};
+__export(cli_exports, {
+  default: () => cli_default
+});
+module.exports = __toCommonJS(cli_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_server_utils = require("@modern-js/server-utils");
+var import_bff_core = require("@modern-js/bff-core");
+var import_helper = require("./helper");
 const DEFAULT_API_PREFIX = "/api";
 const TS_CONFIG_FILENAME = "tsconfig.json";
 var cli_default = () => ({
@@ -92,7 +92,10 @@ var cli_default = () => ({
             }
           },
           source: {
-            moduleScopes: [`./${import_utils.API_DIR}`, /create-request/]
+            moduleScopes: [`./${import_utils.API_DIR}`, /create-request/],
+            define: {
+              "process.env.PORT": JSON.stringify(process.env.PORT)
+            }
           }
         };
       },
@@ -115,6 +118,12 @@ var cli_default = () => ({
         }));
         return { routes: routes.concat(apiServerRoutes) };
       },
+      collectServerPlugins({ plugins }) {
+        plugins.push({
+          "@modern-js/plugin-bff": "@modern-js/plugin-bff/server"
+        });
+        return { plugins };
+      },
       beforeBuild() {
         return __async(this, null, function* () {
           if ((0, import_utils.isProd)()) {
@@ -166,3 +175,5 @@ var cli_default = () => ({
     };
   }
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/constants.js

@@ -15,12 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var constants_exports = {};
+__export(constants_exports, {
   API_APP_NAME: () => API_APP_NAME,
   BUILD_FILES: () => BUILD_FILES
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(constants_exports);
 const API_APP_NAME = "_app";
 const BUILD_FILES = [
   "**/*.[tj]sx?",
@@ -31,3 +31,8 @@ const BUILD_FILES = [
   "!__tests__/*.tsx?",
   "!__tests__/*.jsx?"
 ];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  API_APP_NAME,
+  BUILD_FILES
+});

package/dist/js/node/helper.js

@@ -21,11 +21,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var helper_exports = {};
+__export(helper_exports, {
   registerModernRuntimePath: () => registerModernRuntimePath
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(helper_exports);
 var path = __toESM(require("path"));
 var import_bff_core = require("@modern-js/bff-core");
 const serverRuntimeAlias = "@modern-js/runtime/server";
@@ -37,3 +37,7 @@ const registerModernRuntimePath = (internalDirectory) => {
   const unRegister = (0, import_bff_core.registerPaths)(paths);
   return unRegister;
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  registerModernRuntimePath
+});

package/dist/js/node/index.js

@@ -12,6 +12,6 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-module.exports = __toCommonJS(stdin_exports);
-__reExport(stdin_exports, require("./constants"), module.exports);
+var src_exports = {};
+module.exports = __toCommonJS(src_exports);
+__reExport(src_exports, require("./constants"), module.exports);

package/dist/js/node/loader.js

@@ -15,13 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  default: () => loader_default
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_bff_core = require("@modern-js/bff-core");
-var import_utils = require("@modern-js/utils");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -42,6 +35,13 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var loader_exports = {};
+__export(loader_exports, {
+  default: () => loader_default
+});
+module.exports = __toCommonJS(loader_exports);
+var import_bff_core = require("@modern-js/bff-core");
+var import_utils = require("@modern-js/utils");
 function loader(source) {
   return __async(this, null, function* () {
     this.cacheable();
@@ -84,3 +84,5 @@ function loader(source) {
   });
 }
 var loader_default = loader;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/server.js

@@ -1,9 +1,26 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,34 +38,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var server_exports = {};
+__export(server_exports, {
   default: () => server_default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(server_exports);
 var import_path = __toESM(require("path"));
 var import_bff_core = require("@modern-js/bff-core");
 var import_utils = require("@modern-js/utils");
 var import_constants = require("./constants");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.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));
 class Storage {
   constructor() {
     this.middlewares = [];
@@ -111,3 +109,5 @@ var server_default = () => ({
     };
   }
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/treeshaking/cli.js

@@ -196,7 +196,10 @@ var cli_default = function() {
                             moduleScopes: [
                                 "./".concat(API_DIR),
                                 /create-request/
-                            ]
+                            ],
+                            define: {
+                                "process.env.PORT": JSON.stringify(process.env.PORT)
+                            }
                         }
                     };
                 },
@@ -225,6 +228,15 @@ var cli_default = function() {
                         routes: routes.concat(apiServerRoutes)
                     };
                 },
+                collectServerPlugins: function collectServerPlugins(param) {
+                    var plugins = param.plugins;
+                    plugins.push({
+                        "@modern-js/plugin-bff": "@modern-js/plugin-bff/server"
+                    });
+                    return {
+                        plugins: plugins
+                    };
+                },
                 beforeBuild: function beforeBuild() {
                     return _asyncToGenerator(function() {
                         var internalDirectory;

package/package.json

@@ -11,20 +11,16 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
-  "jsnext:source": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "version": "2.0.0-beta.6",
+  "jsnext:source": "./src/cli.ts",
+  "types": "./dist/types/cli.d.ts",
+  "main": "./dist/js/node/cli.js",
+  "module": "./dist/js/treeshaking/cli.js",
+  "jsnext:modern": "./dist/js/modern/cli.js",
   "exports": {
     ".": {
-      "node": {
-        "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
-      },
-      "default": "./dist/js/treeshaking/index.js"
+      "jsnext:source": "./src/cli.ts",
+      "default": "./dist/js/node/cli.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli.ts",
@@ -55,11 +51,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "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/server-utils": "2.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4"
+    "@modern-js/babel-compiler": "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/server-utils": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -71,14 +67,14 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "webpack-chain": "^6.5.1",
-    "@modern-js/runtime": "2.0.0-beta.4",
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/bff-runtime": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4",
-    "@modern-js/app-tools": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "@modern-js/runtime": "2.0.0-beta.6",
+    "@modern-js/core": "2.0.0-beta.6",
+    "@modern-js/bff-runtime": "2.0.0-beta.6",
+    "@modern-js/server-core": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@modern-js/app-tools": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "sideEffects": false,
   "publishConfig": {

package/types.d.ts

@@ -1,9 +0,0 @@
-declare module '@modern-js/core' {
-  interface UserConfig {
-    bff?: Partial<{
-      prefix: string;
-      requestCreator: string;
-      fetcher: string;
-    }>;
-  }
-}