Merge pull request #1110 from refly-ai/fix/web-dockerfile

fix: update Dockerfile config for web-next

Author: mrcfps

.github/workflows/deploy-web-prod.yml

@@ -47,6 +47,8 @@ jobs:
           VITE_SUBSCRIPTION_ENABLED: true
           VITE_CANVAS_TEMPLATE_ENABLED: true
           VITE_SENTRY_ENABLED: true
+          VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          VITE_GTAG_ID: ${{ secrets.GTAG_ID }}
           VITE_RUNTIME: web
           VITE_STATIC_PUBLIC_ENDPOINT: https://static.refly.ai
           VITE_STATIC_PRIVATE_ENDPOINT: https://api.refly.ai/v1/misc

.github/workflows/deploy-web-staging.yml

@@ -38,6 +38,8 @@ jobs:
           VITE_SUBSCRIPTION_ENABLED: true
           VITE_CANVAS_TEMPLATE_ENABLED: true
           VITE_SENTRY_ENABLED: true
+          VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          VITE_GTAG_ID: ${{ secrets.GTAG_ID }}
           VITE_RUNTIME: web
           VITE_STATIC_PUBLIC_ENDPOINT: https://static.refly.ai
           VITE_STATIC_PRIVATE_ENDPOINT: https://staging-api.refly.ai/v1/misc

apps/desktop/package.json

@@ -7,7 +7,7 @@
     "dev": "nodemon",
     "dev:electron": "nodemon",
     "start": "tsc && tsc-alias --project tsconfig.json && electron .",
-    "copy-renderer": "ncp ../web/dist dist/renderer",
+    "copy-renderer": "ncp ../web-next/dist dist/renderer",
     "build:mac": "tsc && electron-builder --mac --dir",
     "build:mac:x64": "tsc && electron-builder --mac --x64 --dir",
     "build:mac:arm64": "tsc && electron-builder --mac --arm64 --dir",

apps/extension/src/entrypoints/main-csui.content/App.tsx

@@ -19,7 +19,6 @@ import { AppRouter } from '@/routes/index';
 
 // 加载国际化
 import '@/i18n/config';
-import { SENTRY_DSN } from '@refly/utils/url';
 
 // 样式
 import '@/styles/style.css';
@@ -29,9 +28,10 @@ import { getPopupContainer } from '@refly-packages/ai-workspace-common/utils/ui'
 import { getEnv, setRuntime } from '@refly/utils/env';
 const Sentry = _Sentry;
 
-if (process.env.NODE_ENV !== 'development') {
+const sentryDsn = process.env.VITE_SENTRY_DSN;
+if (process.env.NODE_ENV !== 'development' && sentryDsn) {
   Sentry.init({
-    dsn: SENTRY_DSN,
+    dsn: sentryDsn,
     environment: getEnv(),
     integrations: [Sentry.browserTracingIntegration(), Sentry.replayIntegration()],
     tracesSampleRate: 1.0, //  Capture 100% of the transactions

apps/web-next/.env.example

@@ -16,6 +16,11 @@ VITE_STATIC_PUBLIC_ENDPOINT=http://localhost:5800/v1/misc/public
 # Static private endpoint
 VITE_STATIC_PRIVATE_ENDPOINT=http://localhost:5800/v1/misc
 
-
+# Sentry configuration
 VITE_SENTRY_ENABLED=
+VITE_SENTRY_DSN=
+
+# Google tag manager ID
+VITE_GTAG_ID=
+
 VITE_RUNTIME=

apps/web-next/Dockerfile

@@ -9,7 +9,7 @@ COPY deploy/docker/nginx.conf /etc/nginx/conf.d/default.conf
 
 # Copy static files
 WORKDIR /usr/share/nginx/html
-COPY apps/web/dist .
+COPY apps/web-next/dist .
 
 # Create config.js template
 RUN echo 'window.ENV = { \

apps/web-next/rsbuild.config.ts

@@ -10,7 +10,7 @@ const { publicVars } = loadEnv({ prefixes: ['VITE_'] });
 
 import path from 'node:path';
 
-const GTAG_ID = 'G-ER782LXJ5F';
+const gtagId = process.env.VITE_GTAG_ID;
 
 const isProduction = process.env.NODE_ENV === 'production';
 
@@ -74,13 +74,13 @@ export default defineConfig({
   },
   html: {
     template: './public/index.html',
-    tags: isProduction
+    tags: gtagId
       ? [
           {
             tag: 'script',
             attrs: {
               async: true,
-              src: `https://www.googletagmanager.com/gtag/js?id=${GTAG_ID}`,
+              src: `https://www.googletagmanager.com/gtag/js?id=${gtagId}`,
             },
           },
           {
@@ -91,7 +91,7 @@ export default defineConfig({
             dataLayer.push(arguments);
           }
           gtag('js', new Date());
-          gtag('config', '${GTAG_ID}');
+          gtag('config', '${gtagId}');
       `,
           },
         ]

apps/web/src/main.tsx

@@ -65,10 +65,11 @@ window.addEventListener('unhandledrejection', (event) => {
 
 // Move Sentry initialization to a separate function
 const initSentry = async () => {
-  if (process.env.NODE_ENV !== 'development') {
+  const sentryDsn = process.env.VITE_SENTRY_DSN;
+  if (process.env.NODE_ENV !== 'development' && sentryDsn) {
     const Sentry = await import('@sentry/react');
     Sentry.init({
-      dsn: 'https://a687291d5ba3a77b0fa559e6d197eac8@o4507205453414400.ingest.us.sentry.io/4507208398602240',
+      dsn: sentryDsn,
       environment: getEnv(),
       integrations: [
         Sentry.browserTracingIntegration(),

apps/web/vite-gtag-plugin.ts

@@ -1,6 +1,6 @@
 import type { Plugin } from 'vite';
 
-const GTAG_ID = 'G-ER782LXJ5F';
+const GTAG_ID = process.env.VITE_GTAG_ID;
 
 export function gtagPlugin(): Plugin {
   return {

packages/ai-workspace-common/src/components/project/project-knowledge-toggle/index.tsx

@@ -90,8 +90,8 @@ export const ProjectKnowledgeToggle: React.FC<ProjectKnowledgeToggleProps> = ({
   const projectName = currentProject?.name || t('common.untitled');
 
   return (
-    <div className={`project-kb-toggle mt-auto border-t border-gray-100 pt-2 pb-2 ${className}`}>
-      <div className="rounded-lg flex items-center justify-between bg-gray-50 p-2 pt-0 pb-0 border border-solid dark:border-gray-700 dark:bg-gray-800 hover:border-[#00968F]/30 transition-all cursor-pointer">
+    <div className={`project-kb-toggle mt-auto pt-2 pb-2 ${className}`}>
+      <div className="rounded-lg flex items-center justify-between bg-gray-100 p-2 pt-0 pb-0 dark:bg-gray-800 hover:border-[#00968F]/30 transition-all cursor-pointer">
         <div className="flex items-center gap-2 flex-shrink overflow-hidden">
           <LuBrain
             className={`transition-colors duration-300 flex-shrink-0 ${enabledKnowledgeBase ? 'text-[#00968F]' : 'text-gray-500'}`}