Skip to content

Commit 946533e

Browse files
kodiakhq[bot]kodiakhq[bot]
authored
Merge branch 'main' into rs/shim-require-buffer
2 parents 409354d + 826d708 commit 946533e

File tree

86 files changed

+1591
-968
lines changed

Some content is hidden

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

86 files changed

+1591
-968
lines changed

‎.eslintignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
.next
22
node_modules
3-
test
43
lib
54
demos
65
packages/runtime/src/templates/edge
76
packages/runtime/src/templates/edge-shared
87
packages/runtime/lib
98
packages/runtime/dist-types
10-
jestSetup.js
9+
jestSetup.js
10+
test/e2e
11+
test/fixtures/broken_next_config/next.config.js

‎.eslintrc.js

+23
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,28 @@ module.exports = {
5959
'promise/catch-or-return': 0,
6060
},
6161
},
62+
{
63+
files: ['test/**', 'packages/**/test/**'],
64+
plugins: ['jest'],
65+
extends: ['plugin:jest/recommended'],
66+
rules: {
67+
// Disable global rules
68+
'max-nested-callbacks': 'off',
69+
'@typescript-eslint/no-empty-function': 0,
70+
'max-lines-per-function': 0,
71+
'unicorn/no-empty-file': 0,
72+
'prefer-destructuring': 0,
73+
'@typescript-eslint/no-unused-vars': 0,
74+
'unicorn/no-await-expression-member': 0,
75+
'import/no-anonymous-default-export': 0,
76+
'no-shadow': 0,
77+
'@typescript-eslint/no-var-requires': 0,
78+
'require-await': 0,
79+
// esling-plugin-jest specific rules
80+
'jest/consistent-test-it': ['error', { fn: 'it', withinDescribe: 'it' }],
81+
'jest/no-disabled-tests': 0,
82+
'jest/no-conditional-expect': 0,
83+
},
84+
},
6285
],
6386
}

‎.github/workflows/cypress-canary.yml

-6
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ jobs:
1313
cypress:
1414
name: Cypress
1515
runs-on: ubuntu-latest
16-
strategy:
17-
fail-fast: false
18-
matrix:
19-
containers: [1, 2, 3, 4]
2016
steps:
2117
- name: Checkout
2218
uses: actions/checkout@v2
@@ -59,9 +55,7 @@ jobs:
5955
uses: cypress-io/github-action@v5
6056
with:
6157
browser: chrome
62-
headless: true
6358
record: true
64-
parallel: true
6559
config-file: cypress/config/canary.config.ts
6660
group: 'Next Runtime - Demo Canary'
6761
spec: cypress/e2e/canary/*

‎.github/workflows/cypress-demo-nx.yml

-6
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ jobs:
1313
cypress:
1414
name: Cypress
1515
runs-on: ubuntu-latest
16-
strategy:
17-
fail-fast: false
18-
matrix:
19-
containers: [1, 2, 3, 4]
2016
steps:
2117
- name: Checkout
2218
uses: actions/checkout@v2
@@ -59,9 +55,7 @@ jobs:
5955
uses: cypress-io/github-action@v5
6056
with:
6157
browser: chrome
62-
headless: true
6358
record: true
64-
parallel: true
6559
config-file: cypress/config/nx-demo.config.ts
6660
group: 'Next Runtime - Demo NX'
6761
spec: cypress/e2e/nx/*

‎.github/workflows/cypress-demo-static.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
containers: [1, 2, 3, 4]
19+
containers: [1, 2]
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v2
@@ -59,7 +59,6 @@ jobs:
5959
uses: cypress-io/github-action@v5
6060
with:
6161
browser: chrome
62-
headless: true
6362
record: true
6463
parallel: true
6564
config-file: cypress/config/static-root.config.ts

‎.github/workflows/cypress-demo.yml

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
uses: cypress-io/github-action@v5
6060
with:
6161
browser: chrome
62-
headless: true
6362
record: true
6463
parallel: true
6564
config-file: cypress/config/ci.config.ts

‎.github/workflows/cypress-middleware.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
containers: [1, 2, 3, 4]
19+
containers: [1, 2]
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v2
@@ -59,7 +59,6 @@ jobs:
5959
uses: cypress-io/github-action@v5
6060
with:
6161
browser: chrome
62-
headless: true
6362
record: true
6463
parallel: true
6564
config-file: cypress/config/middleware.config.ts

‎.prettierignore

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ node_modules
2121
lib
2222
tsconfig.json
2323
demos/nx-next-monorepo-demo
24+
test/fixtures/broken_next_config/next.config.js
25+
test/e2e
2426

2527
**/CHANGELOG.md
2628
packages/runtime/lib

‎cypress/e2e/default/appdir.cy.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('appDir', () => {
2525
},
2626
followRedirect: false,
2727
}).then((response) => {
28-
expect(response.headers).to.have.property('content-type', 'application/octet-stream')
28+
expect(response.headers).to.have.property('content-type', 'text/x-component')
2929
})
3030
})
3131

@@ -58,7 +58,7 @@ describe('appDir', () => {
5858
},
5959
followRedirect: false,
6060
}).then((response) => {
61-
expect(response.headers).to.have.property('content-type', 'application/octet-stream')
61+
expect(response.headers).to.have.property('content-type', 'text/x-component')
6262
})
6363
})
6464

@@ -70,7 +70,7 @@ describe('appDir', () => {
7070
},
7171
followRedirect: false,
7272
}).then((response) => {
73-
expect(response.headers).to.have.property('content-type', 'application/octet-stream')
73+
expect(response.headers).to.have.property('content-type', 'text/x-component')
7474
})
7575
})
7676

‎demos/base-path/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"typescript": "^4.6.3"
1515
},
1616
"dependencies": {
17-
"next": "^13.1.6"
17+
"next": "^13.3.0"
1818
},
1919
"scripts": {
2020
"test": "echo \"Error: no test specified\" && exit 1"

‎demos/canary/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"nanoid": "^3.3.4",
13-
"next": "^13.1.6",
13+
"next": "^13.3.0",
1414
"react": "latest",
1515
"react-dom": "latest",
1616
"sass": "latest",

‎demos/custom-routes/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"typescript": "^4.7.4"
1616
},
1717
"dependencies": {
18-
"next": "^13.1.6"
18+
"next": "^13.3.0"
1919
},
2020
"scripts": {
2121
"build": "next build",

‎demos/default/next-env.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference types="next/navigation-types/compat/navigation" />
34

45
// NOTE: This file should not be edited
56
// see https://nextjs.org/docs/basic-features/typescript for more information.

‎demos/default/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@reach/dialog": "^0.16.2",
2323
"@reach/visually-hidden": "^0.16.0",
2424
"@vercel/og": "^0.0.27",
25-
"next": "^13.1.6",
25+
"next": "^13.3.0",
2626
"react": "^18.2.0",
2727
"react-dom": "^18.2.0"
2828
},

‎demos/default/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
{
1717
"name": "next"
1818
}
19-
]
19+
],
20+
"strictNullChecks": true
2021
},
2122
"include": [
2223
"next-env.d.ts",

‎demos/middleware/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@netlify/next": "*",
1313
"@netlify/plugin-nextjs": "*",
1414
"isomorphic-unfetch": "^3.1.0",
15-
"next": "^13.1.6",
15+
"next": "^13.3.0",
1616
"react": "^18.2.0",
1717
"react-dom": "^18.2.0"
1818
},

‎demos/next-auth/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
],
2424
"license": "MIT",
2525
"dependencies": {
26-
"next": "^13.1.6",
26+
"next": "^13.3.0",
2727
"next-auth": "^4.15.0",
2828
"nodemailer": "^6.6.3",
2929
"react": "^18.2.0",

‎demos/next-export/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"description": "",
55
"dependencies": {
6-
"next": "^13.1.6"
6+
"next": "^13.3.0"
77
},
88
"devDependencies": {
99
"@netlify/next": "*",

‎demos/next-i18next/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lint": "next lint"
1010
},
1111
"dependencies": {
12-
"next": "^13.0.6",
12+
"next": "^13.3.0",
1313
"next-i18next": "^11.0.0",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0"

‎demos/next-with-edge-functions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"start": "next start"
88
},
99
"dependencies": {
10-
"next": "^13.1.6",
10+
"next": "^13.3.0",
1111
"react": "^18.0.2",
1212
"react-dom": "^18.0.2"
1313
}

‎demos/nx-next-monorepo-demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@netlify/plugin-nextjs": "file:plugin-wrapper",
1313
"@nrwl/next": "15.9.2",
1414
"core-js": "^3.6.5",
15-
"next": "^13.0.6",
15+
"next": "^13.3.0",
1616
"react": "^18.2.0",
1717
"react-dom": "18.2.0",
1818
"regenerator-runtime": "0.13.11",

‎demos/static-root/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"description": "",
55
"dependencies": {
6-
"next": "^13.1.6"
6+
"next": "^13.3.0"
77
},
88
"devDependencies": {
99
"@netlify/next": "*",

‎demos/turborepo-next-monorepo-demo/apps/docs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"lint": "next lint"
1010
},
1111
"dependencies": {
12-
"next": "13.0.7",
13-
"react": "17.0.2",
14-
"react-dom": "17.0.2",
12+
"next": "^13.3.0",
13+
"react": "^18.2.0",
14+
"react-dom": "^18.2.0",
1515
"ui": "*"
1616
},
1717
"devDependencies": {

‎demos/turborepo-next-monorepo-demo/apps/web/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"lint": "next lint"
1010
},
1111
"dependencies": {
12-
"next": "13.0.7",
13-
"react": "17.0.2",
14-
"react-dom": "17.0.2",
12+
"next": "^13.3.0",
13+
"react": "^18.2.0",
14+
"react-dom": "^18.2.0",
1515
"ui": "*"
1616
},
1717
"devDependencies": {

‎demos/turborepo-next-monorepo-demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"@types/react": "^18.0.0",
26-
"next": "^13.0.6",
26+
"next": "^13.3.0",
2727
"react": "^18.2.0",
2828
"react-dom": "^18.2.0"
2929
},

0 commit comments

Comments
 (0)