Skip to content

Commit

Permalink
Merge github.com:hashintel/hash into cm/use-and-set-datatypeid-in-edi…
Browse files Browse the repository at this point in the history
…tor-metadata
  • Loading branch information
CiaranMn committed Dec 6, 2024
2 parents 64b99ff + 30313be commit 00bd165
Show file tree
Hide file tree
Showing 47 changed files with 657 additions and 664 deletions.
2 changes: 1 addition & 1 deletion .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: Install WASM tools
uses: taiki-e/install-action@c4bf614c2fb42375baf4f51283c33befce095fc5 # v2.45.15
uses: taiki-e/install-action@6aa8b420a527920162babdd71d780f9e5b3b4bc8 # v2.46.1
with:
tool: wasm-pack@0.12.1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
- name: Install Rust tools
if: steps.benches.outputs.has-rust == 'true'
uses: taiki-e/install-action@c4bf614c2fb42375baf4f51283c33befce095fc5 # v2.45.15
uses: taiki-e/install-action@6aa8b420a527920162babdd71d780f9e5b3b4bc8 # v2.46.1
with:
tool: just@1.34.0,critcmp@0.1.8

Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
- name: Install Rust tools
if: steps.benches.outputs.has-rust == 'true'
uses: taiki-e/install-action@c4bf614c2fb42375baf4f51283c33befce095fc5 # v2.45.15
uses: taiki-e/install-action@6aa8b420a527920162babdd71d780f9e5b3b4bc8 # v2.46.1
with:
tool: just@1.34.0,critcmp@0.1.8

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:

- name: Install Rust tools
if: always() && steps.lints.outputs.has-rust == 'true'
uses: taiki-e/install-action@c4bf614c2fb42375baf4f51283c33befce095fc5 # v2.45.15
uses: taiki-e/install-action@6aa8b420a527920162babdd71d780f9e5b3b4bc8 # v2.46.1
with:
tool: just@1.34.0,cargo-hack@0.6.30,clippy-sarif@0.6.5,sarif-fmt@0.6.5

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:

- name: Install Rust tools
if: always() && steps.tests.outputs.has-rust == 'true'
uses: taiki-e/install-action@c4bf614c2fb42375baf4f51283c33befce095fc5 # v2.45.15
uses: taiki-e/install-action@6aa8b420a527920162babdd71d780f9e5b3b4bc8 # v2.46.1
with:
tool: just@1.34.0,cargo-hack@0.6.30,cargo-nextest@0.9.72,cargo-llvm-cov@0.6.11

Expand Down Expand Up @@ -281,7 +281,7 @@ jobs:

- name: Install Rust tools
if: steps.tests.outputs.has-rust == 'true'
uses: taiki-e/install-action@c4bf614c2fb42375baf4f51283c33befce095fc5 # v2.45.15
uses: taiki-e/install-action@6aa8b420a527920162babdd71d780f9e5b3b4bc8 # v2.46.1
with:
tool: just@1.34.0,cargo-hack@0.6.30,cargo-nextest@0.9.72,cargo-llvm-cov@0.6.11

Expand Down
16 changes: 8 additions & 8 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ axum = { version = "0.7.5" }
axum-core = { version = "0.4.3" }
bumpalo = { version = "=3.16.0", default-features = false }
bytes = { version = "1.6.0" }
clap_builder = { version = "=4.5.22", default-features = false, features = ["std"] }
clap_builder = { version = "=4.5.23", default-features = false, features = ["std"] }
criterion = { version = "=0.5.1" }
deadpool = { version = "=0.12.1", default-features = false }
deadpool-postgres = { version = "=0.14.0", default-features = false }
Expand Down Expand Up @@ -136,7 +136,7 @@ text-size = { version = "=1.1.1", default-features = false }
time = { version = "=0.3.36", default-features = false }
tokio = { version = "=1.42.0", default-features = false }
tokio-postgres = { version = "=0.7.12", default-features = false }
tokio-util = { version = "=0.7.12", default-features = false }
tokio-util = { version = "=0.7.13", default-features = false }
tower-http = { version = "=0.6.2", features = ["trace"] }
tower-layer = { version = "=0.3.3", default-features = false }
tower-service = { version = "=0.3.3", default-features = false }
Expand All @@ -158,7 +158,7 @@ aws-config = { version = "=1.5.10" }
aws-sdk-s3 = { version = "=1.65.0", default-features = false }
bitvec = { version = "=1.0.1", default-features = false }
bytes-utils = { version = "=0.1.4", default-features = false }
clap = { version = "=4.5.22", features = ["color", "error-context", "help", "std", "suggestions", "usage"] }
clap = { version = "=4.5.23", features = ["color", "error-context", "help", "std", "suggestions", "usage"] }
clap_complete = { version = "=4.5.38", default-features = false }
convert_case = { version = "=0.6.0", default-features = false }
criterion-macro = { version = "=0.4.0", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions apps/hash-ai-worker-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
"@local/hash-isomorphic-utils": "0.0.0-private",
"@local/hash-subgraph": "0.0.0-private",
"@local/status": "0.0.0-private",
"@sentry/node": "7.120.0",
"@sentry/node": "7.120.1",
"@temporalio/activity": "1.11.5",
"@temporalio/common": "1.11.5",
"@temporalio/proto": "1.11.5",
"@temporalio/worker": "1.11.5",
"@temporalio/workflow": "1.11.5",
"ajv": "8.17.1",
"ajv-formats": "3.0.1",
"axios": "1.7.8",
"axios": "1.7.9",
"cache-manager": "5.7.6",
"dedent": "0.7.0",
"dotenv-flow": "3.3.0",
Expand Down
32 changes: 16 additions & 16 deletions apps/hash-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
},
"dependencies": {
"@apps/hash-graph": "0.0.0-private",
"@aws-sdk/client-s3": "3.703.0",
"@aws-sdk/client-s3": "3.705.0",
"@aws-sdk/client-ses": "3.699.0",
"@aws-sdk/credential-provider-node": "3.699.0",
"@aws-sdk/s3-presigned-post": "3.703.0",
"@aws-sdk/s3-request-presigner": "3.703.0",
"@aws-sdk/s3-presigned-post": "3.705.0",
"@aws-sdk/s3-request-presigner": "3.705.0",
"@blockprotocol/core": "0.1.3",
"@blockprotocol/type-system": "0.1.2-canary.0",
"@graphql-tools/schema": "8.5.1",
Expand All @@ -42,20 +42,20 @@
"@local/status": "0.0.0-private",
"@mailchimp/mailchimp_marketing": "3.0.80",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/core": "1.28.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.55.0",
"@opentelemetry/instrumentation": "0.55.0",
"@opentelemetry/instrumentation-express": "0.45.0",
"@opentelemetry/instrumentation-graphql": "0.45.0",
"@opentelemetry/instrumentation-http": "0.55.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-trace-base": "1.28.0",
"@opentelemetry/sdk-trace-node": "1.28.0",
"@opentelemetry/core": "1.29.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.56.0",
"@opentelemetry/instrumentation": "0.56.0",
"@opentelemetry/instrumentation-express": "0.46.0",
"@opentelemetry/instrumentation-graphql": "0.46.0",
"@opentelemetry/instrumentation-http": "0.56.0",
"@opentelemetry/resources": "1.29.0",
"@opentelemetry/sdk-trace-base": "1.29.0",
"@opentelemetry/sdk-trace-node": "1.29.0",
"@ory/client": "1.1.41",
"@ory/hydra-client": "2.2.1",
"@ory/kratos-client": "1.0.0",
"@rudderstack/rudder-sdk-node": "2.1.1",
"@sentry/node": "7.120.0",
"@sentry/node": "7.120.1",
"@snowplow/node-tracker": "3.24.6",
"@temporalio/client": "1.11.5",
"@temporalio/proto": "1.11.5",
Expand All @@ -66,14 +66,14 @@
"apollo-server-errors": "3.3.1",
"apollo-server-express": "3.9.0",
"app-root-path": "3.1.0",
"axios": "1.7.8",
"axios": "1.7.9",
"body-parser": "1.20.3",
"clipboardy": "2.3.0",
"cors": "2.8.5",
"cross-env": "7.0.3",
"dedent": "0.7.0",
"exponential-backoff": "3.1.1",
"express": "4.21.1",
"express": "4.21.2",
"express-handlebars": "7.1.3",
"express-http-proxy": "2.1.1",
"express-rate-limit": "7.4.1",
Expand Down Expand Up @@ -123,7 +123,7 @@
"@types/nodemailer": "6.4.17",
"@vitest/coverage-istanbul": "2.1.8",
"eslint": "8.57.0",
"prettier": "3.4.1",
"prettier": "3.4.2",
"rimraf": "6.0.1",
"typescript": "5.6.3",
"vitest": "2.1.8",
Expand Down
16 changes: 8 additions & 8 deletions apps/hash-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@blockprotocol/hook": "0.1.3",
"@blockprotocol/service": "0.1.4",
"@blockprotocol/type-system": "0.1.2-canary.0",
"@dnd-kit/core": "6.2.0",
"@dnd-kit/core": "6.3.1",
"@dnd-kit/sortable": "7.0.2",
"@dnd-kit/utilities": "3.2.2",
"@emoji-mart/react": "1.0.1",
Expand All @@ -46,15 +46,15 @@
"@local/hash-isomorphic-utils": "0.0.0-private",
"@local/hash-subgraph": "0.0.0-private",
"@local/status": "0.0.0-private",
"@mui/icons-material": "5.16.8",
"@mui/material": "5.16.8",
"@mui/icons-material": "5.16.9",
"@mui/material": "5.16.9",
"@mui/system": "5.16.8",
"@ory/client": "1.1.41",
"@ory/integrations": "1.1.4",
"@popperjs/core": "2.11.8",
"@react-sigma/core": "4.0.3",
"@sentry/nextjs": "7.120.0",
"@sentry/react": "7.120.0",
"@sentry/nextjs": "7.120.1",
"@sentry/react": "7.120.1",
"@sentry/webpack-plugin": "1.21.0",
"@sigma/edge-curve": "patch:@sigma/edge-curve@npm%3A3.0.0-beta.16#~/.yarn/patches/@sigma-edge-curve-npm-3.0.0-beta.16-3d8b985284.patch",
"@sigma/node-border": "3.0.0-beta.7",
Expand All @@ -65,7 +65,7 @@
"@tldraw/tldraw": "2.0.0-alpha.12",
"@tldraw/tlvalidate": "2.0.0-alpha.12",
"@types/prismjs": "1.26.5",
"axios": "1.7.8",
"axios": "1.7.9",
"buffer": "6.0.3",
"clsx": "1.2.1",
"date-fns": "4.1.0",
Expand Down Expand Up @@ -153,10 +153,10 @@
"eslint": "8.57.0",
"graphology-types": "0.24.8",
"rimraf": "6.0.1",
"sass": "1.81.1",
"sass": "1.82.0",
"typescript": "5.6.3",
"wait-on": "8.0.1",
"webpack": "5.97.0"
"webpack": "5.97.1"
},
"engines": {
"node": ">= v20"
Expand Down
4 changes: 2 additions & 2 deletions apps/hash-integration-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"@local/hash-graph-sdk": "0.0.0-private",
"@local/hash-isomorphic-utils": "0.0.0-private",
"@local/hash-subgraph": "0.0.0-private",
"@sentry/node": "7.120.0",
"@sentry/node": "7.120.1",
"@temporalio/activity": "1.11.5",
"@temporalio/worker": "1.11.5",
"@temporalio/workflow": "1.11.5",
"agentkeepalive": "4.5.0",
"axios": "1.7.8",
"axios": "1.7.9",
"dotenv-flow": "3.3.0",
"tsx": "4.19.2",
"typescript": "5.6.3"
Expand Down
2 changes: 1 addition & 1 deletion apps/hashdotdesign/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@emotion/cache": "11.13.5",
"@emotion/react": "11.13.5",
"@emotion/styled": "11.13.5",
"@mui/material": "5.16.8",
"@mui/material": "5.16.9",
"@mui/system": "5.16.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
6 changes: 3 additions & 3 deletions apps/hashdotdev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"@emotion/styled": "11.13.5",
"@fortawesome/free-solid-svg-icons": "6.7.1",
"@matejmazur/react-katex": "3.1.3",
"@mui/icons-material": "5.16.8",
"@mui/material": "5.16.8",
"@mui/icons-material": "5.16.9",
"@mui/material": "5.16.9",
"@mui/system": "5.16.8",
"axios": "1.7.8",
"axios": "1.7.9",
"calculation-block": "0.2.2",
"clsx": "1.2.1",
"d3": "7.9.0",
Expand Down
12 changes: 6 additions & 6 deletions apps/plugin-browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"@local/hash-graph-types": "0.0.0-private",
"@local/hash-isomorphic-utils": "0.0.0-private",
"@local/hash-subgraph": "0.0.0-private",
"@mui/material": "5.16.8",
"@sentry/browser": "7.120.0",
"@mui/material": "5.16.9",
"@sentry/browser": "7.120.1",
"bowser": "2.11.0",
"date-fns": "4.1.0",
"fractional-indexing": "2.1.0",
Expand All @@ -53,7 +53,7 @@
"@babel/eslint-parser": "7.25.9",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/preset-env": "7.26.0",
"@babel/preset-react": "7.25.9",
"@babel/preset-react": "7.26.3",
"@blockprotocol/core": "0.1.3",
"@graphql-codegen/cli": "^5.0.3",
"@local/eslint-config": "0.0.0-private",
Expand All @@ -62,7 +62,7 @@
"@local/hash-subgraph": "0.0.0-private",
"@local/status": "0.0.0-private",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@sentry/webpack-plugin": "2.22.6",
"@sentry/webpack-plugin": "2.22.7",
"@types/lodash.debounce": "4.0.9",
"@types/react": "18.2.68",
"@types/react-dom": "18.2.25",
Expand All @@ -83,7 +83,7 @@
"react-refresh": "0.14.0",
"react-refresh-typescript": "2.0.9",
"rimraf": "6.0.1",
"sass": "1.81.1",
"sass": "1.82.0",
"sass-loader": "13.3.3",
"source-map-loader": "3.0.2",
"style-loader": "3.3.4",
Expand All @@ -92,7 +92,7 @@
"tsconfig-paths-webpack-plugin": "4.2.0",
"type-fest": "3.13.1",
"typescript": "5.6.3",
"webpack": "5.97.0",
"webpack": "5.97.1",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.15.2",
"zip-webpack-plugin": "4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions blocks/address/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@fortawesome/free-solid-svg-icons": "6.7.1",
"@hashintel/block-design-system": "0.0.2",
"@hashintel/design-system": "0.0.8",
"@mui/material": "5.16.8",
"@mui/material": "5.16.9",
"lodash.debounce": "4.0.8",
"react-sizeme": "3.0.2",
"rooks": "7.14.1",
Expand All @@ -51,7 +51,7 @@
"block-scripts": "0.3.4",
"eslint": "8.57.0",
"mock-block-dock": "0.1.9",
"prettier": "3.4.1",
"prettier": "3.4.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.6.3"
Expand Down
4 changes: 2 additions & 2 deletions blocks/ai-chat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@blockprotocol/service": "0.1.4",
"@hashintel/block-design-system": "0.0.2",
"@hashintel/design-system": "0.0.8",
"@mui/material": "5.16.8",
"@mui/material": "5.16.9",
"react-sizeme": "3.0.2",
"react-transition-group": "4.4.5",
"react-type-animation": "3.2.0",
Expand All @@ -46,7 +46,7 @@
"block-scripts": "0.3.4",
"eslint": "8.57.0",
"mock-block-dock": "0.1.9",
"prettier": "3.4.1",
"prettier": "3.4.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.6.3"
Expand Down
Loading

0 comments on commit 00bd165

Please sign in to comment.