Merge pull request #9 from okx/feat-demo-release

chore: optimize widget-configurator build
okx · Sep 27, 2024 · b7e4e55 · b7e4e55
2 parents f561400 + 7603127
commit b7e4e55
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,7 @@ yarn.lock
 yalc.lock
 .npmrc
 
-.env*
+.env*
+uploadKey.txt
+deploy-static.sh
+output.tgz
diff --git a/packages/widget-configurator/package.json b/packages/widget-configurator/package.json
@@ -4,9 +4,9 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
-    "build": "vite build --mode production",
-    "build:aladdin": "vite build --mode aladdin --base /assets/dex-iframe-test/",
+    "dev": "VITE_APP_ENV=development vite",
+    "build": "vite build --mode production --base /dex-widget/",
+    "build:static": "vite build",
     "lint": "eslint .",
     "preview": "vite preview"
   },

diff --git a/packages/widget-configurator/src/app/configurator/controls/BaseUrlControl.tsx b/packages/widget-configurator/src/app/configurator/controls/BaseUrlControl.tsx
@@ -1,11 +1,10 @@
-import React, { Dispatch, SetStateAction, useEffect, useState } from 'react';
+import React, { Dispatch, SetStateAction } from 'react';
 import Select, { SelectChangeEvent } from '@mui/material/Select';
 import FormControl from '@mui/material/FormControl';
 import InputLabel from '@mui/material/InputLabel';
 import MenuItem from '@mui/material/MenuItem';
-import TextField from '@mui/material/TextField';
 
-const local_urls = 'local_urls';
+const BASE_DEFAULT_URL = import.meta.env.VITE_BASE_DEFAULT_URL;
 
 export const BaseUrlControl = ({ state, widgetHandler, params }: {
   state: [string, Dispatch<SetStateAction<string>>],
@@ -21,33 +20,6 @@ export const BaseUrlControl = ({ state, widgetHandler, params }: {
     });
   };
 
-  const [customUrl, setCustomUrl] = useState('');
-
-  const [urlOptions, setUrlOptions] = useState([]);
-  useEffect(() => {
-    const localUrls = localStorage.getItem(local_urls);
-    try {
-      if (localUrls) {
-        setUrlOptions(JSON.parse(localUrls));
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  }, []);
-
-  const addCustomUrl = () => {
-    if (!customUrl) return;
-    const preUrls = localStorage.getItem(local_urls);
-    try {
-      const urls = preUrls ? JSON.parse(preUrls) : [];
-      urls.push(customUrl);
-      localStorage.setItem(local_urls, JSON.stringify(urls));
-      setUrlOptions(urls);
-    } catch (e) {
-      console.error(e);
-    }
-  };
-
   return (
     <>
       <FormControl fullWidth>
@@ -60,26 +32,15 @@ export const BaseUrlControl = ({ state, widgetHandler, params }: {
           onChange={handleBaseUrlChange}
           size="small"
         >
-          <MenuItem value="https://www.okx.com">https://www.okx.com</MenuItem>
-          <MenuItem value="http://127.0.0.1:3000">http://127.0.0.1:3000</MenuItem>
           {
-            urlOptions.map((url: string, index) => {
-              return <MenuItem key={index} value={url}>{url}</MenuItem>;
-            })
+            BASE_DEFAULT_URL && (
+              <MenuItem value={BASE_DEFAULT_URL}>{BASE_DEFAULT_URL}</MenuItem>
+            )
           }
+          <MenuItem value="https://www.okx.com">https://www.okx.com</MenuItem>
+          <MenuItem value="http://127.0.0.1:3000">http://127.0.0.1:3000</MenuItem>
         </Select>
       </FormControl>
-      <TextField
-        size="small"
-        value={customUrl}
-        fullWidth
-        label="Custum Base Url"
-        onChange={(event) => {
-          const url = event.target.value;
-          setCustomUrl(url);
-        }}
-        onBlur={addCustomUrl}
-      />
     </>
   );
 };
diff --git a/packages/widget-configurator/src/app/configurator/hooks/useDevMode.ts b/packages/widget-configurator/src/app/configurator/hooks/useDevMode.ts
@@ -3,9 +3,10 @@ import { useEffect, useState } from 'react';
 let clickNum = 0;
 
 const CACHE_KEY = 'dev_mode_is_open';
+const isDev = ['aladdin', 'development'].includes(import.meta.env.VITE_APP_ENV);
 export const useDevMode = () => {
     const [isDevModeOpen, setIsDevModeOpen] = useState<boolean>(
-        import.meta.env.VITE_APP_ENV !== 'prod',
+        isDev
     );
 
     useEffect(() => {
@@ -16,7 +17,7 @@ export const useDevMode = () => {
     }, []);
 
     const openDevMode = () => {
-        if (isDevModeOpen) {
+        if (isDevModeOpen || !isDev) {
             return;
         }
         clickNum++;

diff --git a/packages/widget-configurator/src/app/configurator/index.tsx b/packages/widget-configurator/src/app/configurator/index.tsx
@@ -64,7 +64,7 @@ export function Configurator({ title }: { title: string }) {
   const feeConfigState = useState<string>('');
   const [feeConfig] = feeConfigState;
 
-  const baseUrlState = useState<string>(import.meta.env.VITE_APP_DEFAUL_BASE_URL as string || 'https://www.okx.com');
+  const baseUrlState = useState<string>(import.meta.env.VITE_BASE_DEFAULT_URL as string || 'https://www.okx.com');
   const [baseUrl] = baseUrlState;
 
   const widthState = useState('');

diff --git a/packages/widget-configurator/vite.config.ts b/packages/widget-configurator/vite.config.ts
@@ -10,7 +10,6 @@ export default defineConfig(({ mode }) => {
     const isDev = mode === 'development';
 
     return {
-        base: isDev ? '' : '/dex-widget/',
         define: {
             'process.env': {
                 isDev: isDev,