Skip to content

chore: upgrade to next v13.4 #2080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 92 commits into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
40e1705
chore: upgrade to next v13.3.4
taty2010 May 1, 2023
344bc23
chore: changed experimental-edge to edge
taty2010 May 1, 2023
9da47cc
fix: updated shims file with Robs recent update
taty2010 May 1, 2023
6d39cbe
chore: prettier
taty2010 May 1, 2023
b82bb68
Merge branch 'main' into tn/nextjs-v13.3.4
taty2010 May 1, 2023
dc7459f
chore: updated e2e next-font
taty2010 May 1, 2023
dc8c75c
chore: testing out new createNextDescribe within next tests
taty2010 May 2, 2023
17c374e
chore: updated check/replacement for base-server
taty2010 May 2, 2023
61dc5ab
chore: updated format of new baseservereplacement
taty2010 May 2, 2023
49493a4
chore: updated to v13.4
taty2010 May 4, 2023
0b0095a
fix: moved next back to being a dep
taty2010 May 4, 2023
1bab739
Merge branch 'main' into tn/nextjs-v13.3.4
taty2010 May 4, 2023
459bedf
fix: test
taty2010 May 4, 2023
627788e
Merge branch 'main' into tn/nextjs-v13.3.4
taty2010 May 5, 2023
f20abb2
chore: merge main
taty2010 May 8, 2023
0e004dc
chore: package-lock
taty2010 May 8, 2023
bee550b
chore: packagelock formatting
taty2010 May 8, 2023
c05ed9d
chore: test
taty2010 May 8, 2023
00fc24c
Merge branch 'main' into tn/nextjs-v13.3.4
taty2010 May 8, 2023
0a6f9f0
chore: v3.4.1
taty2010 May 8, 2023
128170c
chore: packages I missed for 13.4.1
taty2010 May 8, 2023
1e50fb4
Merge branch 'main' into tn/nextjs-v13.3.4
LekoArts May 10, 2023
ea311c2
chore: remove unnecessary lock files
LekoArts May 10, 2023
2d2bb32
chore: update lock file
LekoArts May 10, 2023
73e9308
fix: prebundled react env var
LekoArts May 10, 2023
7cb15eb
chore: add comment
LekoArts May 10, 2023
6308e4c
chore: update snapshots
LekoArts May 10, 2023
5d7d61f
chore: linting
LekoArts May 10, 2023
47e95c9
chore: fix linting and config
LekoArts May 10, 2023
3c5027b
chore: add debug logging
LekoArts May 10, 2023
ad04aa1
chore: unskip test that needs to fix something
LekoArts May 10, 2023
0e6b3f9
fix: set env var differently
LekoArts May 11, 2023
4f13f66
chore: try stuff
LekoArts May 11, 2023
20afcf7
fix: try buildEnv
LekoArts May 11, 2023
d38f9e1
chore: linting
LekoArts May 11, 2023
662c41c
fix: revert stuff
LekoArts May 11, 2023
f15a159
chore: more revert
LekoArts May 11, 2023
bfd0bdd
Merge branch 'main' into tn/nextjs-v13.3.4
taty2010 May 11, 2023
4a5183e
chore: updated app-edge e2e test
taty2010 May 11, 2023
9bad109
chore: updated async-component-preload test
taty2010 May 11, 2023
47dc3ca
chore: try env var in ci
LekoArts May 12, 2023
e5a73af
chore: disabled app-edge-global tests and updated app-edge app
taty2010 May 12, 2023
e92333e
chore: updated rendering.test.ts
taty2010 May 12, 2023
f0c848a
Merge branch 'main' into tn/nextjs-v13.3.4
taty2010 May 12, 2023
de5d86b
chore: revert non-working env var setting
LekoArts May 15, 2023
2fd3d28
chore: whitespace
LekoArts May 15, 2023
5996df1
Merge branch 'main' into tn/nextjs-v13.3.4
taty2010 May 15, 2023
5b8eb39
Merge branch 'main' into tn/nextjs-v13.3.4
taty2010 May 16, 2023
3ec0c12
fix: testing env var workaround
taty2010 May 17, 2023
a643f79
chore: one last test
taty2010 May 17, 2023
82c1ea3
fix: removed prev env var changes
taty2010 May 17, 2023
4542684
chore: bump to next 13.4.3
orinokai May 24, 2023
b27e309
fix: use prebundled react at runtime
orinokai May 24, 2023
8cfe379
Merge branch 'main' into tn/nextjs-v13.3.4
orinokai May 24, 2023
14808eb
fix: set prebundled react for page/app route
orinokai May 24, 2023
612ef78
chore: update snapshots and package-lock
orinokai May 24, 2023
2c4d59e
Merge branch 'main' into tn/nextjs-v13.3.4
orinokai May 25, 2023
1b00d35
fix: make experimental config param optional
orinokai May 25, 2023
77c1d46
chore: update tests and snapshots
orinokai May 25, 2023
b795a53
Merge branch 'tn/nextjs-v13.3.4' of github.com:netlify/netlify-plugin…
orinokai May 25, 2023
c2c10e4
Merge branch 'main' into tn/nextjs-v13.3.4
orinokai May 25, 2023
1cf3e7f
chore: updating nextjs app-dir index test
taty2010 May 26, 2023
4b02bb6
chore: removed stale tests and added missing import
taty2010 May 26, 2023
b537ded
chore: try ignoring import error for tests
orinokai May 26, 2023
6a3b8aa
fix: conditionally load the Next Server Require module
orinokai May 26, 2023
4c11e25
fix: guard against undefined NextRequire
orinokai May 26, 2023
9760f50
chore: remove only from test
taty2010 May 26, 2023
1acf126
chore: update entrypoints test
orinokai May 30, 2023
5419d3a
chore: update app dir static tests from next repo
orinokai May 31, 2023
9b71249
Merge branch 'main' into tn/nextjs-v13.3.4
orinokai May 31, 2023
c4cfa16
chore: disabled app-static tests
taty2010 May 31, 2023
d319cc9
chore: skip cy rewrite test
taty2010 May 31, 2023
8fa64e0
chore: checking cy test fix
taty2010 May 31, 2023
1447487
chore: updated trailing-slash
taty2010 May 31, 2023
0325ac4
fix: changed testing route
taty2010 May 31, 2023
88f5179
chore: updated testing for custom-errors
taty2010 Jun 1, 2023
504d237
chore: move app-static handler to disabled folder
taty2010 Jun 1, 2023
d875211
Discard changes to cypress/e2e/default/appdir.cy.ts
LekoArts Jun 2, 2023
886c529
fix: conditionally resolve prebundled react
orinokai Jun 7, 2023
3ce59e4
Merge branch 'main' into tn/nextjs-v13.3.4
orinokai Jun 7, 2023
ad262c6
Merge branch 'main' into tn/nextjs-v13.3.4
orinokai Jun 12, 2023
a1bec9f
fix: guard against missing app path manifest
orinokai Jun 12, 2023
5108b76
chore: update tests
orinokai Jun 12, 2023
550ec86
chore: disable server tests until we fix revalidation issues
orinokai Jun 12, 2023
a5a13a8
chore: disable server tests until fix is ready
orinokai Jun 12, 2023
6a3fcef
chore: skip server tests
orinokai Jun 12, 2023
b255cc2
chore: disable split api routes on middleware until fix is in place
orinokai Jun 12, 2023
4f51249
fix: ensure middleware is disabled at origin
orinokai Jun 13, 2023
d6ec745
Merge branch 'main' into tn/nextjs-v13.3.4
orinokai Jun 13, 2023
280ed87
fix: ensure require hooks resolve from cwd
orinokai Jun 13, 2023
8d98f3f
Merge branch 'tn/nextjs-v13.3.4' of github.com:netlify/netlify-plugin…
orinokai Jun 13, 2023
ca0cca7
Merge branch 'main' into tn/nextjs-v13.3.4
orinokai Jun 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = {
},
},
{
files: ['cypress/**/*.spec.ts'],
files: ['cypress/**/*.cy.ts'],
rules: {
'max-nested-callbacks': 0,
'promise/prefer-await-to-then': 0,
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/default/custom-errors.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
describe('Custom error pages', () => {
it('should show custom 404 page on /404', () => {
cy.visit('/404', {failOnStatusCode: false})
cy.findByText('Custom 404 - Page Not Found')
cy.findByText('Custom 404 - Page Not Found', { selector: 'h1' })
})

it('should show custom 500 page on /500', () => {
cy.visit('/500', {failOnStatusCode: false})
cy.findByText('Custom 500 - Server-side error occurred')
cy.findByText('Custom 500 - Server-side error occurred', { selector: 'h1' })
})
})
3 changes: 2 additions & 1 deletion cypress/e2e/default/rewrites-redirects.cy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
describe('Rewrites and Redirects', () => {
it('rewrites: points /old to /', () => {
// TODO: detect if rewrite is app or page route for __NEXT_PRIVATE_PREBUNDLED_REACT logic
it.skip('rewrites: points /old to /', () => {
// preview mode is off by default
cy.visit('/old')
cy.findByText('NextJS on Netlify (imported Header component)')
Expand Down
12 changes: 6 additions & 6 deletions cypress/e2e/default/trailing-slash.cy.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
describe('Trailing slash enabled', () => {
it('should keep the trailing slash, i.e. points /old/ to /old/', () => {
cy.visit('/old/')
cy.url().should('eq', `${Cypress.config().baseUrl}/old/`)
it('should keep the trailing slash, i.e. points /static/ to /static/', () => {
cy.visit('/static/')
cy.url().should('eq', `${Cypress.config().baseUrl}/static/`)
})

it('should put a trailing slash when there is none, i.e. points /old to /old/', () => {
cy.visit('/old')
cy.url().should('eq', `${Cypress.config().baseUrl}/old/`)
it('should put a trailing slash when there is none, i.e. points /static to /static/', () => {
cy.visit('/static')
cy.url().should('eq', `${Cypress.config().baseUrl}/static/`)
})
})
2 changes: 1 addition & 1 deletion demos/base-path/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"typescript": "^4.6.3"
},
"dependencies": {
"next": "^13.3.0"
"next": "^13.4.1"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
Loading