Merge remote-tracking branch 'upstream/main'

Author: KaelWD

.github/workflows/validate.yml

@@ -6,8 +6,6 @@ on:
       # e.g. "12.x" or "8.x"
       - '[0-9]+.x'
       - 'main'
-      - 'next'
-      - 'next-major'
       - 'beta'
       - 'alpha'
       - '!all-contributors/**'
@@ -29,7 +27,7 @@ jobs:
       # Otherwise we would not know if the problem is tied to the Node.js version
       fail-fast: false
       matrix:
-        node: [18, 20]
+        node: [18, 24]
     runs-on: ubuntu-latest
     steps:
       - name: ⬇️ Checkout repo
@@ -56,7 +54,9 @@ jobs:
         run: npm run validate
 
   release:
+    environment: production
     permissions:
+      id-token: write # Required for OIDC
       contents: write #  to create release tags (cycjimmy/semantic-release-action)
       issues: write # to post release that resolves an issue
 
@@ -72,7 +72,7 @@ jobs:
       - name: ⎔ Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 24
 
       - name: 📥 Download deps
         uses: bahmutov/npm-install@v1
@@ -83,18 +83,15 @@ jobs:
         run: npm run build
 
       - name: 🚀 Release
-        uses: cycjimmy/semantic-release-action@v2
+        uses: cycjimmy/semantic-release-action@v5
         with:
-          semantic_version: 17
+          semantic_version: 25
           branches: |
             [
               '+([0-9])?(.{+([0-9]),x}).x',
               'main',
-              'next',
-              'next-major',
               {name: 'beta', prerelease: true},
               {name: 'alpha', prerelease: true}
             ]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -63,9 +63,9 @@
     "@babel/runtime": "^7.12.5",
     "@types/aria-query": "^5.0.1",
     "aria-query": "5.3.0",
-    "chalk": "^4.1.0",
     "dom-accessibility-api": "^0.5.9",
     "lz-string": "^1.5.0",
+    "picocolors": "1.1.1",
     "pretty-format": "^27.0.2"
   },
   "devDependencies": {
@@ -80,6 +80,7 @@
     "typescript": "^4.1.2"
   },
   "overrides": {
+    "@babel/helper-compilation-targets": "7.24.7",
     "browserslist": "4.21.8",
     "caniuse-lite": "1.0.30001502"
   },

src/get-user-code-frame.js

@@ -1,5 +1,5 @@
 // We try to load node dependencies
-let chalk = null
+let picocolors = null
 let readFileSync = null
 let codeFrameColumns = null
 
@@ -11,7 +11,7 @@ try {
     module,
     '@babel/code-frame',
   ).codeFrameColumns
-  chalk = nodeRequire.call(module, 'chalk')
+  picocolors = nodeRequire.call(module, 'picocolors')
 } catch {
   // We're in a browser environment
 }
@@ -46,7 +46,7 @@ function getCodeFrame(frame) {
       linesBelow: 0,
     },
   )
-  return `${chalk.dim(frameLocation)}\n${codeFrame}\n`
+  return `${picocolors.dim(frameLocation)}\n${codeFrame}\n`
 }
 
 function getUserCodeFrame() {