Skip to content

Commit

Permalink
Merge branch 'main' into renovate/auth0-auth0-spa-js-2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jtoar authored Mar 1, 2023
2 parents 555e475 + 4b00e5a commit 29db78f
Show file tree
Hide file tree
Showing 18 changed files with 464 additions and 475 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@babel/preset-typescript": "7.21.0",
"@babel/runtime-corejs3": "7.21.0",
"@npmcli/arborist": "6.2.3",
"@nrwl/nx-cloud": "15.0.3",
"@nrwl/nx-cloud": "15.1.1",
"@playwright/test": "1.31.1",
"@replayio/playwright": "0.3.23",
"@testing-library/jest-dom": "5.16.5",
Expand Down Expand Up @@ -84,7 +84,7 @@
"listr2": "5.0.7",
"lodash.template": "4.5.0",
"make-dir-cli": "3.0.0",
"msw": "0.49.3",
"msw": "1.0.0",
"ncp": "2.0.0",
"node-notifier": "10.0.1",
"nodemon": "2.0.20",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"devDependencies": {
"@babel/cli": "7.21.0",
"@babel/core": "7.21.0",
"@types/aws-lambda": "8.10.110",
"@types/aws-lambda": "8.10.111",
"@types/lodash.escape": "4.0.7",
"@types/qs": "6.9.7",
"@types/split2": "3.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"@babel/cli": "7.21.0",
"@babel/core": "7.21.0",
"@types/aws-lambda": "8.10.110",
"@types/aws-lambda": "8.10.111",
"@types/jsonwebtoken": "9.0.1",
"@types/memjs": "1",
"@types/pascalcase": "1.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@babel/cli": "7.21.0",
"@babel/core": "7.21.0",
"@redwoodjs/api": "4.0.0",
"@types/aws-lambda": "8.10.110",
"@types/aws-lambda": "8.10.111",
"@types/jsonwebtoken": "9.0.1",
"jest": "29.4.2",
"typescript": "4.9.5"
Expand Down
4 changes: 2 additions & 2 deletions packages/auth-providers/clerk/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
},
"dependencies": {
"@babel/runtime-corejs3": "7.21.0",
"@clerk/clerk-sdk-node": "4.7.6",
"@clerk/clerk-sdk-node": "4.7.7",
"core-js": "3.29.0"
},
"devDependencies": {
"@babel/cli": "7.21.0",
"@babel/core": "7.21.0",
"@redwoodjs/api": "4.0.0",
"@types/aws-lambda": "8.10.110",
"@types/aws-lambda": "8.10.111",
"jest": "29.4.2",
"typescript": "4.9.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/clerk/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@babel/cli": "7.21.0",
"@babel/core": "7.21.0",
"@clerk/clerk-react": "4.11.6",
"@clerk/types": "3.28.3",
"@clerk/types": "3.28.4",
"@types/react": "18.0.28",
"jest": "29.4.2",
"react": "18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/auth-providers/firebase/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
"dependencies": {
"@babel/runtime-corejs3": "7.21.0",
"core-js": "3.29.0",
"firebase-admin": "10.3.0"
"firebase-admin": "11.5.0"
},
"devDependencies": {
"@babel/cli": "7.21.0",
"@babel/core": "7.21.0",
"@redwoodjs/api": "4.0.0",
"@types/aws-lambda": "8.10.110",
"@types/aws-lambda": "8.10.111",
"jest": "29.4.2",
"typescript": "4.9.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/netlify/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@babel/cli": "7.21.0",
"@babel/core": "7.21.0",
"@redwoodjs/api": "4.0.0",
"@types/aws-lambda": "8.10.110",
"@types/aws-lambda": "8.10.111",
"@types/jsonwebtoken": "9.0.1",
"jest": "29.4.2",
"typescript": "4.9.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/supabase/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@babel/cli": "7.21.0",
"@babel/core": "7.21.0",
"@redwoodjs/api": "4.0.0",
"@types/aws-lambda": "8.10.110",
"@types/aws-lambda": "8.10.111",
"@types/jsonwebtoken": "9.0.1",
"jest": "29.4.2",
"typescript": "4.9.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/supertokens/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"typescript": "4.9.5"
},
"peerDependencies": {
"supertokens-node": "13.0.2"
"supertokens-node": "13.1.2"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "13.4.0",
"jest": "29.4.2",
"msw": "0.49.3",
"msw": "1.0.0",
"typescript": "4.9.5"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@babel/eslint-parser": "7.19.1",
"@babel/eslint-plugin": "7.19.1",
"@redwoodjs/internal": "4.0.0",
"@typescript-eslint/eslint-plugin": "5.51.0",
"@typescript-eslint/parser": "5.51.0",
"@typescript-eslint/eslint-plugin": "5.54.0",
"@typescript-eslint/parser": "5.54.0",
"eslint": "8.35.0",
"eslint-config-prettier": "8.6.0",
"eslint-import-resolver-babel-module": "5.3.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@envelop/core": "3.0.6",
"@envelop/depth-limit": "2.0.6",
"@envelop/disable-introspection": "4.0.6",
"@envelop/filter-operation-type": "4.0.4",
"@envelop/filter-operation-type": "4.0.6",
"@escape.tech/graphql-armor": "1.7.1",
"@graphql-tools/merge": "8.3.18",
"@graphql-tools/schema": "9.0.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/internal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"prettier": "2.8.4",
"rimraf": "3.0.2",
"string-env-interpolation": "1.0.1",
"systeminformation": "5.17.9",
"systeminformation": "5.17.12",
"terminal-link": "2.1.1",
"ts-node": "10.9.1",
"typescript": "4.9.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/telemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"ci-info": "3.8.0",
"core-js": "3.29.0",
"envinfo": "7.8.1",
"systeminformation": "5.17.9",
"systeminformation": "5.17.12",
"uuid": "9.0.0",
"yargs": "17.7.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "13.4.0",
"@testing-library/user-event": "14.4.3",
"@types/aws-lambda": "8.10.110",
"@types/aws-lambda": "8.10.111",
"@types/babel-core": "6.25.7",
"@types/jest": "29.4.0",
"@types/node": "16.18.12",
Expand All @@ -56,7 +56,7 @@
"jest": "29.4.2",
"jest-environment-jsdom": "29.4.2",
"jest-watch-typeahead": "2.2.2",
"msw": "0.49.3",
"msw": "1.0.0",
"ts-toolbelt": "9.6.0",
"whatwg-fetch": "3.6.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/testing/src/web/mockRequests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import type {
GraphQLContext,
GraphQLRequest,
ResponseTransformer,
SetupWorkerApi,
SetupWorker,
ResponseComposition,
} from 'msw'

// Allow users to call "mockGraphQLQuery" and "mockGraphQLMutation"
// before the server has started. We store the request handlers in
// a queue that is drained once the server is started.
let REQUEST_HANDLER_QUEUE: RequestHandler[] = []
let SERVER_INSTANCE: SetupWorkerApi | any
let SERVER_INSTANCE: SetupWorker | any

/**
* Plugs fetch for the correct target in order to capture requests.
Expand Down
Loading

0 comments on commit 29db78f

Please sign in to comment.