Skip to content

Commit a8d7db6

Browse files
doinkidoinki
authored
Merge branch 'canary' into fix/standalone-keep-alive
2 parents 720f25b + 5e36c34 commit a8d7db6

File tree

1,716 files changed

+82890
-82927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,716 files changed

+82890
-82927
lines changed

‎.cargo/.vercel.approvers‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@vercel/web-tooling

‎.cargo/config.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ linker = "aarch64-linux-musl-gcc"
1616
rustflags = [
1717
"--cfg",
1818
"tokio_unstable",
19+
"-Zshare-generics=y",
1920
"-Csymbol-mangling-version=v0",
2021
"-Ctarget-feature=-crt-static",
2122
"-Clink-arg=-lgcc",
@@ -28,6 +29,7 @@ linker = "arm-linux-gnueabihf-gcc"
2829
rustflags = [
2930
"--cfg",
3031
"tokio_unstable",
32+
"-Zshare-generics=y",
3133
"-Csymbol-mangling-version=v0",
3234
"-Aclippy::too_many_arguments",
3335
]

‎.config/.vercel.approvers‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nextest.toml @vercel/web-tooling

‎.config/nextest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ filter = "package(next-dev-tests)"
55
leak-timeout = "500ms"
66
retries = 2
77
slow-timeout = "60s"
8-
threads-required = 2
8+
threads-required = 4
99
failure-output = "immediate-final"

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ packages/react-dev-overlay/lib/**
2222
.github/actions/next-stats-action/.work
2323
.github/actions/issue-validator/index.mjs
2424
.github/actions/issue-labeler/lib/index.js
25+
.github/actions/validate-docs-links/lib/index.js
2526
packages/next-codemod/transforms/__testfixtures__/**/*
2627
packages/next-codemod/transforms/__tests__/**/*
2728
packages/next-codemod/**/*.js

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
packages/next/bundles/** -text
22
packages/next/compiled/** -text
3+
4+
# Make next/src/build folder indexable for github search
5+
packages/next/src/build/** linguist-generated=false

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,13 @@
11
# Learn how to add code owners here:
22
# https://help.github.com/en/articles/about-code-owners
33

4+
# Codeowners now use Vercel Spaces
5+
# Search .vercel.approvers for all files
6+
47
* @timneutkens @ijjk @shuding @huozhi @feedthejim
5-
/.git* @vercel/next-js
6-
/docs/ @vercel/next-js @leerob
7-
/errors/ @vercel/next-js @leerob
8-
/examples/ @vercel/next-js @leerob @steven-tey
9-
/scripts/ @vercel/next-js
10-
/.alex* @vercel/next-js @leerob
11-
/.eslint* @vercel/next-js @leerob
12-
/.prettier* @vercel/next-js @leerob
13-
/*.md @vercel/next-js @leerob
14-
/packages/create-next-app/ @vercel/next-js
15-
/pnpm-lock.yaml @vercel/next-js @vercel/web-tooling
168

179
# Image Component (@styfle)
1810

19-
/**/*image* @timneutkens @ijjk @shuding @styfle @huozhi
20-
/**/*image*/** @timneutkens @ijjk @shuding @styfle @huozhi
21-
/packages/next/client/use-intersection.tsx @timneutkens @ijjk @shuding @styfle
22-
/packages/next/server/lib/squoosh/ @timneutkens @ijjk @shuding @styfle
23-
/packages/next/server/serve-static.ts @timneutkens @ijjk @shuding @styfle @huozhi
24-
/packages/next/server/config.ts @timneutkens @ijjk @shuding @styfle @huozhi
25-
26-
# Tooling & Telemetry
11+
/**/*image* @timneutkens @ijjk @shuding @styfle @huozhi @vercel/devex
12+
/**/*image*/** @timneutkens @ijjk @shuding @styfle @huozhi @vercel/devex
2713

28-
/packages/next/src/build/ @timneutkens @ijjk @shuding @vercel/web-tooling @huozhi
29-
/packages/next/src/telemetry/ @timneutkens @ijjk @shuding @padmaia
30-
/packages/next-swc/ @timneutkens @ijjk @shuding @vercel/web-tooling
31-
Cargo.toml @timneutkens @ijjk @shuding @vercel/web-tooling
32-
Cargo.lock @timneutkens @ijjk @shuding @vercel/web-tooling
33-
/.cargo/config.toml @timneutkens @ijjk @shuding @vercel/web-tooling
34-
/.config/nextest.toml @timneutkens @ijjk @shuding @vercel/web-tooling

‎.github/ISSUE_TEMPLATE/4.docs_request.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ title: 'Docs: '
44
labels:
55
- 'template: documentation'
66
body:
7+
- type: markdown
8+
attributes:
9+
value: Before opening this issue to request a docs improvement, is this something you can help us with? Your contributions are welcomed and appreciated. See our [Docs Contribution Guide](https://nextjs.org/docs/community/contribution-guide) to learn how to edit the Next.js docs.
10+
- type: markdown
11+
attributes:
12+
value: Thank you for helping us improve the docs!
713
- type: textarea
814
attributes:
915
label: What is the improvement or update you wish to see?

‎.github/actions/next-stats-action/Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
FROM node:16-bullseye
1+
FROM ubuntu:22.04
22

33
LABEL com.github.actions.name="Next.js PR Stats"
44
LABEL com.github.actions.description="Compares stats of a PR with the main branch"
55
LABEL repository="https://github.com/vercel/next-stats-action"
66

77
COPY . /next-stats
88

9+
RUN apt update && apt upgrade -y
10+
RUN apt install unzip wget curl nano htop screen build-essential pkg-config libssl-dev git build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libreadline-dev libffi-dev python3 moreutils jq iproute2 openssh-server sudo whois dnsutils -y
11+
12+
RUN ln $(which python3) /usr/bin/python
13+
14+
RUN curl -sfLS https://install-node.vercel.app/v18 | bash -s -- -f
15+
916
# Install node_modules
10-
RUN npm i -g pnpm@7.24.3
17+
RUN npm i -g pnpm@7.24.3 yarn@1.22.19
1118
RUN cd /next-stats && pnpm install --production
1219

1320
RUN git config --global user.email 'stats@localhost'

‎.github/actions/next-stats-action/src/constants.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ const mainRepoDir = path.join(workDir, 'main-repo')
88
const diffRepoDir = path.join(workDir, 'diff-repo')
99
const statsAppDir = path.join(workDir, 'stats-app')
1010
const diffingDir = path.join(workDir, 'diff')
11-
const yarnEnvValues = {
12-
YARN_CACHE_FOLDER: path.join(workDir, 'yarn-cache'),
13-
}
1411
const allowedConfigLocations = [
1512
'./',
1613
'.stats-app',
@@ -25,6 +22,5 @@ module.exports = {
2522
mainRepoDir,
2623
diffRepoDir,
2724
statsAppDir,
28-
yarnEnvValues,
2925
allowedConfigLocations,
3026
}

0 commit comments

Comments
 (0)