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

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/server-plugin
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: 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 [5b9049f2e9]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/plugin@2.0.0-beta.2
+
 ## 2.0.0-beta.1
 
 ### Major Changes

package/dist/js/modern/index.js

@@ -1,3 +1,4 @@
 export * from "./plugin";
 export * from '@modern-js/plugin';
-export * from "./loadPlugins";
+export * from "./loadPlugins";
+export * from "./types/config";

package/dist/js/modern/types/config/index.js

@@ -0,0 +1,7 @@
+export * from "./bff";
+export * from "./html";
+export * from "./output";
+export * from "./server";
+export * from "./source";
+export * from "./tools";
+export {};

package/dist/js/modern/types/config/tools.js

@@ -0,0 +1 @@
+export {};

package/dist/js/node/index.js

@@ -35,4 +35,15 @@ Object.keys(_loadPlugins).forEach(function (key) {
       return _loadPlugins[key];
     }
   });
+});
+var _config = require("./types/config");
+Object.keys(_config).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _config[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _config[key];
+    }
+  });
 });

package/dist/js/node/types/config/index.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _bff = require("./bff");
+Object.keys(_bff).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _bff[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _bff[key];
+    }
+  });
+});
+var _html = require("./html");
+Object.keys(_html).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _html[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _html[key];
+    }
+  });
+});
+var _output = require("./output");
+Object.keys(_output).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _output[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _output[key];
+    }
+  });
+});
+var _server = require("./server");
+Object.keys(_server).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _server[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _server[key];
+    }
+  });
+});
+var _source = require("./source");
+Object.keys(_source).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _source[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _source[key];
+    }
+  });
+});
+var _tools = require("./tools");
+Object.keys(_tools).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _tools[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _tools[key];
+    }
+  });
+});

package/dist/js/node/types/config/tools.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
 export * from './plugin';
 export * from '@modern-js/plugin';
-export * from './loadPlugins';
+export * from './loadPlugins';
+export * from './types/config';

package/dist/types/loadPlugins.d.ts

@@ -19,13 +19,13 @@ export declare const loadPlugins: (appDirectory: string, configPlugins: ServerPl
     filename: string;
     event: "add" | "unlink" | "change";
   }[]>;
-  beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<import("./plugin").ServerOptions, any>;
+  beforeDevServer: import("@modern-js/plugin").ParallelWorkflow<import(".").ServerOptions, any>;
   setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
-  afterDevServer: import("@modern-js/plugin").ParallelWorkflow<import("./plugin").ServerOptions, any>;
+  afterDevServer: import("@modern-js/plugin").ParallelWorkflow<import(".").ServerOptions, any>;
   beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<import("./plugin").Route[], import("./plugin").Route[]>;
   afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
-  beforeProdServer: import("@modern-js/plugin").ParallelWorkflow<import("./plugin").ServerOptions, any>;
-  afterProdServer: import("@modern-js/plugin").ParallelWorkflow<import("./plugin").ServerOptions, any>;
+  beforeProdServer: import("@modern-js/plugin").ParallelWorkflow<import(".").ServerOptions, any>;
+  afterProdServer: import("@modern-js/plugin").ParallelWorkflow<import(".").ServerOptions, any>;
   listen: import("@modern-js/plugin").ParallelWorkflow<{
     ip: string;
     port: number;
@@ -59,6 +59,6 @@ export declare const loadPlugins: (appDirectory: string, configPlugins: ServerPl
   reset: import("@modern-js/plugin").ParallelWorkflow<void, unknown>;
 }, {
   useAppContext: () => import("@modern-js/types").ISAppContext;
-  useConfigContext: () => import("@modern-js/core").UserConfig;
+  useConfigContext: () => import(".").UserConfig;
   setAppContext: (value: import("@modern-js/types").ISAppContext) => void;
 }>[];

package/dist/types/plugin.d.ts

@@ -3,20 +3,8 @@ import { IncomingMessage, ServerResponse } from 'http';
 import type { Component } from 'react';
 import { CommonAPI, ToThreads, AsyncSetup, PluginOptions } from '@modern-js/plugin';
 import type { ModernServerContext, BaseSSRServerContext, AfterMatchContext, AfterRenderContext, MiddlewareContext, ISAppContext, ServerRoute } from '@modern-js/types';
-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'>;
-  tools: {
-    babel: NormalizedConfig['tools']['babel'];
-  };
-  server: NormalizedConfig['server'];
-  runtime: NormalizedConfig['runtime'];
-  bff: NormalizedConfig['bff'];
-  plugins: NormalizedConfig['plugins'];
-};
+import type { ServerOptions, UserConfig } from './types/config';
 export declare type WebAdapter = (ctx: MiddlewareContext) => void | Promise<void>;
 export declare type Adapter = (req: IncomingMessage, res: ServerResponse) => void | Promise<void>;
 export declare type WebServerStartInput = {
@@ -402,7 +390,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
   useAppContext: () => ISAppContext;
   useConfigContext: () => UserConfig;
   setAppContext: (value: ISAppContext) => void;
-}>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
+}>, Record<string, unknown>, any, any> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
   gather: import("@modern-js/plugin").ParallelWorkflow<{
     addWebMiddleware: (_input: any) => void;
     addAPIMiddleware: (_input: any) => void;

package/dist/types/types/config/bff.d.ts

@@ -0,0 +1,5 @@
+export interface BffUserConfig {
+  prefix?: string;
+  proxy?: Record<string, string>;
+}
+export declare type BffNormalizedConfig = BffUserConfig;

package/dist/types/types/config/html.d.ts

@@ -0,0 +1,5 @@
+export interface HtmlUserConfig {
+  favicon?: string;
+  faviconByEntries?: Record<string, string | undefined>;
+}
+export declare type HtmlNormalizedConfig = HtmlUserConfig;

package/dist/types/types/config/index.d.ts

@@ -0,0 +1,34 @@
+import { BffNormalizedConfig, BffUserConfig } from './bff';
+import { HtmlNormalizedConfig, HtmlUserConfig } from './html';
+import { OutputNormalizedConfig, OutputUserConfig } from './output';
+import { ServerNormalizedConfig, ServerUserConfig } from './server';
+import { SourceNormalizedConfig, SourceUserConfig } from './source';
+import { ToolsNormalizedConfig, ToolsUserConfig } from './tools';
+export * from './bff';
+export * from './html';
+export * from './output';
+export * from './server';
+export * from './source';
+export * from './tools';
+interface RuntimeUserConfig {
+  [property: string]: any;
+}
+declare type RuntimeNormalizedConfig = RuntimeUserConfig;
+export interface UserConfig {
+  output?: OutputUserConfig;
+  source?: SourceUserConfig;
+  tools?: ToolsUserConfig;
+  server?: ServerUserConfig;
+  runtime?: RuntimeUserConfig;
+  html?: HtmlUserConfig;
+  bff?: BffUserConfig;
+}
+export declare type ServerOptions = {
+  output: OutputNormalizedConfig;
+  source: SourceNormalizedConfig;
+  tools: ToolsNormalizedConfig;
+  server: ServerNormalizedConfig;
+  runtime: RuntimeNormalizedConfig;
+  html: HtmlNormalizedConfig;
+  bff: BffNormalizedConfig;
+};

package/dist/types/types/config/output.d.ts

@@ -0,0 +1,17 @@
+export interface OutputUserConfig {
+  distPath?: {
+    root?: string;
+    js?: string;
+    css?: string;
+    svg?: string;
+    font?: string;
+    html?: string;
+    image?: string;
+    media?: string;
+    server?: string;
+  };
+  path?: string;
+  assetPrefix?: string;
+  polyfill?: 'entry' | 'usage' | 'ua' | 'off';
+}
+export declare type OutputNormalizedConfig = OutputUserConfig;

package/dist/types/types/config/server.d.ts

@@ -0,0 +1,27 @@
+import type { WatchOptions } from '@modern-js/utils';
+declare type Route = string | string[] | {
+  route?: string | string[];
+  disableSpa?: boolean;
+  resHeaders?: Record<string, unknown>;
+};
+export declare type Routes = Record<string, Route>;
+export declare type SSR = boolean | {
+  mode?: 'string' | 'stream';
+};
+export declare type SSRByEntries = Record<string, SSR>;
+export interface ServerUserConfig {
+  routes?: Routes;
+  publicRoutes?: Record<string, string>;
+  ssr?: SSR;
+  ssrByEntries?: SSRByEntries;
+  baseUrl?: string | string[];
+  port?: number;
+  logger?: boolean | Record<string, any>;
+  metrics?: boolean | Record<string, any>;
+  enableMicroFrontendDebug?: boolean;
+  watchOptions?: WatchOptions;
+  compiler?: 'babel' | 'typescript';
+  disableFrameworkExt?: boolean;
+}
+export declare type ServerNormalizedConfig = ServerUserConfig;
+export {};

package/dist/types/types/config/share.d.ts

@@ -0,0 +1,3 @@
+declare type ArrayOrNot<T> = T | T[];
+export declare type ChainedConfig<Config, Utils = unknown> = ArrayOrNot<Config | (keyof Utils extends never ? (config: Config) => Config | void : (config: Config, utils: Utils) => Config | void)>;
+export {};

package/dist/types/types/config/source.d.ts

@@ -0,0 +1,15 @@
+import type { Alias } from '@modern-js/utils';
+import type { ChainedConfig } from './share';
+declare type JSONPrimitive = string | number | boolean | null;
+declare type JSONArray = Array<JSONValue>;
+declare type JSONObject = {
+  [key: string]: JSONValue;
+};
+declare type JSONValue = JSONPrimitive | JSONObject | JSONArray;
+export interface SourceUserConfig {
+  alias?: ChainedConfig<Alias>;
+  define?: Record<string, any>;
+  globalVars?: Record<string, JSONValue>;
+}
+export declare type SourceNormalizedConfig = SourceUserConfig;
+export {};

package/dist/types/types/config/tools.d.ts

@@ -0,0 +1,9 @@
+import { BabelConfigUtils } from '@modern-js/babel-preset-app';
+import { BabelTransformOptions } from '@modern-js/types/common';
+import { ChainedConfig } from './share';
+declare type ToolsBabelConfig = ChainedConfig<BabelTransformOptions, BabelConfigUtils>;
+export interface ToolsUserConfig {
+  babel?: ToolsBabelConfig;
+}
+export declare type ToolsNormalizedConfig = ToolsUserConfig;
+export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,8 +29,8 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "2.0.0-beta.1",
-    "@modern-js/utils": "2.0.0-beta.1"
+    "@modern-js/plugin": "2.0.0-beta.2",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
     "@types/jest": "^27",
@@ -39,10 +39,10 @@
     "jest": "^27",
     "ts-jest": "^27.0.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"
+    "@modern-js/types": "2.0.0-beta.2",
+    "@modern-js/babel-preset-app": "2.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -55,9 +55,9 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "dev": "modern build --watch",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "dev": "modern-lib build --watch",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }