@nocobase/app 2.2.0-beta.10 → 2.2.0-beta.12

package/client/src/__tests__/runtimePublicPath.test.ts

@@ -11,13 +11,23 @@ import { resolveRuntimeAssetPublicPath } from '../runtimePublicPath';
 
 describe('resolveRuntimeAssetPublicPath', () => {
   it('should prefer the injected window public path over an auto-detected runtime path', () => {
-    expect(resolveRuntimeAssetPublicPath('/dist/2.1.8/', 'https://static.cloudflareinsights.com/assets/../')).toBe(
+    expect(resolveRuntimeAssetPublicPath('/dist/2.1.8/', '/', 'https://static.cloudflareinsights.com/assets/../')).toBe(
       '/dist/2.1.8/',
     );
   });
 
-  it('should fall back to the runtime public path when the injected value is missing', () => {
-    expect(resolveRuntimeAssetPublicPath(undefined, 'https://cdn.nocobase.com/dist/2.1.8/')).toBe(
+  it('should use the app public path when the CDN base URL is empty', () => {
+    expect(resolveRuntimeAssetPublicPath('', '/', 'https://static.cloudflareinsights.com/assets/../')).toBe('/');
+  });
+
+  it('should use the configured APP_PUBLIC_PATH when the CDN base URL is empty', () => {
+    expect(resolveRuntimeAssetPublicPath('', '/custom-base/', 'https://static.cloudflareinsights.com/assets/../')).toBe(
+      '/custom-base/',
+    );
+  });
+
+  it('should fall back to the runtime public path when the injected paths are missing', () => {
+    expect(resolveRuntimeAssetPublicPath(undefined, undefined, 'https://cdn.nocobase.com/dist/2.1.8/')).toBe(
       'https://cdn.nocobase.com/dist/2.1.8/',
     );
   });

package/client/src/runtimePublicPath.ts

@@ -9,6 +9,7 @@
 
 declare global {
   interface Window {
+    __nocobase_public_path__?: string;
     __webpack_public_path__?: string;
   }
 }
@@ -22,10 +23,14 @@ function normalizePublicPath(value: string | undefined, fallback = '/') {
 }
 
 export function resolveRuntimeAssetPublicPath(
-  windowPublicPath: string | undefined,
+  cdnPublicPath: string | undefined,
+  appPublicPath: string | undefined,
   runtimePublicPath: string | undefined,
 ) {
-  return normalizePublicPath(windowPublicPath, normalizePublicPath(runtimePublicPath, '/'));
+  return normalizePublicPath(
+    cdnPublicPath,
+    normalizePublicPath(appPublicPath, normalizePublicPath(runtimePublicPath, '/')),
+  );
 }
 
 // `__webpack_public_path__` is a webpack magic global that must be assigned
@@ -36,5 +41,9 @@ const runtimePublicPath = typeof __webpack_public_path__ === 'string' ? __webpac
 
 if (typeof window !== 'undefined' && typeof __webpack_public_path__ !== 'undefined') {
   // eslint-disable-next-line prefer-const
-  __webpack_public_path__ = resolveRuntimeAssetPublicPath(window.__webpack_public_path__, runtimePublicPath);
+  __webpack_public_path__ = resolveRuntimeAssetPublicPath(
+    window.__webpack_public_path__,
+    window.__nocobase_public_path__,
+    runtimePublicPath,
+  );
 }

package/client-v2/src/__tests__/runtimePublicPath.test.ts

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+import { resolveRuntimeAssetPublicPath } from '../runtimePublicPath';
+
+describe('resolveRuntimeAssetPublicPath', () => {
+  it('should append the fixed build asset directory to the CDN base URL', () => {
+    expect(resolveRuntimeAssetPublicPath('https://cdn.nocobase.com/dist/2.1.22/', '/v/', 'v')).toBe(
+      'https://cdn.nocobase.com/dist/2.1.22/v/',
+    );
+  });
+
+  it('should use the modern client public path when the CDN base URL is empty', () => {
+    expect(resolveRuntimeAssetPublicPath('', '/v/', 'v')).toBe('/v/');
+  });
+
+  it('should use APP_PUBLIC_PATH plus the runtime modern prefix when the CDN base URL is empty', () => {
+    expect(resolveRuntimeAssetPublicPath('', '/custom-base/modern/', 'v')).toBe('/custom-base/modern/');
+  });
+});

package/client-v2/src/main.tsx

@@ -10,6 +10,7 @@
 import { Application, getModernClientPrefix } from '@nocobase/client-v2';
 import devDynamicImport from './.plugins';
 import { NocoBaseClientPresetPluginV2 } from '@nocobase/preset-nocobase/client-v2';
+import { resolveRuntimeAssetPublicPath } from './runtimePublicPath';
 
 declare global {
   interface Window {
@@ -113,9 +114,7 @@ function getBuildAssetDir() {
 declare let __webpack_public_path__: string;
 const cdnBase = window.__webpack_public_path__;
 // eslint-disable-next-line prefer-const
-__webpack_public_path__ = cdnBase
-  ? ensureSlash(`${cdnBase.replace(/\/$/, '')}/${getBuildAssetDir()}/`, '/')
-  : v2PublicPath;
+__webpack_public_path__ = resolveRuntimeAssetPublicPath(cdnBase, v2PublicPath, getBuildAssetDir());
 
 const app = new Application({
   publicPath: v2PublicPath,

package/client-v2/src/runtimePublicPath.ts

@@ -0,0 +1,34 @@
+/**
+ * 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 normalizePublicPath(value: string, fallback: string) {
+  let normalized = value.trim() || fallback;
+  if (!normalized.endsWith('/')) {
+    normalized = `${normalized}/`;
+  }
+  return normalized;
+}
+
+export function resolveRuntimeAssetPublicPath(
+  cdnPublicPath: string | undefined,
+  appPublicPath: string,
+  buildAssetDir: string,
+) {
+  const normalizedAppPublicPath = normalizePublicPath(appPublicPath, '/');
+  const normalizedCdnPublicPath = cdnPublicPath?.trim();
+  if (!normalizedCdnPublicPath) {
+    return normalizedAppPublicPath;
+  }
+
+  const normalizedBuildAssetDir = buildAssetDir.replace(/^\/+|\/+$/g, '');
+  return normalizePublicPath(
+    `${normalizedCdnPublicPath.replace(/\/+$/, '')}/${normalizedBuildAssetDir}/`,
+    normalizedAppPublicPath,
+  );
+}