@modern-js/plugin-bff 0.0.0-canary-202111382413 → 0.0.0-runtime-2021112193858

package/.runtime-exports/index.js

@@ -1 +1 @@
-export * from '/github/workspace/packages/cli/plugin-runtime'
+export * from '/Users/admin/github/modern.js/packages/cli/plugin-runtime'

package/CHANGELOG.md

@@ -1,15 +1,46 @@
 # @modern-js/plugin-bff
 
-## 0.0.0-canary-202111382413
+## 0.0.0-runtime-2021112193858
 
 ### Patch Changes
 
-- fda2d7f0: support server runtime
-- Updated dependencies [fda2d7f0]
-  - @modern-js/core@0.0.0-canary-202111382413
-  - @modern-js/server-plugin@0.0.0-canary-202111382413
-  - @modern-js/server-utils@0.0.0-canary-202111382413
-  - @modern-js/utils@0.0.0-canary-202111382413
+- 8698465e: fix: dependence version
+- Updated dependencies [8698465e]
+- Updated dependencies [e04914ce]
+- Updated dependencies [e04914ce]
+  - @modern-js/babel-preset-lib@0.0.0-runtime-2021112193858
+  - @modern-js/core@0.0.0-runtime-2021112193858
+  - @modern-js/bff-utils@0.0.0-runtime-2021112193858
+  - @modern-js/create-request@0.0.0-runtime-2021112193858
+  - @modern-js/server-plugin@0.0.0-runtime-2021112193858
+  - @modern-js/server-utils@0.0.0-runtime-2021112193858
+  - @modern-js/babel-chain@0.0.0-runtime-2021112193858
+  - @modern-js/babel-compiler@0.0.0-runtime-2021112193858
+  - @modern-js/utils@0.0.0-runtime-2021112193858
+
+## 1.1.2
+
+### Patch Changes
+
+- 085a6a58: refactor server plugin
+- 39e8137d: fix: support prefix array & webpack loader should read requestCreator & adjust runtime path to relative
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server conifg
+- 085a6a58: support server runtime
+- 085a6a58: feat: refactor server plugin
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [d280ea33]
+- Updated dependencies [d4fcc73a]
+- Updated dependencies [085a6a58]
+- Updated dependencies [ed1f6b12]
+- Updated dependencies [a5ebbb00]
+- Updated dependencies [085a6a58]
+  - @modern-js/core@1.1.3
+  - @modern-js/server-plugin@1.1.2
+  - @modern-js/server-utils@1.1.2
+  - @modern-js/utils@1.1.3
 
 ## 1.1.1
 

package/dist/js/modern/cli.js

@@ -2,9 +2,8 @@ import path from 'path';
 import fs from 'fs-extra';
 import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import { compiler } from '@modern-js/babel-compiler';
-import { PLUGIN_SCHEMAS, normalizeOutputPath } from '@modern-js/utils';
+import { PLUGIN_SCHEMAS, normalizeOutputPath, API_DIR } from '@modern-js/utils';
 import { resolveBabelConfig } from '@modern-js/server-utils';
-import { API_DIR } from "./constants";
 const DEFAULT_API_PREFIX = '/api';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
 const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
@@ -41,7 +40,8 @@ export default createPlugin(() => ({
             apiDir: rootDir,
             port,
             fetcher,
-            target: _config.name
+            target: _config.name,
+            requestCreator: bff === null || bff === void 0 ? void 0 : bff.requestCreator
           });
         }
       },

package/dist/js/modern/constants.js

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

package/dist/js/modern/loader.js

@@ -9,7 +9,7 @@ async function loader(source) {
 
   const draftOptions = getOptions(this);
   const options = {
-    prefix: draftOptions.prefix,
+    prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
     apiDir: draftOptions.apiDir,
     target: draftOptions.target,
     port: Number(draftOptions.port),

package/dist/js/modern/server.js

@@ -2,8 +2,8 @@ import path from 'path';
 import { createPlugin } from '@modern-js/server-plugin';
 import { injectAPIHandlerInfos } from '@modern-js/bff-utils';
 import { useAppContext } from '@modern-js/core';
-import { API_DIR, API_APP_NAME } from "./constants";
-import { requireModule } from "./requireModule";
+import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
+import { API_APP_NAME } from "./constants";
 
 class Storage {
   constructor() {
@@ -25,13 +25,15 @@ const createTransformAPI = storage => ({
 
 export default createPlugin(() => {
   const {
-    appDirectory
+    appDirectory,
+    distDirectory
   } = useAppContext();
-  const apiPath = path.resolve(appDirectory, API_DIR);
+  const root = isProd() ? distDirectory : appDirectory;
+  const apiPath = path.resolve(root || process.cwd(), API_DIR);
   const apiAppPath = path.resolve(apiPath, API_APP_NAME);
   const storage = new Storage();
   const transformAPI = createTransformAPI(storage);
-  const apiMod = requireModule(apiAppPath);
+  const apiMod = requireExistModule(apiAppPath);
 
   if (apiMod) {
     apiMod(transformAPI);
@@ -40,7 +42,7 @@ export default createPlugin(() => {
   return {
     reset() {
       storage.reset();
-      const newApiModule = requireModule(apiAppPath);
+      const newApiModule = requireExistModule(apiAppPath);
 
       if (newApiModule) {
         newApiModule(transformAPI);

package/dist/js/node/cli.js

@@ -17,8 +17,6 @@ var _utils = require("@modern-js/utils");
 
 var _serverUtils = require("@modern-js/server-utils");
 
-var _constants = require("./constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const DEFAULT_API_PREFIX = '/api';
@@ -51,7 +49,7 @@ var _default = (0, _core.createPlugin)(() => ({
           } = bff || {};
           const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || DEFAULT_API_PREFIX;
 
-          const rootDir = _path.default.resolve(appDirectory, _constants.API_DIR);
+          const rootDir = _path.default.resolve(appDirectory, _utils.API_DIR);
 
           chain.resolve.alias.set('@api', rootDir);
           const apiRegexp = new RegExp((0, _utils.normalizeOutputPath)(`${appDirectory}${_path.default.sep}api${_path.default.sep}.*(.[tj]s)$`));
@@ -60,12 +58,13 @@ var _default = (0, _core.createPlugin)(() => ({
             apiDir: rootDir,
             port,
             fetcher,
-            target: _config.name
+            target: _config.name,
+            requestCreator: bff === null || bff === void 0 ? void 0 : bff.requestCreator
           });
         }
       },
       source: {
-        moduleScopes: [`./${_constants.API_DIR}`]
+        moduleScopes: [`./${_utils.API_DIR}`]
       }
     };
   },
@@ -109,11 +108,11 @@ var _default = (0, _core.createPlugin)(() => ({
 
     const modernConfig = (0, _core.useResolvedConfigContext)();
 
-    const rootDir = _path.default.resolve(appDirectory, _constants.API_DIR);
+    const rootDir = _path.default.resolve(appDirectory, _utils.API_DIR);
 
-    const distDir = _path.default.resolve(distDirectory, _constants.API_DIR);
+    const distDir = _path.default.resolve(distDirectory, _utils.API_DIR);
 
-    const sourceAbsDir = _path.default.resolve(appDirectory, _constants.API_DIR);
+    const sourceAbsDir = _path.default.resolve(appDirectory, _utils.API_DIR);
 
     const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
 

package/dist/js/node/constants.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BUILD_FILES = exports.API_DIR = exports.API_APP_NAME = void 0;
-const API_DIR = 'api';
-exports.API_DIR = API_DIR;
+exports.BUILD_FILES = exports.API_APP_NAME = void 0;
 const API_APP_NAME = '_app';
 exports.API_APP_NAME = API_APP_NAME;
 const BUILD_FILES = ['**/*.[tj]sx?', '!**/*.test.jsx?', '!**/*.test.tsx?', '!**/*.spec.jsx?', '!**/*.spec.tsx?', '!__tests__/*.tsx?', '!__tests__/*.jsx?'];

package/dist/js/node/loader.js

@@ -17,7 +17,7 @@ async function loader(source) {
 
   const draftOptions = (0, _loaderUtils.getOptions)(this);
   const options = {
-    prefix: draftOptions.prefix,
+    prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
     apiDir: draftOptions.apiDir,
     target: draftOptions.target,
     port: Number(draftOptions.port),

package/dist/js/node/server.js

@@ -13,9 +13,9 @@ var _bffUtils = require("@modern-js/bff-utils");
 
 var _core = require("@modern-js/core");
 
-var _constants = require("./constants");
+var _utils = require("@modern-js/utils");
 
-var _requireModule = require("./requireModule");
+var _constants = require("./constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -39,16 +39,18 @@ const createTransformAPI = storage => ({
 
 var _default = (0, _serverPlugin.createPlugin)(() => {
   const {
-    appDirectory
+    appDirectory,
+    distDirectory
   } = (0, _core.useAppContext)();
+  const root = (0, _utils.isProd)() ? distDirectory : appDirectory;
 
-  const apiPath = _path.default.resolve(appDirectory, _constants.API_DIR);
+  const apiPath = _path.default.resolve(root || process.cwd(), _utils.API_DIR);
 
   const apiAppPath = _path.default.resolve(apiPath, _constants.API_APP_NAME);
 
   const storage = new Storage();
   const transformAPI = createTransformAPI(storage);
-  const apiMod = (0, _requireModule.requireModule)(apiAppPath);
+  const apiMod = (0, _utils.requireExistModule)(apiAppPath);
 
   if (apiMod) {
     apiMod(transformAPI);
@@ -57,7 +59,7 @@ var _default = (0, _serverPlugin.createPlugin)(() => {
   return {
     reset() {
       storage.reset();
-      const newApiModule = (0, _requireModule.requireModule)(apiAppPath);
+      const newApiModule = (0, _utils.requireExistModule)(apiAppPath);
 
       if (newApiModule) {
         newApiModule(transformAPI);
@@ -78,7 +80,7 @@ var _default = (0, _serverPlugin.createPlugin)(() => {
         prefix
       } = props;
 
-      const apiDir = _path.default.resolve(pwd, _constants.API_DIR);
+      const apiDir = _path.default.resolve(pwd, _utils.API_DIR);
 
       (0, _bffUtils.injectAPIHandlerInfos)(apiDir, prefix);
       return next(props);

package/dist/types/cli.d.ts

@@ -2,7 +2,7 @@ declare module '@modern-js/core' {
   interface UserConfig {
     bff: {
       prefix?: string;
-      requestCreater?: string;
+      requestCreator?: string;
       fetcher?: string;
       proxy: Record<string, any>;
     };

package/dist/types/constants.d.ts

@@ -1,3 +1,2 @@
-export declare const API_DIR = "api";
 export declare const API_APP_NAME = "_app";
 export declare const BUILD_FILES: string[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-canary-202111382413",
+  "version": "0.0.0-runtime-2021112193858",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -44,24 +44,24 @@
   "dependencies": {
     "@babel/core": "^7.15.5",
     "@babel/runtime": "^7",
-    "@modern-js/babel-chain": "^1.1.1",
-    "@modern-js/babel-compiler": "^1.1.2",
-    "@modern-js/babel-preset-lib": "^1.1.1",
-    "@modern-js/create-request": "^1.1.1",
-    "@modern-js/server-utils": "^0.0.0-canary-202111382413",
-    "@modern-js/utils": "^0.0.0-canary-202111382413",
+    "@modern-js/babel-chain": "^0.0.0-runtime-2021112193858",
+    "@modern-js/babel-compiler": "^0.0.0-runtime-2021112193858",
+    "@modern-js/babel-preset-lib": "^0.0.0-runtime-2021112193858",
+    "@modern-js/create-request": "^0.0.0-runtime-2021112193858",
+    "@modern-js/server-utils": "^0.0.0-runtime-2021112193858",
+    "@modern-js/utils": "^0.0.0-runtime-2021112193858",
     "fs-extra": "^10.0.0",
     "loader-utils": "^2.0.0"
   },
   "devDependencies": {
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/core": "^0.0.0-canary-202111382413",
-    "@modern-js/module-tools": "^1.1.1",
-    "@modern-js/plugin-analyze": "^1.1.1",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/runtime": "^1.1.1",
-    "@modern-js/server-plugin": "^0.0.0-canary-202111382413",
-    "@modern-js/types": "^1.1.2",
+    "@modern-js/bff-utils": "^0.0.0-runtime-2021112193858",
+    "@modern-js/core": "^0.0.0-runtime-2021112193858",
+    "@modern-js/module-tools": "^0.0.0-runtime-2021112193858",
+    "@modern-js/plugin-analyze": "^0.0.0-runtime-2021112193858",
+    "@modern-js/plugin-testing": "^0.0.0-runtime-2021112193858",
+    "@modern-js/runtime": "^0.0.0-runtime-2021112193858",
+    "@modern-js/server-plugin": "^0.0.0-runtime-2021112193858",
+    "@modern-js/types": "^0.0.0-runtime-2021112193858",
     "@types/babel__core": "^7.1.15",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^26",
@@ -69,14 +69,14 @@
     "@types/node": "^14",
     "memfs": "^3.3.0",
     "ts-jest": "^27.0.5",
-    "typescript": "^4",
+    "typescript": "^4.4.4",
     "webpack": "^5.54.0",
     "webpack-chain": "^6.5.1"
   },
   "peerDependencies": {
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/core": "^0.0.0-canary-202111382413",
-    "@modern-js/server-plugin": "^0.0.0-canary-202111382413"
+    "@modern-js/bff-utils": "^0.0.0-runtime-2021112193858",
+    "@modern-js/core": "^0.0.0-runtime-2021112193858",
+    "@modern-js/server-plugin": "^0.0.0-runtime-2021112193858"
   },
   "modernConfig": {
     "output": {

package/src/cli.ts

@@ -6,19 +6,18 @@ import {
   useResolvedConfigContext,
 } from '@modern-js/core';
 import { compiler } from '@modern-js/babel-compiler';
-import { PLUGIN_SCHEMAS, normalizeOutputPath } from '@modern-js/utils';
+import { PLUGIN_SCHEMAS, normalizeOutputPath, API_DIR } from '@modern-js/utils';
 import { resolveBabelConfig } from '@modern-js/server-utils';
 
 import type { Configuration } from 'webpack';
 import type Chain from 'webpack-chain';
 import type { ServerRoute } from '@modern-js/types';
-import { API_DIR } from './constants';
 
 declare module '@modern-js/core' {
   interface UserConfig {
     bff: {
       prefix?: string;
-      requestCreater?: string;
+      requestCreator?: string;
       fetcher?: string;
       proxy: Record<string, any>;
     };
@@ -69,6 +68,7 @@ export default createPlugin(
                 port,
                 fetcher,
                 target: _config.name,
+                requestCreator: bff?.requestCreator,
               });
           },
         },

package/src/constants.ts

@@ -1,5 +1,3 @@
-export const API_DIR = 'api';
-
 export const API_APP_NAME = '_app';
 
 export const BUILD_FILES = [

package/src/loader.ts

@@ -20,7 +20,9 @@ async function loader(this: LoaderContext<APILoaderOptions>, source: string) {
   const draftOptions = getOptions(this as any);
 
   const options: GenClientOptions = {
-    prefix: draftOptions.prefix as string,
+    prefix: (Array.isArray(draftOptions.prefix)
+      ? draftOptions.prefix[0]
+      : draftOptions.prefix) as string,
     apiDir: draftOptions.apiDir as string,
     target: draftOptions.target as string,
     port: Number(draftOptions.port),

package/src/server.ts

@@ -2,8 +2,8 @@ import path from 'path';
 import { createPlugin } from '@modern-js/server-plugin';
 import { injectAPIHandlerInfos } from '@modern-js/bff-utils';
 import { useAppContext } from '@modern-js/core';
-import { API_DIR, API_APP_NAME } from './constants';
-import { requireModule } from './requireModule';
+import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
+import { API_APP_NAME } from './constants';
 
 type SF = (args: any) => void;
 class Storage {
@@ -22,15 +22,17 @@ const createTransformAPI = (storage: Storage) => ({
 
 export default createPlugin(
   () => {
-    const { appDirectory } = useAppContext();
+    const { appDirectory, distDirectory } = useAppContext();
 
-    const apiPath = path.resolve(appDirectory, API_DIR);
+    const root = isProd() ? distDirectory : appDirectory;
+
+    const apiPath = path.resolve(root || process.cwd(), API_DIR);
     const apiAppPath = path.resolve(apiPath, API_APP_NAME);
 
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
 
-    const apiMod = requireModule(apiAppPath);
+    const apiMod = requireExistModule(apiAppPath);
     if (apiMod) {
       apiMod(transformAPI);
     }
@@ -38,7 +40,7 @@ export default createPlugin(
     return {
       reset() {
         storage.reset();
-        const newApiModule = requireModule(apiAppPath);
+        const newApiModule = requireExistModule(apiAppPath);
         if (newApiModule) {
           newApiModule(transformAPI);
         }

package/tests/__snapshots__/cli.test.ts.snap

@@ -25,12 +25,18 @@ Array [
             "type": "string",
           },
           "prefix": Object {
-            "type": "string",
+            "items": Object {
+              "type": "string",
+            },
+            "type": Array [
+              "string",
+              "array",
+            ],
           },
           "proxy": Object {
             "type": "object",
           },
-          "requestCreater": Object {
+          "requestCreator": Object {
             "type": "string",
           },
         },

package/dist/js/modern/requireModule.js

@@ -1,14 +0,0 @@
-import { findExists, compatRequire } from '@modern-js/utils';
-const FILE_EXTENSIONS = ['.ts', '.js'];
-export const requireModule = filename => {
-  const exist = findExists(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  } // throw errors directly if require fail
-
-
-  const mod = require(exist);
-
-  return compatRequire(mod);
-};

package/dist/js/node/requireModule.js

@@ -1,25 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.requireModule = void 0;
-
-var _utils = require("@modern-js/utils");
-
-const FILE_EXTENSIONS = ['.ts', '.js'];
-
-const requireModule = filename => {
-  const exist = (0, _utils.findExists)(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  } // throw errors directly if require fail
-
-
-  const mod = require(exist);
-
-  return (0, _utils.compatRequire)(mod);
-};
-
-exports.requireModule = requireModule;

package/dist/types/requireModule.d.ts

@@ -1 +0,0 @@
-export declare const requireModule: (filename: string) => any;

package/src/requireModule.ts

@@ -1,15 +0,0 @@
-import { findExists, compatRequire } from '@modern-js/utils';
-
-const FILE_EXTENSIONS = ['.ts', '.js'];
-
-export const requireModule = (filename: string) => {
-  const exist = findExists(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  }
-
-  // throw errors directly if require fail
-  const mod = require(exist);
-  return compatRequire(mod);
-};