Merge branch 'canary' of https://github.com/vercel/next.js into update-with-redux-example

Author: aryaemami59

.eslintignore

@@ -38,3 +38,4 @@ bench/nested-deps-app-router/**
 packages/next-bundle-analyzer/index.d.ts
 examples/with-typescript-graphql/lib/gql/
 test/development/basic/hmr/components/parse-error.js
+packages/next-swc/docs/assets/**/*

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# All revisions specified in the `.git-blame-ignore-revs` file, are hidden from the blame
+# when running `git blame --ignore-revs-file .git-blame-ignore-revs`.
+# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+
+# chore(examples): use default prettier for examples/templates (#60530)
+4466ba436b996263307171d344cca199e8087744

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -40,13 +40,6 @@ body:
       placeholder: 'Following the steps from the previous section, I expected A to happen, but I observed B instead'
     validations:
       required: true
-  - type: checkboxes
-    attributes:
-      label: Verify canary release
-      description: 'Please run `npm install next@canary` to try the canary version of Next.js that ships daily. It includes all features and fixes that have not been released to the stable version yet. Some issues may already be fixed in the canary version, so please verify that your issue reproduces before opening a new issue.'
-      options:
-        - label: I verified that the issue exists in the latest Next.js canary release
-          required: true
   - type: textarea
     attributes:
       label: Provide environment information

.github/actions/next-integration-stat/package.json

@@ -22,7 +22,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.9.0"
+    "pnpm": "8.15.1"
   },
-  "packageManager": "pnpm@8.9.0"
+  "packageManager": "pnpm@8.15.1"
 }

.github/actions/next-repo-info/dist/issues/index.mjs

@@ -0,0 +1,17 @@
+{
+  "private": true,
+  "description": "Notify Next.js team about pending PRs and popular issues",
+  "scripts": {
+    "build": "pnpm build-issues && pnpm build-prs",
+    "build-issues": "ncc build src/popular-issues.mjs -m -o dist/issues --license licenses.txt",
+    "build-prs": "ncc build src/popular-prs.mjs -m -o dist/prs --license licenses.txt"
+  },
+  "dependencies": {
+    "@actions/core": "^1.10.1",
+    "@actions/github": "6.0.0",
+    "@slack/web-api": "^7.0.1"
+  },
+  "devDependencies": {
+    "@vercel/ncc": "^0.38.1"
+  }
+}

.github/actions/next-repo-info/dist/issues/licenses.txt

@@ -0,0 +1,76 @@
+// @ts-check
+import { context, getOctokit } from '@actions/github'
+import { setFailed, info } from '@actions/core'
+import { WebClient } from '@slack/web-api'
+
+function generateBlocks(issues) {
+  const blocks = [
+    {
+      type: 'section',
+      text: {
+        type: 'mrkdwn',
+        text: '*A list of the top 15 issues sorted by most :+1: reactions over the last 90 days.*\n_Note: This :github2: workflow will run every Monday at 1PM UTC (9AM EST)._',
+      },
+    },
+    {
+      type: 'divider',
+    },
+  ]
+
+  let text = ''
+  issues.forEach((issue, i) => {
+    text += `${i + 1}. [<${issue.html_url}|#${issue.number}>, :+1: ${
+      issue.reactions['+1']
+    }]: ${issue.title}\n`
+  })
+
+  blocks.push({
+    type: 'section',
+    text: {
+      type: 'mrkdwn',
+      text: text,
+    },
+  })
+
+  return blocks
+}
+
+async function run() {
+  try {
+    if (!process.env.GITHUB_TOKEN) throw new TypeError('GITHUB_TOKEN not set')
+    if (!process.env.SLACK_TOKEN) throw new TypeError('SLACK_TOKEN not set')
+
+    const octoClient = getOctokit(process.env.GITHUB_TOKEN)
+    const slackClient = new WebClient(process.env.SLACK_TOKEN)
+
+    // Get the date 90 days ago (YYYY-MM-DD)
+    const date = new Date()
+    date.setDate(date.getDate() - 90)
+    const ninetyDaysAgo = date.toISOString().split('T')[0]
+
+    const { owner, repo } = context.repo
+    const { data } = await octoClient.rest.search.issuesAndPullRequests({
+      order: 'desc',
+      per_page: 15,
+      q: `repo:${owner}/${repo} is:issue is:open created:>=${ninetyDaysAgo}`,
+      sort: 'reactions-+1',
+    })
+
+    if (data.items.length > 0) {
+      await slackClient.chat.postMessage({
+        blocks: generateBlocks(data.items),
+        channel: '#team-next-js',
+        icon_emoji: ':github:',
+        username: 'GitHub Notifier',
+      })
+
+      info(`Posted to Slack!`)
+    } else {
+      info(`No popular issues`)
+    }
+  } catch (error) {
+    setFailed(error)
+  }
+}
+
+run()

.github/actions/next-repo-info/dist/prs/index.mjs

@@ -0,0 +1,82 @@
+// @ts-check
+import { context, getOctokit } from '@actions/github'
+import { setFailed, info } from '@actions/core'
+import { WebClient } from '@slack/web-api'
+
+function generateBlocks(prs) {
+  let text = ''
+  let count = 0
+
+  const blocks = [
+    {
+      type: 'divider',
+    },
+  ]
+
+  prs.forEach((pr, i) => {
+    if (pr.reactions['+1'] > 1) {
+      text += `${i + 1}. [<${pr.html_url}|#${pr.number}>, :+1: ${
+        pr.reactions['+1']
+      }]: ${pr.title}\n`
+      count++
+    }
+  })
+
+  blocks.unshift({
+    type: 'section',
+    text: {
+      type: 'mrkdwn',
+      text: `*A list of the top ${count} PRs sorted by most :+1: reactions (> 1) over the last 90 days.*\n_Note: This :github2: workflow will run every Monday at 1PM UTC (9AM EST)._`,
+    },
+  })
+
+  blocks.push({
+    type: 'section',
+    text: {
+      type: 'mrkdwn',
+      text: text,
+    },
+  })
+
+  return blocks
+}
+
+async function run() {
+  try {
+    if (!process.env.GITHUB_TOKEN) throw new TypeError('GITHUB_TOKEN not set')
+    if (!process.env.SLACK_TOKEN) throw new TypeError('SLACK_TOKEN not set')
+
+    const octoClient = getOctokit(process.env.GITHUB_TOKEN)
+    const slackClient = new WebClient(process.env.SLACK_TOKEN)
+
+    // Get the date 90 days ago (YYYY-MM-DD)
+    const date = new Date()
+    date.setDate(date.getDate() - 90)
+    const ninetyDaysAgo = date.toISOString().split('T')[0]
+
+    const { owner, repo } = context.repo
+    const { data } = await octoClient.rest.search.issuesAndPullRequests({
+      order: 'desc',
+      per_page: 15,
+      q: `repo:${owner}/${repo} is:pr is:open created:>=${ninetyDaysAgo}`,
+      sort: 'reactions-+1',
+    })
+
+    if (data.items.length > 0) {
+      await slackClient.chat.postMessage({
+        blocks: generateBlocks(data.items),
+        channel: '#team-next-js',
+        icon_emoji: ':github:',
+        username: 'GitHub Notifier',
+      })
+
+      info(`Posted to Slack!`)
+    } else {
+      info(`No popular PRs`)
+    }
+  } catch (error) {
+    setFailed(error)
+  }
+}
+
+run()

.github/actions/next-repo-info/dist/prs/licenses.txt

@@ -19,7 +19,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.9.0"
+    "pnpm": "8.15.1"
   },
-  "packageManager": "pnpm@8.9.0"
+  "packageManager": "pnpm@8.15.1"
 }

.github/actions/next-repo-info/package.json

@@ -27,7 +27,9 @@ module.exports = (actionInfo) => {
         )
       }
       // last stable tag will always be 1 patch less than canary
-      return `${major}.${minor}.${Number(patch) - 1}`
+      return `${major}.${minor}.${
+        Number(patch) - tag.includes('-canary') ? 1 : 0
+      }`
     },
     async getCommitId(repoDir = '') {
       const { stdout } = await exec(`cd ${repoDir} && git rev-parse HEAD`)

.github/actions/next-repo-info/src/popular-issues.mjs

@@ -32,10 +32,15 @@ module.exports = async function collectDiffs(
     filesToTrack.map(async (fileGroup) => {
       const { globs } = fileGroup
       const curFiles = []
+      const prettierExts = ['.js', '.html', '.css', '.json']
 
       await Promise.all(
         globs.map(async (pattern) => {
-          curFiles.push(...(await glob(pattern, { cwd: statsAppDir })))
+          curFiles.push(
+            ...(await glob(pattern, { cwd: statsAppDir })).filter((item) =>
+              prettierExts.includes(path.extname(item))
+            )
+          )
         })
       )