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

package/assets/env-proxy/nginx/snippets/proxy-location.conf

@@ -15,3 +15,4 @@ proxy_connect_timeout 600;
 proxy_send_timeout 600;
 proxy_read_timeout 600;
 send_timeout 600;
+proxy_buffering off;

package/dist/commands/app/start.js

@@ -37,6 +37,9 @@ function buildLicenseSyncArgv(envName, options) {
 }
 function resolveHookCommand(value) {
     const text = String(value ?? '').trim();
+    if (text === 'init') {
+        return text;
+    }
     if (text === 'app:restart' || text === 'app:upgrade') {
         return text;
     }
@@ -225,7 +228,7 @@ export default class AppStart extends Command {
         }),
         'hook-command': Flags.string({
             hidden: true,
-            options: ['app:start', 'app:restart', 'app:upgrade'],
+            options: ['init', 'app:start', 'app:restart', 'app:upgrade'],
         }),
     };
     async run() {

package/dist/commands/env/info.js

@@ -170,8 +170,13 @@ export default class EnvInfo extends Command {
             'auth.accessToken': authGroup.accessToken,
             'auth.refreshToken': authGroup.refreshToken,
         };
+        const envGroup = {
+            name: runtime.envName,
+            kind: runtime.kind,
+        };
         const output = {
             ok: true,
+            name: runtime.envName,
             env: runtime.envName,
             kind: runtime.kind,
             app: serializeGroup(appGroup),
@@ -197,6 +202,11 @@ export default class EnvInfo extends Command {
             this.log(JSON.stringify(output, null, 2));
             return;
         }
-        this.log([createGroupTable('App', appGroup), createGroupTable('DB', dbGroup), createGroupTable('API', apiGroup)].join('\n\n'));
+        this.log([
+            createGroupTable('Env', envGroup),
+            createGroupTable('App', appGroup),
+            createGroupTable('DB', dbGroup),
+            createGroupTable('API', apiGroup),
+        ].join('\n\n'));
     }
 }

package/dist/commands/init.js

@@ -16,7 +16,8 @@ import { getEnv, upsertEnv } from "../lib/auth-store.js";
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
 import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRelativePath } from '../lib/cli-home.js';
-import { resolveDefaultApiHost, resolveDefaultUiHost } from '../lib/cli-config.js';
+import { getCliConfigValue, resolveDefaultApiHost, resolveDefaultUiHost } from '../lib/cli-config.js';
+import { resolveOfficialDockerRegistry } from '../lib/docker-image.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
 import { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
@@ -697,6 +698,12 @@ Prompt modes:
         if (flags.yes && !Object.prototype.hasOwnProperty.call(downloadSeed, 'source')) {
             downloadSeed.source = 'docker';
         }
+        const builtinDbImageRegistry = String(presetValues.dockerRegistry ?? '').trim() ||
+            resolveOfficialDockerRegistry(await getCliConfigValue('nb-image-registry'));
+        if (!Object.prototype.hasOwnProperty.call(presetValues, 'dockerRegistry')) {
+            out.dockerRegistry = builtinDbImageRegistry;
+        }
+        out.builtinDbImageRegistry = builtinDbImageRegistry;
         const dbInitial = await Install.buildDbPromptInitialValues({
             flags,
             downloadResults: downloadSeed,
@@ -704,6 +711,9 @@ Prompt modes:
             warnOnPortFallback: false,
         });
         for (const [key, value] of Object.entries(dbInitial)) {
+            if (key === 'builtinDbImage') {
+                continue;
+            }
             if (!Object.prototype.hasOwnProperty.call(presetValues, key)) {
                 out[key] = value;
             }

package/dist/commands/install.js

@@ -180,6 +180,10 @@ function defaultBuiltinDbImageForDialect(value, options) {
 function defaultDbDatabaseForDialect(value) {
     return String(value ?? '').trim() === 'kingbase' ? 'kingbase' : DEFAULT_INSTALL_DB_DATABASE;
 }
+function supportsDbSchemaPrompt(value) {
+    const dialect = String(value ?? '').trim();
+    return dialect === 'postgres' || dialect === 'kingbase';
+}
 function defaultDbHostForBuiltinDb(values) {
     return values.builtinDb ? DEFAULT_INSTALL_BUILTIN_DB_HOST : DEFAULT_INSTALL_DB_HOST;
 }
@@ -536,7 +540,9 @@ export default class Install extends Command {
             type: 'text',
             message: installText('prompts.builtinDbImage.message'),
             placeholder: installText('prompts.builtinDbImage.placeholder'),
-            initialValue: (values) => defaultBuiltinDbImageForDialect(values.dbDialect),
+            initialValue: (values) => defaultBuiltinDbImageForDialect(values.dbDialect, {
+                registry: String(values.builtinDbImageRegistry ?? '').trim() || undefined,
+            }),
             hidden: (values) => !values.builtinDb || !supportsBuiltinDbDialect(values.dbDialect),
             required: true,
         },
@@ -586,7 +592,7 @@ export default class Install extends Command {
             type: 'text',
             message: installText('prompts.dbSchema.message'),
             placeholder: installText('prompts.dbSchema.placeholder'),
-            hidden: (values) => String(values.dbDialect ?? '').trim() !== 'postgres',
+            hidden: (values) => !supportsDbSchemaPrompt(values.dbDialect),
         },
         dbTablePrefix: {
             type: 'text',
@@ -2253,6 +2259,13 @@ export default class Install extends Command {
         }
         await this.config.runCommand('env:update', [params.envName]);
     }
+    buildAppStartArgv(params) {
+        const argv = ['--env', params.envName, '--yes', '--no-sync-licensed-plugins', '--hook-command', 'init'];
+        if (params.verbose) {
+            argv.push('--verbose');
+        }
+        return argv;
+    }
     async runInstallHookIfNeeded(params) {
         const appPath = Install.resolveAbsoluteAppPath(params.envName, params.appResults);
         const savedHookScript = Install.toOptionalPromptString(params.appResults.hookScript);
@@ -2497,7 +2510,6 @@ export default class Install extends Command {
         const parsed = {
             ...flags,
         };
-        const defaultApiHost = await resolveDefaultApiHost();
         if (parsed['skip-auth'] && (parsed['access-token'] !== undefined || parsed.token !== undefined)) {
             this.error('--skip-auth cannot be used with --access-token or --token.');
         }
@@ -2577,8 +2589,7 @@ export default class Install extends Command {
             dbResults.dbUser = builtinDbPlan.dbUser;
             dbResults.dbPassword = builtinDbPlan.dbPassword;
         }
-        let dockerAppPlan;
-        let localAppPlan;
+        let shouldStartApp = false;
         if (source === 'docker' || source === 'npm' || source === 'git') {
             this.logStage('Preparing application');
             if (source === 'docker') {
@@ -2590,111 +2601,28 @@ export default class Install extends Command {
                     printInfo('Application image ready.');
                 }
                 if (!parsed['prepare-only']) {
-                    await this.runInstallHookIfNeeded({
-                        hookName: 'beforeAppInstall',
-                        envName,
-                        source,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        envAddResults,
-                        defaultApiHost,
-                    });
-                    dockerAppPlan = await this.installDockerApp({
-                        envName,
-                        dockerNetworkName,
-                        dockerContainerPrefix,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        builtinDbPlan,
-                        force: parsed.force,
-                        commandStdio,
-                    });
-                    appResults.appKey = dockerAppPlan.appKey;
-                    appResults.timeZone = dockerAppPlan.timeZone;
+                    shouldStartApp = true;
                 }
             }
             else if (source === 'npm' || source === 'git') {
-                const localSource = source === 'npm' ? 'npm' : 'git';
-                const projectRoot = parsed['skip-download'] || parsed['prepare-only']
-                    ? Install.resolveLocalProjectRoot({
-                        envName,
-                        appResults,
-                        downloadResults,
-                    })
-                    : await this.downloadLocalApp({
+                if (!parsed['skip-download'] && !parsed['prepare-only']) {
+                    await this.downloadLocalApp({
                         envName,
                         appResults,
                         downloadResults,
                         verbose: parsed.verbose,
                     });
-                if (!parsed['skip-download'] && !parsed['prepare-only']) {
                     printInfo('Application files ready.');
                 }
                 if (!parsed['prepare-only']) {
-                    await this.runInstallHookIfNeeded({
-                        hookName: 'beforeAppInstall',
-                        envName,
-                        source,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        envAddResults,
-                        projectRoot,
-                        defaultApiHost,
-                    });
-                    localAppPlan = await this.startLocalApp({
-                        envName,
-                        source: localSource,
-                        projectRoot,
-                        appResults,
-                        dbResults,
-                        rootResults,
-                        commandStdio,
-                    });
-                    appResults.appKey = localAppPlan.appKey;
-                    appResults.timeZone = localAppPlan.timeZone;
+                    shouldStartApp = true;
                 }
             }
         }
         else {
             this.logDetail('Skipped app download and install.');
         }
-        if (dockerAppPlan || localAppPlan) {
-            this.logStage('Starting NocoBase');
-            await this.waitForAppHealthCheck(Install.resolveApiBaseUrl({
-                appResults,
-                envAddResults,
-                defaultApiHost,
-            }), {
-                containerName: dockerAppPlan?.containerName,
-                verbose: parsed.verbose,
-            });
-            const displayApiBaseUrl = Install.resolveApiBaseUrl({
-                appResults,
-                envAddResults,
-                defaultApiHost,
-            });
-            printInfo(`NocoBase is ready at ${formatInstallDisplayUrl(displayApiBaseUrl)}`);
-            appResults.setupState = 'installed';
-            await this.runInstallHookIfNeeded({
-                hookName: 'afterAppStart',
-                envName,
-                source,
-                appResults,
-                downloadResults,
-                dbResults,
-                rootResults,
-                envAddResults,
-                projectRoot: localAppPlan?.projectRoot,
-                defaultApiHost,
-            });
-        }
-        if (dockerAppPlan || localAppPlan || builtinDbPlan) {
+        if (shouldStartApp || builtinDbPlan) {
             await this.saveInstalledEnv({
                 envName,
                 appResults,
@@ -2704,10 +2632,14 @@ export default class Install extends Command {
                 envAddResults,
             });
         }
+        if (shouldStartApp) {
+            this.logStage('Starting NocoBase');
+            await this.config.runCommand('app:start', this.buildAppStartArgv({ envName, verbose: parsed.verbose }));
+        }
         await this.syncInstalledEnvConnection({
             envName,
             envAddResults,
-            appReady: Boolean(dockerAppPlan || localAppPlan),
+            appReady: shouldStartApp,
             skipAuth: Boolean(parsed['skip-auth']),
         });
         if (!parsed['prepare-only']) {
@@ -2716,7 +2648,7 @@ export default class Install extends Command {
         if (parsed['prepare-only']) {
             printInfo(`Preparation complete for "${envName}". Activate the license, then run \`nb app start --env ${envName}\`.`);
         }
-        else if (!dockerAppPlan && !localAppPlan) {
+        else if (!shouldStartApp) {
             printInfo(`Install config for "${envName}" has been saved.`);
         }
     }

package/dist/commands/proxy/caddy/generate.js

@@ -8,6 +8,8 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, } from '../../../lib/app-runtime.js';
+import { resolveEnvProxyEntry, setEnvProxyEntry } from '../../../lib/auth-store.js';
+import { resolveDefaultConfigScope } from '../../../lib/cli-home.js';
 import { getCaddyProxyDriver, writeManualCaddyProxyBundle, writeCaddyProxyBundle, resolveCaddyProxyRuntimeContext, } from '../../../lib/proxy-caddy.js';
 import { normalizeProxyListenPort } from '../../../lib/proxy-nginx.js';
 import { announceTargetEnv, failTask, startTask, succeedTask } from '../../../lib/ui.js';
@@ -129,12 +131,18 @@ export default class ProxyCaddyGenerate extends Command {
         announceTargetEnv(runtime.envName);
         startTask(`Generating caddy proxy config for env "${runtime.envName}" with the ${driver} driver...`);
         try {
-            const { bundle, status } = await writeCaddyProxyBundle(runtime, {
-                host: flags.host?.trim() || undefined,
-                port: normalizedPort,
-            }, runtimeContext, {
+            const savedAppEntryOptions = resolveEnvProxyEntry(runtime.env.config, 'caddy');
+            const appEntryOptions = {
+                host: flags.host?.trim() || savedAppEntryOptions?.host,
+                port: normalizedPort ?? (savedAppEntryOptions?.port !== undefined ? String(savedAppEntryOptions.port) : undefined),
+            };
+            const { bundle, status } = await writeCaddyProxyBundle(runtime, appEntryOptions, runtimeContext, {
                 cdnBaseUrl: flags['cdn-base-url']?.trim() || undefined,
             });
+            await setEnvProxyEntry(runtime.envName, 'caddy', {
+                host: appEntryOptions.host,
+                port: appEntryOptions.port ? Number(appEntryOptions.port) : undefined,
+            }, { scope: resolveDefaultConfigScope() });
             succeedTask(status === 'created'
                 ? `Saved caddy proxy files for env "${runtime.envName}" under ${bundle.entryDir}, and created app.caddy at ${bundle.appConfigPath}.`
                 : `Saved caddy proxy files for env "${runtime.envName}" under ${bundle.entryDir}, and refreshed app.caddy at ${bundle.appConfigPath}.`);

package/dist/commands/proxy/nginx/generate.js

@@ -8,7 +8,9 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, } from '../../../lib/app-runtime.js';
+import { resolveDefaultConfigScope } from '../../../lib/cli-home.js';
 import { getNginxProxyDriver, normalizeProxyListenPort, resolveNginxProxyRuntimeContext, writeManualNginxProxyBundle, writeNginxProxyBundle, } from '../../../lib/proxy-nginx.js';
+import { resolveEnvProxyEntry, setEnvProxyEntry } from '../../../lib/auth-store.js';
 import { announceTargetEnv, failTask, startTask, succeedTask } from '../../../lib/ui.js';
 export default class ProxyNginxGenerate extends Command {
     static summary = 'Generate nginx proxy files for one managed env';
@@ -132,13 +134,19 @@ export default class ProxyNginxGenerate extends Command {
         announceTargetEnv(runtime.envName);
         startTask(`Generating nginx proxy config for env "${runtime.envName}" with the ${driver} driver...`);
         try {
-            const { bundle, status } = await writeNginxProxyBundle(runtime, {
-                host: flags.host?.trim() || undefined,
-                port: normalizedPort,
-            }, runtimeContext, {
+            const savedAppEntryOptions = resolveEnvProxyEntry(runtime.env.config, 'nginx');
+            const appEntryOptions = {
+                host: flags.host?.trim() || savedAppEntryOptions?.host,
+                port: normalizedPort ?? (savedAppEntryOptions?.port !== undefined ? String(savedAppEntryOptions.port) : undefined),
+            };
+            const { bundle, status } = await writeNginxProxyBundle(runtime, appEntryOptions, runtimeContext, {
                 cdnBaseUrl: flags['cdn-base-url']?.trim() || undefined,
                 force: flags.force,
             });
+            await setEnvProxyEntry(runtime.envName, 'nginx', {
+                host: appEntryOptions.host,
+                port: appEntryOptions.port ? Number(appEntryOptions.port) : undefined,
+            }, { scope: resolveDefaultConfigScope() });
             succeedTask(status === 'created'
                 ? `Saved nginx proxy files for env "${runtime.envName}" under ${bundle.entryDir}, and created editable app entry config at ${bundle.appConfigPath}.`
                 : `Saved nginx proxy files for env "${runtime.envName}" under ${bundle.entryDir}, and refreshed editable app entry config at ${bundle.appConfigPath}.`);

package/dist/commands/source/download.js

@@ -345,8 +345,8 @@ export default class SourceDownload extends Command {
                     label: downloadText('prompts.dockerPlatform.autoLabel'),
                     hint: downloadText('prompts.dockerPlatform.autoHint'),
                 },
-                { value: 'linux/amd64', label: 'linux/amd64' },
-                { value: 'linux/arm64', label: 'linux/arm64' },
+                { value: 'linux/amd64', label: 'amd64' },
+                { value: 'linux/arm64', label: 'arm64' },
             ],
             initialValue: DEFAULT_DOCKER_PLATFORM,
             yesInitialValue: DEFAULT_DOCKER_PLATFORM,

package/dist/lib/auth-store.js

@@ -11,6 +11,7 @@ import path from 'node:path';
 import { resolveAppPublicPath } from './app-public-path.js';
 import { resolveCliHomeDir, resolveConfiguredEnvPath, resolveEnvRelativePath } from './cli-home.js';
 import { normalizeCliLocale } from './cli-locale.js';
+import { normalizeEnvProxyConfig, normalizeEnvProxyProviderConfig, } from './env-proxy-config.js';
 import { inferConfiguredAppPathFromLegacyConfig, resolveConfiguredAppPath, resolveConfiguredSourcePath, resolveConfiguredStoragePath, } from './env-paths.js';
 import { ENV_CONFIG_SCHEMA_VERSION, normalizeEnvConfigSchemaVersion } from './env-config.js';
 import { cleanupCurrentSessionAfterEnvRemoval, resolveEffectiveCurrentEnv, setSessionCurrentEnv, } from './session-store.js';
@@ -81,12 +82,14 @@ function normalizeEnvConfigEntry(entry) {
     const normalizedKind = resolveEnvKind(entry);
     const apiBaseUrl = readEnvApiBaseUrl(entry);
     const schemaVersion = normalizeEnvConfigSchemaVersion(entry.schemaVersion);
+    const proxy = normalizeEnvProxyConfig(entry.proxy);
     return {
         ...rest,
         ...(schemaVersion ? { schemaVersion } : {}),
         ...(normalizedKind ? { kind: normalizedKind } : {}),
         ...(apiBaseUrl !== undefined ? { apiBaseUrl } : {}),
         ...(normalizeOptionalString(entry.appPublicPath) ? { appPublicPath: resolveAppPublicPath(entry.appPublicPath) } : {}),
+        ...(proxy ? { proxy } : {}),
     };
 }
 function normalizeAuthConfig(config) {
@@ -516,6 +519,64 @@ export async function setEnvRuntime(envName, runtime, options = {}) {
     };
     await saveAuthConfig(config, options);
 }
+export function resolveEnvProxyEntry(config, provider) {
+    const proxy = normalizeEnvProxyConfig(config?.proxy);
+    const resolved = {
+        ...(proxy?.host ? { host: proxy.host } : {}),
+        ...(proxy?.port !== undefined ? { port: proxy.port } : {}),
+        ...((provider === 'nginx' ? proxy?.nginx : proxy?.caddy) ?? {}),
+    };
+    return Object.keys(resolved).length > 0 ? resolved : undefined;
+}
+export async function setEnvProxyEntry(envName, provider, entry, options = {}) {
+    await writeEnv(envName, (previous) => {
+        const currentProxy = normalizeEnvProxyConfig(previous?.proxy) ?? {};
+        const nextEntry = normalizeEnvProxyProviderConfig(entry);
+        const nextProxy = { ...currentProxy };
+        if (nextEntry && 'host' in nextEntry) {
+            const host = normalizeOptionalString(nextEntry.host);
+            if (host) {
+                nextProxy.host = host;
+            }
+            else {
+                delete nextProxy.host;
+            }
+        }
+        if (nextEntry && 'port' in nextEntry) {
+            const portValue = nextEntry.port;
+            const port = typeof portValue === 'number' && Number.isInteger(portValue) && portValue >= 1 && portValue <= 65535
+                ? portValue
+                : undefined;
+            if (port !== undefined) {
+                nextProxy.port = port;
+            }
+            else {
+                delete nextProxy.port;
+            }
+        }
+        const providerConfig = nextEntry && Object.keys(nextEntry).some((key) => key !== 'host' && key !== 'port')
+            ? Object.fromEntries(Object.entries(nextEntry).filter(([key]) => key !== 'host' && key !== 'port'))
+            : undefined;
+        if (provider === 'nginx') {
+            if (providerConfig && Object.keys(providerConfig).length > 0) {
+                nextProxy.nginx = providerConfig;
+            }
+            else {
+                delete nextProxy.nginx;
+            }
+        }
+        else if (providerConfig && Object.keys(providerConfig).length > 0) {
+            nextProxy.caddy = providerConfig;
+        }
+        else {
+            delete nextProxy.caddy;
+        }
+        return {
+            ...previous,
+            proxy: nextProxy,
+        };
+    }, options);
+}
 export async function clearEnvRootSetup(envName, options = {}) {
     const config = await loadExactAuthConfig(options);
     const current = config.envs[envName];

package/dist/lib/cli-config.js

@@ -242,7 +242,9 @@ export function getEffectiveCliConfigValue(config, key) {
         case 'docker.container-prefix':
             return trimValue(config.name) || DEFAULT_DOCKER_CONTAINER_PREFIX;
         case 'nb-image-registry':
-            return explicit ?? DEFAULT_NB_IMAGE_REGISTRY;
+            return explicit ?? (resolveCliLocale(undefined, { configuredLocale: trimValue(config.settings?.locale) }) === 'zh-CN'
+                ? 'aliyun'
+                : DEFAULT_NB_IMAGE_REGISTRY);
         case 'nb-image-variant':
             return explicit ?? DEFAULT_NB_IMAGE_VARIANT;
         case 'bin.docker':

package/dist/lib/env-config.js

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { normalizeEnvProxyConfig } from './env-proxy-config.js';
 import { resolveAppPublicPath } from './app-public-path.js';
 const STRING_ENV_CONFIG_KEYS = [
     'source',
@@ -110,5 +111,9 @@ export function buildStoredEnvConfig(input) {
     if ((authType === 'basic' || authType === 'token') && accessToken) {
         envConfig.accessToken = accessToken;
     }
+    const proxy = normalizeEnvProxyConfig(input.proxy);
+    if (proxy) {
+        envConfig.proxy = proxy;
+    }
     return envConfig;
 }

package/dist/lib/env-proxy-config.js

@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+function normalizeOptionalString(value) {
+    const normalized = String(value ?? '').trim();
+    return normalized || undefined;
+}
+function normalizeOptionalPort(value) {
+    const normalized = normalizeOptionalString(value);
+    if (!normalized || !/^\d+$/.test(normalized)) {
+        return undefined;
+    }
+    const port = Number(normalized);
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        return undefined;
+    }
+    return port;
+}
+export function normalizeEnvProxyProviderConfig(value) {
+    if (!value || typeof value !== 'object') {
+        return undefined;
+    }
+    return { ...value };
+}
+export function normalizeEnvProxyConfig(value) {
+    if (!value || typeof value !== 'object') {
+        return undefined;
+    }
+    const proxy = value;
+    const host = normalizeOptionalString(proxy.host);
+    const port = normalizeOptionalPort(proxy.port);
+    const nginx = normalizeEnvProxyProviderConfig(proxy.nginx);
+    const caddy = normalizeEnvProxyProviderConfig(proxy.caddy);
+    if (!host && port === undefined && !nginx && !caddy) {
+        return undefined;
+    }
+    return {
+        ...(host ? { host } : {}),
+        ...(port !== undefined ? { port } : {}),
+        ...(nginx ? { nginx } : {}),
+        ...(caddy ? { caddy } : {}),
+    };
+}

package/dist/lib/env-proxy.js

@@ -487,6 +487,7 @@ function rewriteHtmlAssetPublicPath(html, currentPublicPath, nextPublicPath) {
 }
 function buildNginxManagedConfigBlock(context) {
     const v2PublicPathNoTrailingSlash = trimTrailingSlash(context.v2PublicPath);
+    const apiBasePathNoTrailingSlash = trimTrailingSlash(context.apiBasePath);
     const appPublicPathNoTrailingSlash = trimTrailingSlash(context.appPublicPath);
     const isRootMounted = context.appPublicPath === '/';
     const appPublicPathRedirectBlock = isRootMounted
@@ -525,6 +526,10 @@ function buildNginxManagedConfigBlock(context) {
         `        include ${context.snippetsDir}/proxy-location.conf;`,
         '    }',
         '',
+        `    location = ${apiBasePathNoTrailingSlash} {`,
+        `        return 308 ${context.apiBasePath}$is_args$args;`,
+        '    }',
+        '',
         `    location ^~ ${context.apiBasePath} {`,
         `        proxy_pass ${context.backendUrl};`,
         `        include ${context.snippetsDir}/proxy-location.conf;`,
@@ -989,6 +994,7 @@ function buildNginxOtherLocation(appPublicPath, v2PublicPath, modernClientPrefix
 function renderNginxLocationTemplate(context) {
     const proxyPassBlock = buildNginxProxyPassBlock(context.proxyHost, context.apiPort);
     const wsProxyPassTarget = `http://${context.proxyHost}:${context.apiPort}${context.wsPath}`;
+    const apiBasePathNoTrailingSlash = trimTrailingSlash(context.apiBasePath);
     return `    location ~* ^${context.appPublicPath}storage/uploads/(.*\\.md)$ {
         alias ${context.uploadsPath}/$1;
         default_type text/markdown;
@@ -1034,6 +1040,10 @@ function renderNginxLocationTemplate(context) {
         ${proxyPassBlock}
     }${context.otherLocation}
 
+    location = ${apiBasePathNoTrailingSlash} {
+        return 308 ${context.apiBasePath}$is_args$args;
+    }
+
     location ^~ ${context.apiBasePath} {
         ${proxyPassBlock}
     }