Merge branch 'refs/heads/main' into CORE-2086/suffixed-cookies-draft

clerk · Jul 3, 2024 · b6a8f19 · b6a8f19
2 parents 02c6f00 + 81bd03b
commit b6a8f19
Show file tree

Hide file tree

Showing 25 changed files with 167 additions and 45 deletions.
diff --git a/integration/templates/next-app-router-quickstart/package.json b/integration/templates/next-app-router-quickstart/package.json
@@ -12,7 +12,7 @@
     "@types/node": "^20.12.12",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "next": "14.1.1",
+    "next": "14.2.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.4.5"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/chrome-extension/CHANGELOG.md b/packages/chrome-extension/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 1.1.2
+
+### Patch Changes
+
+- Ensure client cookie URLs resolve appropriately ([#3658](https://github.com/clerk/javascript/pull/3658)) by [@tmilewski](https://github.com/tmilewski)
+
+- Updated dependencies [[`427fcdeaa`](https://github.com/clerk/javascript/commit/427fcdeaaba4e77273be29b4d7cca43f9aa18693)]:
+  - @clerk/[email protected]
+
 ## 1.1.1
 
 ### Patch Changes

diff --git a/packages/chrome-extension/package.json b/packages/chrome-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/chrome-extension",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Clerk SDK for Chrome extensions",
   "keywords": [
     "auth",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@clerk/clerk-js": "5.8.0",
-    "@clerk/clerk-react": "5.2.6",
+    "@clerk/clerk-react": "5.2.7",
     "@clerk/shared": "2.3.2",
     "webextension-polyfill": "^0.10.0"
   },

diff --git a/packages/chrome-extension/src/singleton.ts b/packages/chrome-extension/src/singleton.ts
@@ -45,7 +45,7 @@ export async function buildClerk({
   // Set up cookie params based on environment
   const getClientCookieParams: GetClientCookieParams = isProd
     ? {
-        urls: key.frontendApi,
+        urls: `https://${key.frontendApi}`,
         name: CLIENT_JWT_KEY,
       }
     : {

diff --git a/packages/chrome-extension/src/utils/cookies.ts b/packages/chrome-extension/src/utils/cookies.ts
@@ -5,10 +5,19 @@ export type GetClientCookieParams = {
   name: string;
 };
 
+function isSingleHost(urls: string | string[]): urls is string {
+  return typeof urls === 'string';
+}
+
+function ensureFormattedUrl(url: string): string {
+  return url.startsWith('http') ? url : `https://${url}`;
+}
+
 export async function getClientCookie({ urls, name }: GetClientCookieParams) {
   // Handle single host request
-  if (typeof urls === 'string') {
-    return browser.cookies.get({ url: urls, name });
+  if (isSingleHost(urls)) {
+    const url = ensureFormattedUrl(urls);
+    return await browser.cookies.get({ url, name });
   }
 
   // Handle multi-host request

diff --git a/packages/elements/CHANGELOG.md b/packages/elements/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @clerk/elements
 
+## 0.10.1
+
 ## 0.10.0
 
 ### Minor Changes

diff --git a/packages/elements/package.json b/packages/elements/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/elements",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Clerk Elements",
   "keywords": [
     "clerk",
@@ -78,7 +78,7 @@
     "xstate": "^5.13.0"
   },
   "devDependencies": {
-    "@clerk/clerk-react": "5.2.6",
+    "@clerk/clerk-react": "5.2.7",
     "@clerk/eslint-config-custom": "*",
     "@clerk/shared": "2.3.2",
     "@statelyai/inspect": "^0.3.1",

diff --git a/packages/expo/CHANGELOG.md b/packages/expo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.2.5
+
+### Patch Changes
+
+- Updated dependencies [[`427fcdeaa`](https://github.com/clerk/javascript/commit/427fcdeaaba4e77273be29b4d7cca43f9aa18693)]:
+  - @clerk/clerk-react@5.2.7
+
 ## 1.2.4
 
 ### Patch Changes

diff --git a/packages/expo/package.json b/packages/expo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-expo",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Clerk React Native/Expo library",
   "keywords": [
     "react",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@clerk/clerk-js": "5.8.0",
-    "@clerk/clerk-react": "5.2.6",
+    "@clerk/clerk-react": "5.2.7",
     "@clerk/shared": "2.3.2",
     "@clerk/types": "4.7.0",
     "base-64": "^1.0.0",

diff --git a/packages/gatsby-plugin-clerk/package.json b/packages/gatsby-plugin-clerk/package.json
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@clerk/backend": "1.3.0",
-    "@clerk/clerk-react": "5.2.6",
+    "@clerk/clerk-react": "5.2.7",
     "@clerk/clerk-sdk-node": "5.0.14",
     "@clerk/types": "4.7.0",
     "cookie": "0.5.0",

diff --git a/packages/nextjs/CHANGELOG.md b/packages/nextjs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 5.2.1
+
+### Patch Changes
+
+- Updated dependencies [[`427fcdeaa`](https://github.com/clerk/javascript/commit/427fcdeaaba4e77273be29b4d7cca43f9aa18693)]:
+  - @clerk/clerk-react@5.2.7
+
 ## 5.2.0
 
 ### Minor Changes

diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/nextjs",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "Clerk SDK for NextJS",
   "keywords": [
     "clerk",
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@clerk/backend": "1.3.0",
-    "@clerk/clerk-react": "5.2.6",
+    "@clerk/clerk-react": "5.2.7",
     "@clerk/shared": "2.3.2",
     "@clerk/types": "4.7.0",
     "crypto-js": "4.2.0",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 5.2.7
+
+### Patch Changes
+
+- Fix race condition on updating ClerkProvider props before ClerkJS has loaded ([#3655](https://github.com/clerk/javascript/pull/3655)) by [@anagstef](https://github.com/anagstef)
+
 ## 5.2.6
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-react",
-  "version": "5.2.6",
+  "version": "5.2.7",
   "description": "Clerk React library",
   "keywords": [
     "clerk",

diff --git a/packages/react/src/__tests__/isomorphicClerk.test.ts b/packages/react/src/__tests__/isomorphicClerk.test.ts
@@ -0,0 +1,52 @@
+import { IsomorphicClerk } from '../isomorphicClerk';
+
+describe('isomorphicClerk', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('instantiates a IsomorphicClerk instance', () => {
+    expect(() => {
+      new IsomorphicClerk({ publishableKey: 'pk_test_XXX' });
+    }).not.toThrow();
+  });
+
+  it('updates props asynchronously after clerkjs has loaded', async () => {
+    const propsHistory: any[] = [];
+    const dummyClerkJS = {
+      __unstable__updateProps: (props: any) => propsHistory.push(props),
+    };
+
+    const isomorphicClerk = new IsomorphicClerk({ publishableKey: 'pk_test_XXX' });
+    (isomorphicClerk as any).clerkjs = dummyClerkJS as any;
+
+    void isomorphicClerk.__unstable__updateProps({ appearance: { baseTheme: 'dark' } });
+    void isomorphicClerk.__unstable__updateProps({ appearance: { baseTheme: 'light' } });
+    void isomorphicClerk.__unstable__updateProps({ appearance: { baseTheme: 'purple' } });
+    void isomorphicClerk.__unstable__updateProps({ appearance: { baseTheme: 'yellow' } });
+    void isomorphicClerk.__unstable__updateProps({ appearance: { baseTheme: 'red' } });
+    void isomorphicClerk.__unstable__updateProps({ appearance: { baseTheme: 'blue' } });
+    void isomorphicClerk.__unstable__updateProps({ appearance: { baseTheme: 'green' } });
+    expect(propsHistory).toEqual([]);
+
+    jest.spyOn(isomorphicClerk, 'loaded', 'get').mockReturnValue(true);
+    isomorphicClerk.emitLoaded();
+    void isomorphicClerk.__unstable__updateProps({ appearance: { baseTheme: 'white' } });
+    await jest.runAllTimersAsync();
+
+    expect(propsHistory).toEqual([
+      { appearance: { baseTheme: 'dark' } },
+      { appearance: { baseTheme: 'light' } },
+      { appearance: { baseTheme: 'purple' } },
+      { appearance: { baseTheme: 'yellow' } },
+      { appearance: { baseTheme: 'red' } },
+      { appearance: { baseTheme: 'blue' } },
+      { appearance: { baseTheme: 'green' } },
+      { appearance: { baseTheme: 'white' } },
+    ]);
+  });
+});
diff --git a/packages/react/src/contexts/ClerkContextProvider.tsx b/packages/react/src/contexts/ClerkContextProvider.tsx
@@ -72,11 +72,11 @@ const useLoadedIsomorphicClerk = (options: IsomorphicClerkOptions) => {
   const isomorphicClerk = React.useMemo(() => IsomorphicClerk.getOrCreateInstance(options), []);
 
   React.useEffect(() => {
-    isomorphicClerk.__unstable__updateProps({ appearance: options.appearance });
+    void isomorphicClerk.__unstable__updateProps({ appearance: options.appearance });
   }, [options.appearance]);
 
   React.useEffect(() => {
-    isomorphicClerk.__unstable__updateProps({ options });
+    void isomorphicClerk.__unstable__updateProps({ options });
   }, [options.localization]);
 
   React.useEffect(() => {