Skip to content

Commit

Permalink
Merge pull request #3182 from OpenNeuroOrg/typescript-5.6.3
Browse files Browse the repository at this point in the history
deps: Upgrade to TypeScript 5.6.3
  • Loading branch information
nellh authored Oct 24, 2024
2 parents 556621f + 8146ad6 commit 1c1e0d3
Show file tree
Hide file tree
Showing 11 changed files with 593 additions and 275 deletions.
588 changes: 391 additions & 197 deletions .pnp.cjs

Large diffs are not rendered by default.

64 changes: 40 additions & 24 deletions .pnp.loader.mjs

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

2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "5.1.6-sdk",
"version": "5.6.3-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
Expand Down
43 changes: 21 additions & 22 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# docker compose versions
version: '2.3'
version: "2.3"

services:
# This dummy service provides shared configuration for all Node deps
Expand Down Expand Up @@ -30,7 +30,7 @@ services:
retries: 10
ports:
# HMR port
- '9992:9992'
- "9992:9992"
environment:
- NODE_ENV=development
depends_on:
Expand Down Expand Up @@ -94,20 +94,20 @@ services:
init: true
command:
[
'uvicorn',
'--host',
'0.0.0.0',
'--port',
'80',
'--reload',
'--factory',
"uvicorn",
"--host",
"0.0.0.0",
"--port",
"80",
"--reload",
"--factory",
"datalad_service.app:create_app",
'--workers',
'8',
'--timeout-keep-alive',
'30',
'--log-level',
'debug',
"--workers",
"8",
"--timeout-keep-alive",
"30",
"--log-level",
"debug",
]
networks:
default:
Expand All @@ -121,8 +121,8 @@ services:
volumes:
- ./nginx/nginx.dev.conf:/etc/nginx/conf.d/default.conf:ro
ports:
- '8110:8110'
- '9876:80'
- "8110:8110"
- "9876:80"
depends_on:
server:
condition: service_healthy
Expand All @@ -135,14 +135,13 @@ services:
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4
environment:
discovery.type: single-node
cluster.routing.allocation.disk.threshold_enabled: 'true'
cluster.routing.allocation.disk.threshold_enabled: "true"
cluster.routing.allocation.disk.watermark.flood_stage: 1gb
cluster.routing.allocation.disk.watermark.low: 10gb
cluster.routing.allocation.disk.watermark.high: 5gb
xpack.security.enabled: false
xpack.security.enrollment.enabled: false
ES_JAVA_OPTS: '-Xms750m -Xmx750m'
ES_JAVA_OPTS: "-Xms750m -Xmx750m"
ports:
- '9200:9200'
- '9300:9300'

- "9200:9200"
- "9300:9300"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"react": "18.2.0",
"sass": "^1.56.1",
"tsc-watch": "6.0.4",
"typescript": "5.1.6",
"typescript": "5.6.3",
"typescript-eslint": "^8.11.0",
"vite": "5.4.8",
"vitest": "1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/openneuro-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"rollup-plugin-polyfill-node": "0.12.0",
"sass": "^1.32.8",
"stream-browserify": "^3.0.0",
"typescript": "5.1.6",
"typescript": "5.6.3",
"vite": "5.4.8",
"vitest": "2.1.2"
},
Expand Down
1 change: 1 addition & 0 deletions packages/openneuro-cli/src/upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ export const uploadFiles = async ({
requests,
uploads.uploadSize(filesChunk),
uploadProgress,
// @ts-expect-error The fetch-h2 interface doesn't match exactly but well enough for use here
fetch,
)
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion packages/openneuro-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@types/testing-library__jest-dom": "5.14.5",
"core-js": "^3.14.0",
"sass": "^1.32.8",
"typescript": "5.1.6",
"typescript": "5.6.3",
"vitest": "2.1.2"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/openneuro-indexer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@openneuro/client": "^4.28.3",
"@openneuro/search": "^4.28.3",
"graphql": "16.8.1",
"ts-node": "^9.1.1",
"typescript": "5.1.6"
"ts-node": "10.9.2",
"typescript": "5.6.3"
},
"scripts": {
"build": "tsc -b",
Expand Down
4 changes: 2 additions & 2 deletions packages/openneuro-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
"semver": "^5.5.0",
"sitemap": "^2.1.0",
"superagent": "^3.8.2",
"ts-node": "9.1.1",
"typescript": "5.1.6",
"ts-node": "10.9.2",
"typescript": "5.6.3",
"underscore": "^1.8.3",
"uuid": "10.0.0",
"xmldoc": "^1.1.0"
Expand Down
Loading

0 comments on commit 1c1e0d3

Please sign in to comment.