Skip to content

Commit 8f0bca2

Browse files
author
Alex Bordin
committed
Merge tag 'v11.0.1' into feat/add-pagesPaths-config-options
v11.0.1 * tag 'v11.0.1': (374 commits) v11.0.1 v11.0.1-canary.8 Ensure image-types file is included (vercel#26495) Strongly type `Router.events.on` and `Router.events.off` (vercel#26456) v11.0.1-canary.7 Update i18n fields in docs (vercel#26492) Update to only add image import types when enabled (vercel#26485) Fix domain locales not available on client (vercel#26083) chore: Add Alex to lint documentation (vercel#26354) fix: ignore invalid accept-language header (vercel#26476) Add module.exports to security headers documentation (vercel#26466) (examples/with-webassembly) fixed for webpack 5 (vercel#26440) Add check for startLatency in fast refresh (vercel#26417) v11.0.1-canary.6 docs(router.md) Add note about page state and navigation (vercel#26320) Remove period for ESLint `passHref` docs link. (vercel#26402) Update with-eslint example. (vercel#25817) Docs: Add Prettier section on ESLint page (vercel#26347) add missing closing bracket (vercel#26375) Improve the `next/script` documentation. (vercel#26325) ...
2 parents f471882 + e969d22 commit 8f0bca2

File tree

1,245 files changed

+119573
-91627
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,245 files changed

+119573
-91627
lines changed

.alexignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CODE_OF_CONDUCT.md
2+
docs/
3+
errors/
4+
examples/

.eslintignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ node_modules
22
**/.next/**
33
**/_next/**
44
**/dist/**
5+
e2e-tests/**
6+
examples/with-eslint/**
57
examples/with-typescript-eslint-jest/**
68
examples/with-kea/**
79
packages/next/bundles/webpack/packages/*.runtime.js
@@ -15,6 +17,7 @@ packages/next-codemod/transforms/__tests__/**/*
1517
packages/next-codemod/**/*.js
1618
packages/next-codemod/**/*.d.ts
1719
packages/next-env/**/*.d.ts
20+
packages/create-next-app/templates/**
1821
test/integration/async-modules/**
22+
test/integration/eslint/**
1923
test-timings.json
20-
packages/next/lib/regexr/**/*

.eslintrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
"extends": ["plugin:jest/recommended"],
2828
"rules": {
2929
"jest/expect-expect": "off",
30-
"jest/no-disabled-tests": "off"
30+
"jest/no-disabled-tests": "off",
31+
"jest/no-conditional-expect": "off",
32+
"jest/valid-title": "off",
33+
"jest/no-interpolation-in-snapshots": "off"
3134
}
3235
},
3336
{ "files": ["**/__tests__/**"], "env": { "jest": true } },

.github/ISSUE_TEMPLATE/1.bug_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Bug Report
22
description: Create a bug report for the Next.js core
3-
title: 'Bug Report'
43
labels: 'template: bug'
54
body:
65
- type: markdown

.github/ISSUE_TEMPLATE/2.example_bug_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Example Bug Report
22
description: Create a bug report for the examples
3-
title: 'Example Bug Report'
43
labels: 'type: example,template: bug'
54
body:
65
- type: markdown

.github/ISSUE_TEMPLATE/3.feature_request.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Feature Request
22
description: Create a feature request for the Next.js core
3-
title: 'Feature Request'
43
labels: 'template: story'
54
body:
65
- type: markdown

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM node:10-buster
1+
FROM node:14-buster
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"
5-
LABEL repository="https://github.com/zeit/next-stats-action"
5+
LABEL repository="https://github.com/vercel/next-stats-action"
66

77
COPY . /next-stats
88

.github/labeler.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
"packages/react-dev-overlay/**",
99
"packages/react-refresh-utils/**",
1010
"packages/next-codemod/**"
11+
],
12+
"type: chrome": [
13+
{ "type": "user", "pattern": "spanicker" },
14+
{ "type": "user", "pattern": "housseindjirdeh" },
15+
{ "type": "user", "pattern": "devknoll" },
16+
{ "type": "user", "pattern": "janicklas-ralph" },
17+
{ "type": "user", "pattern": "atcastle" },
18+
{ "type": "user", "pattern": "Joonpark13" }
1119
]
1220
}
1321
}

.github/workflows/build_test_deploy.yml

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,15 @@ jobs:
156156
steps:
157157
- run: exit 0
158158

159-
testFutureDependencies:
160-
name: Webpack 5 (Basic, Production, Acceptance)
159+
testLegacyWebpack:
160+
name: Webpack 4 (Basic, Production, Acceptance)
161161
runs-on: ubuntu-latest
162162
needs: build
163163
env:
164164
NEXT_TELEMETRY_DISABLED: 1
165165
NEXT_TEST_JOB: 1
166166
HEADLESS: true
167-
NEXT_PRIVATE_TEST_WEBPACK5_MODE: 1
167+
NEXT_PRIVATE_TEST_WEBPACK4_MODE: 1
168168

169169
steps:
170170
- uses: actions/cache@v2
@@ -174,50 +174,16 @@ jobs:
174174
path: ./*
175175
key: ${{ github.sha }}
176176

177-
- run: xvfb-run node run-tests.js test/integration/{fallback-modules,link-ref,production,basic,async-modules,font-optimization,ssr-ctx}/test/index.test.js test/acceptance/*.test.js
177+
- run: xvfb-run node run-tests.js test/integration/{basic,fallback-modules,link-ref,production,async-modules,font-optimization,ssr-ctx}/test/index.test.js test/acceptance/*.test.js
178178
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
179179

180-
testLegacyReact:
181-
name: React 16 + Webpack 4 (Basic, Production, Acceptance)
182-
runs-on: ubuntu-latest
183-
env:
184-
NEXT_TELEMETRY_DISABLED: 1
185-
NEXT_TEST_JOB: 1
186-
HEADLESS: true
187-
188-
steps:
189-
- uses: actions/checkout@v2
190-
with:
191-
fetch-depth: 25
192-
193-
- run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
194-
id: docs-change
195-
196-
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
197-
if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
198-
199-
- run: cat package.json | jq '.resolutions.react = "^16.14.0"' > package.json.tmp && mv package.json.tmp package.json
200-
if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
201-
202-
- run: cat package.json | jq '.resolutions."react-dom" = "^16.14.0"' > package.json.tmp && mv package.json.tmp package.json
203-
if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
204-
205-
- run: yarn install --check-files
206-
if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
207-
208-
- run: yarn list react react-dom
209-
if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
210-
211-
- run: xvfb-run node run-tests.js test/integration/{link-ref,production,basic,async-modules,font-optimization,ssr-ctx,worker-loader}/test/index.test.js test/acceptance/*.test.js
212-
if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
213-
214180
testFirefox:
215181
name: Test Firefox (production)
216182
runs-on: ubuntu-latest
217183
needs: build
218184
env:
219185
HEADLESS: true
220-
BROWSERNAME: 'firefox'
186+
BROWSER_NAME: 'firefox'
221187
NEXT_TELEMETRY_DISABLED: 1
222188
steps:
223189
- uses: actions/cache@v2
@@ -226,7 +192,7 @@ jobs:
226192
with:
227193
path: ./*
228194
key: ${{ github.sha }}
229-
- run: node run-tests.js test/integration/production/test/index.test.js
195+
- run: node run-tests.js -c 1 test/integration/production/test/index.test.js
230196
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
231197

232198
testSafari:
@@ -235,7 +201,7 @@ jobs:
235201
needs: build
236202
env:
237203
BROWSERSTACK: true
238-
BROWSERNAME: 'safari'
204+
BROWSER_NAME: 'safari'
239205
NEXT_TELEMETRY_DISABLED: 1
240206
SKIP_LOCAL_SELENIUM_SERVER: true
241207
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
@@ -247,7 +213,7 @@ jobs:
247213
with:
248214
path: ./*
249215
key: ${{ github.sha }}
250-
- run: '[[ -z "$BROWSERSTACK_ACCESS_KEY" ]] && echo "Skipping for PR" || node run-tests.js test/integration/production/test/index.test.js'
216+
- run: '[[ -z "$BROWSERSTACK_ACCESS_KEY" ]] && echo "Skipping for PR" || node run-tests.js -c 1 test/integration/production/test/index.test.js'
251217
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
252218

253219
testSafariOld:
@@ -257,7 +223,7 @@ jobs:
257223
env:
258224
BROWSERSTACK: true
259225
LEGACY_SAFARI: true
260-
BROWSERNAME: 'safari'
226+
BROWSER_NAME: 'safari'
261227
NEXT_TELEMETRY_DISABLED: 1
262228
SKIP_LOCAL_SELENIUM_SERVER: true
263229
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
@@ -269,7 +235,7 @@ jobs:
269235
with:
270236
path: ./*
271237
key: ${{ github.sha }}
272-
- run: '[[ -z "$BROWSERSTACK_ACCESS_KEY" ]] && echo "Skipping for PR" || node run-tests.js test/integration/production-nav/test/index.test.js'
238+
- run: '[[ -z "$BROWSERSTACK_ACCESS_KEY" ]] && echo "Skipping for PR" || node run-tests.js -c 1 test/integration/production-nav/test/index.test.js'
273239
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
274240

275241
publishRelease:

.github/workflows/test_react_experimental.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
# needs: build
3030
env:
3131
NEXT_TELEMETRY_DISABLED: 1
32-
NEXT_PRIVATE_REACT_MODE: concurrent
3332
HEADLESS: true
3433
NEXT_PRIVATE_SKIP_SIZE_TESTS: true
34+
NEXT_PRIVATE_REACT_ROOT: 1
3535
strategy:
3636
fail-fast: false
3737
matrix:

0 commit comments

Comments
 (0)