@nocobase/cli 2.2.0-alpha.7 → 2.2.0-alpha.9

package/dist/lib/env-proxy.js

@@ -489,6 +489,7 @@ function buildNginxManagedConfigBlock(context) {
     const v2PublicPathNoTrailingSlash = trimTrailingSlash(context.v2PublicPath);
     const apiBasePathNoTrailingSlash = trimTrailingSlash(context.apiBasePath);
     const appPublicPathNoTrailingSlash = trimTrailingSlash(context.appPublicPath);
+    const fileAccessPath = `${context.appPublicPath}files/`;
     const isRootMounted = context.appPublicPath === '/';
     const appPublicPathRedirectBlock = isRootMounted
         ? ''
@@ -526,6 +527,20 @@ function buildNginxManagedConfigBlock(context) {
         `        include ${context.snippetsDir}/proxy-location.conf;`,
         '    }',
         '',
+        `    location ^~ ${fileAccessPath} {`,
+        `        proxy_pass ${context.backendUrl};`,
+        `        include ${context.snippetsDir}/proxy-location.conf;`,
+        '    }',
+        ...(!isRootMounted
+            ? [
+                '',
+                '    location ^~ /files/ {',
+                `        proxy_pass ${context.backendUrl};`,
+                `        include ${context.snippetsDir}/proxy-location.conf;`,
+                '    }',
+            ]
+            : []),
+        '',
         `    location = ${apiBasePathNoTrailingSlash} {`,
         `        return 308 ${context.apiBasePath}$is_args$args;`,
         '    }',
@@ -1095,6 +1110,7 @@ function buildCaddyContextCommentLines(siteAddress, context, publicDir) {
 }
 function renderCaddyAppTemplate(siteAddress, context, publicDir) {
     const uploadsPath = `${context.appPublicPath}storage/uploads/`;
+    const fileAccessPathMatcher = toCaddyPathMatcher(`${context.appPublicPath}files/`);
     const distPathMatcher = toCaddyPathMatcher(context.distPath);
     const uploadsPathMatcher = toCaddyPathMatcher(uploadsPath);
     const apiPathMatcher = toCaddyPathMatcher(context.apiBasePath);
@@ -1161,7 +1177,19 @@ function renderCaddyAppTemplate(siteAddress, context, publicDir) {
         `        reverse_proxy ${context.proxyHost}:${context.apiPort}`,
         '    }',
         '',
-        '    # Keep API and WS routes above the SPA fallbacks.',
+        '    # Keep file, API and WS routes above the SPA fallbacks.',
+        `    handle ${fileAccessPathMatcher} {`,
+        `        reverse_proxy ${context.proxyHost}:${context.apiPort}`,
+        '    }',
+        ...(context.appPublicPath === DEFAULT_APP_PUBLIC_PATH
+            ? []
+            : [
+                '',
+                '    handle /files/* {',
+                `        reverse_proxy ${context.proxyHost}:${context.apiPort}`,
+                '    }',
+            ]),
+        '',
         `    handle ${apiPathMatcher} {`,
         `        reverse_proxy ${context.proxyHost}:${context.apiPort}`,
         '    }',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.2.0-alpha.7",
+  "version": "2.2.0-alpha.9",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -144,5 +144,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "34ba02960fca9ab0b6881d3db7040a8a64067bba"
+  "gitHead": "4949bf5ebcd92d77a3a0a718ed578c270e4bd570"
 }