Merge pull request #105 from eruptionjs/chore/update-ts-and-deps

RC: v1.13 - Update ts and deps

Author: Diogo Fonseca

.github/workflows/ci.yml

@@ -1,40 +1,46 @@
-name: CI
+# This workflow runs on every push to the staging and main branches
+# and on pull requests targeting those branches.
+# It installs dependencies, runs linting, tests, and builds the project using Bun.
+name: 'CI: Pre-Merge Validations'
 
 on:
   push:
     branches:
+      - staging
       - main
   pull_request:
+    branches:
+      - staging
+      - main
 
 # cancel in-progress runs on new commits to same PR (gitub.event.number)
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
   cancel-in-progress: true
 
 jobs:
-  build:
-    name: Build, lint, and test on Node ${{ matrix.node }} and ${{ matrix.os }}
+  run:
+    name: Install, lint, test, and build on Bun  ${{ matrix.os }}
 
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node: ['20.x']
         os: [ubuntu-latest]
 
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
 
-      # bun install
-      - uses: oven-sh/setup-bun@v1
+      - name: Setup Bun and install dependencies
+        uses: oven-sh/setup-bun@v1
         with:
           bun-version: latest
 
       - name: Install
         run: bun install
 
       - name: Lint
-        run: bun run lint
+        run: bun run lint-staged
 
       - name: Test
         run: bun run test

.husky/pre-commit

@@ -1 +1 @@
-bun run lint-staged && bun run test && bun run build
+bun run test && bun run build

.lintstagedrc

@@ -1,5 +1,5 @@
 {
-  "*.{html,md,json,jsonc}": ["npm run prettier:fix"],
-  "*.{ts,tsx}": ["npm run prettier:fix", "npm run lint:fix"],
-  "*.css": ["npm run lint:css"]
+  "*.{html,md,json,jsonc}": ["bun run prettier:fix"],
+  "*.{ts,tsx}": ["bun run prettier:fix", "bun run lint:fix"],
+  "*.css": ["bun run lint:css"]
 }

.prettierrc.js

@@ -1,4 +1,3 @@
-import { default as eruptionPrettierConfig } from "@eruptionjs/config/prettier"
-export default {
-  ...eruptionPrettierConfig,
-}
+import { default as eruptionPrettierConfig } from '@eruptionjs/config/prettier'
+
+export default { ...eruptionPrettierConfig }

bun.lock

@@ -2,7 +2,7 @@
   "name": "eruption",
   "description": "Next Generation Boilerplate for React/Typescript, built on top of Vite ⚡️",
   "private": false,
-  "version": "1.12",
+  "version": "1.13",
   "type": "module",
   "main": "src/main.tsx",
   "license": "MIT",
@@ -32,7 +32,8 @@
     "prettier:fix": "bun run prettier -- --write",
     "format": "bun run prettier && bun run lint",
     "format:fix": "bun run prettier:fix && bun run lint:fix",
-    "lint-staged": "lint-staged && tsc",
+    "typecheck": "tsc",
+    "lint-staged": "tsc & lint-staged",
     "prebuild": "bun run lint-staged",
     "prepare": "husky",
     "commit": "commit"
@@ -42,7 +43,7 @@
     "npm": "!^x",
     "yarn": "!^x",
     "pnpm": "!^x",
-    "bun": "^1.1.x"
+    "bun": "^1.2.x"
   },
   "dependencies": {
     "react": "^19.x",
@@ -53,33 +54,33 @@
     "@commitlint/config-conventional": "^19.x",
     "@commitlint/prompt-cli": "^19.x",
     "@commitlint/types": "^19.x",
-    "@eruptionjs/config": "^0.5.0",
+    "@eruptionjs/config": "^0.6.1",
     "@testing-library/jest-dom": "^6.x",
     "@testing-library/react": "^16.x",
     "@testing-library/user-event": "^14.x",
     "@types/bun": "^1.x",
     "@types/react": "^19.x",
     "@types/react-dom": "^19.x",
     "@vitejs/plugin-react-swc": "^3.x",
-    "@vitest/coverage-v8": "^2.x",
-    "@vitest/ui": "^2.x",
+    "@vitest/coverage-v8": "^3.x",
+    "@vitest/ui": "^3.x",
     "c8": "^10.x",
     "eslint": "^9.x",
-    "happy-dom": "^15.x",
+    "happy-dom": "^17.x",
     "husky": "^9.x",
     "lint-staged": "^15.x",
     "msw": "^2.x",
-    "npm-check-updates": "^16.x",
+    "npm-check-updates": "^17.x",
     "prettier": "^3.x",
     "stylelint": "^16.x",
-    "stylelint-config-standard": "^36.x",
+    "stylelint-config-standard": "^37.x",
     "typescript": "^5.x",
-    "vite": "^5.x",
+    "vite": "^6.x",
     "vite-bundle-visualizer": "^1.x",
     "vite-plugin-compression2": "^1.x",
     "vite-plugin-qrcode": "^0.x",
-    "vitest": "^2.x",
-    "web-vitals": "^3.x"
+    "vitest": "^3.x",
+    "web-vitals": "^4.x"
   },
   "msw": {
     "workerDirectory": "public"

bun.lockb

@@ -8,8 +8,8 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.2.13'
-const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
+const PACKAGE_VERSION = '2.7.3'
+const INTEGRITY_CHECKSUM = '00729d72e3b82faf54ca8b9621dbb96f'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
@@ -62,7 +62,12 @@ self.addEventListener('message', async function (event) {
 
       sendToClient(client, {
         type: 'MOCKING_ENABLED',
-        payload: true,
+        payload: {
+          client: {
+            id: client.id,
+            frameType: client.frameType,
+          },
+        },
       })
       break
     }
@@ -155,6 +160,10 @@ async function handleRequest(event, requestId) {
 async function resolveMainClient(event) {
   const client = await self.clients.get(event.clientId)
 
+  if (activeClientIds.has(event.clientId)) {
+    return client
+  }
+
   if (client?.frameType === 'top-level') {
     return client
   }
@@ -183,12 +192,26 @@ async function getResponse(event, client, requestId) {
   const requestClone = request.clone()
 
   function passthrough() {
-    const headers = Object.fromEntries(requestClone.headers.entries())
+    // Cast the request headers to a new Headers instance
+    // so the headers can be manipulated with.
+    const headers = new Headers(requestClone.headers)
+
+    // Remove the "accept" header value that marked this request as passthrough.
+    // This prevents request alteration and also keeps it compliant with the
+    // user-defined CORS policies.
+    const acceptHeader = headers.get('accept')
+    if (acceptHeader) {
+      const values = acceptHeader.split(',').map((value) => value.trim())
+      const filteredValues = values.filter(
+        (value) => value !== 'msw/passthrough',
+      )
 
-    // Remove internal MSW request header so the passthrough request
-    // complies with any potential CORS preflight checks on the server.
-    // Some servers forbid unknown request headers.
-    delete headers['x-msw-intention']
+      if (filteredValues.length > 0) {
+        headers.set('accept', filteredValues.join(', '))
+      } else {
+        headers.delete('accept')
+      }
+    }
 
     return fetch(requestClone, { headers })
   }

package.json

@@ -1,37 +1,10 @@
 {
+  "extends": "@eruptionjs/config/typescript",
+  "include": ["@eruptionjs/reset.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "lib": ["ESNext", "DOM", "DOM.Iterable"],
-    "module": "ESNext",
-    "skipLibCheck": true,
-
-    /* Bundler mode */
-    "moduleResolution": "Bundler",
-    "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "allowJs": false,
-    "esModuleInterop": false,
-    "jsx": "react-jsx",
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true,
-    "forceConsistentCasingInFileNames": true,
-    "allowSyntheticDefaultImports": true,
-
     /* Absolute import */
     "baseUrl": ".",
-    "paths": {
-      "@/*": ["src/*"]
-    },
+    "paths": { "@/*": ["src/*"] },
     "types": ["vite/client", "vitest/globals"]
-  },
-  "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  }
 }