Skip to content

Commit e6e0016

Browse files
authored
Merge branch 'master' into feat/update-storage-mock
2 parents a15cbfd + c127bc6 commit e6e0016

File tree

65 files changed

+1604
-831
lines changed

Some content is hidden

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

65 files changed

+1604
-831
lines changed

.github/workflows/pull_request.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
fetch-depth: 0
1414

1515
- name: Use Node.js ${{ matrix.node-version }}
16-
uses: actions/setup-node@v3
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: ${{ matrix.node-version }}
1919
cache: 'npm'
2020

2121
- name: Cache node modules
22-
uses: actions/cache@v3
22+
uses: actions/cache@v4
2323
id: cache-node-modules
2424
env:
2525
cache-name: cache-node-modules
@@ -30,7 +30,7 @@ jobs:
3030
key: ${{ runner.os }}-${{ matrix.node-version }}-build-${{ env.cache-name }}-${{ hashFiles('./packages/*/package-lock.json') }}-${{ hashFiles('./package-lock.json') }}
3131

3232
- name: Cache turbo
33-
uses: actions/cache@v3
33+
uses: actions/cache@v4
3434
id: cache-turbo
3535
with:
3636
path: .turbo

.github/workflows/release.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
pull_request:
55
types: [closed]
66

7+
permissions:
8+
contents: write
9+
pull-requests: read
10+
711
jobs:
812
check-next-version:
913
runs-on: ubuntu-latest
@@ -19,18 +23,18 @@ jobs:
1923
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'master'
2024

2125
steps:
22-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2327
with:
2428
fetch-depth: 0
2529
ref: master
2630

2731
- name: Use Node.js ${{ matrix.node-version }}
28-
uses: actions/setup-node@v3
32+
uses: actions/setup-node@v4
2933
with:
3034
node-version: ${{ matrix.node-version }}
3135

3236
- name: Cache node modules
33-
uses: actions/cache@v3
37+
uses: actions/cache@v4
3438
id: cache-node-modules
3539
env:
3640
cache-name: cache-node-modules
@@ -59,18 +63,18 @@ jobs:
5963
node-version: [20]
6064

6165
steps:
62-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v4
6367
with:
6468
fetch-depth: 0
6569
ref: master
6670

6771
- name: Use Node.js ${{ matrix.node-version }}
68-
uses: actions/setup-node@v3
72+
uses: actions/setup-node@v4
6973
with:
7074
node-version: ${{ matrix.node-version }}
7175

7276
- name: Cache node modules
73-
uses: actions/cache@v3
77+
uses: actions/cache@v4
7478
id: cache-node-modules
7579
env:
7680
cache-name: cache-node-modules
@@ -81,7 +85,7 @@ jobs:
8185
key: ${{ runner.os }}-${{ matrix.node-version }}-build-${{ env.cache-name }}-${{ hashFiles('./packages/*/package-lock.json') }}-${{ hashFiles('./package-lock.json') }}
8286

8387
- name: Cache turbo build setup
84-
uses: actions/cache@v3
88+
uses: actions/cache@v4
8589
with:
8690
path: .turbo
8791
key: turbo-master-${{ github.sha }}
@@ -103,13 +107,9 @@ jobs:
103107

104108
- name: Configures Git
105109
run: |
106-
git config --global user.name "${{ github.actor }}"
107-
git config --global user.email "$(git log --format='%ae' HEAD^!)"
108-
109-
- name: Creates release branch
110-
run: |
111-
git checkout -b release/${{ needs.check-next-version.outputs.next_version }} origin/master
112-
git push origin release/${{ needs.check-next-version.outputs.next_version }}
110+
git config user.name "${{ secrets.GIT_REPOSITORY_USERNAME }}"
111+
git config user.email "${{ secrets.GIT_REPOSITORY_EMAIL }}"
112+
git remote set-url origin https://${{ secrets.GIT_REPOSITORY_USERNAME }}:${{ secrets.GIT_REPOSITORY_ACCESS_TOKEN }}@github.com/capricorn86/happy-dom.git
113113
114114
- name: Pushes Git tag
115115
run: |
@@ -133,18 +133,18 @@ jobs:
133133
node-version: [20]
134134

135135
steps:
136-
- uses: actions/checkout@v3
136+
- uses: actions/checkout@v4
137137
with:
138138
fetch-depth: 0
139139
ref: master
140140

141141
- name: Use Node.js ${{ matrix.node-version }}
142-
uses: actions/setup-node@v3
142+
uses: actions/setup-node@v4
143143
with:
144144
node-version: ${{ matrix.node-version }}
145145

146146
- name: Cache node modules
147-
uses: actions/cache@v3
147+
uses: actions/cache@v4
148148
id: cache-node-modules
149149
env:
150150
cache-name: cache-node-modules

.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
legacy-peer-deps=true

docs/contributing.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ We are very happy that you would like to contribute. In this guide you will find
66

77
### Install
88

9-
We need to add "--legacy-peer-deps" to the install as a workaround to be able to install Vitest. Otherwise we get an "Cannot set properties of null (setting 'parent')" error as Vitest has "happy-dom" as peer dependency. Hopefully we can find a better solution in the future.
10-
119
```bash
12-
npm install --legacy-peer-deps
10+
npm install
1311
```
1412

1513
### Compile

0 commit comments

Comments
 (0)