@nocobase/app 1.6.0-alpha.3 → 1.6.0-alpha.30

package/client/.umirc.ts

@@ -16,16 +16,16 @@ generatePlugins();
 export default defineConfig({
   title: 'Loading...',
   devtool: process.env.NODE_ENV === 'development' ? 'source-map' : false,
-  favicons: [`${appPublicPath}favicon/favicon.ico`],
-  metas: [{ name: 'viewport', content: 'initial-scale=0.1' }],
+  favicons: [`${appPublicPath}favicon_no_exist.ico`], // 设置一个不存在的 favicon，防止显示 Umi 默认的 favicon
+  metas: [{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no' }],
   links: [{ rel: 'stylesheet', href: `${appPublicPath}global.css` }],
   headScripts: [
-    {
-      src: `${appPublicPath}browser-checker.js`,
-    },
     {
       content: isDevCmd
-        ? ''
+        ? `
+          window['__nocobase_public_path__'] = "${process.env.APP_PUBLIC_PATH || '/'}";
+          window['__nocobase_dev_public_path__'] = "/";
+        `
         : `
         window['__webpack_public_path__'] = '{{env.APP_PUBLIC_PATH}}';
         window['__nocobase_public_path__'] = '{{env.APP_PUBLIC_PATH}}';
@@ -36,6 +36,9 @@ export default defineConfig({
         window['__nocobase_ws_path__'] = '{{env.WS_PATH}}';
       `,
     },
+    {
+      src: `${appPublicPath}browser-checker.js?v=1`,
+    },
   ],
   cacheDirectoryPath: process.env.APP_CLIENT_CACHE_DIR || `node_modules/.cache`,
   outputPath: path.resolve(__dirname, '../dist/client'),

package/client/public/browser-checker.js

@@ -1,3 +1,13 @@
+const basename = window['__nocobase_public_path__'] || '/';
+let currentPath = window.location.pathname;
+if (currentPath === basename.slice(0, -1)) {
+  const newUrl = `${window.location.origin}${basename}${window.location.search}${window.location.hash}`;
+  window.location.replace(newUrl);
+} else if (!currentPath.startsWith(basename)) {
+  let newPath = basename + (currentPath.startsWith('/') ? currentPath.slice(1) : currentPath);
+  let newUrl = window.location.origin + newPath + window.location.search + window.location.hash;
+  window.location.replace(newUrl);
+}
 showLog = true;
 function log(m) {
   if (window.console && showLog) {

package/client/src/.umi-production/core/helmet.ts

@@ -2,7 +2,7 @@
 // This file is generated by Umi automatically
 // DO NOT CHANGE IT MANUALLY!
 import React from 'react';
-import { HelmetProvider } from '/__w/nocobase/nocobase/node_modules/@umijs/renderer-react';
+import { HelmetProvider } from '/home/runner/work/nocobase/nocobase/node_modules/@umijs/renderer-react';
 import { context } from './helmetContext';
 
 export const innerProvider = (container) => {

package/client/src/.umi-production/core/history.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 // This file is generated by Umi automatically
 // DO NOT CHANGE IT MANUALLY!
-import { createHashHistory, createMemoryHistory, createBrowserHistory } from '/__w/nocobase/nocobase/node_modules/@umijs/renderer-react';
+import { createHashHistory, createMemoryHistory, createBrowserHistory } from '/home/runner/work/nocobase/nocobase/node_modules/@umijs/renderer-react';
 import type { UmiHistory } from './historyIntelli';
 
 let history: UmiHistory;

package/client/src/.umi-production/core/historyIntelli.ts

@@ -2,7 +2,7 @@
 // This file is generated by Umi automatically
 // DO NOT CHANGE IT MANUALLY!
 import { getRoutes } from './route'
-import type { History } from '/__w/nocobase/nocobase/node_modules/@umijs/renderer-react'
+import type { History } from '/home/runner/work/nocobase/nocobase/node_modules/@umijs/renderer-react'
 
 type Routes = Awaited<ReturnType<typeof getRoutes>>['routes']
 type AllRoute = Routes[keyof Routes]