Skip to content

Commit 1008d18

Browse files
committed
Merge branch 'dev' into releases/v4
2 parents 65b5dfd + d60bb0b commit 1008d18

23 files changed

+1837
-3301
lines changed

.devcontainer/Dockerfile

-2
This file was deleted.

.devcontainer/devcontainer.json

-22
This file was deleted.

.github/workflows/build.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: actions/setup-node@v4
2020
with:
21-
node-version: 'v20.10.0'
21+
node-version-file: '.nvmrc'
2222
registry-url: 'https://registry.npmjs.org'
2323

2424
- name: Install Yarn
@@ -32,7 +32,7 @@ jobs:
3232
yarn test
3333
3434
- name: Uploade CodeCov Report
35-
uses: codecov/codecov-action@v3.1.4
35+
uses: codecov/codecov-action@v4.3.0
3636
with:
3737
token: ${{ secrets.CODECOV_TOKEN }}
3838

@@ -44,7 +44,7 @@ jobs:
4444

4545
- uses: actions/setup-node@v4
4646
with:
47-
node-version: 'v20.10.0'
47+
node-version-file: '.nvmrc'
4848
registry-url: 'https://registry.npmjs.org'
4949

5050
- name: Install Yarn
@@ -61,7 +61,7 @@ jobs:
6161
ls node_modules
6262
6363
- name: artifact
64-
uses: actions/upload-artifact@v3
64+
uses: actions/upload-artifact@v4
6565
with:
6666
name: dist
6767
path: |
@@ -84,11 +84,11 @@ jobs:
8484

8585
- uses: actions/setup-node@v4
8686
with:
87-
node-version: 'v20.10.0'
87+
node-version-file: '.nvmrc'
8888
registry-url: 'https://registry.npmjs.org'
8989

9090
- name: Download artifact
91-
uses: actions/download-artifact@v3
91+
uses: actions/download-artifact@v4
9292
with:
9393
name: dist
9494

.github/workflows/codeql-analysis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
uses: actions/checkout@v4
2323

2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@v2
25+
uses: github/codeql-action/init@v3
2626

2727
- name: Autobuild
28-
uses: github/codeql-action/autobuild@v2
28+
uses: github/codeql-action/autobuild@v3
2929

3030
- name: Perform CodeQL Analysis
31-
uses: github/codeql-action/analyze@v2
31+
uses: github/codeql-action/analyze@v3

.github/workflows/integration.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
persist-credentials: false
152152

153153
- name: Install SSH Client
154-
uses: webfactory/ssh-agent@v0.8.0
154+
uses: webfactory/ssh-agent@v0.9.0
155155
with:
156156
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
157157

@@ -175,7 +175,7 @@ jobs:
175175
steps:
176176
- uses: actions/setup-node@v4
177177
with:
178-
node-version: 'v20.10.0'
178+
node-version-file: '.nvmrc'
179179

180180
- name: Checkout
181181
uses: actions/checkout@v4

.github/workflows/production.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
- uses: actions/setup-node@v4
1919
with:
20-
node-version: 'v20.10.0'
20+
node-version-file: '.nvmrc'
2121
registry-url: 'https://registry.npmjs.org'
2222

2323
- name: Install Yarn

.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# Setup .npmrc file to publish to npm
1818
- uses: actions/setup-node@v4
1919
with:
20-
node-version: 'v20.10.0'
20+
node-version-file: '.nvmrc'
2121
registry-url: 'https://registry.npmjs.org'
2222
scope: '@jamesives'
2323

@@ -43,7 +43,7 @@ jobs:
4343
# Setup .npmrc file to publish to GitHub Packages
4444
- uses: actions/setup-node@v4
4545
with:
46-
node-version: 'v20.10.0'
46+
node-version-file: '.nvmrc'
4747
registry-url: 'https://npm.pkg.github.com'
4848
scope: '@jamesives'
4949

.github/workflows/sponsors.yml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
file: 'README.md'
1919
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="50px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
2020
maximum: 4999
21+
active-only: false
2122

2223
- name: Generate Sponsors 💖
2324
uses: JamesIves/github-sponsors-readme-action@v1
@@ -27,6 +28,7 @@ jobs:
2728
minimum: 5000
2829
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="80px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
2930
marker: 'premium'
31+
active-only: false
3032

3133
- name: Deploy to GitHub Pages
3234
uses: JamesIves/github-pages-deploy-action@v4

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ yarn-error.log
2626
coverage
2727

2828
# Yarn Integrity file
29-
.yarn-integrity
29+
.yarn-integrity
30+
31+
# Dot Env
32+
.env

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
steps:
6969
- name: Checkout 🛎️
70-
uses: actions/checkout@v3
70+
uses: actions/checkout@v4
7171

7272
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
7373
run: |
@@ -89,7 +89,7 @@ on:
8989
- main
9090
```
9191

92-
> **Warning**
92+
> [!WARNING]
9393
> If you do not supply the action with an access token or an SSH key, you must access your repositories settings and provide `Read and Write Permissions` to the provided `GITHUB_TOKEN`, otherwise you'll potentially run into permission issues. Alternatively you can set the following in your workflow file to grant the action the permissions it needs.
9494

9595
```yml
@@ -185,7 +185,7 @@ jobs:
185185
runs-on: ubuntu-latest
186186
steps:
187187
- name: Checkout 🛎️
188-
uses: actions/checkout@v3
188+
uses: actions/checkout@v4
189189
190190
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
191191
run: |
@@ -235,7 +235,7 @@ jobs:
235235
runs-on: windows-latest # The first job utilizes windows-latest
236236
steps:
237237
- name: Checkout 🛎️
238-
uses: actions/checkout@v3
238+
uses: actions/checkout@v4
239239
240240
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
241241
run: |
@@ -254,7 +254,7 @@ jobs:
254254
runs-on: ubuntu-latest
255255
steps:
256256
- name: Checkout 🛎️
257-
uses: actions/checkout@v3
257+
uses: actions/checkout@v4
258258
259259
- name: Download Artifacts 🔻 # The built project is downloaded into the 'site' folder.
260260
uses: actions/download-artifact@v1
@@ -308,7 +308,7 @@ jobs:
308308
runs-on: ubuntu-latest
309309
steps:
310310
- name: Checkout 🛎️
311-
uses: actions/checkout@v3
311+
uses: actions/checkout@v4
312312
313313
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
314314
run: |

__tests__/execute.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe('execute', () => {
1010
stdout('hello')
1111
await execute('echo Montezuma', './', true)
1212

13-
expect(exec).toBeCalledWith('echo Montezuma', [], {
13+
expect(exec).toHaveBeenCalledWith('echo Montezuma', [], {
1414
cwd: './',
1515
silent: true,
1616
ignoreReturnCode: false,
@@ -27,7 +27,7 @@ describe('execute', () => {
2727
stdout('hello')
2828
await execute('echo Montezuma', './', false)
2929

30-
expect(exec).toBeCalledWith('echo Montezuma', [], {
30+
expect(exec).toHaveBeenCalledWith('echo Montezuma', [], {
3131
cwd: './',
3232
silent: false,
3333
ignoreReturnCode: false,

0 commit comments

Comments
 (0)