[pull] canary from vercel:canary

.eslintignore

@@ -11,6 +11,7 @@ examples/with-flow/**
 examples/with-jest/**
 examples/with-mobx-state-tree/**
 examples/with-mobx/**
+examples/with-tigris/db/models/todoItems.ts
 packages/next/src/bundles/webpack/packages/*.runtime.js
 packages/next/src/bundles/webpack/packages/lazy-compilation-*.js
 packages/next/src/compiled/**/*
@@ -36,4 +37,4 @@ bench/nested-deps/pages/**
 bench/nested-deps/components/**
 packages/next-bundle-analyzer/index.d.ts
 examples/with-typescript-graphql/lib/gql/
-test/development/basic/hmr/components/parse-error.js
+test/development/basic/hmr/components/parse-error.js

.eslintrc.json

@@ -158,6 +158,9 @@
     {
       "files": ["packages/**/*.tsx", "packages/**/*.ts"],
       "rules": {
+        // Note: you must disable the base rule as it can report incorrect errors
+        "no-shadow": "off",
+        "@typescript-eslint/no-shadow": ["warn", { "builtinGlobals": false }],
         "@typescript-eslint/no-unused-vars": [
           "warn",
           {

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -49,7 +49,7 @@ body:
   - type: input
     attributes:
       label: Link to the code that reproduces this issue
-      description: A link to a GitHub repository, a [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template), or a [CodeSandbox](https://codesandbox.io/s/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create-next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue.
+      description: A link to a GitHub repository, a [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template), or a [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create-next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue.
     validations:
       required: true
   - type: textarea

.github/actions/next-stats-action/package.json

@@ -3,6 +3,7 @@
   "main": "src/index.js",
   "dependencies": {
     "async-sema": "^3.1.0",
+    "execa": "2.0.3",
     "fs-extra": "^8.1.0",
     "get-port": "^5.0.0",
     "glob": "^7.1.4",

.github/actions/next-stats-action/src/index.js

@@ -78,9 +78,7 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
       if (actionInfo.isRelease) {
         logger('Release detected, resetting mainRepo to last stable tag')
         const lastStableTag = await getLastStable(mainRepoDir, actionInfo.prRef)
-        mainNextSwcVersion = {
-          '@next/swc-linux-x64-gnu': lastStableTag,
-        }
+        mainNextSwcVersion = lastStableTag
         if (!lastStableTag) throw new Error('failed to get last stable tag')
         console.log('using latestStable', lastStableTag)
         await checkoutRef(lastStableTag, mainRepoDir)
@@ -140,7 +138,7 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
       const isMainRepo = dir === mainRepoDir
       const pkgPaths = await linkPackages({
         repoDir: dir,
-        nextSwcPkg: isMainRepo ? mainNextSwcVersion : undefined,
+        nextSwcVersion: isMainRepo ? mainNextSwcVersion : undefined,
       })
 
       if (isMainRepo) mainRepoPkgPaths = pkgPaths

.github/actions/next-stats-action/src/prepare/repo-setup.js

@@ -4,11 +4,7 @@ const exec = require('../util/exec')
 const { remove } = require('fs-extra')
 const logger = require('../util/logger')
 const semver = require('semver')
-
-const mockTrace = () => ({
-  traceAsyncFn: (fn) => fn(mockTrace()),
-  traceChild: () => mockTrace(),
-})
+const execa = require('execa')
 
 module.exports = (actionInfo) => {
   return {
@@ -58,12 +54,47 @@ module.exports = (actionInfo) => {
         }
       }
     },
-    async linkPackages({ repoDir = '', nextSwcPkg, parentSpan }) {
-      const rootSpan = parentSpan
-        ? parentSpan.traceChild('linkPackages')
-        : mockTrace()
+    async linkPackages({ repoDir, nextSwcVersion }) {
+      let hasTestPack = false
+
+      try {
+        hasTestPack = Boolean(
+          ((await fs.readJSON(path.join(repoDir, 'package.json'))).scripts ||
+            {})['test-pack']
+        )
+      } catch (err) {
+        console.error(err)
+      }
+
+      if (hasTestPack) {
+        execa.sync('pnpm', ['turbo', 'run', 'test-pack'], {
+          cwd: repoDir,
+          env: { NEXT_SWC_VERSION: nextSwcVersion },
+        })
 
-      return await rootSpan.traceAsyncFn(async () => {
+        const pkgPaths = new Map()
+        const pkgs = await fs.readdir(path.join(repoDir, 'packages'))
+
+        pkgs.forEach((pkgDirname) => {
+          const { name } = require(path.join(
+            repoDir,
+            'packages',
+            pkgDirname,
+            'package.json'
+          ))
+          pkgPaths.set(
+            name,
+            path.join(
+              repoDir,
+              'packages',
+              pkgDirname,
+              `packed-${pkgDirname}.tgz`
+            )
+          )
+        })
+        return pkgPaths
+      } else {
+        // TODO: remove after next stable release (current v13.1.2)
         const pkgPaths = new Map()
         const pkgDatas = new Map()
         let pkgs
@@ -78,97 +109,84 @@ module.exports = (actionInfo) => {
           throw err
         }
 
-        await rootSpan
-          .traceChild('prepare packages for packing')
-          .traceAsyncFn(async () => {
-            for (const pkg of pkgs) {
-              const pkgPath = path.join(repoDir, 'packages', pkg)
-              const packedPkgPath = path.join(pkgPath, `${pkg}-packed.tgz`)
-
-              const pkgDataPath = path.join(pkgPath, 'package.json')
-              if (!fs.existsSync(pkgDataPath)) {
-                require('console').log(`Skipping ${pkgDataPath}`)
-                continue
-              }
-              const pkgData = require(pkgDataPath)
-              const { name } = pkgData
-              pkgDatas.set(name, {
-                pkgDataPath,
-                pkg,
-                pkgPath,
-                pkgData,
-                packedPkgPath,
-              })
-              pkgPaths.set(name, packedPkgPath)
-            }
+        for (const pkg of pkgs) {
+          const pkgPath = path.join(repoDir, 'packages', pkg)
+          const packedPkgPath = path.join(pkgPath, `${pkg}-packed.tgz`)
 
-            for (const pkg of pkgDatas.keys()) {
-              const { pkgDataPath, pkgData } = pkgDatas.get(pkg)
+          const pkgDataPath = path.join(pkgPath, 'package.json')
+          if (!fs.existsSync(pkgDataPath)) {
+            require('console').log(`Skipping ${pkgDataPath}`)
+            continue
+          }
+          const pkgData = require(pkgDataPath)
+          const { name } = pkgData
+          pkgDatas.set(name, {
+            pkgDataPath,
+            pkg,
+            pkgPath,
+            pkgData,
+            packedPkgPath,
+          })
+          pkgPaths.set(name, packedPkgPath)
+        }
 
-              for (const pkg of pkgDatas.keys()) {
-                const { packedPkgPath } = pkgDatas.get(pkg)
-                if (!pkgData.dependencies || !pkgData.dependencies[pkg])
-                  continue
-                pkgData.dependencies[pkg] = packedPkgPath
-              }
+        for (const pkg of pkgDatas.keys()) {
+          const { pkgDataPath, pkgData } = pkgDatas.get(pkg)
 
-              // make sure native binaries are included in local linking
-              if (pkg === '@next/swc') {
-                if (!pkgData.files) {
-                  pkgData.files = []
-                }
-                pkgData.files.push('native')
-                require('console').log(
-                  'using swc binaries: ',
-                  await exec(
-                    `ls ${path.join(path.dirname(pkgDataPath), 'native')}`
-                  )
-                )
-              }
+          for (const pkg of pkgDatas.keys()) {
+            const { packedPkgPath } = pkgDatas.get(pkg)
+            if (!pkgData.dependencies || !pkgData.dependencies[pkg]) continue
+            pkgData.dependencies[pkg] = packedPkgPath
+          }
 
-              if (pkg === 'next') {
-                if (nextSwcPkg) {
-                  Object.assign(pkgData.dependencies, nextSwcPkg)
-                } else {
-                  if (pkgDatas.get('@next/swc')) {
-                    pkgData.dependencies['@next/swc'] =
-                      pkgDatas.get('@next/swc').packedPkgPath
-                  } else {
-                    pkgData.files.push('native')
-                  }
-                }
-              }
+          // make sure native binaries are included in local linking
+          if (pkg === '@next/swc') {
+            if (!pkgData.files) {
+              pkgData.files = []
+            }
+            pkgData.files.push('native')
+            require('console').log(
+              'using swc binaries: ',
+              await exec(`ls ${path.join(path.dirname(pkgDataPath), 'native')}`)
+            )
+          }
 
-              await fs.writeFile(
-                pkgDataPath,
-                JSON.stringify(pkgData, null, 2),
-                'utf8'
-              )
+          if (pkg === 'next') {
+            if (nextSwcVersion) {
+              Object.assign(pkgData.dependencies, {
+                '@next/swc-linux-x64-gnu': nextSwcVersion,
+              })
+            } else {
+              if (pkgDatas.get('@next/swc')) {
+                pkgData.dependencies['@next/swc'] =
+                  pkgDatas.get('@next/swc').packedPkgPath
+              } else {
+                pkgData.files.push('native')
+              }
             }
-          })
+          }
+
+          await fs.writeFile(
+            pkgDataPath,
+            JSON.stringify(pkgData, null, 2),
+            'utf8'
+          )
+        }
 
         // wait to pack packages until after dependency paths have been updated
         // to the correct versions
-        await rootSpan
-          .traceChild('packing packages')
-          .traceAsyncFn(async (packingSpan) => {
-            await Promise.all(
-              Array.from(pkgDatas.keys()).map(async (pkgName) => {
-                await packingSpan
-                  .traceChild(`pack ${pkgName}`)
-                  .traceAsyncFn(async () => {
-                    const { pkg, pkgPath } = pkgDatas.get(pkgName)
-                    await exec(
-                      `cd ${pkgPath} && yarn pack -f '${pkg}-packed.tgz'`,
-                      true
-                    )
-                  })
-              })
+        await Promise.all(
+          Array.from(pkgDatas.keys()).map(async (pkgName) => {
+            const { pkg, pkgPath } = pkgDatas.get(pkgName)
+            await exec(
+              `cd ${pkgPath} && yarn pack -f '${pkg}-packed.tgz'`,
+              true
             )
           })
+        )
 
         return pkgPaths
-      })
+      }
     },
   }
 }