@modern-js/plugin-bff 1.2.2-beta.1 → 1.3.3

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # @modern-js/plugin-bff
 
+## 1.3.3
+
+### Patch Changes
+
+- 272cab15: refactor server plugin manager
+- Updated dependencies [d9cc5ea9]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [ec4dbffb]
+- Updated dependencies [d099e5c5]
+- Updated dependencies [bada2879]
+- Updated dependencies [24f616ca]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [272cab15]
+  - @modern-js/core@1.4.0
+  - @modern-js/utils@1.3.0
+  - @modern-js/server-core@1.2.2
+
+## 1.3.2
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/babel-preset-lib@1.2.1
+  - @modern-js/core@1.3.2
+  - @modern-js/bff-utils@1.2.2
+  - @modern-js/create-request@1.2.1
+  - @modern-js/server-plugin@1.2.1
+  - @modern-js/server-utils@1.2.1
+  - @modern-js/babel-chain@1.2.1
+  - @modern-js/babel-compiler@1.2.1
+  - @modern-js/utils@1.2.2
+
+## 1.3.1
+
+### Patch Changes
+
+- e2d3a575: fix extending core config interface
+- Updated dependencies [823809c6]
+- Updated dependencies [4584cc04]
+- Updated dependencies [7c19fd94]
+  - @modern-js/bff-utils@1.2.1
+  - @modern-js/utils@1.2.1
+  - @modern-js/core@1.3.1
+
+## 1.3.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- 8e7603ee: fix custom requestCreator path
+- 1ebc7ee2: fix: @babel/core version
+- Updated dependencies [2da09c69]
+- Updated dependencies [5597289b]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [146dcd85]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+- Updated dependencies [146dcd85]
+- Updated dependencies [8e7603ee]
+- Updated dependencies [146dcd85]
+- Updated dependencies [1ebc7ee2]
+  - @modern-js/utils@1.2.0
+  - @modern-js/create-request@1.2.0
+  - @modern-js/core@1.3.0
+  - @modern-js/server-utils@1.2.0
+  - @modern-js/babel-preset-lib@1.2.0
+  - @modern-js/bff-utils@1.2.0
+  - @modern-js/server-plugin@1.2.0
+  - @modern-js/babel-chain@1.2.0
+  - @modern-js/babel-compiler@1.2.0
+
 ## 1.2.1
 
 ### Patch Changes

package/dist/js/modern/server.js

@@ -1,7 +1,6 @@
 import path from 'path';
-import { createPlugin } from '@modern-js/server-plugin';
+import { createPlugin, useAppContext } from '@modern-js/server-core';
 import { injectAPIHandlerInfos } from '@modern-js/bff-utils';
-import { useAppContext } from '@modern-js/core';
 import { API_DIR, isProd, requireExistModule } from '@modern-js/utils';
 import { API_APP_NAME } from "./constants";
 

package/dist/js/node/server.js

@@ -7,12 +7,10 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _serverPlugin = require("@modern-js/server-plugin");
+var _serverCore = require("@modern-js/server-core");
 
 var _bffUtils = require("@modern-js/bff-utils");
 
-var _core = require("@modern-js/core");
-
 var _utils = require("@modern-js/utils");
 
 var _constants = require("./constants");
@@ -37,11 +35,11 @@ const createTransformAPI = storage => ({
 
 });
 
-var _default = (0, _serverPlugin.createPlugin)(() => {
+var _default = (0, _serverCore.createPlugin)(() => {
   const {
     appDirectory,
     distDirectory
-  } = (0, _core.useAppContext)();
+  } = (0, _serverCore.useAppContext)();
   const root = (0, _utils.isProd)() ? distDirectory : appDirectory;
 
   const apiPath = _path.default.resolve(root || process.cwd(), _utils.API_DIR);

package/dist/types/cli.d.ts

@@ -1,6 +1,6 @@
 declare module '@modern-js/core' {
   interface UserConfig {
-    bff: {
+    bff?: {
       prefix?: string;
       requestCreator?: string;
       fetcher?: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.2-beta.1",
+  "version": "1.3.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -49,25 +49,25 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.15.5",
+    "@babel/core": "7.16.7",
     "@babel/runtime": "^7",
-    "@modern-js/babel-chain": "^1.1.2",
-    "@modern-js/babel-compiler": "^1.1.4",
-    "@modern-js/babel-preset-lib": "^1.1.6",
-    "@modern-js/create-request": "^1.1.2",
-    "@modern-js/server-utils": "^1.1.2",
-    "@modern-js/utils": "^1.1.6",
+    "@modern-js/babel-chain": "^1.2.1",
+    "@modern-js/babel-compiler": "^1.2.1",
+    "@modern-js/babel-preset-lib": "^1.2.1",
+    "@modern-js/create-request": "^1.2.1",
+    "@modern-js/server-utils": "^1.2.1",
+    "@modern-js/utils": "^1.3.0",
     "fs-extra": "^10.0.0",
     "loader-utils": "^2.0.0"
   },
   "devDependencies": {
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/core": "^1.2.0",
+    "@modern-js/bff-utils": "^1.2.2",
+    "@modern-js/core": "^1.4.0",
     "@scripts/build": "0.0.0",
-    "@modern-js/plugin-analyze": "^1.1.3",
-    "@modern-js/runtime": "^1.1.3",
-    "@modern-js/server-plugin": "^1.1.4",
-    "@modern-js/types": "^1.1.5",
+    "@modern-js/plugin-analyze": "^1.3.0",
+    "@modern-js/runtime": "^1.2.2",
+    "@modern-js/server-core": "^1.2.2",
+    "@modern-js/types": "^1.3.0",
     "@types/babel__core": "^7.1.15",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^26",
@@ -82,9 +82,9 @@
     "@scripts/jest-config": "0.0.0"
   },
   "peerDependencies": {
-    "@modern-js/bff-utils": "^1.1.1",
-    "@modern-js/core": "^1.2.0",
-    "@modern-js/server-plugin": "^1.1.4"
+    "@modern-js/bff-utils": "^1.2.2",
+    "@modern-js/core": "^1.4.0",
+    "@modern-js/server-core": "^1.2.2"
   },
   "modernConfig": {
     "output": {

package/tests/server.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { serverManager } from '@modern-js/server-plugin';
+import { serverManager } from '@modern-js/server-core';
 import { useAPIHandlerInfos } from '@modern-js/bff-utils';
 import plugin from '../src/server';
 

package/src/cli.ts

@@ -1,146 +0,0 @@
-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, 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';
-
-declare module '@modern-js/core' {
-  interface UserConfig {
-    bff: {
-      prefix?: string;
-      requestCreator?: string;
-      fetcher?: string;
-      proxy: Record<string, any>;
-    };
-  }
-}
-
-const DEFAULT_API_PREFIX = '/api';
-const TS_CONFIG_FILENAME = 'tsconfig.json';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
-
-export default createPlugin(
-  () => ({
-    validateSchema() {
-      return PLUGIN_SCHEMAS['@modern-js/plugin-bff'];
-    },
-    config() {
-      return {
-        tools: {
-          webpack: (_config: Configuration, { chain }: { chain: Chain }) => {
-            // eslint-disable-next-line react-hooks/rules-of-hooks
-            const { appDirectory, port } = useAppContext();
-            // eslint-disable-next-line react-hooks/rules-of-hooks
-            const modernConfig = useResolvedConfigContext();
-
-            const { bff } = modernConfig || {};
-            const { fetcher } = bff || {};
-            const prefix = bff?.prefix || DEFAULT_API_PREFIX;
-
-            const rootDir = path.resolve(appDirectory, API_DIR);
-
-            chain.resolve.alias.set('@api', rootDir);
-
-            const apiRegexp = new RegExp(
-              normalizeOutputPath(
-                `${appDirectory}${path.sep}api${path.sep}.*(.[tj]s)$`,
-              ),
-            );
-            chain.module
-              .rule('loaders')
-              .oneOf('bff-client')
-              .before('fallback')
-              .test(apiRegexp)
-              .use('custom-loader')
-              .loader(require.resolve('./loader').replace(/\\/g, '/'))
-              .options({
-                prefix,
-                apiDir: rootDir,
-                port,
-                fetcher,
-                target: _config.name,
-                requestCreator: bff?.requestCreator,
-              });
-          },
-        },
-        source: {
-          moduleScopes: [`./${API_DIR}`, /create-request/],
-        },
-      };
-    },
-    modifyServerRoutes({ routes }: any) {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const modernConfig = useResolvedConfigContext();
-
-      const { bff } = modernConfig || {};
-      const prefix = bff?.prefix || '/api';
-
-      const prefixList: string[] = [];
-
-      if (Array.isArray(prefix)) {
-        prefixList.push(...prefix);
-      } else {
-        prefixList.push(prefix);
-      }
-      const apiServerRoutes = prefixList.map(pre => ({
-        urlPath: pre,
-        isApi: true,
-        entryPath: '',
-        isSPA: false,
-        isSSR: false,
-        // FIXME: })) as IAppContext[`serverRoutes`];
-      })) as ServerRoute[];
-
-      return { routes: routes.concat(apiServerRoutes) };
-    },
-    async afterBuild() {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const { appDirectory, distDirectory } = useAppContext();
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const modernConfig = useResolvedConfigContext();
-
-      const rootDir = path.resolve(appDirectory, API_DIR);
-      const distDir = path.resolve(distDirectory, API_DIR);
-
-      const sourceAbsDir = path.resolve(appDirectory, API_DIR);
-      const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-      const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-        tsconfigPath,
-        syntax: 'es6+',
-        type: 'commonjs',
-      });
-
-      const result = await compiler(
-        {
-          rootDir,
-          distDir,
-          sourceDir: sourceAbsDir,
-          extensions: FILE_EXTENSIONS,
-          ignore: [`**/__tests__/**`, '**/typings/**', '*.d.ts'],
-        },
-        babelConfig,
-      );
-
-      if (await fs.pathExists(rootDir)) {
-        await fs.copy(rootDir, distDir, {
-          filter: src =>
-            !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath,
-        });
-      }
-
-      if (result.code === 1) {
-        throw new Error(result.message);
-      }
-    },
-  }),
-  { name: '@modern-js/plugin-bff' },
-) as any;

package/src/constants.ts

@@ -1,11 +0,0 @@
-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/src/index.ts

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

package/src/loader.ts

@@ -1,53 +0,0 @@
-import { getOptions } from 'loader-utils';
-import { generateClient, GenClientOptions } from '@modern-js/bff-utils';
-import { LoaderContext } from 'webpack';
-
-export type APILoaderOptions = {
-  prefix: string;
-  apiDir: string;
-  port: number;
-  fetcher?: string;
-  requestCreator?: string;
-  target: string;
-};
-
-async function loader(this: LoaderContext<APILoaderOptions>, source: string) {
-  // 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 = getOptions(this as any);
-
-  const options: GenClientOptions = {
-    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),
-    source,
-    // eslint-disable-next-line @babel/no-invalid-this
-    resourcePath: this.resourcePath,
-  };
-
-  if (draftOptions.fetcher) {
-    options.fetcher = draftOptions.fetcher as string;
-  }
-
-  if (draftOptions.requestCreator) {
-    options.requestCreator = draftOptions.requestCreator as string;
-  }
-
-  options.requireResolve = require.resolve;
-
-  const result = await generateClient(options);
-
-  if (result.isOk) {
-    callback(undefined, result.value);
-  } else {
-    callback(undefined, `throw new Error('${result.value}')`);
-  }
-}
-
-export default loader;

package/src/server.ts

@@ -1,64 +0,0 @@
-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, isProd, requireExistModule } from '@modern-js/utils';
-import { API_APP_NAME } from './constants';
-
-type SF = (args: any) => void;
-class Storage {
-  public middlewares: SF[] = [];
-
-  reset() {
-    this.middlewares = [];
-  }
-}
-
-const createTransformAPI = (storage: Storage) => ({
-  addMiddleware(fn: SF) {
-    storage.middlewares.push(fn);
-  },
-});
-
-export default createPlugin(
-  () => {
-    const { appDirectory, distDirectory } = useAppContext();
-
-    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 = requireExistModule(apiAppPath);
-    if (apiMod && typeof apiMod === 'function') {
-      apiMod(transformAPI);
-    }
-
-    return {
-      reset() {
-        storage.reset();
-        const newApiModule = requireExistModule(apiAppPath);
-        if (newApiModule && typeof newApiModule === 'function') {
-          newApiModule(transformAPI);
-        }
-      },
-      gather({ addAPIMiddleware }) {
-        storage.middlewares.forEach(mid => {
-          addAPIMiddleware(mid);
-        });
-      },
-      prepareApiServer(props, next) {
-        const { pwd, prefix } = props;
-        const apiDir = path.resolve(pwd, API_DIR);
-
-        injectAPIHandlerInfos(apiDir, prefix);
-
-        return next(props);
-      },
-    };
-  },
-  { name: '@modern-js/plugin-bff' },
-) as any;