Skip to content

Commit ec6a01c

Browse files
committed
fix orval gen and update opentelemetry js due to build failures
1 parent 5c88a50 commit ec6a01c

File tree

20 files changed

+6599
-5695
lines changed

20 files changed

+6599
-5695
lines changed

bin/project

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ x.backend.typecheck() {
16691669
}
16701670

16711671
# depends on gen.xo output
1672+
# still no branded types in orval: https://github.com/orval-labs/orval/issues/1222
16721673
orval_frontend_branded_types() {
16731674
local import_string="import type * as EntityIDs from 'src/gen/entity-ids'"
16741675
local escaped_import_string=$(escape_sed "$import_string")
@@ -1686,7 +1687,10 @@ orval_frontend_branded_types() {
16861687
"-e" "s/${camel}?: number/${camel}?: EntityIDs.${pascal}/g"
16871688
"-e" "s/${camel}: number/${camel}: EntityIDs.${pascal}/g"
16881689
"-e" "s/${camel}: faker.number.int({min: undefined, max: undefined})/${camel}: faker.number.int({min: undefined, max: undefined}) as EntityIDs.${pascal}/g"
1690+
"-e" "s/${camel}: faker.number.int({min: undefined, max: undefined})/${camel}: faker.number.int({min: undefined, max: undefined}) as EntityIDs.${pascal}/g"
1691+
"-e" "s/${camel}:[[:space:]]*faker\.helpers\.arrayElement(\[faker\.number\.int({min:[[:space:]]*undefined,[[:space:]]*max:[[:space:]]*undefined}),[[:space:]]*null\])/${camel}: faker.helpers.arrayElement([faker.number.int({min: undefined, max: undefined}), null]) as EntityIDs.${pascal} | null/g"
16891692
)
1693+
16901694
done
16911695

16921696
local uuid_ids=()
@@ -1699,6 +1703,7 @@ orval_frontend_branded_types() {
16991703
"-e" "s/${camel}?: Models${pascal}/${camel}?: EntityIDs.${pascal}/g"
17001704
"-e" "s/${camel}: Models${pascal}/${camel}: EntityIDs.${pascal}/g"
17011705
"-e" "s/${camel}: faker.word.sample()/${camel}: faker.string.uuid() as EntityIDs.${pascal}/g"
1706+
"-e" "s/${camel}: faker.string.uuid()/${camel}: faker.string.uuid() as EntityIDs.${pascal}/g"
17021707
)
17031708
done
17041709

frontend/orval.config.ts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { defineConfig } from 'orval'
22
import { faker } from '@faker-js/faker'
3-
import _, { uniqueId } from 'lodash'
3+
import * as _ from 'lodash'
4+
45
// relative paths only
56
import { reactQueryDefaultAppOptions } from './src/react-query.default'
67

@@ -24,7 +25,21 @@ export default defineConfig({
2425
useQuery: true,
2526
useInfinite: true, // https://tanstack.com/query/v4/docs/guides/infinite-queries
2627
options: reactQueryDefaultAppOptions.queries,
27-
useInfiniteQueryParam: 'cursor', // same param for all app paginated queries
28+
// FIXME: leads to issues with /events, /oidc and /project where it assumes there's a cursor param
29+
useInfiniteQueryParam: 'cursor', // same param for all app paginated queries.
30+
},
31+
operations: {
32+
..._.fromPairs(
33+
['GetProjectWorkitems', 'MyProviderLogin', 'Events'].map((operation) => [
34+
operation,
35+
{
36+
query: {
37+
useQuery: true,
38+
useInfinite: false,
39+
},
40+
},
41+
]),
42+
),
2843
},
2944
mock: {
3045
delay: 200,

frontend/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@
3131
"@mantine/hooks": "7.13.2",
3232
"@mantine/modals": "7.13.2",
3333
"@mantine/notifications": "^7.13.2",
34-
"@opentelemetry/api": "1.7.0",
35-
"@opentelemetry/auto-instrumentations-web": "0.30.0",
36-
"@opentelemetry/context-zone": "1.7.0",
37-
"@opentelemetry/context-zone-peer-dep": "1.7.0",
38-
"@opentelemetry/core": "1.19.0",
39-
"@opentelemetry/exporter-trace-otlp-http": "0.33.0",
40-
"@opentelemetry/exporter-zipkin": "1.21.0",
41-
"@opentelemetry/instrumentation": "0.46.0",
42-
"@opentelemetry/instrumentation-document-load": "0.34.0",
43-
"@opentelemetry/instrumentation-fetch": "0.46.0",
44-
"@opentelemetry/instrumentation-xml-http-request": "0.46.0",
45-
"@opentelemetry/propagator-b3": "1.7.0",
46-
"@opentelemetry/resources": "1.19.0",
47-
"@opentelemetry/sdk-trace-base": "1.19.0",
48-
"@opentelemetry/sdk-trace-web": "1.19.0",
49-
"@opentelemetry/semantic-conventions": "1.19.0",
34+
"@opentelemetry/api": "1.9.0",
35+
"@opentelemetry/auto-instrumentations-web": "0.45.0",
36+
"@opentelemetry/context-zone": "1.30.1",
37+
"@opentelemetry/context-zone-peer-dep": "1.30.1",
38+
"@opentelemetry/core": "1.30.1",
39+
"@opentelemetry/exporter-trace-otlp-http": "0.57.1",
40+
"@opentelemetry/exporter-zipkin": "1.30.1",
41+
"@opentelemetry/instrumentation": "0.57.1",
42+
"@opentelemetry/instrumentation-document-load": "0.44.0",
43+
"@opentelemetry/instrumentation-fetch": "0.57.1",
44+
"@opentelemetry/instrumentation-xml-http-request": "0.57.1",
45+
"@opentelemetry/propagator-b3": "1.30.1",
46+
"@opentelemetry/resources": "1.30.1",
47+
"@opentelemetry/sdk-trace-base": "1.30.1",
48+
"@opentelemetry/sdk-trace-web": "1.30.1",
49+
"@opentelemetry/semantic-conventions": "1.28.0",
5050
"@reactour/tour": "^3.6.1",
5151
"@tabler/icons": "^1.119.0",
5252
"@tabler/icons-react": "^2.47.0",

0 commit comments

Comments
 (0)