Skip to content

Commit

Permalink
Upgrade dependencies (#706)
Browse files Browse the repository at this point in the history
* Apply many minor/patch upgrades

* Upgrade deps

* Upgrade ESLint and Prettier

* Upgrade cookies

* Downgrade types generator

* Fix types generator behavior

* Revert "Upgrade cookies"

This reverts commit cae686e.

* Upgrade deps
  • Loading branch information
kmjennison authored Dec 31, 2023
1 parent e5adda7 commit 4556701
Show file tree
Hide file tree
Showing 7 changed files with 1,052 additions and 997 deletions.
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,36 @@
"publish:experimental": "Be sure to run with npm, not yarn."
},
"devDependencies": {
"@babel/cli": "^7.22.6",
"@babel/core": "^7.22.8",
"@babel/plugin-transform-runtime": "^7.22.7",
"@babel/preset-env": "^7.22.7",
"@babel/preset-react": "^7.18.6",
"@testing-library/react": "^14.0.0",
"@babel/cli": "^7.23.4",
"@babel/core": "^7.23.7",
"@babel/plugin-transform-runtime": "^7.23.7",
"@babel/preset-env": "^7.23.7",
"@babel/preset-react": "^7.23.3",
"@testing-library/react": "^14.1.2",
"@testing-library/react-hooks": "^8.0.1",
"@types/cookies": "^0.7.7",
"@types/hoist-non-react-statics": "^3.3.1",
"@types/jest": "^29.5.2",
"@types/keygrip": "^1.0.2",
"@types/set-cookie-parser": "^2.4.2",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@types/cookies": "^0.7.10",
"@types/hoist-non-react-statics": "^3.3.5",
"@types/jest": "^29.5.11",
"@types/keygrip": "^1.0.6",
"@types/set-cookie-parser": "^2.4.7",
"@typescript-eslint/eslint-plugin": "^6.16.0",
"@typescript-eslint/parser": "^6.16.0",
"babel-jest": "^29.6.1",
"babel-loader": "^9.1.3",
"babel-plugin-module-resolver": "^5.0.0",
"copy-webpack-plugin": "^11.0.0",
"core-js": "^3.31.1",
"core-js": "^3.35.0",
"datwd": "^0.2.0",
"dts-bundle-generator": "^8.0.1",
"eslint": "^8.20.0",
"dts-bundle-generator": "^9.2.1",
"eslint": "^8.56.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.2.2",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.1.2",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"firebase": "^10.0.0",
Expand All @@ -83,23 +83,23 @@
"jscodeshift": "^0.15.0",
"lodash": "^4.17.21",
"mockdate": "^3.0.2",
"moment": "^2.29.4",
"moment": "^2.30.1",
"next": "~13.3.0",
"next-test-api-route-handler": "^3.1.6",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"prettier": "^3.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-test-renderer": "^18.2.0",
"regenerator-runtime": "^0.13.9",
"regenerator-runtime": "^0.14.1",
"set-cookie-parser": "^2.5.0",
"source-map-loader": "^4.0.1",
"source-map-loader": "^4.0.2",
"ts-jest": "^29.1.1",
"ts-loader": "^9.4.3",
"ts-loader": "^9.5.1",
"tsconfig-paths-webpack-plugin": "^4.0.1",
"typescript": "^5.1.6",
"typescript": "^5.3.3",
"webpack": "^5.73.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^5.1.4",
"webpack-node-externals": "^3.0.0",
"yargs": "^17.7.2"
Expand Down Expand Up @@ -130,7 +130,7 @@
}
},
"dependencies": {
"@babel/runtime": "^7.22.6",
"@babel/runtime": "^7.23.7",
"cookies": "^0.8.0",
"hoist-non-react-statics": "^3.3.2"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Spread.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type SpreadTwo<L, R> = Id<
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type Spread<A extends readonly [...any]> = A extends [
infer L,
...infer R
...infer R,
]
? SpreadTwo<L, Spread<R>>
: unknown
2 changes: 1 addition & 1 deletion src/configTypes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Cookies from 'cookies'
import Cookies from 'cookies'
import { PageURL } from './redirectTypes'
import { User } from './createUser'
import { Spread } from './Spread'
Expand Down
5 changes: 2 additions & 3 deletions src/setAuthCookies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ const setAuthCookies: SetAuthCookies = async (
let refreshToken = null
let user = createUser() // default to an unauthed user
try {
;({ idToken, refreshToken, user } = await getCustomIdAndRefreshTokens(
token
))
;({ idToken, refreshToken, user } =
await getCustomIdAndRefreshTokens(token))
} catch (e) {
logDebug(
'[setAuthCookies] Failed to verify the ID token. Cannot authenticate the user or get a refresh token.'
Expand Down
2 changes: 1 addition & 1 deletion src/testHelpers/createMockFetchResponse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ const createMockFetchResponse = () =>
text: '',
type: 'cors' as ResponseType,
url: 'https://example.com/foo/',
} as unknown as Response)
}) as unknown as Response

export default createMockFetchResponse
4 changes: 2 additions & 2 deletions src/withUserTokenSSR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type GetSSRResult<P> =

type SSRPropsContext<
Q extends ParsedUrlQuery = ParsedUrlQuery,
D extends PreviewData = PreviewData
D extends PreviewData = PreviewData,
> = GetServerSidePropsContext<Q, D> & { user?: User }

type SSRPropsGetter<P, Q extends ParsedUrlQuery, D extends PreviewData> = (
Expand All @@ -70,7 +70,7 @@ export type WithUserSSR = (
) => <
P extends Dictionary = Dictionary,
Q extends ParsedUrlQuery = ParsedUrlQuery,
D extends PreviewData = PreviewData
D extends PreviewData = PreviewData,
>(
propGetter?: SSRPropsGetter<P, Q, D>
) => GetServerSideProps<P, Q, D>
Expand Down
Loading

0 comments on commit 4556701

Please sign in to comment.