Merge branch 'main' into lekoarts/sdk-1721-add-e2e-tests-to-normal-ci

clerk · May 24, 2024 · ff3e23f · ff3e23f
2 parents c7359bc + 0a6883f
commit ff3e23f
Show file tree

Hide file tree

Showing 53 changed files with 407 additions and 251 deletions.
diff --git a/.changeset/clean-kings-brake.md b/.changeset/clean-kings-brake.md
diff --git a/.changeset/great-parents-invent.md b/.changeset/great-parents-invent.md
diff --git a/.changeset/hot-phones-serve.md b/.changeset/hot-phones-serve.md
diff --git a/.changeset/sharp-apples-think.md b/.changeset/sharp-apples-think.md
diff --git a/integration/presets/next.ts b/integration/presets/next.ts
@@ -12,8 +12,8 @@ const appRouter = applicationConfig()
   .addScript('build', 'npm run build')
   .addScript('serve', 'npm run start')
   .addDependency('next', constants.E2E_NEXTJS_VERSION)
-  .addDependency('react', constants.E2E_NEXTJS_VERSION)
-  .addDependency('react-dom', constants.E2E_NEXTJS_VERSION)
+  .addDependency('react', constants.E2E_REACT_VERSION)
+  .addDependency('react-dom', constants.E2E_REACT_DOM_VERSION)
   .addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || clerkNextjsLocal);
 
 const appRouterTurbo = appRouter

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.2.1
+
+### Patch Changes
+
+- Updated dependencies [[`ff31f7255`](https://github.com/clerk/javascript/commit/ff31f725541d82caaa9c13cf42cf15f8ce3992f4), [`0e48fc210`](https://github.com/clerk/javascript/commit/0e48fc210cf0b5852052a21494a05f6e723101f5)]:
+  - @clerk/shared@2.2.1
+
 ## 1.2.0
 
 ### Minor Changes