Skip to content

Commit

Permalink
Merge branch 'main' into deps/js/check-dependency-version-consistency…
Browse files Browse the repository at this point in the history
…-3.x
  • Loading branch information
vilkinsons authored Feb 1, 2024
2 parents ddddaa1 + 0dcbcbd commit 036b20e
Show file tree
Hide file tree
Showing 12 changed files with 664 additions and 514 deletions.
4 changes: 2 additions & 2 deletions .github/actions/warm-up-repo/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
# cache: yarn ## Currently disabled because of frequent timeouts

- name: yarn install
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
with:
max_attempts: 3
timeout_minutes: 10
Expand All @@ -28,7 +28,7 @@ runs:
- name: npx playwright install
if: ${{ inputs.playwright-deps != '' }}
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
with:
max_attempts: 3
timeout_minutes: 10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
run: sudo apt install protobuf-compiler

- name: Install yarn dependencies
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
env:
HUSKY: 0
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
run: sudo apt install protobuf-compiler

- name: Install yarn dependencies
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
env:
HUSKY: 0
with:
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
- name: Show disk usage
run: df -h

- uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
- uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
name: Upload coverage to https://app.codecov.io/gh/hashintel/hash
with:
flags: ${{ env.TRIMMED_PACKAGE_NAME }}
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
@apps/hash-external-services
- name: Install yarn dependencies
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
env:
HUSKY: 0
with:
Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:
- name: Show disk usage
run: df -h

- uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
- uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
name: Upload coverage to https://app.codecov.io/gh/hashintel/hash
with:
flags: ${{ env.TRIMMED_PACKAGE_NAME }}
Expand Down Expand Up @@ -411,7 +411,7 @@ jobs:
run: sudo apt install protobuf-compiler

- name: Install yarn dependencies
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
env:
HUSKY: 0
with:
Expand Down Expand Up @@ -442,7 +442,7 @@ jobs:

- name: Install playwright
if: matrix.package == '@tests/hash-playwright'
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
with:
max_attempts: 3
timeout_minutes: 10
Expand Down
9 changes: 5 additions & 4 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions apps/hashdotdesign/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"storybook": "storybook dev -p 6006"
},
"devDependencies": {
"@babel/preset-env": "7.20.2",
"@babel/preset-typescript": "7.18.6",
"@babel/preset-env": "7.23.9",
"@babel/preset-typescript": "7.23.3",
"@hashintel/block-design-system": "0.0.1",
"@hashintel/design-system": "0.0.7",
"@local/eslint-config": "0.0.0-private",
Expand Down
2 changes: 1 addition & 1 deletion apps/hashdotdev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"unist-util-visit": "4.1.2"
},
"devDependencies": {
"@babel/core": "7.20.2",
"@babel/core": "7.23.9",
"@local/eslint-config": "0.0.0-private",
"@local/tsconfig": "0.0.0-private",
"@types/d3": "7.4.0",
Expand Down
8 changes: 4 additions & 4 deletions apps/plugin-browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"ws": "8.15.1"
},
"devDependencies": {
"@babel/core": "7.20.12",
"@babel/eslint-parser": "7.19.1",
"@babel/core": "7.23.9",
"@babel/eslint-parser": "7.23.10",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/preset-env": "7.20.2",
"@babel/preset-react": "7.18.6",
"@babel/preset-env": "7.23.9",
"@babel/preset-react": "7.23.3",
"@blockprotocol/core": "0.1.2",
"@graphql-codegen/cli": "5.0.0",
"@local/eslint-config": "0.0.0-private",
Expand Down
6 changes: 3 additions & 3 deletions libs/@local/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"lint:eslint": "eslint --report-unused-disable-directives ."
},
"dependencies": {
"@babel/core": "7.20.12",
"@babel/eslint-parser": "7.19.1",
"@babel/preset-react": "7.18.6",
"@babel/core": "7.23.9",
"@babel/eslint-parser": "7.23.10",
"@babel/preset-react": "7.23.3",
"@typescript-eslint/eslint-plugin": "6.20.0",
"@typescript-eslint/parser": "6.20.0",
"eslint": "8.56.0",
Expand Down
2 changes: 1 addition & 1 deletion libs/@local/hash-authorization/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ futures = { version = "0.3.30", default-features = false }
serde_json = { version = "1.0.113" }
serde_plain = "1.0.2"

reqwest = { version = "0.11.23", default-features = false, features = ["json", "stream"] }
reqwest = { version = "0.11.24", default-features = false, features = ["json", "stream"] }
tokio-util = { version ="0.7.10", features = ["io"] }
uuid = { version = "1.7.0", default-features = false, features = ["v5"] }

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"husky": "8.0.3",
"lint-staged": "15.2.0",
"lockfile-lint": "4.12.1",
"markdownlint-cli": "0.38.0",
"markdownlint-cli": "0.39.0",
"npm-run-all": "4.1.5",
"patch-package": "6.5.0",
"postinstall-postinstall": "2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/hash-backend-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"node-fetch": "^2.6.7"
},
"devDependencies": {
"@babel/preset-env": "7.20.2",
"@babel/preset-typescript": "7.18.6",
"@babel/preset-env": "7.23.9",
"@babel/preset-typescript": "7.23.3",
"@graphql-codegen/cli": "5.0.0",
"@graphql-codegen/introspection": "2.2.3",
"@graphql-codegen/typescript": "2.8.7",
Expand Down
Loading

0 comments on commit 036b20e

Please sign in to comment.