@modern-js/server-core 1.2.5 → 1.3.1

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @modern-js/server-plugin
 
+## 1.3.1
+
+### Patch Changes
+
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/plugin@1.3.3
+
+## 1.3.0
+
+### Minor Changes
+
+- d2d1d6b2: feat: support server config
+
+### Patch Changes
+
+- d2d1d6b2: feat: add prepare hook
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/utils@1.4.0
+
 ## 1.2.5
 
 ### Patch Changes

package/dist/js/modern/plugin.js

@@ -1,8 +1,11 @@
-import { createContext, createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createParallelWorkflow } from '@modern-js/plugin';
+import { createContext, createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createParallelWorkflow, createWaterfall } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
 enable(); // collect all middleware register in server plugins
 
 const gather = createParallelWorkflow();
+// config
+const config = createWaterfall();
+const prepare = createWaterfall();
 const create = createAsyncPipeline();
 const prepareWebServer = createAsyncPipeline();
 const prepareApiServer = createAsyncPipeline();
@@ -50,6 +53,8 @@ const pluginAPI = {
 const serverHooks = {
   // server hook
   gather,
+  config,
+  prepare,
   create,
   prepareWebServer,
   prepareApiServer,

package/dist/js/node/plugin.js

@@ -12,6 +12,9 @@ var _node = require("@modern-js/plugin/node");
 (0, _node.enable)(); // collect all middleware register in server plugins
 
 const gather = (0, _plugin.createParallelWorkflow)();
+// config
+const config = (0, _plugin.createWaterfall)();
+const prepare = (0, _plugin.createWaterfall)();
 const create = (0, _plugin.createAsyncPipeline)();
 const prepareWebServer = (0, _plugin.createAsyncPipeline)();
 const prepareApiServer = (0, _plugin.createAsyncPipeline)();
@@ -67,6 +70,8 @@ const pluginAPI = {
 const serverHooks = {
   // server hook
   gather,
+  config,
+  prepare,
   create,
   prepareWebServer,
   prepareApiServer,

package/dist/types/plugin.d.ts

@@ -5,6 +5,7 @@ import { CommonAPI, ToThreads, AsyncSetup, PluginOptions } from '@modern-js/plug
 import type { ModernServerContext, BaseSSRServerContext, Metrics, Logger } from '@modern-js/types/server';
 import type { NormalizedConfig, UserConfig } from '@modern-js/core';
 import type { ISAppContext } from '@modern-js/types';
+import type { Options } from 'http-proxy-middleware';
 declare type ServerInitInput = {
   loggerOptions: any;
   metricsOptions: any;
@@ -53,6 +54,8 @@ declare const serverHooks: {
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;
   }, unknown>;
+  config: import("@modern-js/plugin").Waterfall<ServerConfig>;
+  prepare: import("@modern-js/plugin").Waterfall<void>;
   create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
@@ -115,6 +118,8 @@ export declare const createServerManager: () => import("@modern-js/plugin").Asyn
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;
   }, unknown>;
+  config: import("@modern-js/plugin").Waterfall<ServerConfig>;
+  prepare: import("@modern-js/plugin").Waterfall<void>;
   create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
@@ -171,6 +176,8 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;
   }, unknown>;
+  config: import("@modern-js/plugin").Waterfall<ServerConfig>;
+  prepare: import("@modern-js/plugin").Waterfall<void>;
   create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
@@ -225,11 +232,19 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
 /** Plugin options of a server plugin. */
 
 export declare type ServerPlugin = PluginOptions<ServerHooks, AsyncSetup<ServerHooks, PluginAPI>>;
+export declare type ServerConfig = {
+  bff?: Partial<{
+    proxy: Record<string, Options>;
+  }>;
+  plugins?: ServerPlugin[];
+};
 export declare const createPlugin: (setup?: AsyncSetup<{
   gather: import("@modern-js/plugin").ParallelWorkflow<{
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;
   }, unknown>;
+  config: import("@modern-js/plugin").Waterfall<ServerConfig>;
+  prepare: import("@modern-js/plugin").Waterfall<void>;
   create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
@@ -285,6 +300,8 @@ export declare const createPlugin: (setup?: AsyncSetup<{
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;
   }, unknown>;
+  config: import("@modern-js/plugin").Waterfall<ServerConfig>;
+  prepare: import("@modern-js/plugin").Waterfall<void>;
   create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
@@ -337,6 +354,8 @@ export declare const createPlugin: (setup?: AsyncSetup<{
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;
   }, unknown>;
+  config: import("@modern-js/plugin").Waterfall<ServerConfig>;
+  prepare: import("@modern-js/plugin").Waterfall<void>;
   create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
@@ -392,6 +411,8 @@ export declare const createPlugin: (setup?: AsyncSetup<{
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;
   }, unknown>;
+  config: import("@modern-js/plugin").Waterfall<ServerConfig>;
+  prepare: import("@modern-js/plugin").Waterfall<void>;
   create: import("@modern-js/plugin").AsyncPipeline<ServerInitInput, InitExtension>;
   prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, Adapter>;
   prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.5",
+  "version": "1.3.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,21 +28,22 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "^1.3.2",
-    "@modern-js/utils": "^1.3.7"
+    "@modern-js/plugin": "^1.3.3",
+    "@modern-js/utils": "^1.5.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.6.1",
-    "@modern-js/types": "^1.3.6",
+    "@modern-js/core": "1.8.0",
+    "@modern-js/types": "^1.5.0",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "ts-jest": "^27.0.4",
-    "typescript": "^4",
-    "@scripts/build": "0.0.0",
+    "http-proxy-middleware": "^2.0.4",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0"
+    "ts-jest": "^27.0.4",
+    "typescript": "^4"
   },
   "sideEffects": false,
   "modernConfig": {

package/tests/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: require.resolve('./tsconfig.json'),
-  },
-};

package/tests/fixtures/load-plugins/test-a/index.js

@@ -1,3 +0,0 @@
-module.exports = () => ({
-  name: 'test-a',
-});

package/tests/fixtures/load-plugins/test-a/package.json

@@ -1,3 +0,0 @@
-{
-  "name": "test-a"
-}

package/tests/loadPlugin.test.ts

@@ -1,33 +0,0 @@
-import path from 'path';
-import { loadPlugins } from '../src/loadPlugins';
-
-const modulePath = path.join(__dirname, './fixtures/load-plugins');
-describe('test load plugin', () => {
-  it('should load string plugin correctly', () => {
-    const loaded = loadPlugins(['test-a'], modulePath);
-    expect(loaded[0].pluginPath).toBe(
-      path.join(__dirname, './fixtures/load-plugins/test-a/index.js'),
-    );
-  });
-
-  it('should load plugin instance correctly', () => {
-    const loaded = loadPlugins(
-      [
-        {
-          name: 'modern',
-        },
-      ],
-      modulePath,
-    );
-
-    expect(loaded[0].name).toBe('modern');
-  });
-
-  it('should throw error if plugin not found', () => {
-    try {
-      loadPlugins(['test-b'], modulePath);
-    } catch (e: any) {
-      expect(e.message).toMatch('Can not find plugin test-b.');
-    }
-  });
-});

package/tests/server-plugin.test.ts

@@ -1,22 +0,0 @@
-import { serverManager } from '../src';
-
-describe('Default cases', () => {
-  it('Have returns plugins', async () => {
-    let count = 0;
-
-    serverManager.usePlugin(
-      serverManager.createPlugin(() => ({
-        prepareApiServer: () => {
-          count = 1;
-          // eslint-disable-next-line @typescript-eslint/no-empty-function
-          return () => {};
-        },
-      })),
-    );
-
-    const runner = await serverManager.init();
-    await runner.prepareApiServer({ pwd: '', mode: 'function', config: {} });
-
-    expect(count).toBe(1);
-  });
-});

package/tests/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "paths": {},
-    "types": ["node", "jest"]
-  }
-}