Skip to content

Commit ea794b8

Browse files
joshunraujoshunrau
authored
Merge pull request #1080 from joshunrau/patches
Improve error logging in core API and custom proxy for browser globals when running instruments on server for debugging
2 parents 84e7bb1 + baaacc6 commit ea794b8

File tree

22 files changed

+6852
-4596
lines changed

22 files changed

+6852
-4596
lines changed

‎apps/api/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
"@douglasneuroinformatics/libnest": "catalog:",
2727
"@douglasneuroinformatics/libpasswd": "catalog:",
2828
"@douglasneuroinformatics/libstats": "catalog:",
29-
"@faker-js/faker": "^9.0.0",
29+
"@faker-js/faker": "^9.4.0",
3030
"@nestjs/axios": "^3.0.3",
3131
"@nestjs/common": "^10.4.1",
3232
"@nestjs/config": "^3.2.3",
3333
"@nestjs/core": "^10.4.1",
3434
"@nestjs/jwt": "^10.2.0",
35-
"@nestjs/mapped-types": "2.0.5",
35+
"@nestjs/mapped-types": "2.1.0",
3636
"@nestjs/passport": "^10.0.3",
3737
"@nestjs/platform-express": "^10.4.1",
3838
"@nestjs/swagger": "^7.4.0",
39-
"@nestjs/throttler": "^6.2.1",
39+
"@nestjs/throttler": "^6.3.0",
4040
"@opendatacapture/demo": "workspace:*",
4141
"@opendatacapture/instrument-library": "workspace:*",
4242
"@opendatacapture/instrument-utils": "workspace:*",
@@ -47,9 +47,9 @@
4747
"@opendatacapture/subject-utils": "workspace:*",
4848
"@prisma/client": "catalog:",
4949
"axios": "catalog:",
50-
"express": "^4.19.2",
50+
"express": "^4.21.2",
5151
"lodash-es": "workspace:lodash-es__4.x@*",
52-
"mongodb": "^6.8.1",
52+
"mongodb": "^6.12.0",
5353
"passport": "^0.7.0",
5454
"passport-jwt": "4.0.1",
5555
"reflect-metadata": "^0.1.14",
@@ -62,15 +62,15 @@
6262
"@nestjs/testing": "^10.4.1",
6363
"@opendatacapture/instrument-stubs": "workspace:*",
6464
"@types/express": "^4.17.21",
65-
"@types/passport": "^1.0.16",
65+
"@types/passport": "^1.0.17",
6666
"@types/passport-jwt": "^4.0.1",
6767
"@types/supertest": "^6.0.2",
68-
"concurrently": "^9.0.0",
68+
"concurrently": "^9.1.2",
6969
"esbuild": "catalog:",
7070
"esbuild-plugin-tsc": "^0.4.0",
7171
"nodemon": "catalog:",
7272
"prisma": "catalog:",
73-
"prisma-json-types-generator": "^3.0.4",
73+
"prisma-json-types-generator": "^3.2.2",
7474
"supertest": "^7.0.0",
7575
"type-fest": "workspace:type-fest__4.x@*"
7676
},

‎apps/gateway/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"@opendatacapture/schemas": "workspace:*",
2626
"@prisma/client": "catalog:",
2727
"axios": "catalog:",
28-
"compression": "^1.7.4",
29-
"express": "^4.19.2",
28+
"compression": "^1.7.5",
29+
"express": "^4.21.2",
3030
"lodash-es": "workspace:lodash-es__4.x@*",
31-
"pino-http": "^10.3.0",
31+
"pino-http": "^10.4.0",
3232
"pino-pretty": "^11.2.2",
3333
"react": "workspace:react__18.x@*",
3434
"react-dom": "workspace:react-dom__18.x@*",
@@ -42,15 +42,15 @@
4242
"@opendatacapture/vite-plugin-runtime": "workspace:*",
4343
"@types/compression": "^1.7.5",
4444
"@types/express": "^4.17.21",
45-
"@vitejs/plugin-react-swc": "^3.7.0",
45+
"@vitejs/plugin-react-swc": "^3.7.2",
4646
"autoprefixer": "^10.4.20",
4747
"esbuild": "catalog:",
4848
"nodemon": "catalog:",
49-
"postcss": "^8.4.45",
49+
"postcss": "^8.5.1",
5050
"prisma": "catalog:",
51-
"tailwindcss": "^3.4.10",
51+
"tailwindcss": "^3.4.17",
5252
"type-fest": "workspace:type-fest__4.x@*",
53-
"vite": "^5.4.12"
53+
"vite": "catalog:"
5454
},
5555
"trustedDependencies": [
5656
"prisma",

‎apps/outreach/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
"lodash-es": "workspace:lodash-es__4.x@*",
1818
"mdast-util-to-string": "^4.0.0",
1919
"reading-time": "^1.5.0",
20-
"tailwind-merge": "^2.5.2"
20+
"tailwind-merge": "^2.6.0"
2121
},
2222
"devDependencies": {
23-
"@astrojs/check": "^0.9.3",
24-
"@astrojs/sitemap": "^3.1.6",
25-
"@astrojs/starlight": "^0.27.1",
26-
"@astrojs/starlight-tailwind": "^2.0.3",
27-
"@astrojs/tailwind": "^5.1.0",
23+
"@astrojs/check": "^0.9.4",
24+
"@astrojs/sitemap": "^3.2.1",
25+
"@astrojs/starlight": "^0.31.1",
26+
"@astrojs/starlight-tailwind": "^3.0.0",
27+
"@astrojs/tailwind": "^5.1.5",
2828
"@opendatacapture/runtime-core": "workspace:*",
29-
"@tailwindcss/typography": "^0.5.15",
30-
"astro": "^4.16.18",
29+
"@tailwindcss/typography": "^0.5.16",
30+
"astro": "^5.1.8",
3131
"github-slugger": "^2.0.0",
3232
"sharp": "^0.33.5",
33-
"tailwindcss": "^3.4.10",
33+
"tailwindcss": "^3.4.17",
3434
"type-fest": "workspace:type-fest__4.x@*",
35-
"typedoc": "^0.26.7",
36-
"typedoc-plugin-markdown": "^4.2.7"
35+
"typedoc": "^0.27.6",
36+
"typedoc-plugin-markdown": "^4.4.1"
3737
}
3838
}

‎apps/outreach/src/plugins/astro-plugin-symlink.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import fs from 'fs';
22
import path from 'path';
33
import url from 'url';
44

5-
import type { ViteUserConfig } from 'astro/config';
5+
import type { ViteUserConfig } from 'astro';
66

77
type PluginOption = NonNullable<ViteUserConfig['plugins']>[number];
88
type Plugin = Extract<PluginOption, { name: string }>;

apps/playground/.storybook/main.cts renamed to apps/playground/.storybook/main.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import type { StorybookConfig } from '@storybook/react-vite';
2-
31
import path from 'node:path';
42

3+
import type { StorybookConfig } from '@storybook/react-vite';
54
import autoprefixer from 'autoprefixer';
65
import tailwindcss from 'tailwindcss';
7-
import vite from 'vite';
6+
import { mergeConfig } from 'vite';
87

98
const config: StorybookConfig = {
109
addons: [
@@ -22,7 +21,7 @@ const config: StorybookConfig = {
2221
},
2322
stories: ['../src/**/*.stories.@(js|jsx|ts|tsx)'],
2423
viteFinal(config) {
25-
return vite.mergeConfig(config, {
24+
return mergeConfig(config, {
2625
css: {
2726
postcss: {
2827
plugins: [autoprefixer(), tailwindcss()]

‎apps/playground/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,28 @@
2828
"immer": "^10.1.1",
2929
"jszip": "^3.10.1",
3030
"lodash-es": "workspace:lodash-es__4.x@*",
31-
"lucide-react": "^0.439.0",
31+
"lucide-react": "^0.473.0",
3232
"lz-string": "^1.5.0",
33-
"monaco-editor": "^0.51.0",
33+
"monaco-editor": "^0.52.2",
3434
"motion": "^11.15.0",
35-
"prettier": "^3.3.3",
35+
"prettier": "^3.4.2",
3636
"react": "workspace:react__18.x@*",
3737
"react-dom": "workspace:react-dom__18.x@*",
38-
"react-dropzone": "^14.2.3",
38+
"react-dropzone": "^14.3.5",
3939
"react-error-boundary": "^4.0.13",
4040
"stacktrace-parser": "^0.1.10",
4141
"ts-pattern": "workspace:ts-pattern__5.x@*",
4242
"zod": "workspace:zod__3.23.x@*",
43-
"zod-validation-error": "^3.3.1",
43+
"zod-validation-error": "^3.4.0",
4444
"zustand": "^4.5.5"
4545
},
4646
"devDependencies": {
4747
"@opendatacapture/vite-plugin-runtime": "workspace:*",
48-
"@vitejs/plugin-react-swc": "^3.7.0",
48+
"@vitejs/plugin-react-swc": "^3.7.2",
4949
"autoprefixer": "^10.4.20",
50-
"postcss": "^8.4.45",
51-
"tailwindcss": "^3.4.10",
50+
"postcss": "^8.5.1",
51+
"tailwindcss": "^3.4.17",
5252
"type-fest": "workspace:type-fest__4.x@*",
53-
"vite": "^5.4.12"
53+
"vite": "catalog:"
5454
}
5555
}

apps/web/.storybook/main.cts renamed to apps/web/.storybook/main.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import type { StorybookConfig } from '@storybook/react-vite';
2-
31
import path from 'node:path';
42

3+
import type { StorybookConfig } from '@storybook/react-vite';
54
import autoprefixer from 'autoprefixer';
65
import tailwindcss from 'tailwindcss';
7-
import vite from 'vite';
6+
import { mergeConfig } from 'vite';
87

98
const config: StorybookConfig = {
109
addons: [
@@ -73,7 +72,7 @@ const config: StorybookConfig = {
7372
}
7473
],
7574
viteFinal(config) {
76-
return vite.mergeConfig(config, {
75+
return mergeConfig(config, {
7776
css: {
7877
postcss: {
7978
plugins: [autoprefixer(), tailwindcss()]

‎apps/web/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"@douglasneuroinformatics/libjs": "catalog:",
2121
"@douglasneuroinformatics/libpasswd": "catalog:",
2222
"@douglasneuroinformatics/libui": "catalog:",
23-
"@heroicons/react": "^2.1.5",
24-
"@import-meta-env/cli": "^0.7.0",
25-
"@import-meta-env/unplugin": "^0.6.0",
23+
"@heroicons/react": "^2.2.0",
24+
"@import-meta-env/cli": "^0.7.2",
25+
"@import-meta-env/unplugin": "^0.6.2",
2626
"@opendatacapture/demo": "workspace:*",
2727
"@opendatacapture/instrument-interpreter": "workspace:*",
2828
"@opendatacapture/instrument-renderer": "workspace:*",
@@ -34,23 +34,23 @@
3434
"@opendatacapture/runtime-v1": "workspace:*",
3535
"@opendatacapture/schemas": "workspace:*",
3636
"@opendatacapture/subject-utils": "workspace:*",
37-
"@tanstack/react-query": "^5.55.4",
38-
"@tanstack/react-query-devtools": "^5.55.4",
37+
"@tanstack/react-query": "^5.64.2",
38+
"@tanstack/react-query-devtools": "^5.64.2",
3939
"axios": "catalog:",
4040
"clsx": "^2.1.1",
4141
"html2canvas": "^1.4.1",
4242
"immer": "^10.1.1",
4343
"jwt-decode": "^4.0.0",
4444
"lodash-es": "workspace:lodash-es__4.x@*",
45-
"lucide-react": "^0.439.0",
45+
"lucide-react": "^0.473.0",
4646
"motion": "^11.15.0",
4747
"papaparse": "workspace:papaparse__5.x@*",
4848
"react": "workspace:react__18.x@*",
4949
"react-dom": "workspace:react-dom__18.x@*",
5050
"react-error-boundary": "^4.0.13",
5151
"react-router-dom": "^6.26.1",
52-
"recharts": "^2.12.7",
53-
"tailwind-merge": "^2.5.2",
52+
"recharts": "^2.15.0",
53+
"tailwind-merge": "^2.6.0",
5454
"ts-pattern": "workspace:ts-pattern__5.x@*",
5555
"type-fest": "workspace:type-fest__4.x@*",
5656
"xlsx": "^0.18.5",
@@ -64,16 +64,16 @@
6464
"@testing-library/jest-dom": "catalog:",
6565
"@testing-library/react": "catalog:",
6666
"@testing-library/user-event": "catalog:",
67-
"@vitejs/plugin-react-swc": "^3.7.0",
67+
"@vitejs/plugin-react-swc": "^3.7.2",
6868
"autoprefixer": "^10.4.20",
6969
"esbuild-wasm": "catalog:",
7070
"happy-dom": "catalog:",
71-
"postcss": "^8.4.45",
71+
"postcss": "^8.5.1",
7272
"prop-types": "^15.8.1",
7373
"rollup-plugin-copy": "^3.5.0",
7474
"sort-json": "^2.0.1",
75-
"tailwindcss": "^3.4.10",
76-
"vite": "^5.4.12",
75+
"tailwindcss": "^3.4.17",
76+
"vite": "catalog:",
7777
"vite-plugin-compression": "^0.5.1"
7878
}
7979
}

‎package.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "module",
44
"version": "1.8.5",
55
"private": true,
6-
"packageManager": "pnpm@9.14.2",
6+
"packageManager": "pnpm@9.15.4",
77
"license": "Apache-2.0",
88
"engines": {
99
"node": ">=v20.17.0"
@@ -33,43 +33,43 @@
3333
"ws": "./scripts/workspace.sh $@"
3434
},
3535
"devDependencies": {
36-
"@commitlint/cli": "^19.4.1",
37-
"@commitlint/config-conventional": "^19.4.1",
38-
"@commitlint/types": "^19.0.3",
36+
"@commitlint/cli": "^19.6.1",
37+
"@commitlint/config-conventional": "^19.6.0",
38+
"@commitlint/types": "^19.5.0",
3939
"@douglasneuroinformatics/eslint-config": "catalog:",
4040
"@douglasneuroinformatics/prettier-config": "catalog:",
4141
"@douglasneuroinformatics/tsconfig": "catalog:",
42-
"@storybook/addon-essentials": "^8.2.9",
43-
"@storybook/addon-interactions": "^8.2.9",
44-
"@storybook/addon-links": "^8.2.9",
45-
"@storybook/addon-themes": "^8.2.9",
46-
"@storybook/blocks": "^8.2.9",
47-
"@storybook/icons": "^1.2.10",
48-
"@storybook/react": "^8.2.9",
49-
"@storybook/react-vite": "^8.2.9",
42+
"@storybook/addon-essentials": "^8.5.0",
43+
"@storybook/addon-interactions": "^8.5.0",
44+
"@storybook/addon-links": "^8.5.0",
45+
"@storybook/addon-themes": "^8.5.0",
46+
"@storybook/blocks": "^8.5.0",
47+
"@storybook/icons": "^1.3.0",
48+
"@storybook/react": "^8.5.0",
49+
"@storybook/react-vite": "^8.5.0",
5050
"@swc-node/register": "^1.10.9",
51-
"@swc/cli": "^0.4.0",
52-
"@swc/core": "^1.7.24",
53-
"@swc/helpers": "^0.5.13",
51+
"@swc/cli": "^0.6.0",
52+
"@swc/core": "^1.10.9",
53+
"@swc/helpers": "^0.5.15",
5454
"@types/github-script": "https://github.com/actions/github-script/archive/refs/tags/v7.0.1.tar.gz",
5555
"@types/js-yaml": "^4.0.9",
5656
"@types/node": "^20.14.2",
5757
"@vitest/browser": "^2.0.5",
5858
"@vitest/coverage-v8": "^2.0.5",
59-
"dotenv": "^16.4.5",
59+
"dotenv": "^16.4.7",
6060
"env-cmd": "^10.1.0",
61-
"eslint": "^9.10.0",
61+
"eslint": "^9.18.0",
6262
"expect-type": "^0.20.0",
63-
"husky": "^9.1.5",
63+
"husky": "^9.1.7",
6464
"js-yaml": "^4.1.0",
65-
"prettier": "^3.3.3",
65+
"prettier": "^3.4.2",
6666
"prettier-plugin-astro": "^0.14.1",
67-
"prettier-plugin-tailwindcss": "^0.6.6",
68-
"start-server-and-test": "^2.0.8",
69-
"storybook": "^8.2.9",
67+
"prettier-plugin-tailwindcss": "^0.6.10",
68+
"start-server-and-test": "^2.0.10",
69+
"storybook": "^8.5.0",
7070
"tsx": "catalog:",
71-
"turbo": "^2.1.1",
72-
"typescript": "~5.5.4",
71+
"turbo": "^2.3.3",
72+
"typescript": "5.6.x",
7373
"unplugin-swc": "^1.5.1",
7474
"vitest": "^2.1.1"
7575
},

‎packages/instrument-bundler/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
},
2424
"dependencies": {
2525
"commander": "^12.1.0",
26-
"es-module-lexer": "^1.5.4",
26+
"es-module-lexer": "^1.6.0",
2727
"esbuild": "catalog:",
2828
"esbuild-wasm": "catalog:",
29-
"glob": "^11.0.0",
29+
"glob": "^11.0.1",
3030
"slashes": "^3.0.12",
3131
"ts-pattern": "workspace:ts-pattern__5.x@*",
3232
"type-fest": "workspace:type-fest__4.x@*",

0 commit comments

Comments
 (0)