Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/client/braces-3.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
robere2 authored Nov 11, 2024
2 parents f8e7c31 + 08829fb commit e992d4d
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
node-version: [ 18.x, 20.x, 22.x ]
node-version: [ 20.x, 22.x ]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
22
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ As few dependencies as possible are used, and new dependencies should be install

### Prerequisites

You should have [Node.JS and NPM](https://nodejs.org/en/download/) installed on your computer. Node.js v20 is recommended, but v18 and v22 are also supported. If you have [nvm](https://github.com/nvm-sh/nvm) installed, you can switch to the correct Node.js version by running:
You should have [Node.JS and NPM](https://nodejs.org/en/download/) installed on your computer. Node.js v22 is recommended, but v20 is also supported. If you have [nvm](https://github.com/nvm-sh/nvm) installed, you can switch to the correct Node.js version by running:

```shell
nvm use
Expand Down
1 change: 1 addition & 0 deletions client/components/MySkills/MySkills.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class MySkills extends HTMLElement {
<tech-icon data-name="HTML/CSS" data-icon="fab fa-html5"></tech-icon>
<tech-icon data-name="Java" data-icon="fab fa-java"></tech-icon>
<tech-icon data-name="C/C++" data-icon="fak fa-cpp"></tech-icon>
<tech-icon data-name="Lua" data-icon="fak fa-lua"></tech-icon>
<tech-icon data-name="SQL" data-icon="fal fa-database"></tech-icon>
</repeating-list>
</div>
Expand Down
34 changes: 20 additions & 14 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e992d4d

Please sign in to comment.