@modern-js/server 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @modern-js/server
 
+## 1.1.2
+
+### Patch Changes
+
+- 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

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/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,
@@ -277,6 +282,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/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/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,
@@ -310,6 +315,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/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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.1",
+  "version": "1.1.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -33,12 +33,12 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.1.1",
-    "@modern-js/hmr-client": "^1.1.0",
-    "@modern-js/server-plugin": "^1.1.0",
-    "@modern-js/server-utils": "^1.1.0",
-    "@modern-js/bff-utils": "^1.1.0",
-    "@modern-js/utils": "^1.1.1",
+    "@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",
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@modern-js/module-tools": "^1.1.0",
     "@modern-js/plugin-testing": "^1.1.0",
-    "@modern-js/types": "^1.1.1",
+    "@modern-js/types": "^1.1.2",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",

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/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,
       },
     ]);
 
@@ -315,6 +321,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