@modern-js/server-core 2.0.0-beta.0 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/server-plugin
 
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Minor Changes
+
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- 15bf09d9c8: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- cc971eabfc: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/plugin@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/loadPlugins.js

@@ -1,15 +1,12 @@
 import { compatRequire, getInternalPlugins, tryResolve } from '@modern-js/utils';
 import { createPlugin } from "./plugin";
-
 const resolvePlugin = (p, appDirectory) => {
   const isPluginInstance = typeof p !== 'string';
-
   if (isPluginInstance) {
     return {
       module: createPlugin(p.setup, p)
     };
   }
-
   const pluginPath = tryResolve(p, appDirectory);
   const module = compatRequire(pluginPath);
   const pluginInstance = module();
@@ -17,7 +14,6 @@ const resolvePlugin = (p, appDirectory) => {
     module: createPlugin(pluginInstance.setup, pluginInstance)
   };
 };
-
 export const loadPlugins = (appDirectory, configPlugins, options) => {
   const loadedPlugins = getInternalPlugins(appDirectory, options.internalPlugins);
   return [...loadedPlugins, ...configPlugins].map(plugin => {

package/dist/js/modern/plugin.js

@@ -1,7 +1,8 @@
 import { createContext, createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createParallelWorkflow, createWaterfall } from '@modern-js/plugin';
 // collect all middleware register in server plugins
-const gather = createParallelWorkflow(); // config
+const gather = createParallelWorkflow();
 
+// config
 const config = createWaterfall();
 const prepare = createWaterfall();
 const preparebeforeRouteHandler = createAsyncPipeline();
@@ -10,7 +11,9 @@ const prepareApiServer = createAsyncPipeline();
 const onApiChange = createWaterfall();
 const beforeDevServer = createParallelWorkflow();
 const setupCompiler = createParallelWorkflow();
-const afterDevServer = createParallelWorkflow(); // TODO FIXME
+const afterDevServer = createParallelWorkflow();
+
+// TODO FIXME
 
 const beforeRouteSet = createAsyncPipeline();
 const afterRouteSet = createAsyncPipeline();
@@ -23,9 +26,13 @@ const extendSSRContext = createAsyncWaterfall();
 const extendContext = createAsyncPipeline();
 const handleError = createParallelWorkflow();
 const beforeMatch = createAsyncPipeline();
-const afterMatch = createAsyncPipeline(); // TODO FIXME
+const afterMatch = createAsyncPipeline();
+
+// TODO FIXME
+
+const prefetch = createParallelWorkflow();
 
-const prefetch = createParallelWorkflow(); // TODO FIXME
+// TODO FIXME
 
 const renderToString = createAsyncPipeline();
 const beforeRender = createAsyncPipeline();
@@ -36,15 +43,15 @@ const reset = createParallelWorkflow();
 export const AppContext = createContext({});
 export const setAppContext = value => AppContext.set(value);
 export const ConfigContext = createContext({});
+
 /**
  * Get original content of user config.
  */
-
 export const useConfigContext = () => ConfigContext.use().value;
+
 /**
  * Get app context, including directories, plugins and some static infos.
  */
-
 export const useAppContext = () => AppContext.use().value;
 const pluginAPI = {
   useAppContext,
@@ -84,10 +91,12 @@ const serverHooks = {
   afterSend,
   reset
 };
+
 /** All hooks of server plugin. */
 
 export const createServerManager = () => createAsyncManager(serverHooks, pluginAPI);
 export const serverManager = createServerManager();
+
 /** Plugin options of a server plugin. */
 
 export const {

package/dist/js/node/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _plugin = require("./plugin");
-
 Object.keys(_plugin).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _plugin[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_plugin).forEach(function (key) {
     }
   });
 });
-
 var _plugin2 = require("@modern-js/plugin");
-
 Object.keys(_plugin2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _plugin2[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_plugin2).forEach(function (key) {
     }
   });
 });
-
 var _loadPlugins = require("./loadPlugins");
-
 Object.keys(_loadPlugins).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _loadPlugins[key]) return;

package/dist/js/node/loadPlugins.js

@@ -4,20 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.loadPlugins = void 0;
-
 var _utils = require("@modern-js/utils");
-
 var _plugin = require("./plugin");
-
 const resolvePlugin = (p, appDirectory) => {
   const isPluginInstance = typeof p !== 'string';
-
   if (isPluginInstance) {
     return {
       module: (0, _plugin.createPlugin)(p.setup, p)
     };
   }
-
   const pluginPath = (0, _utils.tryResolve)(p, appDirectory);
   const module = (0, _utils.compatRequire)(pluginPath);
   const pluginInstance = module();
@@ -25,7 +20,6 @@ const resolvePlugin = (p, appDirectory) => {
     module: (0, _plugin.createPlugin)(pluginInstance.setup, pluginInstance)
   };
 };
-
 const loadPlugins = (appDirectory, configPlugins, options) => {
   const loadedPlugins = (0, _utils.getInternalPlugins)(appDirectory, options.internalPlugins);
   return [...loadedPlugins, ...configPlugins].map(plugin => {
@@ -35,5 +29,4 @@ const loadPlugins = (appDirectory, configPlugins, options) => {
     return module;
   });
 };
-
 exports.loadPlugins = loadPlugins;

package/dist/js/node/plugin.js

@@ -4,12 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useConfigContext = exports.useAppContext = exports.setAppContext = exports.serverManager = exports.createServerManager = exports.createPlugin = exports.ConfigContext = exports.AppContext = void 0;
-
 var _plugin = require("@modern-js/plugin");
-
 // collect all middleware register in server plugins
-const gather = (0, _plugin.createParallelWorkflow)(); // config
+const gather = (0, _plugin.createParallelWorkflow)();
 
+// config
 const config = (0, _plugin.createWaterfall)();
 const prepare = (0, _plugin.createWaterfall)();
 const preparebeforeRouteHandler = (0, _plugin.createAsyncPipeline)();
@@ -18,7 +17,9 @@ const prepareApiServer = (0, _plugin.createAsyncPipeline)();
 const onApiChange = (0, _plugin.createWaterfall)();
 const beforeDevServer = (0, _plugin.createParallelWorkflow)();
 const setupCompiler = (0, _plugin.createParallelWorkflow)();
-const afterDevServer = (0, _plugin.createParallelWorkflow)(); // TODO FIXME
+const afterDevServer = (0, _plugin.createParallelWorkflow)();
+
+// TODO FIXME
 
 const beforeRouteSet = (0, _plugin.createAsyncPipeline)();
 const afterRouteSet = (0, _plugin.createAsyncPipeline)();
@@ -31,9 +32,13 @@ const extendSSRContext = (0, _plugin.createAsyncWaterfall)();
 const extendContext = (0, _plugin.createAsyncPipeline)();
 const handleError = (0, _plugin.createParallelWorkflow)();
 const beforeMatch = (0, _plugin.createAsyncPipeline)();
-const afterMatch = (0, _plugin.createAsyncPipeline)(); // TODO FIXME
+const afterMatch = (0, _plugin.createAsyncPipeline)();
+
+// TODO FIXME
+
+const prefetch = (0, _plugin.createParallelWorkflow)();
 
-const prefetch = (0, _plugin.createParallelWorkflow)(); // TODO FIXME
+// TODO FIXME
 
 const renderToString = (0, _plugin.createAsyncPipeline)();
 const beforeRender = (0, _plugin.createAsyncPipeline)();
@@ -43,27 +48,21 @@ const afterSend = (0, _plugin.createParallelWorkflow)();
 const reset = (0, _plugin.createParallelWorkflow)();
 const AppContext = (0, _plugin.createContext)({});
 exports.AppContext = AppContext;
-
 const setAppContext = value => AppContext.set(value);
-
 exports.setAppContext = setAppContext;
 const ConfigContext = (0, _plugin.createContext)({});
+
 /**
  * Get original content of user config.
  */
-
 exports.ConfigContext = ConfigContext;
-
 const useConfigContext = () => ConfigContext.use().value;
+
 /**
  * Get app context, including directories, plugins and some static infos.
  */
-
-
 exports.useConfigContext = useConfigContext;
-
 const useAppContext = () => AppContext.use().value;
-
 exports.useAppContext = useAppContext;
 const pluginAPI = {
   useAppContext,
@@ -103,14 +102,14 @@ const serverHooks = {
   afterSend,
   reset
 };
+
 /** All hooks of server plugin. */
 
 const createServerManager = () => (0, _plugin.createAsyncManager)(serverHooks, pluginAPI);
-
 exports.createServerManager = createServerManager;
 const serverManager = createServerManager();
-/** Plugin options of a server plugin. */
 
+/** Plugin options of a server plugin. */
 exports.serverManager = serverManager;
 const {
   createPlugin

package/dist/types/plugin.d.ts

@@ -6,7 +6,6 @@ import type { ModernServerContext, BaseSSRServerContext, AfterMatchContext, Afte
 import type { NormalizedConfig, UserConfig } from '@modern-js/core';
 import type { Options } from 'http-proxy-middleware';
 /** The subset of NormalizedConfig, which really need in server */
-
 export declare type ServerOptions = {
   output: Pick<NormalizedConfig['output'], 'path' | 'assetPrefix'>;
   source: Pick<NormalizedConfig['source'], 'alias' | 'envVars' | 'globalVars'>;
@@ -48,12 +47,10 @@ export declare const ConfigContext: import("@modern-js/plugin").Context<UserConf
 /**
  * Get original content of user config.
  */
-
 export declare const useConfigContext: () => UserConfig;
 /**
  * Get app context, including directories, plugins and some static infos.
  */
-
 export declare const useAppContext: () => ISAppContext;
 declare const pluginAPI: {
   useAppContext: () => ISAppContext;
@@ -114,13 +111,10 @@ declare const serverHooks: {
   reset: import("@modern-js/plugin").ParallelWorkflow<void, unknown>;
 };
 /** All hooks of server plugin. */
-
 export declare type ServerHooks = typeof serverHooks;
 /** All hook callbacks of server plugin. */
-
 export declare type ServerHookCallbacks = ToThreads<ServerHooks>;
 /** All apis for server plugin. */
-
 export declare type PluginAPI = typeof pluginAPI & CommonAPI<ServerHooks>;
 export declare const createServerManager: () => import("@modern-js/plugin").AsyncManager<{
   gather: import("@modern-js/plugin").ParallelWorkflow<{
@@ -237,7 +231,6 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
   setAppContext: (value: ISAppContext) => void;
 }>;
 /** Plugin options of a server plugin. */
-
 export declare type ServerPlugin = PluginOptions<ServerHooks, AsyncSetup<ServerHooks, PluginAPI>>;
 export declare type ServerConfig = {
   bff?: Partial<{

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,20 +29,20 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "2.0.0-beta.0",
-    "@modern-js/utils": "2.0.0-beta.0"
+    "@modern-js/plugin": "2.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1"
   },
   "devDependencies": {
-    "@modern-js/core": "2.0.0-beta.0",
-    "@modern-js/types": "2.0.0-beta.0",
-    "@scripts/build": "2.0.0-beta.0",
-    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "http-proxy-middleware": "^2.0.4",
     "jest": "^27",
     "ts-jest": "^27.0.4",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@modern-js/core": "2.0.0-beta.1",
+    "@modern-js/types": "2.0.0-beta.1",
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "modernConfig": {