From d12788801902f79aea27402bda927939eb8959a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 19:44:20 +0000 Subject: [PATCH 1/7] Bump @types/react from 18.2.23 to 18.2.24 Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.23 to 18.2.24. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc3f3844..9d6a12a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2036,9 +2036,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.23", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.23.tgz", - "integrity": "sha512-qHLW6n1q2+7KyBEYnrZpcsAmU/iiCh9WGCKgXvMxx89+TYdJWRjZohVIo9XTcoLhfX3+/hP0Pbulu3bCZQ9PSA==", + "version": "18.2.24", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.24.tgz", + "integrity": "sha512-Ee0Jt4sbJxMu1iDcetZEIKQr99J1Zfb6D4F3qfUWoR1JpInkY1Wdg4WwCyBjL257D0+jGqSl1twBjV8iCaC0Aw==", "dev": true, "dependencies": { "@types/prop-types": "*", From f32823279f266841d527c07b52821c860a91c903 Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Tue, 3 Oct 2023 12:26:46 +0100 Subject: [PATCH 2/7] Share @types/react, remove router-dom types --- examples/cra-react-router/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/cra-react-router/package.json b/examples/cra-react-router/package.json index 73095cb7..d0796566 100644 --- a/examples/cra-react-router/package.json +++ b/examples/cra-react-router/package.json @@ -5,8 +5,7 @@ "dependencies": { "@auth0/auth0-react": "file:../..", "@types/node": "^17.0.29", - "@types/react": "^18.0.8", - "@types/react-router-dom": "^5.3.3", + "@types/react": "file:../../node_modules/@types/react", "react": "file:../../node_modules/react", "react-dom": "file:../../node_modules/react-dom", "react-router-dom": "^6.3.0", From ce70daf877534e714c4381f8bcbcd713af9fb106 Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Fri, 6 Oct 2023 15:24:40 +0100 Subject: [PATCH 3/7] Convert to string This only seems to fail in CI, so lets just handle it --- examples/cra-react-router/src/Users.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/cra-react-router/src/Users.tsx b/examples/cra-react-router/src/Users.tsx index 636cbb67..69f4c762 100644 --- a/examples/cra-react-router/src/Users.tsx +++ b/examples/cra-react-router/src/Users.tsx @@ -32,9 +32,9 @@ export function Users() { - {users!.map( + {users.map( ({ name, email }: { name: string; email: string }, i: number) => ( - + {name} {email} From 036c180181293fc407926d7723903acc0701c840 Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Fri, 6 Oct 2023 15:40:52 +0100 Subject: [PATCH 4/7] Try and sync some more modules --- examples/cra-react-router/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/cra-react-router/package.json b/examples/cra-react-router/package.json index d0796566..e93ef650 100644 --- a/examples/cra-react-router/package.json +++ b/examples/cra-react-router/package.json @@ -8,9 +8,9 @@ "@types/react": "file:../../node_modules/@types/react", "react": "file:../../node_modules/react", "react-dom": "file:../../node_modules/react-dom", - "react-router-dom": "^6.3.0", + "react-router-dom": "^6.16.0", "react-scripts": "^5.0.1", - "typescript": "^4.6.3" + "typescript": "file:../../node_modules/typescript" }, "scripts": { "start": "react-scripts start", From 20592d10c8228dbbcd384810c05f764ff3590da8 Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Mon, 9 Oct 2023 13:41:19 +0100 Subject: [PATCH 5/7] Use component instead of element --- examples/cra-react-router/package.json | 2 +- examples/cra-react-router/src/App.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/cra-react-router/package.json b/examples/cra-react-router/package.json index e93ef650..05f6f28d 100644 --- a/examples/cra-react-router/package.json +++ b/examples/cra-react-router/package.json @@ -10,7 +10,7 @@ "react-dom": "file:../../node_modules/react-dom", "react-router-dom": "^6.16.0", "react-scripts": "^5.0.1", - "typescript": "file:../../node_modules/typescript" + "typescript": "^4.9.4" }, "scripts": { "start": "react-scripts start", diff --git a/examples/cra-react-router/src/App.tsx b/examples/cra-react-router/src/App.tsx index 277106cb..7692b30b 100644 --- a/examples/cra-react-router/src/App.tsx +++ b/examples/cra-react-router/src/App.tsx @@ -22,7 +22,7 @@ function App() { {error && } - } /> + ); From dd572d2eda3806c3e02d68e563766184a0d3458b Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Mon, 9 Oct 2023 13:42:49 +0100 Subject: [PATCH 6/7] Revert toString for key in users --- examples/cra-react-router/src/Users.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cra-react-router/src/Users.tsx b/examples/cra-react-router/src/Users.tsx index 69f4c762..eef2661f 100644 --- a/examples/cra-react-router/src/Users.tsx +++ b/examples/cra-react-router/src/Users.tsx @@ -34,7 +34,7 @@ export function Users() { {users.map( ({ name, email }: { name: string; email: string }, i: number) => ( - + {name} {email} From 0561ae2f2019ac870be7247675ba791441d8f476 Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Mon, 9 Oct 2023 13:55:16 +0100 Subject: [PATCH 7/7] Checkout correct ref --- .github/workflows/integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 35ac59a0..38790846 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -54,6 +54,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha || github.ref }} - name: Install dependencies run: npm ci