merge dev into main 20241017

.github/workflows/yarn-test.yml

@@ -27,15 +27,26 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         check-latest: true
+        cache: 'yarn'
 
     - name: Enable Corepack
       run: corepack enable  # Enable Corepack to manage Yarn versions
 
     - name: Set Yarn to version 2
       run: yarn set version berry  # Set Yarn to v2 (Berry)
+
+    - name: Cache Yarn and Next.js build
+      uses: actions/cache@v4
+      with:
+        path: |
+          .yarn/cache
+          .next/cache
+        key: ${{ runner.os }}-node-${{ matrix.node-version }}-nextjs-${{ hashFiles('yarn.lock', 'src/**/*') }}
+        restore-keys: |
+          ${{ runner.os }}-node-${{ matrix.node-version }}-nextjs-${{ hashFiles('yarn.lock') }}-
 
     - name: Install dependencies
-      run: yarn install
+      run: yarn install --immutable
 
     - name: Build project
       run: yarn build

package.json

@@ -43,7 +43,7 @@
     "eslint-config-next": "^14.2.15",
     "happy-dom": "^15.7.4",
     "typescript": "^5.6.2",
-    "vite": "^5.4.8",
+    "vite": "^5.4.9",
     "vitest": "^2.1.3"
   },
   "browserslist": [
@@ -53,6 +53,5 @@
   "resolutions": {
     "glob": "^11",
     "rimraf": "^4"
-  },
-  "packageManager": "[email protected]"
+  }
 }

tsconfig.json

@@ -37,6 +37,7 @@
     "**/*.tsx",
     ".next/types/**/*.ts"
   ],
+  "types": ["vitest/globals"],
   "exclude": [
     "node_modules"
   ]

vite.config.ts

@@ -1,11 +1,9 @@
-// vite.config.ts
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
+// vitest.config.ts
+import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
-  plugins: [react()],
   test: {
     globals: true,
-    environment: 'node', // Set a default environment
+    environment: 'node',
   },
 });

yarn.lock

@@ -5176,7 +5176,7 @@ __metadata:
     react-dom: "npm:^18.3.1"
     regenerator-runtime: "npm:^0.14.1"
     typescript: "npm:^5.6.2"
-    vite: "npm:^5.4.8"
+    vite: "npm:^5.4.9"
     vitest: "npm:^2.1.3"
     winston: "npm:^3.15.0"
   languageName: unknown
@@ -5497,7 +5497,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.0, vite@npm:^5.4.8":
+"vite@npm:^5.0.0":
   version: 5.4.8
   resolution: "vite@npm:5.4.8"
   dependencies:
@@ -5540,6 +5540,49 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite@npm:^5.4.9":
+  version: 5.4.9
+  resolution: "vite@npm:5.4.9"
+  dependencies:
+    esbuild: "npm:^0.21.3"
+    fsevents: "npm:~2.3.3"
+    postcss: "npm:^8.4.43"
+    rollup: "npm:^4.20.0"
+  peerDependencies:
+    "@types/node": ^18.0.0 || >=20.0.0
+    less: "*"
+    lightningcss: ^1.21.0
+    sass: "*"
+    sass-embedded: "*"
+    stylus: "*"
+    sugarss: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+    less:
+      optional: true
+    lightningcss:
+      optional: true
+    sass:
+      optional: true
+    sass-embedded:
+      optional: true
+    stylus:
+      optional: true
+    sugarss:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: 10c0/e9c59f2c639047e37c79bbbb151c7a55a3dc27932957cf4cf0447ee0bdcc1ddfd9b1fb3ba0465371c01ba3616d62561327855794c2d652213c3a10a32e6d369d
+  languageName: node
+  linkType: hard
+
 "vitest@npm:^2.1.3":
   version: 2.1.3
   resolution: "vitest@npm:2.1.3"