Skip to content

Commit

Permalink
Merge branch 'bc/upgrade-ts' into bc/1464/remix-v2-updates-2
Browse files Browse the repository at this point in the history
  • Loading branch information
BlairCurrey committed Jan 18, 2024
2 parents ca9ad2c + 4043c3c commit 6afae62
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 47 deletions.
1 change: 0 additions & 1 deletion localenv/mock-account-servicing-entity/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
"~/*": ["./app/*"]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"prettier": "^3.2.2",
"ts-jest": "^29.1.1",
"tunnelmole": "^2.2.13",
"typescript": "^4.9.5",
"typescript": "^5.3.3",
"uuid": "^9.0.1"
},
"dependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/src/graphql/scalars/UInt8.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function coerceUInt8Value(value: number | string | unknown): number {
throw new TypeError('Provided value is not number or string.')
}
const nValue = Number(value)
if (Number.isInteger(nValue) && value >= 0 && value <= 255) {
if (Number.isInteger(nValue) && nValue >= 0 && nValue <= 255) {
return nValue
}
throw new GraphQLError('Provided value is not a UInt8.', {
Expand Down
4 changes: 1 addition & 3 deletions packages/auth/src/tests/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ export function createContext<T extends AppContext>(
maxAge: 60 * 1000,
signed: true
},
// Only accepts Middleware<DefaultState, DefaultContext> for some reason, koa is Middleware<DefaultState, AppContext>
// eslint-disable-next-line @typescript-eslint/no-explicit-any
koa as any
koa
)
)
const ctx = koa.createContext(req, res)
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/graphql/scalars/UInt8.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function coerceUInt8Value(value: number | string | unknown): number {
throw new TypeError('Provided value is not number or string.')
}
const nValue = Number(value)
if (Number.isInteger(nValue) && value >= 0 && value <= 255) {
if (Number.isInteger(nValue) && nValue >= 0 && nValue <= 255) {
return nValue
}
throw new GraphQLError('Provided value is not a UInt8.', {
Expand Down
1 change: 0 additions & 1 deletion packages/frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
"~/*": ["./app/*"]
Expand Down
82 changes: 44 additions & 38 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

/* Advanced Options */
"skipLibCheck": true /* Skip type checking of declaration files. */,
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
// "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
"resolveJsonModule": true
}
}

0 comments on commit 6afae62

Please sign in to comment.