@nocobase/cli-v1 3.0.0-alpha.2 → 3.0.0-alpha.4

package/nocobase.conf.tpl

@@ -214,14 +214,28 @@ server {
 
 
 
-    location ^~ {{publicPath}}x/apps/ {
+    location = {{publicPath}}{{portalClientPrefix}} {
         absolute_redirect off;
+        return 302 {{v2PublicPath}}$is_args$args;
+    }
+
+    location = {{publicPath}}{{portalClientPrefix}}/ {
+        absolute_redirect off;
+        return 302 {{v2PublicPath}}$is_args$args;
+    }
+
+    location ^~ {{publicPath}}{{portalClientPrefix}}/apps/ {
+        absolute_redirect off;
+
+        if ($uri ~ ^{{publicPath}}{{portalClientPrefix}}/apps/(?<subapp>[A-Za-z0-9_-]+)/?$) {
+            return 302 {{v2PublicPath}}apps/$subapp/$is_args$args;
+        }
 
-        if ($uri ~ ^{{publicPath}}x/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)$) {
-            return 308 {{publicPath}}x/apps/$subapp/$portal/$is_args$args;
+        if ($uri ~ ^{{publicPath}}{{portalClientPrefix}}/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)$) {
+            return 308 {{publicPath}}{{portalClientPrefix}}/apps/$subapp/$portal/$is_args$args;
         }
 
-        if ($uri !~ ^{{publicPath}}x/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
+        if ($uri !~ ^{{publicPath}}{{portalClientPrefix}}/apps/(?<subapp>[A-Za-z0-9_-]+)/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
             return 404;
         }
 
@@ -238,14 +252,14 @@ server {
             =404;
     }
 
-    location ^~ {{publicPath}}x/ {
+    location ^~ {{publicPath}}{{portalClientPrefix}}/ {
         absolute_redirect off;
 
-        if ($uri ~ ^{{publicPath}}x/(?<portal>[A-Za-z0-9_-]+)$) {
-            return 308 {{publicPath}}x/$portal/$is_args$args;
+        if ($uri ~ ^{{publicPath}}{{portalClientPrefix}}/(?<portal>[A-Za-z0-9_-]+)$) {
+            return 308 {{publicPath}}{{portalClientPrefix}}/$portal/$is_args$args;
         }
 
-        if ($uri !~ ^{{publicPath}}x/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
+        if ($uri !~ ^{{publicPath}}{{portalClientPrefix}}/(?<portal>[A-Za-z0-9_-]+)/(?<portal_path>.*)$) {
             return 404;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.4",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -9,9 +9,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "3.0.0-alpha.2",
+    "@nocobase/cli": "3.0.0-alpha.4",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "3.0.0-alpha.2",
+    "@nocobase/utils": "3.0.0-alpha.4",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "deepmerge": "^4.3.1",
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "a3faea21082b30989301de04591ee1b91fd4e6a5"
+  "gitHead": "6658768567378382de758c4e814ac510d688400c"
 }

package/src/__tests__/create-nginx-conf.test.js

@@ -15,7 +15,7 @@ const path = require('path');
 
 const registerCreateNginxConf = require('../commands/create-nginx-conf');
 
-describe('create-nginx-conf Settings SPA routing', () => {
+describe('create-nginx-conf routing', () => {
   const originalEnv = { ...process.env };
   let storagePath;
 
@@ -65,4 +65,23 @@ describe('create-nginx-conf Settings SPA routing', () => {
       expect(config).toContain('try_files $uri $uri/ /index.html;');
     },
   );
+
+  test.each([
+    ['root mount', '/', '/x', '/v/'],
+    ['custom public path', '/nocobase/', '/nocobase/x', '/nocobase/v/'],
+  ])('redirects Portal roots to the Modern Client for %s', async (_label, publicPath, portalRoot, modernRoot) => {
+    const config = await renderConfig(publicPath);
+
+    expect(config).toContain(`location = ${portalRoot} {
+        absolute_redirect off;
+        return 302 ${modernRoot}$is_args$args;
+    }`);
+    expect(config).toContain(`location = ${portalRoot}/ {
+        absolute_redirect off;
+        return 302 ${modernRoot}$is_args$args;
+    }`);
+    expect(config).toContain(`return 302 ${modernRoot}$is_args$args;`);
+    expect(config).toContain(`if ($uri ~ ^${portalRoot}/apps/(?<subapp>[A-Za-z0-9_-]+)/?$) {`);
+    expect(config).toContain(`return 302 ${modernRoot}apps/$subapp/$is_args$args;`);
+  });
 });

package/src/commands/create-nginx-conf.js

@@ -11,6 +11,8 @@ const { resolve, posix } = require('path');
 const { storagePathJoin, resolvePublicPath, resolveV2PublicPath, normalizeModernClientPrefix } = require('../util');
 const { readFileSync, writeFileSync } = require('fs');
 
+const PORTAL_CLIENT_PREFIX = 'x';
+
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
@@ -70,6 +72,7 @@ module.exports = (cli) => {
       .replace(/\{\{distPath\}\}/g, distPath)
       .replace(/\{\{v2PublicPath\}\}/g, v2PublicPath)
       .replace(/\{\{v2PublicPathNoTrailingSlash\}\}/g, v2PublicPathWithoutTrailingSlash)
+      .replace(/\{\{portalClientPrefix\}\}/g, PORTAL_CLIENT_PREFIX)
       .replace(/\{\{settingsAssetsPath\}\}/g, settingsAssetsPath)
       .replace(/\{\{settingsDocumentPattern\}\}/g, settingsDocumentPattern)
       .replace(/\{\{apiPort\}\}/g, process.env.APP_PORT)