Skip to content

Commit

Permalink
Merge branch 'canary' into fix-location-header-invalid-char
Browse files Browse the repository at this point in the history
  • Loading branch information
jamsinclair committed Nov 11, 2021
2 parents 1447ec4 + 4551571 commit ab20818
Show file tree
Hide file tree
Showing 615 changed files with 48,764 additions and 34,826 deletions.
1 change: 1 addition & 0 deletions .github/.kodiak.toml
Expand Up @@ -13,6 +13,7 @@ notify_on_conflict = false
[merge.message]
title = "pull_request_title"
body = "pull_request_body"
include_coauthors= true
include_pr_number = true
body_type = "markdown"
strip_html_comments = true
20 changes: 19 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
@@ -1,6 +1,24 @@
# Learn how to add code owners here:
# https://help.github.com/en/articles/about-code-owners

* @timneutkens @ijjk @shuding @styfle @huozhi @padmaia
* @timneutkens @ijjk @shuding @huozhi
/.github/ @timneutkens @ijjk @shuding @styfle @huozhi @padmaia
/docs/ @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @leerob @lfades @molebox
/examples/ @timneutkens @ijjk @shuding @leerob @lfades

# SWC Build (@padmaia)

/packages/next/build/ @timneutkens @ijjk @shuding @padmaia @huozhi

# Image Component (@styfle)

/examples/image-component/ @timneutkens @ijjk @shuding @styfle
/packages/next/build/webpack/loaders/next-image-loader.js @timneutkens @ijjk @shuding @styfle
/packages/next/client/image.tsx @timneutkens @ijjk @shuding @styfle
/packages/next/image-types/ @timneutkens @ijjk @shuding @styfle
/packages/next/server/image-config.ts @timneutkens @ijjk @shuding @styfle
/packages/next/server/image-optimizer.ts @timneutkens @ijjk @shuding @styfle
/packages/next/server/serve-static.ts @timneutkens @ijjk @shuding @styfle
/packages/next/server/config.ts @timneutkens @ijjk @shuding @styfle
/test/integration/image-optimizer/ @timneutkens @ijjk @shuding @styfle
/test/integration/image-component/ @timneutkens @ijjk @shuding @styfle
4 changes: 4 additions & 0 deletions .github/actions/next-stats-action/src/index.js
Expand Up @@ -118,6 +118,10 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
// in case of noisy environment slowing down initial repo build
await exec(buildCommand, false, { timeout: 5 * 60 * 1000 })
}
await fs.copy(
path.join(__dirname, '../native'),
path.join(dir, 'packages/next/native')
)

logger(`Linking packages in ${dir}`)
const pkgPaths = await linkPackages(dir)
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/next-stats-action/src/prepare/repo-setup.js
Expand Up @@ -100,6 +100,10 @@ module.exports = (actionInfo) => {
// make sure native binaries are included in local linking
if (pkg === 'next') {
pkgData.files.push('native')
console.log(
'using swc binaries: ',
await exec(`ls ${path.join(path.dirname(pkgDataPath), 'native')}`)
)
}
await fs.writeFile(
pkgDataPath,
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/next-stats-action/src/run/index.js
Expand Up @@ -67,7 +67,7 @@ async function runConfigs(
const results = await glob(rename.srcGlob, { cwd: statsAppDir })
for (const result of results) {
let dest = rename.removeHash
? result.replace(/(\.|-)[0-9a-f]{20}(\.|-)/g, '$1HASH$2')
? result.replace(/(\.|-)[0-9a-f]{16}(\.|-)/g, '$1HASH$2')
: rename.dest
if (result === dest) continue
await fs.move(
Expand Down
4 changes: 2 additions & 2 deletions .github/lock.yml
@@ -1,6 +1,6 @@
# Configuration for lock-threads - https://github.com/dessant/lock-threads

# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 365
daysUntilLock: 45
# Comment to post before locking. Set to `false` to disable
lockComment: false
lockComment: 'This issue has been automatically locked due to no recent activity. If you are running into a similar issue, please open a new issue with a reproduction. Thank you.'
105 changes: 0 additions & 105 deletions .github/workflows/build_native.yml

This file was deleted.

0 comments on commit ab20818

Please sign in to comment.