Merge branch 'canary' into 05-15-implement_unstable_rethrow

vercel · May 21, 2024 · 7017112 · 7017112
2 parents 66c96d9 + 9d70996
commit 7017112
Show file tree

Hide file tree

Showing 485 changed files with 17,389 additions and 7,657 deletions.
diff --git a/.github/actions/next-repo-info/dist/feature-requests/index.mjs b/.github/actions/next-repo-info/dist/feature-requests/index.mjs
diff --git a/.github/actions/next-repo-info/dist/issues/index.mjs b/.github/actions/next-repo-info/dist/issues/index.mjs
diff --git a/.github/actions/next-repo-info/dist/prs/index.mjs b/.github/actions/next-repo-info/dist/prs/index.mjs
diff --git a/.github/actions/next-repo-info/src/popular-feature-requests.mjs b/.github/actions/next-repo-info/src/popular-feature-requests.mjs
@@ -99,7 +99,7 @@ async function run() {
 
     await slackClient.chat.postMessage({
       blocks: generateBlocks(items),
-      channel: '#team-next-js',
+      channel: '#next-info',
       icon_emoji: ':github:',
       username: 'GitHub Notifier',
     })

diff --git a/.github/actions/next-repo-info/src/popular-issues.mjs b/.github/actions/next-repo-info/src/popular-issues.mjs
@@ -65,7 +65,7 @@ async function run() {
 
       await slackClient.chat.postMessage({
         blocks: generateBlocks(data.items),
-        channel: '#team-next-js',
+        channel: '#next-info',
         icon_emoji: ':github:',
         username: 'GitHub Notifier',
       })

diff --git a/.github/actions/next-repo-info/src/popular-prs.mjs b/.github/actions/next-repo-info/src/popular-prs.mjs
@@ -61,7 +61,7 @@ async function run() {
     if (data.items.length > 0) {
       await slackClient.chat.postMessage({
         blocks: generateBlocks(data.items),
-        channel: '#team-next-js',
+        channel: '#next-info',
         icon_emoji: ':github:',
         username: 'GitHub Notifier',
       })

diff --git a/.husky/pre-push b/.husky/pre-push
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+main_branch="canary"
+
+branch="$(git rev-parse --abbrev-ref HEAD)"
+
+if [ "$branch" = "$main_branch" ]; then
+  echo "You probably didn't intend to push directly to '$main_branch'." >&2
+  echo "If you're sure that that's what you want to do, bypass this check via" >&2
+  echo "" >&2
+  echo "  git push --no-verify" >&2
+  echo "" >&2
+  exit 1
+fi