revert: previous path changes

FuelLabs · Dec 10, 2024 · 008f870 · 008f870
1 parent f2ea1c3
commit 008f870
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/packages/app/e2e.html b/packages/app/e2e.html
@@ -2,12 +2,12 @@
 <html lang="en" translate="no">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/public/favicon.ico" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/public/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/public/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/public/favicon-16x16.png" />
-    <link rel="manifest" href="/public/site.webmanifest" />
-    <link rel="mask-icon" href="/public/safari-pinned-tab.svg" color="#5bbad5" />
+    <link rel="icon" href="/favicon.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
+    <link rel="manifest" href="/site.webmanifest" />
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
     <meta name="msapplication-TileColor" content="#333333" />
     <meta name="theme-color" content="#333333" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />

diff --git a/packages/app/index.html b/packages/app/index.html
@@ -2,7 +2,7 @@
 <html lang="en" translate="no">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/public/favicon.ico" />
+    <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="google" content="notranslate" />
     <title>Fuels Wallet</title>

diff --git a/packages/app/popup.html b/packages/app/popup.html
@@ -2,7 +2,7 @@
 <html lang="en" translate="no">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/public/favicon.ico" />
+    <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="google" content="notranslate" />
     <title>Fuels Wallet</title>

diff --git a/packages/app/public/browserconfig.xml b/packages/app/public/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/public/mstile-150x150.png"/>
+            <square150x150logo src="/mstile-150x150.png"/>
             <TileColor>#333333</TileColor>
         </tile>
     </msapplication>

diff --git a/packages/app/src/systems/Core/components/Layout/Layout.tsx b/packages/app/src/systems/Core/components/Layout/Layout.tsx
@@ -191,7 +191,7 @@ export const styles = {
       bottom: 0,
       width: '100%',
       height: '100vh',
-      background: 'url(/public/signup.png?url)',
+      background: 'url(/signup.png)',
       backgroundPosition: 'left',
       backgroundSize: 'cover',
     },

diff --git a/packages/app/src/systems/SignUp/components/PinWalletText/PinWalletText.tsx b/packages/app/src/systems/SignUp/components/PinWalletText/PinWalletText.tsx
@@ -5,9 +5,9 @@ export function PinWalletText() {
   return (
     <Box.Stack css={styles.root}>
       <Text>Click the extension button in the browser menu.</Text>
-      <Image src="/public/pin-img1.svg?url" />
+      <Image src="/pin-img1.svg?url" />
       <Text>Find Fuel Wallet in the list and click pin.</Text>
-      <Image src="/public/pin-img2.svg?url" />
+      <Image src="/pin-img2.svg?url" />
     </Box.Stack>
   );
 }

diff --git a/packages/app/vite-utils/vite.base.config.ts b/packages/app/vite-utils/vite.base.config.ts
@@ -45,6 +45,9 @@ const baseConfig: UserConfig = {
   server: {
     port: Number(process.env.PORT),
     strictPort: true,
+    // proxy: {
+    //   '/public': 'http://localhost:3000',
+    // }
     watch: {
       ignored: ['**/playwright*/**'], // Ignore changes in any 'playwright' folder
     },

diff --git a/packages/app/vite.config.ts b/packages/app/vite.config.ts
@@ -8,7 +8,6 @@ import baseConfig from './vite-utils/vite.base.config';
 // https://vitejs.dev/config/
 export default defineConfig({
   ...baseConfig,
-  publicDir: 'public',
   plugins: [
     ...baseConfig.plugins,
     viteStaticCopy({

diff --git a/packages/app/vite.crx.config.ts b/packages/app/vite.crx.config.ts
@@ -13,7 +13,6 @@ const APP_VERSION_POSTFIX = process.env.APP_VERSION_POSTFIX || '';
 export default defineConfig({
   ...baseConfig,
   base: '/',
-  publicDir: 'public',
   build: {
     ...baseConfig.build,
     outDir: OUT_DIR,

diff --git a/packages/e2e-contract-tests/index.html b/packages/e2e-contract-tests/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/ico" href="/public/favicon.ico" />
+    <link rel="icon" type="image/ico" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>E2E Test Dapp</title>
   </head>