Merge pull request #378 from blinko-space/dev

dev
blinko-space · Dec 26, 2024 · 0b27be5 · 0b27be5
2 parents 8a17f91 + de49166
commit 0b27be5
Show file tree

Hide file tree

Showing 26 changed files with 924 additions and 206 deletions.
diff --git a/next.config.js b/next.config.js
@@ -4,27 +4,24 @@ const withPWA = require('next-pwa')({
   dest: 'public',
   register: true,
   skipWaiting: true,
-  disable: process.env.NODE_ENV === 'development', // process.env.NODE_ENV === 'development',
+  disable: false, // process.env.NODE_ENV === 'development',
   fallbacks: {
     document: '/offline' 
   },
   cacheOnFrontEndNav: true,
   reloadOnOnline: true,
   runtimeCaching: [
     {
-      urlPattern: ({ url, request }) => {
+      urlPattern: ({ url }) => {
         const isSameOrigin = self.origin === url.origin;
-        return isSameOrigin && (
-          request.destination === 'script' ||
-          url.pathname.includes('/_next/static/chunks/')
-        );
+        return isSameOrigin;
       },
       handler: 'NetworkFirst',
       options: {
-        cacheName: 'js-cache',
+        cacheName: 'pages-cache',
         networkTimeoutSeconds: 10,
         expiration: {
-          maxEntries: 100,
+          maxEntries: 50,
           maxAgeSeconds: 24 * 60 * 60
         }
       }
@@ -122,6 +119,11 @@ module.exports = withPWA({
         path: false,
       };
     }
+    config.module.rules.push({
+      test: /\.(glsl|vs|fs|vert|frag)$/,
+      exclude: /node_modules/,
+      use: ['raw-loader', 'glslify-loader'],
+    })
     return config;
   },
   outputFileTracing: isVercel? false : true,

diff --git a/package.json b/package.json
@@ -46,7 +46,6 @@
     "@langchain/openai": "^0.3.10",
     "@langchain/pinecone": "^0.1.1",
     "@langchain/textsplitters": "^0.1.0",
-    "@next/bundle-analyzer": "^14.1.4",
     "@nextui-org/dropdown": "^2.1.31",
     "@nextui-org/framer-utils": "^2.0.24",
     "@nextui-org/popover": "^2.1.29",
@@ -55,6 +54,9 @@
     "@prisma/client": "^5.21.1",
     "@radix-ui/colors": "^3.0.0",
     "@radix-ui/react-dialog": "^1.1.4",
+    "@react-spring/three": "^9.7.5",
+    "@react-three/fiber": "^8.17.10",
+    "@shadergradient/react": "^2.0.19",
     "@tailwindcss/line-clamp": "^0.4.4",
     "@tailwindcss/typography": "^0.5.15",
     "@trpc/client": "11.0.0-rc.553",
@@ -150,6 +152,8 @@
     "swagger-ui-react": "^5.17.14",
     "swiper": "^11.1.14",
     "tailwind-merge": "^1.14.0",
+    "three": "^0.171.0",
+    "three-stdlib": "^2.35.2",
     "trpc-to-openapi": "^2.0.2",
     "typed-emitter": "^2.1.0",
     "typeorm": "^0.3.20",
@@ -162,6 +166,7 @@
   },
   "devDependencies": {
     "@headlessui/tailwindcss": "^0.1.3",
+    "@next/bundle-analyzer": "^14.1.4",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^13.0.0",
     "@semantic-release/git": "^10.0.1",
@@ -174,13 +179,16 @@
     "@types/react": "18.2.8",
     "@types/react-dom": "^18.2.4",
     "@types/react-grid-layout": "^1.3.2",
+    "@types/three": "^0.171.0",
     "@types/uuid": "^9.0.1",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.2.1",
     "conventional-changelog-conventionalcommits": "^8.0.0",
+    "glslify-loader": "^2.0.0",
     "postcss": "^8.4.24",
     "postcss-nesting": "^12.0.0",
     "prisma": "^5.21.1",
+    "raw-loader": "^4.0.2",
     "semantic-release": "^24.2.0",
     "tailwindcss": "^3.3.2",
     "tailwindcss-animate": "^1.0.7",