Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vercel/next.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 97456e81ce9860ce8b4bb58931b8d723d312d389
Choose a base ref
...
head repository: vercel/next.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 75b7a57e0f0044d9315eb6adbd4231b67799d0b1
Choose a head ref
  • 11 commits
  • 19 files changed
  • 1 contributor

Commits on Dec 4, 2021

  1. Verified

    This commit was signed with the committer’s verified signature.
    gregberge Greg Bergé
    Copy the full SHA
    4888713 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f59c82b View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    303bc0f View commit details
  4. Use next-11 tag

    ijjk committed Dec 4, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    66de88d View commit details
  5. Update branch name to next-11

    ijjk committed Dec 4, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b01acc1 View commit details
  6. fix lint

    ijjk committed Dec 4, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1a40e71 View commit details
  7. use correct token

    ijjk committed Dec 4, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e314019 View commit details
  8. Add no-verify-access for lerna

    ijjk committed Dec 4, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4dc9bba View commit details
  9. v11.1.3

    ijjk committed Dec 4, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ec1a0f7 View commit details

Commits on Jan 27, 2022

  1. Update node-fetch

    ijjk committed Jan 27, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e8b6d05 View commit details
  2. v11.1.4

    ijjk committed Jan 27, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    75b7a57 View commit details
285 changes: 182 additions & 103 deletions .github/workflows/build_test_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches: [canary]
branches: [canary, next-11]
tags: [v*]
pull_request:
types: [opened, synchronize]
@@ -25,6 +25,12 @@ jobs:
outputs:
docsChange: ${{ steps.docs-change.outputs.DOCS_CHANGE }}
steps:
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
node-version: 14

- uses: actions/checkout@v2
with:
fetch-depth: 25
@@ -35,7 +41,7 @@ jobs:

- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
- run: yarn install --frozen-lockfile --check-files
- run: node run-tests.js --timings --write-timings -g 1/1
# - run: node run-tests.js --timings --write-timings -g 1/1
- name: Check docs only change
run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
id: docs-change
@@ -50,11 +56,18 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
node-version: 14

- uses: actions/cache@v2
id: restore-build
with:
path: ./*
key: ${{ github.sha }}

- run: ./scripts/check-manifests.js
- run: yarn lint

@@ -65,6 +78,12 @@ jobs:
env:
NEXT_TELEMETRY_DISABLED: 1
steps:
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
node-version: 14

# https://github.com/actions/virtual-environments/issues/1187
- name: tune linux network
run: sudo ethtool -K eth0 tx off rx off
@@ -97,124 +116,154 @@ jobs:
NEXT_TEST_JOB: 1
HEADLESS: true
steps:
- uses: actions/cache@v2
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
id: restore-build
with:
path: ./*
key: ${{ github.sha }}

- run: node run-tests.js --type unit
if: ${{needs.build.outputs.docsChange != 'docs only change'}}

testIntegration:
name: Test Integration
runs-on: ubuntu-latest
needs: build
env:
NEXT_TELEMETRY_DISABLED: 1
NEXT_TEST_JOB: 1
HEADLESS: true
strategy:
fail-fast: false
matrix:
group: [1, 2, 3, 4, 5, 6]
steps:
- run: echo ${{needs.build.outputs.docsChange}}

# https://github.com/actions/virtual-environments/issues/1187
- name: tune linux network
run: sudo ethtool -K eth0 tx off rx off

- uses: actions/cache@v2
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
id: restore-build
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
path: ./*
key: ${{ github.sha }}

# TODO: remove after we fix watchpack watching too much
- run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
if: ${{needs.build.outputs.docsChange != 'docs only change'}}

- run: xvfb-run node run-tests.js --timings -g ${{ matrix.group }}/6 -c 3
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
node-version: 14

testElectron:
name: Test Electron
runs-on: ubuntu-latest
needs: build
env:
NEXT_TELEMETRY_DISABLED: 1
NEXT_TEST_JOB: 1
HEADLESS: true
TEST_ELECTRON: 1
steps:
- uses: actions/cache@v2
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
id: restore-build
with:
path: ./*
key: ${{ github.sha }}

# TODO: remove after we fix watchpack watching too much
- run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
if: ${{needs.build.outputs.docsChange != 'docs only change'}}

- run: cd test/integration/with-electron/app && yarn
if: ${{needs.build.outputs.docsChange != 'docs only change'}}

- run: xvfb-run node run-tests.js test/integration/with-electron/test/index.test.js
if: ${{needs.build.outputs.docsChange != 'docs only change'}}

testYarnPnP:
runs-on: ubuntu-latest
needs: build
env:
NODE_OPTIONS: '--unhandled-rejections=strict'
YARN_COMPRESSION_LEVEL: '0'
steps:
- uses: actions/cache@v2
- run: node run-tests.js --type unit
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
id: restore-build
with:
path: ./*
key: ${{ github.sha }}

- run: bash ./scripts/test-pnp.sh
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
# testIntegration:
# name: Test Integration
# runs-on: ubuntu-latest
# needs: build
# env:
# NEXT_TELEMETRY_DISABLED: 1
# NEXT_TEST_JOB: 1
# HEADLESS: true
# strategy:
# fail-fast: false
# matrix:
# group: [1, 2, 3, 4, 5, 6]
# steps:
# - name: Setup node
# uses: actions/setup-node@v2
# if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
# with:
# node-version: 14

# - run: echo ${{needs.build.outputs.docsChange}}

# # https://github.com/actions/virtual-environments/issues/1187
# - name: tune linux network
# run: sudo ethtool -K eth0 tx off rx off

# - uses: actions/cache@v2
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}
# id: restore-build
# with:
# path: ./*
# key: ${{ github.sha }}

# # TODO: remove after we fix watchpack watching too much
# - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}

# - run: xvfb-run node run-tests.js --timings -g ${{ matrix.group }}/6 -c 3
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}

# testElectron:
# name: Test Electron
# runs-on: ubuntu-latest
# needs: build
# env:
# NEXT_TELEMETRY_DISABLED: 1
# NEXT_TEST_JOB: 1
# HEADLESS: true
# TEST_ELECTRON: 1
# steps:
# - name: Setup node
# uses: actions/setup-node@v2
# if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
# with:
# node-version: 14

# - uses: actions/cache@v2
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}
# id: restore-build
# with:
# path: ./*
# key: ${{ github.sha }}

# # TODO: remove after we fix watchpack watching too much
# - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}

# - run: cd test/integration/with-electron/app && yarn
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}

# - run: xvfb-run node run-tests.js test/integration/with-electron/test/index.test.js
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}

# testYarnPnP:
# runs-on: ubuntu-latest
# needs: build
# env:
# NODE_OPTIONS: '--unhandled-rejections=strict'
# YARN_COMPRESSION_LEVEL: '0'
# steps:
# - name: Setup node
# uses: actions/setup-node@v2
# if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
# with:
# node-version: 14

# - uses: actions/cache@v2
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}
# id: restore-build
# with:
# path: ./*
# key: ${{ github.sha }}

# - run: bash ./scripts/test-pnp.sh
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}

testsPass:
name: thank you, next
runs-on: ubuntu-latest
needs: [lint, checkPrecompiled, testIntegration, testUnit, testYarnPnP]
needs: [lint, checkPrecompiled, testUnit]
steps:
- run: exit 0

testLegacyWebpack:
name: Webpack 4 (Basic, Production, Acceptance)
runs-on: ubuntu-latest
needs: build
env:
NEXT_TELEMETRY_DISABLED: 1
NEXT_TEST_JOB: 1
HEADLESS: true
NEXT_PRIVATE_TEST_WEBPACK4_MODE: 1

steps:
# https://github.com/actions/virtual-environments/issues/1187
- name: tune linux network
run: sudo ethtool -K eth0 tx off rx off

- uses: actions/cache@v2
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
id: restore-build
with:
path: ./*
key: ${{ github.sha }}

- 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
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
# testLegacyWebpack:
# name: Webpack 4 (Basic, Production, Acceptance)
# runs-on: ubuntu-latest
# needs: build
# env:
# NEXT_TELEMETRY_DISABLED: 1
# NEXT_TEST_JOB: 1
# HEADLESS: true
# NEXT_PRIVATE_TEST_WEBPACK4_MODE: 1

# steps:
# - name: Setup node
# uses: actions/setup-node@v2
# if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
# with:
# node-version: 14

# # https://github.com/actions/virtual-environments/issues/1187
# - name: tune linux network
# run: sudo ethtool -K eth0 tx off rx off

# - uses: actions/cache@v2
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}
# id: restore-build
# with:
# path: ./*
# key: ${{ github.sha }}

# - 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
# if: ${{needs.build.outputs.docsChange != 'docs only change'}}

testFirefox:
name: Test Firefox (production)
@@ -225,6 +274,12 @@ jobs:
BROWSER_NAME: 'firefox'
NEXT_TELEMETRY_DISABLED: 1
steps:
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
node-version: 14

- uses: actions/cache@v2
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
id: restore-build
@@ -246,6 +301,12 @@ jobs:
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
steps:
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
node-version: 14

# https://github.com/actions/virtual-environments/issues/1187
- name: tune linux network
run: sudo ethtool -K eth0 tx off rx off
@@ -272,6 +333,12 @@ jobs:
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
steps:
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
node-version: 14

# https://github.com/actions/virtual-environments/issues/1187
- name: tune linux network
run: sudo ethtool -K eth0 tx off rx off
@@ -291,8 +358,14 @@ jobs:
runs-on: ubuntu-latest
needs: [build, build-native]
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
steps:
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
node-version: 14

# https://github.com/actions/virtual-environments/issues/1187
- name: tune linux network
run: sudo ethtool -K eth0 tx off rx off
@@ -315,6 +388,12 @@ jobs:
runs-on: ubuntu-latest
needs: [publishRelease]
steps:
- name: Setup node
uses: actions/setup-node@v2
if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
with:
node-version: 14

- uses: actions/cache@v2
id: restore-build
with:
5 changes: 3 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -12,10 +12,11 @@
"npmClient": "npm",
"allowBranch": [
"master",
"canary"
"canary",
"next-11"
],
"registry": "https://registry.npmjs.org/"
}
},
"version": "11.1.2"
"version": "11.1.4"
}
Loading