@nocobase/server 0.20.0-alpha.10 → 0.20.0-alpha.12

package/lib/gateway/index.js

@@ -153,23 +153,25 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   }
   async requestHandler(req, res) {
     const { pathname } = (0, import_url.parse)(req.url);
-    if (pathname === "/__umi/api/bundle-status") {
+    const { PLUGIN_STATICS_PATH, APP_PUBLIC_PATH } = process.env;
+    if (pathname.endsWith("/__umi/api/bundle-status")) {
       res.statusCode = 200;
       res.end("ok");
       return;
     }
-    if (pathname.startsWith("/storage/uploads/")) {
+    if (pathname.startsWith(APP_PUBLIC_PATH + "storage/uploads/")) {
+      req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
       await compress(req, res);
       return (0, import_serve_handler.default)(req, res, {
         public: (0, import_path.resolve)(process.cwd()),
         directoryListing: false
       });
     }
-    if (pathname.startsWith(import_plugin_manager.PLUGIN_STATICS_PATH) && !pathname.includes("/server/")) {
+    if (pathname.startsWith(PLUGIN_STATICS_PATH) && !pathname.includes("/server/")) {
       await compress(req, res);
       const packageName = (0, import_plugin_manager.getPackageNameByExposeUrl)(pathname);
       const publicDir = (0, import_plugin_manager.getPackageDirByExposeUrl)(pathname);
-      const destination = pathname.replace(import_plugin_manager.PLUGIN_STATICS_PATH, "").replace(packageName, "");
+      const destination = pathname.replace(PLUGIN_STATICS_PATH, "").replace(packageName, "");
       return (0, import_serve_handler.default)(req, res, {
         public: publicDir,
         rewrites: [
@@ -180,7 +182,8 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
         ]
       });
     }
-    if (!pathname.startsWith("/api")) {
+    if (!pathname.startsWith(process.env.API_BASE_PATH)) {
+      req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
       await compress(req, res);
       return (0, import_serve_handler.default)(req, res, {
         public: `${process.env.APP_PACKAGE_ROOT}/dist/client`,

package/lib/plugin-manager/clientStaticUtils.js

@@ -73,7 +73,7 @@ function getPackageFilePathWithExistCheck(packageName, filePath) {
 }
 __name(getPackageFilePathWithExistCheck, "getPackageFilePathWithExistCheck");
 function getExposeUrl(packageName, filePath) {
-  return `${PLUGIN_STATICS_PATH}${packageName}/${filePath}`;
+  return `${process.env.PLUGIN_STATICS_PATH}${packageName}/${filePath}`;
 }
 __name(getExposeUrl, "getExposeUrl");
 function getExposeReadmeUrl(packageName, lang) {
@@ -92,7 +92,7 @@ function getExposeChangelogUrl(packageName) {
 }
 __name(getExposeChangelogUrl, "getExposeChangelogUrl");
 function getPackageNameByExposeUrl(pathname) {
-  pathname = pathname.replace(PLUGIN_STATICS_PATH, "");
+  pathname = pathname.replace(process.env.PLUGIN_STATICS_PATH, "");
   const pathArr = pathname.split("/");
   if (pathname.startsWith("@")) {
     return pathArr.slice(0, 2).join("/");

package/lib/plugin-manager/options/resource.js

@@ -155,7 +155,10 @@ var resource_default = {
         try {
           return {
             ...item.toJSON(),
-            url: `${(0, import_clientStaticUtils.getExposeUrl)(item.packageName, PLUGIN_CLIENT_ENTRY_FILE)}?version=${item.version}`
+            url: `${process.env.APP_SERVER_BASE_URL}${(0, import_clientStaticUtils.getExposeUrl)(
+              item.packageName,
+              PLUGIN_CLIENT_ENTRY_FILE
+            )}?version=${item.version}`
           };
         } catch {
           return false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "0.20.0-alpha.10",
+    "version": "0.20.0-alpha.12",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "Apache-2.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "0.20.0-alpha.10",
-        "@nocobase/actions": "0.20.0-alpha.10",
-        "@nocobase/auth": "0.20.0-alpha.10",
-        "@nocobase/cache": "0.20.0-alpha.10",
-        "@nocobase/data-source-manager": "0.20.0-alpha.10",
-        "@nocobase/database": "0.20.0-alpha.10",
-        "@nocobase/evaluators": "0.20.0-alpha.10",
-        "@nocobase/logger": "0.20.0-alpha.10",
-        "@nocobase/resourcer": "0.20.0-alpha.10",
-        "@nocobase/sdk": "0.20.0-alpha.10",
-        "@nocobase/telemetry": "0.20.0-alpha.10",
-        "@nocobase/utils": "0.20.0-alpha.10",
+        "@nocobase/acl": "0.20.0-alpha.12",
+        "@nocobase/actions": "0.20.0-alpha.12",
+        "@nocobase/auth": "0.20.0-alpha.12",
+        "@nocobase/cache": "0.20.0-alpha.12",
+        "@nocobase/data-source-manager": "0.20.0-alpha.12",
+        "@nocobase/database": "0.20.0-alpha.12",
+        "@nocobase/evaluators": "0.20.0-alpha.12",
+        "@nocobase/logger": "0.20.0-alpha.12",
+        "@nocobase/resourcer": "0.20.0-alpha.12",
+        "@nocobase/sdk": "0.20.0-alpha.12",
+        "@nocobase/telemetry": "0.20.0-alpha.12",
+        "@nocobase/utils": "0.20.0-alpha.12",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "453e0774dae21750e96c7ddd2019c8889a0314d6"
+    "gitHead": "4d6655776b3f418dacd86370126e82ae25e1185a"
 }