@modern-js/prod-server 2.0.0-beta.1 → 2.0.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,123 @@
 # @modern-js/prod-server
 
+## 2.0.0-beta.3
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- d032d49e09: export createHandle
+  导出 createHandle 函数
+- 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 插件加载逻辑
+- 40ed5874c6: feat: inject css chunk into html for streaming ssr
+  feat: streaming ssr 返回的 html 注入 css chunk
+- 102d32e4ba: feat(server): add `req` and `res` to SSR context
+
+  feat(server): 添加 `req` 和 `res` 到 SSR context 中
+
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 73cd29dd9f: fix(server): add favicon fallback handler
+
+  fix(server): 添加 favicon 兜底处理逻辑
+
+- cce8ece: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- 18aaf42249: fix: fix server loader redirects
+  fix: 修复 server loader 重定向错误
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [6aca875]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [2e60319]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.3
+  - @modern-js/server-core@2.0.0-beta.3
+
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- d032d49: export createHandle
+  导出 createHandle 函数
+- 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 插件加载逻辑
+- 40ed587: feat: inject css chunk into html for streaming ssr
+  feat: streaming ssr 返回的 html 注入 css chunk
+- 102d32e4ba: feat(server): add `req` and `res` to SSR context
+
+  feat(server): 添加 `req` 和 `res` 到 SSR context 中
+
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 73cd29dd9f: fix(server): add favicon fallback handler
+
+  fix(server): 添加 favicon 兜底处理逻辑
+
+- 18aaf42: fix: fix server loader redirects
+  fix: 修复 server loader 重定向错误
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [15bf09d9c8]
+- 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 [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-core@2.0.0-beta.2
+  - @modern-js/utils@2.0.0-beta.2
+
 ## 2.0.0-beta.1
 
 ### Major Changes

package/dist/js/modern/server/index.js

@@ -79,12 +79,11 @@ export class Server {
     runner.prepare();
   }
   initServerConfig(options) {
-    var _options$config$outpu;
     const {
       pwd,
       serverConfigFile
     } = options;
-    const distDirectory = path.join(pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist');
+    const distDirectory = path.join(pwd, options.config.output.path || 'dist');
     const serverConfigPath = getServerConfigPath(distDirectory, serverConfigFile);
     const serverConfig = requireConfig(serverConfigPath);
     this.serverConfig = serverConfig;
@@ -95,7 +94,6 @@ export class Server {
    * merge cliConfig and serverConfig
    */
   async initConfig(runner, options) {
-    var _config$output;
     const {
       pwd,
       config
@@ -104,7 +102,7 @@ export class Server {
       serverConfig
     } = this;
     const finalServerConfig = this.runConfigHook(runner, serverConfig);
-    const resolvedConfigPath = path.join(pwd, (config === null || config === void 0 ? void 0 : (_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist', OUTPUT_CONFIG_FILE);
+    const resolvedConfigPath = path.join(pwd, config.output.path || 'dist', OUTPUT_CONFIG_FILE);
     options.config = loadConfig({
       cliConfig: config,
       serverConfig: finalServerConfig,
@@ -142,8 +140,7 @@ export class Server {
     // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
     const {
       internalPlugins = INTERNAL_SERVER_PLUGINS,
-      pwd,
-      config
+      pwd
     } = options;
     const serverPlugins = this.serverConfig.plugins || [];
 
@@ -151,7 +148,7 @@ export class Server {
     const loadedPlugins = loadPlugins(pwd, serverPlugins, {
       internalPlugins
     });
-    debug('plugins', config.plugins, loadedPlugins);
+    debug('plugins', loadedPlugins);
     loadedPlugins.forEach(p => {
       serverManager.usePlugin(p);
     });
@@ -161,7 +158,6 @@ export class Server {
     return hooksRunner;
   }
   async injectContext(runner, options) {
-    var _config$output2;
     const appContext = this.initAppContext();
     const {
       config,
@@ -169,11 +165,10 @@ export class Server {
     } = options;
     ConfigContext.set(config);
     AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-      distDirectory: path.join(pwd, ((_config$output2 = config.output) === null || _config$output2 === void 0 ? void 0 : _config$output2.path) || 'dist')
+      distDirectory: path.join(pwd, config.output.path || 'dist')
     }));
   }
   initAppContext() {
-    var _config$output3;
     const {
       options
     } = this;
@@ -187,7 +182,7 @@ export class Server {
     }));
     return {
       appDirectory,
-      distDirectory: path.join(appDirectory, ((_config$output3 = config.output) === null || _config$output3 === void 0 ? void 0 : _config$output3.path) || 'dist'),
+      distDirectory: path.join(appDirectory, config.output.path || 'dist'),
       sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
       plugins: serverPlugins
     };

package/dist/js/modern/server/modern-server.js

@@ -38,7 +38,6 @@ export class ModernServer {
     runMode,
     proxyTarget
   }) {
-    var _config$output;
     _defineProperty(this, "pwd", void 0);
     _defineProperty(this, "distDir", void 0);
     _defineProperty(this, "workDir", void 0);
@@ -62,7 +61,7 @@ export class ModernServer {
     _defineProperty(this, "staticGenerate", void 0);
     require('ignore-styles');
     this.pwd = pwd;
-    this.distDir = path.join(pwd, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist');
+    this.distDir = path.join(pwd, config.output.path || 'dist');
     this.workDir = this.distDir;
     this.conf = config;
     debug('server conf', this.conf);
@@ -111,7 +110,7 @@ export class ModernServer {
 
     // Only work when without setting `assetPrefix`.
     // Setting `assetPrefix` means these resources should be uploaded to CDN.
-    const staticPathRegExp = getStaticReg(this.conf.output || {});
+    const staticPathRegExp = getStaticReg(this.conf.output || {}, this.conf.html);
     this.staticFileHandler = createStaticFileHandler([{
       path: staticPathRegExp,
       target: distDir

package/dist/js/modern/utils.js

@@ -67,15 +67,19 @@ export const createMiddlewareCollecter = () => {
 export const useLocalPrefix = url => {
   return isProd() && !url.includes('.');
 };
-export const getStaticReg = (output = {}) => {
+export const getStaticReg = (output = {}, html = {}) => {
   const {
-    favicon,
-    faviconByEntries,
-    cssPath,
-    jsPath,
-    mediaPath,
+    distPath: {
+      css: cssPath,
+      js: jsPath,
+      media: mediaPath
+    } = {},
     assetPrefix = '/'
   } = output;
+  const {
+    favicon,
+    faviconByEntries
+  } = html;
   const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter(v => Boolean(v));

package/dist/js/node/server/index.js

@@ -86,12 +86,11 @@ class Server {
     runner.prepare();
   }
   initServerConfig(options) {
-    var _options$config$outpu;
     const {
       pwd,
       serverConfigFile
     } = options;
-    const distDirectory = _path.default.join(pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist');
+    const distDirectory = _path.default.join(pwd, options.config.output.path || 'dist');
     const serverConfigPath = (0, _loadConfig.getServerConfigPath)(distDirectory, serverConfigFile);
     const serverConfig = (0, _loadConfig.requireConfig)(serverConfigPath);
     this.serverConfig = serverConfig;
@@ -102,7 +101,6 @@ class Server {
    * merge cliConfig and serverConfig
    */
   async initConfig(runner, options) {
-    var _config$output;
     const {
       pwd,
       config
@@ -111,7 +109,7 @@ class Server {
       serverConfig
     } = this;
     const finalServerConfig = this.runConfigHook(runner, serverConfig);
-    const resolvedConfigPath = _path.default.join(pwd, (config === null || config === void 0 ? void 0 : (_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist', _utils.OUTPUT_CONFIG_FILE);
+    const resolvedConfigPath = _path.default.join(pwd, config.output.path || 'dist', _utils.OUTPUT_CONFIG_FILE);
     options.config = (0, _loadConfig.loadConfig)({
       cliConfig: config,
       serverConfig: finalServerConfig,
@@ -149,8 +147,7 @@ class Server {
     // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
     const {
       internalPlugins = _utils.INTERNAL_SERVER_PLUGINS,
-      pwd,
-      config
+      pwd
     } = options;
     const serverPlugins = this.serverConfig.plugins || [];
 
@@ -158,7 +155,7 @@ class Server {
     const loadedPlugins = (0, _serverCore.loadPlugins)(pwd, serverPlugins, {
       internalPlugins
     });
-    (0, _utils2.debug)('plugins', config.plugins, loadedPlugins);
+    (0, _utils2.debug)('plugins', loadedPlugins);
     loadedPlugins.forEach(p => {
       _serverCore.serverManager.usePlugin(p);
     });
@@ -168,7 +165,6 @@ class Server {
     return hooksRunner;
   }
   async injectContext(runner, options) {
-    var _config$output2;
     const appContext = this.initAppContext();
     const {
       config,
@@ -176,11 +172,10 @@ class Server {
     } = options;
     _serverCore.ConfigContext.set(config);
     _serverCore.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-      distDirectory: _path.default.join(pwd, ((_config$output2 = config.output) === null || _config$output2 === void 0 ? void 0 : _config$output2.path) || 'dist')
+      distDirectory: _path.default.join(pwd, config.output.path || 'dist')
     }));
   }
   initAppContext() {
-    var _config$output3;
     const {
       options
     } = this;
@@ -194,7 +189,7 @@ class Server {
     }));
     return {
       appDirectory,
-      distDirectory: _path.default.join(appDirectory, ((_config$output3 = config.output) === null || _config$output3 === void 0 ? void 0 : _config$output3.path) || 'dist'),
+      distDirectory: _path.default.join(appDirectory, config.output.path || 'dist'),
       sharedDirectory: _path.default.resolve(appDirectory, _utils.SHARED_DIR),
       plugins: serverPlugins
     };

package/dist/js/node/server/modern-server.js

@@ -46,7 +46,6 @@ class ModernServer {
     runMode,
     proxyTarget
   }) {
-    var _config$output;
     _defineProperty(this, "pwd", void 0);
     _defineProperty(this, "distDir", void 0);
     _defineProperty(this, "workDir", void 0);
@@ -70,7 +69,7 @@ class ModernServer {
     _defineProperty(this, "staticGenerate", void 0);
     require('ignore-styles');
     this.pwd = pwd;
-    this.distDir = _path.default.join(pwd, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist');
+    this.distDir = _path.default.join(pwd, config.output.path || 'dist');
     this.workDir = this.distDir;
     this.conf = config;
     (0, _utils2.debug)('server conf', this.conf);
@@ -119,7 +118,7 @@ class ModernServer {
 
     // Only work when without setting `assetPrefix`.
     // Setting `assetPrefix` means these resources should be uploaded to CDN.
-    const staticPathRegExp = (0, _utils2.getStaticReg)(this.conf.output || {});
+    const staticPathRegExp = (0, _utils2.getStaticReg)(this.conf.output || {}, this.conf.html);
     this.staticFileHandler = (0, _serveFile.createStaticFileHandler)([{
       path: staticPathRegExp,
       target: distDir

package/dist/js/node/utils.js

@@ -79,15 +79,19 @@ const useLocalPrefix = url => {
   return (0, _utils.isProd)() && !url.includes('.');
 };
 exports.useLocalPrefix = useLocalPrefix;
-const getStaticReg = (output = {}) => {
+const getStaticReg = (output = {}, html = {}) => {
   const {
-    favicon,
-    faviconByEntries,
-    cssPath,
-    jsPath,
-    mediaPath,
+    distPath: {
+      css: cssPath,
+      js: jsPath,
+      media: mediaPath
+    } = {},
     assetPrefix = '/'
   } = output;
+  const {
+    favicon,
+    faviconByEntries
+  } = html;
   const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter(v => Boolean(v));

package/dist/js/treeshaking/server/index.js

@@ -129,10 +129,9 @@ export var Server = /*#__PURE__*/function () {
   }, {
     key: "initServerConfig",
     value: function initServerConfig(options) {
-      var _options$config$outpu;
       var pwd = options.pwd,
         serverConfigFile = options.serverConfigFile;
-      var distDirectory = path.join(pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist');
+      var distDirectory = path.join(pwd, options.config.output.path || 'dist');
       var serverConfigPath = getServerConfigPath(distDirectory, serverConfigFile);
       var serverConfig = requireConfig(serverConfigPath);
       this.serverConfig = serverConfig;
@@ -146,7 +145,6 @@ export var Server = /*#__PURE__*/function () {
     key: "initConfig",
     value: function () {
       var _initConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(runner, options) {
-        var _config$output;
         var pwd, config, serverConfig, finalServerConfig, resolvedConfigPath;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
@@ -155,7 +153,7 @@ export var Server = /*#__PURE__*/function () {
                 pwd = options.pwd, config = options.config;
                 serverConfig = this.serverConfig;
                 finalServerConfig = this.runConfigHook(runner, serverConfig);
-                resolvedConfigPath = path.join(pwd, (config === null || config === void 0 ? void 0 : (_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist', OUTPUT_CONFIG_FILE);
+                resolvedConfigPath = path.join(pwd, config.output.path || 'dist', OUTPUT_CONFIG_FILE);
                 options.config = loadConfig({
                   cliConfig: config,
                   serverConfig: finalServerConfig,
@@ -240,7 +238,7 @@ export var Server = /*#__PURE__*/function () {
     key: "createHookRunner",
     value: function () {
       var _createHookRunner = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var options, _options$internalPlug, internalPlugins, pwd, config, serverPlugins, loadedPlugins, hooksRunner;
+        var options, _options$internalPlug, internalPlugins, pwd, serverPlugins, loadedPlugins, hooksRunner;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
@@ -248,12 +246,12 @@ export var Server = /*#__PURE__*/function () {
                 // clear server manager every create time
                 serverManager.clear();
                 options = this.options; // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
-                _options$internalPlug = options.internalPlugins, internalPlugins = _options$internalPlug === void 0 ? INTERNAL_SERVER_PLUGINS : _options$internalPlug, pwd = options.pwd, config = options.config;
+                _options$internalPlug = options.internalPlugins, internalPlugins = _options$internalPlug === void 0 ? INTERNAL_SERVER_PLUGINS : _options$internalPlug, pwd = options.pwd;
                 serverPlugins = this.serverConfig.plugins || []; // server app context for serve plugin
                 loadedPlugins = loadPlugins(pwd, serverPlugins, {
                   internalPlugins: internalPlugins
                 });
-                debug('plugins', config.plugins, loadedPlugins);
+                debug('plugins', loadedPlugins);
                 loadedPlugins.forEach(function (p) {
                   serverManager.usePlugin(p);
                 });
@@ -280,7 +278,6 @@ export var Server = /*#__PURE__*/function () {
     key: "injectContext",
     value: function () {
       var _injectContext = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(runner, options) {
-        var _config$output2;
         var appContext, config, pwd;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) {
@@ -290,7 +287,7 @@ export var Server = /*#__PURE__*/function () {
                 config = options.config, pwd = options.pwd;
                 ConfigContext.set(config);
                 AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-                  distDirectory: path.join(pwd, ((_config$output2 = config.output) === null || _config$output2 === void 0 ? void 0 : _config$output2.path) || 'dist')
+                  distDirectory: path.join(pwd, config.output.path || 'dist')
                 }));
               case 4:
               case "end":
@@ -307,7 +304,6 @@ export var Server = /*#__PURE__*/function () {
   }, {
     key: "initAppContext",
     value: function initAppContext() {
-      var _config$output3;
       var options = this.options;
       var appDirectory = options.pwd,
         _options$plugins = options.plugins,
@@ -320,7 +316,7 @@ export var Server = /*#__PURE__*/function () {
       });
       return {
         appDirectory: appDirectory,
-        distDirectory: path.join(appDirectory, ((_config$output3 = config.output) === null || _config$output3 === void 0 ? void 0 : _config$output3.path) || 'dist'),
+        distDirectory: path.join(appDirectory, config.output.path || 'dist'),
         sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
         plugins: serverPlugins
       };

package/dist/js/treeshaking/server/modern-server.js

@@ -32,7 +32,6 @@ export var ModernServer = /*#__PURE__*/function () {
   // work on src or dist
 
   function ModernServer(_ref) {
-    var _config$output;
     var pwd = _ref.pwd,
       config = _ref.config,
       routes = _ref.routes,
@@ -65,7 +64,7 @@ export var ModernServer = /*#__PURE__*/function () {
     _defineProperty(this, "staticGenerate", void 0);
     require('ignore-styles');
     this.pwd = pwd;
-    this.distDir = path.join(pwd, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist');
+    this.distDir = path.join(pwd, config.output.path || 'dist');
     this.workDir = this.distDir;
     this.conf = config;
     debug('server conf', this.conf);
@@ -122,7 +121,7 @@ export var ModernServer = /*#__PURE__*/function () {
               case 14:
                 // Only work when without setting `assetPrefix`.
                 // Setting `assetPrefix` means these resources should be uploaded to CDN.
-                staticPathRegExp = getStaticReg(this.conf.output || {});
+                staticPathRegExp = getStaticReg(this.conf.output || {}, this.conf.html);
                 this.staticFileHandler = createStaticFileHandler([{
                   path: staticPathRegExp,
                   target: distDir

package/dist/js/treeshaking/utils.js

@@ -41,13 +41,16 @@ export var useLocalPrefix = function useLocalPrefix(url) {
 };
 export var getStaticReg = function getStaticReg() {
   var output = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var favicon = output.favicon,
-    faviconByEntries = output.faviconByEntries,
-    cssPath = output.cssPath,
-    jsPath = output.jsPath,
-    mediaPath = output.mediaPath,
+  var html = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _output$distPath = output.distPath;
+  _output$distPath = _output$distPath === void 0 ? {} : _output$distPath;
+  var cssPath = _output$distPath.css,
+    jsPath = _output$distPath.js,
+    mediaPath = _output$distPath.media,
     _output$assetPrefix = output.assetPrefix,
     assetPrefix = _output$assetPrefix === void 0 ? '/' : _output$assetPrefix;
+  var favicon = html.favicon,
+    faviconByEntries = html.faviconByEntries;
   var prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
   var favicons = prepareFavicons(favicon, faviconByEntries);
   var staticFiles = [cssPath, jsPath, mediaPath].filter(function (v) {

package/dist/types/utils.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
 import { IncomingMessage } from 'http';
-import type { NormalizedConfig } from '@modern-js/core';
+import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;
 export declare const mergeExtension: (users: any[]) => {
   middleware: any[];
@@ -19,7 +19,7 @@ export declare const createMiddlewareCollecter: () => {
   addAPIMiddleware: (input: any) => void;
 };
 export declare const useLocalPrefix: (url: string) => boolean;
-export declare const getStaticReg: (output?: NormalizedConfig['output']) => RegExp;
+export declare const getStaticReg: (output?: OutputNormalizedConfig, html?: HtmlNormalizedConfig) => RegExp;
 export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];
 export declare const headersWithoutCookie: (headers: IncomingMessage['headers']) => import("http").IncomingHttpHeaders;
 export declare const isRedirect: (code: number) => boolean;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -59,8 +59,8 @@
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
     "ua-parser-js": "^0.7.28",
-    "@modern-js/utils": "2.0.0-beta.1",
-    "@modern-js/server-core": "2.0.0-beta.1"
+    "@modern-js/utils": "2.0.0-beta.3",
+    "@modern-js/server-core": "2.0.0-beta.3"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -76,10 +76,10 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^4",
-    "@modern-js/types": "2.0.0-beta.1",
-    "@modern-js/core": "2.0.0-beta.1",
-    "@scripts/jest-config": "2.0.0-beta.1",
-    "@scripts/build": "2.0.0-beta.1"
+    "@modern-js/types": "2.0.0-beta.3",
+    "@modern-js/server-core": "2.0.0-beta.3",
+    "@scripts/jest-config": "2.0.0-beta.3",
+    "@scripts/build": "2.0.0-beta.3"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -90,9 +90,9 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
+    "dev": "modern-lib build --watch",
     "test": "jest"
   }
 }