@modern-js/server 0.0.0-bundle-deps-2021101244657 → 0.0.0-plugins-202111301002

package/CHANGELOG.md

@@ -1,19 +1,32 @@
 # @modern-js/server
 
-## 0.0.0-bundle-deps-2021101244657
+## 1.1.2
 
 ### Patch Changes
 
-- test
-- Updated dependencies [undefined]
-  - @modern-js/core@0.0.0-bundle-deps-2021101244657
-  - @modern-js/bff-utils@0.0.0-bundle-deps-2021101244657
-  - @modern-js/hmr-client@0.0.0-bundle-deps-2021101244657
-  - @modern-js/server-plugin@0.0.0-bundle-deps-2021101244657
-  - @modern-js/plugin-polyfill@0.0.0-bundle-deps-2021101244657
-  - @modern-js/server-utils@0.0.0-bundle-deps-2021101244657
-  - @modern-js/deps@0.0.0-bundle-deps-2021101244657
-  - @modern-js/utils@0.0.0-bundle-deps-2021101244657
+- 0fa83663: support more .env files
+- f594fbc8: fix apple icon and favicon support
+- d1fde77a: fix public/ file in windows
+- Updated dependencies [6f7fe574]
+- Updated dependencies [b011e0c5]
+- Updated dependencies [0fa83663]
+- Updated dependencies [f594fbc8]
+  - @modern-js/core@1.1.2
+  - @modern-js/server-utils@1.1.1
+  - @modern-js/bff-utils@1.1.1
+  - @modern-js/hmr-client@1.1.1
+  - @modern-js/server-plugin@1.1.1
+  - @modern-js/utils@1.1.2
+
+## 1.1.1
+
+### Patch Changes
+
+- c0fc0700: feat: support deploy plugin
+- Updated dependencies [687c92c7]
+- Updated dependencies [c0fc0700]
+  - @modern-js/core@1.1.1
+  - @modern-js/utils@1.1.1
 
 ## 1.1.0
 

package/dist/js/modern/dev-tools/babel/register.js

@@ -15,7 +15,7 @@ export const enableRegister = (projectRoot, config) => {
     syntax: 'es6+',
     type: 'commonjs'
   });
-  return require('@modern-js/deps/compiled/babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
+  return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
     only: [function (filePath) {
       // TODO: wait params
       if (filePath.includes(`node_modules${path.sep}.modern-js`)) {

package/dist/js/modern/dev-tools/dev-server-plugin.js

@@ -1,4 +1,4 @@
-import Webpack from '@modern-js/deps/compiled/webpack';
+import Webpack from 'webpack';
 const {
   EntryPlugin
 } = Webpack;
@@ -18,7 +18,7 @@ export default class DevServerPlugin {
 
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
 
-    const hotEntry = require.resolve('@modern-js/deps/compiled/webpack/hot/dev-server');
+    const hotEntry = require.resolve('webpack/hot/dev-server');
 
     const additionalEntries = [clientEntry, hotEntry]; // use a hook to add entries if available
 

package/dist/js/modern/libs/render/cache/type.js

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

package/dist/js/modern/libs/route/matcher.js

@@ -2,7 +2,7 @@ import { removeTailSlash } from '@modern-js/utils';
 import { match, pathToRegexp } from 'path-to-regexp';
 import { ModernRoute } from "./route"; // eslint-disable-next-line no-useless-escape
 
-const regCharsDetector = /[^a-zA-Z\-_0-9\/]/;
+const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
 export class RouteMatcher {
   constructor(spec) {
     this.spec = void 0;

package/dist/js/modern/libs/serve-file.js

@@ -1,30 +1,28 @@
 // Todo 看看是不是能 fork 一份，即使命中也返回
 import serve from 'serve-static';
-export const createStaticFileHandler = rules => {
-  const middlewares = rules.reduce((map, rule) => {
-    map[rule.path] = serve(rule.target);
-    return map;
-  }, {}); // eslint-disable-next-line consistent-return
+import { isString, isRegExp } from '@modern-js/utils';
+export const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
+async (context, next) => {
+  const {
+    url: requestUrl,
+    req,
+    res
+  } = context;
+  const hitRule = rules.find(item => {
+    if (isString(item.path) && requestUrl.startsWith(item.path)) {
+      return true;
+    } else if (isRegExp(item.path) && item.path.test(requestUrl)) {
+      return true;
+    }
 
-  return async (context, next) => {
-    const {
-      url: requestUrl,
-      req,
-      res
-    } = context;
-    const hit = Object.keys(middlewares).find(u => requestUrl.startsWith(u));
+    return false;
+  });
 
-    if (hit) {
-      // when matches static resources, delete the first layer of req.url
-      const removed = hit;
-      context.url = requestUrl.slice(removed.length - 1);
-      middlewares[hit](req, res, () => {
-        // will invok next, recover req.url
-        context.url = removed + context.url;
-        next();
-      });
-    } else {
-      return next();
-    }
-  };
+  if (hitRule) {
+    serve(hitRule.target)(req, res, () => {
+      next();
+    });
+  } else {
+    return next();
+  }
 };

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

@@ -1,6 +1,6 @@
 import path from 'path';
 import { HMR_SOCK_PATH } from '@modern-js/utils';
-import webpackDevMiddleware from '@modern-js/deps/compiled/webpack-dev-middleware';
+import webpackDevMiddleware from 'webpack-dev-middleware';
 import { createMockHandler } from "../dev-tools/mock";
 import { createProxyHandler } from "../libs/proxy";
 import SocketServer from "../dev-tools/socket-server";

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

@@ -1,16 +1,12 @@
 import { createServer } from 'http';
 import { createServer as createHttpsServer } from 'https';
 import { serverManager } from '@modern-js/server-plugin';
-import { compatRequire, logger as defaultLogger } from '@modern-js/utils';
+import { logger as defaultLogger } from '@modern-js/utils';
 import { ModernServer } from "./modern-server";
-import { ModernDevServer } from "./dev-server";
-import { WebModernDevServer, WebModernServer } from "./web-server";
-import { APIModernDevServer, APIModernServer } from "./api-server";
 import { measure as defaultMeasure } from "../libs/measure";
-import { genHttpsOptions } from "../dev-tools/https";
 export class Server {
   constructor(options) {
-    var _options$plugins, _options$config, _options$config$outpu;
+    var _options$plugins;
 
     this.options = void 0;
     this.server = void 0;
@@ -20,10 +16,6 @@ export class Server {
     (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
       serverManager.usePlugin(p);
     });
-
-    if (((_options$config = options.config) === null || _options$config === void 0 ? void 0 : (_options$config$outpu = _options$config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.polyfill) === 'ua') {
-      serverManager.usePlugin(compatRequire('@modern-js/plugin-polyfill'));
-    }
   }
 
   getRequestHandler() {
@@ -60,6 +52,10 @@ export class Server {
       const devHttpsOption = typeof options.dev === 'object' && options.dev.https;
 
       if (devHttpsOption) {
+        const {
+          genHttpsOptions
+        } = require("../dev-tools/https");
+
         const httpsOptions = await genHttpsOptions(devHttpsOption);
         this.app = createHttpsServer(httpsOptions, this.getRequestHandler());
       } else {
@@ -101,8 +97,16 @@ export class Server {
     } = this;
 
     if (options.apiOnly) {
+      const {
+        APIModernServer
+      } = require("./api-server");
+
       return new APIModernServer(options, this.runner);
     } else if (options.webOnly) {
+      const {
+        WebModernServer
+      } = require("./web-server");
+
       return new WebModernServer(options, this.runner);
     } else {
       return new ModernServer(options, this.runner);
@@ -115,10 +119,22 @@ export class Server {
     } = this;
 
     if (options.apiOnly) {
+      const {
+        APIModernDevServer
+      } = require("./api-server");
+
       return new APIModernDevServer(options, this.runner);
     } else if (options.webOnly) {
+      const {
+        WebModernDevServer
+      } = require("./web-server");
+
       return new WebModernDevServer(options, this.runner);
     } else {
+      const {
+        ModernDevServer
+      } = require("./dev-server");
+
       return new ModernDevServer(options, this.runner);
     }
   }

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

@@ -120,12 +120,17 @@ export class ModernServer {
     }
 
     await this.prepareFrameHandler();
+    const {
+      favicon,
+      faviconByEntries
+    } = this.conf.output;
+    const favicons = this.prepareFavicons(favicon, faviconByEntries); // Only work when without setting `assetPrefix`.
+    // Setting `assetPrefix` means these resources should be uploaded to CDN.
+
+    const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''})`);
     this.staticFileHandler = createStaticFileHandler([{
-      path: '/static/',
-      target: path.join(distDir, 'static')
-    }, {
-      path: '/upload/',
-      target: path.join(distDir, 'upload')
+      path: staticPathRegExp,
+      target: distDir
     }]);
     this.routeRenderHandler = createRenderHandler({
       distDir,
@@ -194,13 +199,20 @@ export class ModernServer {
   async prepareFrameHandler() {
     const {
       workDir,
-      runner
+      runner,
+      conf
     } = this; // inner tool, gather user inject
 
-    const {
-      api: userAPIExt,
-      web: userWebExt
-    } = gather(workDir); // server hook, gather plugin inject
+    let userAPIExt = [];
+    let userWebExt = [];
+
+    if (!conf.server.disableUserExtension) {
+      ({
+        api: userAPIExt,
+        web: userWebExt
+      } = gather(workDir));
+    } // server hook, gather plugin inject
+
 
     const _createMiddlewareColl = createMiddlewareCollecter(),
           {
@@ -277,6 +289,26 @@ export class ModernServer {
       this.addHandler(mid);
     });
   }
+
+  prepareFavicons(favicon, faviconByEntries) {
+    const faviconNames = [];
+
+    if (favicon) {
+      faviconNames.push(favicon.substring(favicon.lastIndexOf('/') + 1));
+    }
+
+    if (faviconByEntries) {
+      Object.keys(faviconByEntries).forEach(f => {
+        const curFavicon = faviconByEntries[f];
+
+        if (curFavicon) {
+          faviconNames.push(curFavicon.substring(curFavicon.lastIndexOf('/') + 1));
+        }
+      });
+    }
+
+    return faviconNames;
+  }
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   // eslint-disable-next-line max-statements

package/dist/js/modern/type.js

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

package/dist/js/node/dev-tools/babel/register.js

@@ -29,7 +29,7 @@ const enableRegister = (projectRoot, config) => {
     syntax: 'es6+',
     type: 'commonjs'
   });
-  return require('@modern-js/deps/compiled/babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
+  return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
     only: [function (filePath) {
       // TODO: wait params
       if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {

package/dist/js/node/dev-tools/dev-server-plugin.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _webpack = _interopRequireDefault(require("@modern-js/deps/compiled/webpack"));
+var _webpack = _interopRequireDefault(require("webpack"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -29,7 +29,7 @@ class DevServerPlugin {
 
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
 
-    const hotEntry = require.resolve('@modern-js/deps/compiled/webpack/hot/dev-server');
+    const hotEntry = require.resolve('webpack/hot/dev-server');
 
     const additionalEntries = [clientEntry, hotEntry]; // use a hook to add entries if available
 

package/dist/js/node/libs/route/matcher.js

@@ -12,7 +12,7 @@ var _pathToRegexp = require("path-to-regexp");
 var _route = require("./route");
 
 // eslint-disable-next-line no-useless-escape
-const regCharsDetector = /[^a-zA-Z\-_0-9\/]/;
+const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
 
 class RouteMatcher {
   constructor(spec) {

package/dist/js/node/libs/serve-file.js

@@ -7,36 +7,35 @@ exports.createStaticFileHandler = void 0;
 
 var _serveStatic = _interopRequireDefault(require("serve-static"));
 
+var _utils = require("@modern-js/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Todo 看看是不是能 fork 一份，即使命中也返回
-const createStaticFileHandler = rules => {
-  const middlewares = rules.reduce((map, rule) => {
-    map[rule.path] = (0, _serveStatic.default)(rule.target);
-    return map;
-  }, {}); // eslint-disable-next-line consistent-return
-
-  return async (context, next) => {
-    const {
-      url: requestUrl,
-      req,
-      res
-    } = context;
-    const hit = Object.keys(middlewares).find(u => requestUrl.startsWith(u));
-
-    if (hit) {
-      // when matches static resources, delete the first layer of req.url
-      const removed = hit;
-      context.url = requestUrl.slice(removed.length - 1);
-      middlewares[hit](req, res, () => {
-        // will invok next, recover req.url
-        context.url = removed + context.url;
-        next();
-      });
-    } else {
-      return next();
+const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
+async (context, next) => {
+  const {
+    url: requestUrl,
+    req,
+    res
+  } = context;
+  const hitRule = rules.find(item => {
+    if ((0, _utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
+      return true;
+    } else if ((0, _utils.isRegExp)(item.path) && item.path.test(requestUrl)) {
+      return true;
     }
-  };
+
+    return false;
+  });
+
+  if (hitRule) {
+    (0, _serveStatic.default)(hitRule.target)(req, res, () => {
+      next();
+    });
+  } else {
+    return next();
+  }
 };
 
 exports.createStaticFileHandler = createStaticFileHandler;

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

@@ -9,7 +9,7 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _webpackDevMiddleware = _interopRequireDefault(require("@modern-js/deps/compiled/webpack-dev-middleware"));
+var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
 
 var _mock = require("../dev-tools/mock");
 

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

@@ -15,19 +15,11 @@ var _utils = require("@modern-js/utils");
 
 var _modernServer = require("./modern-server");
 
-var _devServer = require("./dev-server");
-
-var _webServer = require("./web-server");
-
-var _apiServer = require("./api-server");
-
 var _measure = require("../libs/measure");
 
-var _https2 = require("../dev-tools/https");
-
 class Server {
   constructor(options) {
-    var _options$plugins, _options$config, _options$config$outpu;
+    var _options$plugins;
 
     this.options = void 0;
     this.server = void 0;
@@ -37,10 +29,6 @@ class Server {
     (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
       _serverPlugin.serverManager.usePlugin(p);
     });
-
-    if (((_options$config = options.config) === null || _options$config === void 0 ? void 0 : (_options$config$outpu = _options$config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.polyfill) === 'ua') {
-      _serverPlugin.serverManager.usePlugin((0, _utils.compatRequire)('@modern-js/plugin-polyfill'));
-    }
   }
 
   getRequestHandler() {
@@ -77,7 +65,11 @@ class Server {
       const devHttpsOption = typeof options.dev === 'object' && options.dev.https;
 
       if (devHttpsOption) {
-        const httpsOptions = await (0, _https2.genHttpsOptions)(devHttpsOption);
+        const {
+          genHttpsOptions
+        } = require("../dev-tools/https");
+
+        const httpsOptions = await genHttpsOptions(devHttpsOption);
         this.app = (0, _https.createServer)(httpsOptions, this.getRequestHandler());
       } else {
         this.app = (0, _http.createServer)(this.getRequestHandler());
@@ -118,9 +110,17 @@ class Server {
     } = this;
 
     if (options.apiOnly) {
-      return new _apiServer.APIModernServer(options, this.runner);
+      const {
+        APIModernServer
+      } = require("./api-server");
+
+      return new APIModernServer(options, this.runner);
     } else if (options.webOnly) {
-      return new _webServer.WebModernServer(options, this.runner);
+      const {
+        WebModernServer
+      } = require("./web-server");
+
+      return new WebModernServer(options, this.runner);
     } else {
       return new _modernServer.ModernServer(options, this.runner);
     }
@@ -132,11 +132,23 @@ class Server {
     } = this;
 
     if (options.apiOnly) {
-      return new _apiServer.APIModernDevServer(options, this.runner);
+      const {
+        APIModernDevServer
+      } = require("./api-server");
+
+      return new APIModernDevServer(options, this.runner);
     } else if (options.webOnly) {
-      return new _webServer.WebModernDevServer(options, this.runner);
+      const {
+        WebModernDevServer
+      } = require("./web-server");
+
+      return new WebModernDevServer(options, this.runner);
     } else {
-      return new _devServer.ModernDevServer(options, this.runner);
+      const {
+        ModernDevServer
+      } = require("./dev-server");
+
+      return new ModernDevServer(options, this.runner);
     }
   }
 

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

@@ -148,12 +148,17 @@ class ModernServer {
     }
 
     await this.prepareFrameHandler();
+    const {
+      favicon,
+      faviconByEntries
+    } = this.conf.output;
+    const favicons = this.prepareFavicons(favicon, faviconByEntries); // Only work when without setting `assetPrefix`.
+    // Setting `assetPrefix` means these resources should be uploaded to CDN.
+
+    const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''})`);
     this.staticFileHandler = (0, _serveFile.createStaticFileHandler)([{
-      path: '/static/',
-      target: _path.default.join(distDir, 'static')
-    }, {
-      path: '/upload/',
-      target: _path.default.join(distDir, 'upload')
+      path: staticPathRegExp,
+      target: distDir
     }]);
     this.routeRenderHandler = (0, _render.createRenderHandler)({
       distDir,
@@ -224,13 +229,20 @@ class ModernServer {
   async prepareFrameHandler() {
     const {
       workDir,
-      runner
+      runner,
+      conf
     } = this; // inner tool, gather user inject
 
-    const {
-      api: userAPIExt,
-      web: userWebExt
-    } = (0, _serverUtils.gather)(workDir); // server hook, gather plugin inject
+    let userAPIExt = [];
+    let userWebExt = [];
+
+    if (!conf.server.disableUserExtension) {
+      ({
+        api: userAPIExt,
+        web: userWebExt
+      } = (0, _serverUtils.gather)(workDir));
+    } // server hook, gather plugin inject
+
 
     const _createMiddlewareColl = (0, _serverUtils.createMiddlewareCollecter)(),
           {
@@ -310,6 +322,26 @@ class ModernServer {
       this.addHandler(mid);
     });
   }
+
+  prepareFavicons(favicon, faviconByEntries) {
+    const faviconNames = [];
+
+    if (favicon) {
+      faviconNames.push(favicon.substring(favicon.lastIndexOf('/') + 1));
+    }
+
+    if (faviconByEntries) {
+      Object.keys(faviconByEntries).forEach(f => {
+        const curFavicon = faviconByEntries[f];
+
+        if (curFavicon) {
+          faviconNames.push(curFavicon.substring(curFavicon.lastIndexOf('/') + 1));
+        }
+      });
+    }
+
+    return faviconNames;
+  }
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   // eslint-disable-next-line max-statements

package/dist/types/dev-tools/dev-server-plugin.d.ts

@@ -1,4 +1,4 @@
-import Webpack from '@modern-js/deps/compiled/webpack';
+import Webpack from 'webpack';
 import { DevServerOptions } from '../type';
 export default class DevServerPlugin {
   private readonly options;

package/dist/types/dev-tools/socket-server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Server } from 'http';
 import ws from 'ws';
-import type { Stats } from '@modern-js/deps/compiled/webpack';
+import type { Stats } from 'webpack';
 import { DevServerOptions } from '../type';
 export default class SocketServer {
   private wsServer;

package/dist/types/libs/serve-file.d.ts

@@ -1,7 +1,7 @@
 import { NextFunction } from '../type';
 import { ModernServerContext } from './context';
 declare type Rule = {
-  path: string;
+  path: string | RegExp;
   target: string;
 };
 export declare const createStaticFileHandler: (rules: Rule[]) => (context: ModernServerContext, next: NextFunction) => Promise<void>;

package/dist/types/server/modern-server.d.ts

@@ -51,6 +51,7 @@ export declare class ModernServer {
   protected prepareAPIHandler(mode: ApiServerMode, extension: ReturnType<typeof mergeExtension>): Promise<Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected preServerInit(): Promise<void>;
+  private prepareFavicons;
   private routeHandler;
   private injectMicroFE;
   private compose;

package/dist/types/type.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type Webpack from '@modern-js/deps/compiled/webpack';
+import type Webpack from 'webpack';
 import { serverManager } from '@modern-js/server-plugin';
 import type { NormalizedConfig } from '@modern-js/core';
 import type { Measure, Logger, NextFunction } from '@modern-js/types/server';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-bundle-deps-2021101244657",
+  "version": "0.0.0-plugins-202111301002",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -26,16 +26,27 @@
       "default": "./dist/js/treeshaking/index.js"
     }
   },
+  "scripts": {
+    "prepare": "pnpm build",
+    "prepublishOnly": "pnpm build --platform",
+    "new": "modern new",
+    "build": "modern build",
+    "dev": "modern build --watch",
+    "test": "modern test --passWithNoTests"
+  },
   "dependencies": {
+    "@babel/core": "^7.15.0",
     "@babel/compat-data": "^7.15.0",
+    "@babel/preset-env": "^7.15.0",
+    "@babel/preset-typescript": "^7.15.0",
+    "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "0.0.0-bundle-deps-2021101244657",
-    "@modern-js/hmr-client": "0.0.0-bundle-deps-2021101244657",
-    "@modern-js/plugin-polyfill": "0.0.0-bundle-deps-2021101244657",
-    "@modern-js/server-plugin": "0.0.0-bundle-deps-2021101244657",
-    "@modern-js/server-utils": "0.0.0-bundle-deps-2021101244657",
-    "@modern-js/bff-utils": "0.0.0-bundle-deps-2021101244657",
-    "@modern-js/utils": "0.0.0-bundle-deps-2021101244657",
+    "@modern-js/core": "^1.1.2",
+    "@modern-js/hmr-client": "^1.1.1",
+    "@modern-js/server-plugin": "^1.1.1",
+    "@modern-js/server-utils": "^1.1.1",
+    "@modern-js/bff-utils": "^1.1.1",
+    "@modern-js/utils": "^1.1.2",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -54,13 +65,13 @@
     "serve-static": "^1.14.1",
     "tsconfig-paths": "^3.11.0",
     "ua-parser-js": "^0.7.28",
-    "ws": "^8.2.0",
-    "@modern-js/deps": "0.0.0-bundle-deps-2021101244657"
+    "webpack-dev-middleware": "^5.0.0",
+    "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^0.0.0-bundle-deps-2021101244657",
-    "@modern-js/plugin-testing": "^0.0.0-bundle-deps-2021101244657",
-    "@modern-js/types": "0.0.0-bundle-deps-2021101244657",
+    "@modern-js/module-tools": "^1.1.1",
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/types": "^1.1.2",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",
@@ -72,8 +83,13 @@
     "@types/serialize-javascript": "^5.0.1",
     "@types/serve-static": "^1.13.10",
     "@types/ua-parser-js": "^0.7.36",
+    "@types/webpack-dev-middleware": "^5.0.2",
     "@types/ws": "^7.4.7",
-    "typescript": "^4"
+    "typescript": "^4",
+    "webpack": "^5.54.0"
+  },
+  "peerDependencies": {
+    "webpack": "^5.54.0"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -84,11 +100,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
-  },
-  "scripts": {
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
   }
-}
+}

package/src/dev-tools/babel/register.ts

@@ -17,7 +17,7 @@ export const enableRegister = (
     type: 'commonjs',
   });
 
-  return require('@modern-js/deps/compiled/babel/register')({
+  return require('@babel/register')({
     ...babelConfig,
     only: [
       function (filePath: string) {

package/src/dev-tools/dev-server-plugin.ts

@@ -1,4 +1,4 @@
-import Webpack from '@modern-js/deps/compiled/webpack';
+import Webpack from 'webpack';
 import { DevServerOptions } from '../type';
 
 const { EntryPlugin } = Webpack;
@@ -20,9 +20,7 @@ export default class DevServerPlugin {
     const clientEntry = `${require.resolve(
       '@modern-js/hmr-client',
     )}?${host}${path}${port}`;
-    const hotEntry = require.resolve(
-      '@modern-js/deps/compiled/webpack/hot/dev-server',
-    );
+    const hotEntry = require.resolve('webpack/hot/dev-server');
     const additionalEntries = [clientEntry, hotEntry];
 
     // use a hook to add entries if available

package/src/dev-tools/socket-server.ts

@@ -1,7 +1,7 @@
 import { Server } from 'http';
 import { Socket } from 'net';
 import ws from 'ws';
-import type { Stats } from '@modern-js/deps/compiled/webpack';
+import type { Stats } from 'webpack';
 import { logger } from '@modern-js/utils';
 import { DevServerOptions } from '../type';
 import { noop } from '@/utils';

package/src/libs/route/matcher.ts

@@ -8,7 +8,7 @@ import {
 import { ModernRoute, ModernRouteInterface } from './route';
 
 // eslint-disable-next-line no-useless-escape
-const regCharsDetector = /[^a-zA-Z\-_0-9\/]/;
+const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
 export class RouteMatcher {
   public spec: ModernRouteInterface;
 

package/src/libs/serve-file.ts

@@ -1,38 +1,34 @@
 // Todo 看看是不是能 fork 一份，即使命中也返回
 import serve from 'serve-static';
+import { isString, isRegExp } from '@modern-js/utils';
 import { NextFunction } from '../type';
 import { ModernServerContext } from './context';
 
 type Rule = {
-  path: string;
+  path: string | RegExp;
   target: string;
 };
 
-export const createStaticFileHandler = (rules: Rule[]) => {
-  const middlewares = rules.reduce(
-    (map: Record<string, ReturnType<typeof serve>>, rule) => {
-      map[rule.path] = serve(rule.target);
-      return map;
-    },
-    {},
-  );
-
+export const createStaticFileHandler =
+  (rules: Rule[]) =>
   // eslint-disable-next-line consistent-return
-  return async (context: ModernServerContext, next: NextFunction) => {
+  async (context: ModernServerContext, next: NextFunction) => {
     const { url: requestUrl, req, res } = context;
-    const hit = Object.keys(middlewares).find(u => requestUrl.startsWith(u));
 
-    if (hit) {
-      // when matches static resources, delete the first layer of req.url
-      const removed = hit;
-      context.url = requestUrl.slice(removed.length - 1);
-      middlewares[hit](req, res, () => {
-        // will invok next, recover req.url
-        context.url = removed + context.url;
+    const hitRule = rules.find(item => {
+      if (isString(item.path) && requestUrl.startsWith(item.path)) {
+        return true;
+      } else if (isRegExp(item.path) && item.path.test(requestUrl)) {
+        return true;
+      }
+      return false;
+    });
+
+    if (hitRule) {
+      serve(hitRule.target)(req, res, () => {
         next();
       });
     } else {
       return next();
     }
   };
-};

package/src/server/dev-server.ts

@@ -1,10 +1,10 @@
 import http, { Server } from 'http';
 import path from 'path';
 import { HMR_SOCK_PATH } from '@modern-js/utils';
-import type { MultiCompiler, Compiler } from '@modern-js/deps/compiled/webpack';
+import type { MultiCompiler, Compiler } from 'webpack';
 import webpackDevMiddleware, {
   WebpackDevMiddleware,
-} from '@modern-js/deps/compiled/webpack-dev-middleware';
+} from 'webpack-dev-middleware';
 import { createMockHandler } from '../dev-tools/mock';
 import { createProxyHandler, ProxyOptions } from '../libs/proxy';
 import {

package/src/server/index.ts

@@ -6,14 +6,11 @@ import {
 } from 'http';
 import { createServer as createHttpsServer } from 'https';
 import { serverManager } from '@modern-js/server-plugin';
-import { compatRequire, logger as defaultLogger } from '@modern-js/utils';
+import { logger as defaultLogger } from '@modern-js/utils';
 import { ModernServerOptions, ServerHookRunner, ReadyOptions } from '../type';
 import { ModernServer } from './modern-server';
-import { ModernDevServer } from './dev-server';
-import { WebModernDevServer, WebModernServer } from './web-server';
-import { APIModernDevServer, APIModernServer } from './api-server';
+import type { ModernDevServer } from './dev-server';
 import { measure as defaultMeasure } from '@/libs/measure';
-import { genHttpsOptions } from '@/dev-tools/https';
 
 export class Server {
   public options: ModernServerOptions;
@@ -29,10 +26,6 @@ export class Server {
     options.plugins?.forEach(p => {
       serverManager.usePlugin(p);
     });
-
-    if (options.config?.output?.polyfill === 'ua') {
-      serverManager.usePlugin(compatRequire('@modern-js/plugin-polyfill'));
-    }
   }
 
   public getRequestHandler() {
@@ -68,6 +61,7 @@ export class Server {
       const devHttpsOption =
         typeof options.dev === 'object' && options.dev.https;
       if (devHttpsOption) {
+        const { genHttpsOptions } = require('@/dev-tools/https');
         const httpsOptions = await genHttpsOptions(devHttpsOption);
         this.app = createHttpsServer(httpsOptions, this.getRequestHandler());
       } else {
@@ -109,8 +103,10 @@ export class Server {
     const { options } = this;
 
     if (options.apiOnly) {
+      const { APIModernServer } = require('./api-server');
       return new APIModernServer(options, this.runner);
     } else if (options.webOnly) {
+      const { WebModernServer } = require('./web-server');
       return new WebModernServer(options, this.runner);
     } else {
       return new ModernServer(options, this.runner);
@@ -121,10 +117,13 @@ export class Server {
     const { options } = this;
 
     if (options.apiOnly) {
+      const { APIModernDevServer } = require('./api-server');
       return new APIModernDevServer(options, this.runner);
     } else if (options.webOnly) {
+      const { WebModernDevServer } = require('./web-server');
       return new WebModernDevServer(options, this.runner);
     } else {
+      const { ModernDevServer } = require('./dev-server');
       return new ModernDevServer(options, this.runner);
     }
   }

package/src/server/modern-server.ts

@@ -154,14 +154,20 @@ export class ModernServer {
 
     await this.prepareFrameHandler();
 
+    const { favicon, faviconByEntries } = this.conf.output;
+    const favicons = this.prepareFavicons(favicon, faviconByEntries);
+    // Only work when without setting `assetPrefix`.
+    // Setting `assetPrefix` means these resources should be uploaded to CDN.
+    const staticPathRegExp = new RegExp(
+      `^/(static/|upload/|favicon.ico|icon.png${
+        favicons.length > 0 ? `|${favicons.join('|')}` : ''
+      })`,
+    );
+
     this.staticFileHandler = createStaticFileHandler([
       {
-        path: '/static/',
-        target: path.join(distDir, 'static'),
-      },
-      {
-        path: '/upload/',
-        target: path.join(distDir, 'upload'),
+        path: staticPathRegExp,
+        target: distDir,
       },
     ]);
 
@@ -233,10 +239,14 @@ export class ModernServer {
 
   // gather frame extension and get framework handler
   protected async prepareFrameHandler() {
-    const { workDir, runner } = this;
+    const { workDir, runner, conf } = this;
 
     // inner tool, gather user inject
-    const { api: userAPIExt, web: userWebExt } = gather(workDir);
+    let userAPIExt = [];
+    let userWebExt = [];
+    if (!conf.server.disableUserExtension) {
+      ({ api: userAPIExt, web: userWebExt } = gather(workDir));
+    }
 
     // server hook, gather plugin inject
     const { getMiddlewares, ...collector } = createMiddlewareCollecter();
@@ -315,6 +325,27 @@ export class ModernServer {
     });
   }
 
+  private prepareFavicons(
+    favicon: string | undefined,
+    faviconByEntries?: Record<string, string | undefined>,
+  ) {
+    const faviconNames = [];
+    if (favicon) {
+      faviconNames.push(favicon.substring(favicon.lastIndexOf('/') + 1));
+    }
+    if (faviconByEntries) {
+      Object.keys(faviconByEntries).forEach(f => {
+        const curFavicon = faviconByEntries[f];
+        if (curFavicon) {
+          faviconNames.push(
+            curFavicon.substring(curFavicon.lastIndexOf('/') + 1),
+          );
+        }
+      });
+    }
+    return faviconNames;
+  }
+
   /* —————————————————————— private function —————————————————————— */
 
   // handler route.json, include api / csr / ssr

package/src/type.ts

@@ -1,5 +1,5 @@
 import { Buffer } from 'buffer';
-import type Webpack from '@modern-js/deps/compiled/webpack';
+import type Webpack from 'webpack';
 import { serverManager } from '@modern-js/server-plugin';
 import type { NormalizedConfig } from '@modern-js/core';
 import type { Measure, Logger, NextFunction } from '@modern-js/types/server';