Skip to content

Commit 7d8f81c

Browse files
LekoArtsLekoArts
authored
Merge branch 'main' into pieh-patch-1
2 parents 5281860 + 36cec73 commit 7d8f81c

File tree

116 files changed

+2628
-1975
lines changed

Some content is hidden

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

116 files changed

+2628
-1975
lines changed

‎.github/workflows/add-to-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
app_id: ${{ secrets.TOKENS_APP_ID }}
1515
private_key: ${{ secrets.TOKENS_PRIVATE_KEY }}
1616
- name: Add issue to Project
17-
uses: actions/add-to-project@v0.4.1
17+
uses: actions/add-to-project@v0.5.0
1818
with:
1919
project-url: https://github.com/orgs/netlify/projects/199
2020
github-token: ${{ steps.generate_token.outputs.token }}

‎.github/workflows/cypress-canary.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- main
88
paths:
99
- 'demos/canary/**/*.{js,jsx,ts,tsx}'
10-
- 'cypress/integration/canary/**/*.{ts,js}'
10+
- 'cypress/e2e/canary/**/*.{ts,js}'
1111
- 'src/**/*.{ts,js}'
1212
jobs:
1313
cypress:
@@ -56,15 +56,15 @@ jobs:
5656
- name: Cypress run
5757
if: ${{ steps.deploy.outputs.origin-url }}
5858
id: cypress
59-
uses: cypress-io/github-action@v2
59+
uses: cypress-io/github-action@v5
6060
with:
6161
browser: chrome
6262
headless: true
6363
record: true
6464
parallel: true
65-
config-file: cypress/config/canary.json
65+
config-file: cypress/config/canary.config.ts
6666
group: 'Next Runtime - Demo Canary'
67-
spec: cypress/integration/canary/*
67+
spec: cypress/e2e/canary/*
6868
env:
6969
DEBUG: '@cypress/github-action'
7070
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- main
88
paths:
99
- 'demos/nx-next-monorepo-demo/**/*.{js,jsx,ts,tsx}'
10-
- 'cypress/integration/nx/**/*.{ts,js}'
10+
- 'cypress/e2e/nx/**/*.{ts,js}'
1111
- 'src/**/*.{ts,js}'
1212
jobs:
1313
cypress:
@@ -56,15 +56,15 @@ jobs:
5656
- name: Cypress run
5757
if: ${{ steps.deploy.outputs.origin-url }}
5858
id: cypress
59-
uses: cypress-io/github-action@v2
59+
uses: cypress-io/github-action@v5
6060
with:
6161
browser: chrome
6262
headless: true
6363
record: true
6464
parallel: true
65-
config-file: cypress/config/nx-demo.json
65+
config-file: cypress/config/nx-demo.config.ts
6666
group: 'Next Runtime - Demo NX'
67-
spec: cypress/integration/nx/*
67+
spec: cypress/e2e/nx/*
6868
env:
6969
DEBUG: '@cypress/github-action'
7070
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- main
88
paths:
99
- 'demos/static-root/**/*.{js,jsx,ts,tsx}'
10-
- 'cypress/integration/static/**/*.{ts,js}'
10+
- 'cypress/e2e/static/**/*.{ts,js}'
1111
- 'src/**/*.{ts,js}'
1212
jobs:
1313
cypress:
@@ -56,15 +56,15 @@ jobs:
5656
- name: Cypress run
5757
if: ${{ steps.deploy.outputs.origin-url }}
5858
id: cypress
59-
uses: cypress-io/github-action@v2
59+
uses: cypress-io/github-action@v5
6060
with:
6161
browser: chrome
6262
headless: true
6363
record: true
6464
parallel: true
65-
config-file: cypress/config/static-root.json
65+
config-file: cypress/config/static-root.config.ts
6666
group: 'Next Runtime - Demo Static'
67-
spec: cypress/integration/static-root/*
67+
spec: cypress/e2e/static-root/*
6868
env:
6969
DEBUG: '@cypress/github-action'
7070
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

‎.github/workflows/cypress-demo.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- main
88
paths:
99
- 'demos/default/**/*.{js,jsx,ts,tsx}'
10-
- 'cypress/integration/default/**/*.{ts,js}'
10+
- 'cypress/e2e/default/**/*.{ts,js}'
1111
- 'src/**/*.{ts,js}'
1212
jobs:
1313
cypress:
@@ -56,15 +56,15 @@ jobs:
5656
- name: Cypress run
5757
if: ${{ steps.deploy.outputs.origin-url }}
5858
id: cypress
59-
uses: cypress-io/github-action@v2
59+
uses: cypress-io/github-action@v5
6060
with:
6161
browser: chrome
6262
headless: true
6363
record: true
6464
parallel: true
65-
config-file: cypress/config/ci.json
65+
config-file: cypress/config/ci.config.ts
6666
group: 'Next Runtime - Demo'
67-
spec: cypress/integration/default/*
67+
spec: cypress/e2e/default/*
6868
env:
6969
DEBUG: '@cypress/github-action'
7070
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

‎.github/workflows/cypress-middleware.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- main
88
paths:
99
- 'demos/middleware/**/*.{js,jsx,ts,tsx}'
10-
- 'cypress/integration/middleware/**/*.{ts,js}'
10+
- 'cypress/e2e/middleware/**/*.{ts,js}'
1111
- 'src/**/*.{ts,js}'
1212
jobs:
1313
cypress:
@@ -56,15 +56,15 @@ jobs:
5656
- name: Cypress run
5757
if: ${{ steps.deploy.outputs.origin-url }}
5858
id: cypress
59-
uses: cypress-io/github-action@v2
59+
uses: cypress-io/github-action@v5
6060
with:
6161
browser: chrome
6262
headless: true
6363
record: true
6464
parallel: true
65-
config-file: cypress/config/middleware.json
65+
config-file: cypress/config/middleware.config.ts
6666
group: 'Next Runtime - Middleware'
67-
spec: cypress/integration/middleware/*
67+
spec: cypress/e2e/middleware/*
6868
env:
6969
DEBUG: '@cypress/github-action'
7070
CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

‎.github/workflows/e2e-appdir.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ jobs:
3535
test-file: ${{ fromJson(needs.setup.outputs['test-files']) }}
3636
steps:
3737
- uses: actions/checkout@v3
38+
- uses: actions/setup-node@v2
39+
with:
40+
node-version: '16'
41+
cache: 'npm'
3842
- run: npm install
43+
- name: Install Netlify CLI
44+
run: npm install -g netlify-cli
3945
- name: Run tests
4046
run: npx jest --reporters=jest-junit --reporters=default -c test/e2e/jest.config.all.js ${{ matrix.test-file }}
4147
env:

‎.github/workflows/e2e-next.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
name: Next.js e2e test suite
22

33
on:
4-
pull_request:
5-
types: [opened, synchronize]
6-
push:
7-
branches: [main]
4+
# pull_request:
5+
# types: [opened, synchronize]
6+
# push:
7+
# branches: [main]
8+
schedule:
9+
- cron: '0 0 * * *'
810

911
jobs:
1012
setup:
@@ -35,7 +37,13 @@ jobs:
3537
test-file: ${{ fromJson(needs.setup.outputs['test-files']) }}
3638
steps:
3739
- uses: actions/checkout@v3
40+
- uses: actions/setup-node@v2
41+
with:
42+
node-version: '16'
43+
cache: 'npm'
3844
- run: npm install
45+
- name: Install Netlify CLI
46+
run: npm install -g netlify-cli
3947
- name: Run tests
4048
run: npx jest --reporters=jest-junit --reporters=default -c test/e2e/jest.config.all.js ${{ matrix.test-file }}
4149
env:

‎.release-please-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"packages/runtime": "4.33.0",
3-
"packages/next": "1.4.4"
2+
"packages/runtime": "4.36.0",
3+
"packages/next": "1.4.5"
44
}

‎cypress/config/all.config.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { defineConfig } from 'cypress'
2+
3+
export default defineConfig({
4+
video: false,
5+
e2e: {
6+
baseUrl: 'http://localhost:3000',
7+
},
8+
})

0 commit comments

Comments
 (0)