Merge branch 'main' of github.com:FuelLabs/fuel-explorer into ag/fix/…

…block-search-views
FuelLabs · Sep 20, 2024 · 8964ffd · 8964ffd
2 parents 46b1610 + e49b834
commit 8964ffd
Show file tree

Hide file tree

Showing 9 changed files with 264 additions and 103 deletions.
diff --git a/packages/app-explorer/public/ecosystem/images/1delta.jpeg b/packages/app-explorer/public/ecosystem/images/1delta.jpeg
diff --git a/packages/app-explorer/public/ecosystem/images/bubbly.jpeg b/packages/app-explorer/public/ecosystem/images/bubbly.jpeg
diff --git a/packages/app-explorer/public/ecosystem/images/meld.jpeg b/packages/app-explorer/public/ecosystem/images/meld.jpeg
diff --git a/packages/app-explorer/public/ecosystem/images/propsoctane.jpeg b/packages/app-explorer/public/ecosystem/images/propsoctane.jpeg
diff --git a/packages/app-explorer/public/ecosystem/images/swayanalyzer.jpeg b/packages/app-explorer/public/ecosystem/images/swayanalyzer.jpeg
diff --git a/packages/app-portal/src/systems/Ecosystem/data/projects.json b/packages/app-portal/src/systems/Ecosystem/data/projects.json
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -35,9 +35,9 @@
         "typings": "./dist/theme/tailwind-preset.d.ts"
       },
       "./styles.css": "./dist/styles.css"
-    },
-    "files": ["dist"]
+    }
   },
+  "files": ["dist"],
   "scripts": {
     "build:lib": "tsup --dts",
     "build:preview": "storybook build -o ../app-explorer/public/ui",
@@ -77,7 +77,8 @@
     "tailwind-variants": "0.1.20",
     "tailwindcss-animate": "1.0.7",
     "tailwindcss-radix": "3.0.3",
-    "tailwindcss-themer": "4.0.0"
+    "tailwindcss-themer": "4.0.0",
+    "tailwindcss": "3.4.4"
   },
   "devDependencies": {
     "@chialab/esbuild-plugin-meta-url": "0.18.0",
@@ -103,7 +104,6 @@
     "postcss-import": "16.0.0",
     "storybook": "8.3.0",
     "storybook-addon-theme": "workspace:*",
-    "tailwindcss": "3.4.4",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "typescript": "5.4.5",
     "vite": "^5.1.3",

diff --git a/packages/ui/tsup.config.mjs b/packages/ui/tsup.config.mjs
@@ -16,6 +16,9 @@ const defConfig = {
     options.banner = {
       js: "'use client'",
     };
+
+    /* This is needed to not get any errors from dynamic requiring */
+    options.external = ['react', 'react-dom', 'tailwindcss'];
   },
 };