Skip to content

Commit

Permalink
Merge pull request #5014 from abnud11/chore/upgrade-dependencies
Browse files Browse the repository at this point in the history
chore: upgrade yarn to v4 and other dependencies
  • Loading branch information
martijnrusschen authored Aug 30, 2024
2 parents c834746 + ca934b8 commit 71cc9e8
Show file tree
Hide file tree
Showing 18 changed files with 38,194 additions and 26,687 deletions.
18 changes: 13 additions & 5 deletions .github/workflows/build-docs-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Corepack enable
run: corepack enable

- name: Yarn setup
run: corepack prepare --activate

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
Expand All @@ -25,10 +36,7 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: Set Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Install dependencies
run: yarn install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -54,7 +54,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -68,4 +68,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
24 changes: 11 additions & 13 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Set Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Corepack enable
run: corepack enable

- name: Yarn setup
run: corepack prepare --activate

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- name: Install dependencies
run: yarn install

Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,24 @@ jobs:

steps:
- uses: actions/checkout@v4

- name: Setup kernel for react, increase watchers
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

- name: Set Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Corepack enable
run: corepack enable

- name: Yarn setup
run: corepack prepare --activate

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,11 @@ docs/year_dropdown.md
package-lock.json
scripts/.DS_Store
.DS_Store

.yarn/*
!.yarn/cache
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn precommit
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
7 changes: 7 additions & 0 deletions docs-site/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,10 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.yarn/*
!.yarn/cache
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
9 changes: 3 additions & 6 deletions docs-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"production": [">0.2%", "not dead", "not op_mini all"],
"development": [
"last 1 chrome version",
"last 1 firefox version",
Expand All @@ -37,5 +33,6 @@
},
"resolutions": {
"strip-ansi": "6.0.1"
}
},
"packageManager": "[email protected]"
}
4 changes: 3 additions & 1 deletion docs-site/src/components/Examples/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ input {
&:focus {
outline: none;
border-color: #aeaeae;
box-shadow: inset 0 2px 2px #e9e9e9, 0 0 10px 0 rgba(73, 107, 125, 0.3);
box-shadow:
inset 0 2px 2px #e9e9e9,
0 0 10px 0 rgba(73, 107, 125, 0.3);
}
}

Expand Down
Loading

0 comments on commit 71cc9e8

Please sign in to comment.