Merge branch 'main' into jacek/async-headers

clerk · Oct 11, 2024 · 8d7d247 · 8d7d247
2 parents 63ebdf9 + 6ef3ec6
commit 8d7d247
Show file tree

Hide file tree

Showing 17 changed files with 162 additions and 130 deletions.
diff --git a/.changeset/blue-pumpkins-travel.md b/.changeset/blue-pumpkins-travel.md
@@ -0,0 +1,5 @@
+---
+"@clerk/clerk-js": patch
+---
+
+Correctly handle malformed or protocol-relative URLs before navigating to cross-origin URLs
diff --git a/.changeset/witty-beds-double.md b/.changeset/witty-beds-double.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.prettierrc b/.prettierrc
@@ -1,12 +1,12 @@
 {
-  "printWidth": 120,
-  "singleAttributePerLine": true,
   "arrowParens": "avoid",
   "bracketSpacing": true,
   "jsxSingleQuote": true,
+  "plugins": ["prettier-plugin-packagejson", "prettier-plugin-tailwindcss"],
+  "printWidth": 120,
   "semi": true,
+  "singleAttributePerLine": true,
   "singleQuote": true,
   "tabWidth": 2,
-  "trailingComma": "all",
-  "plugins": ["prettier-plugin-tailwindcss"]
+  "trailingComma": "all"
 }
diff --git a/integration/templates/astro-hybrid/package.json b/integration/templates/astro-hybrid/package.json
@@ -1,18 +1,18 @@
 {
   "name": "astro-clerk-hybrid-playground",
-  "type": "module",
   "version": "0.0.1",
+  "type": "module",
   "scripts": {
-    "dev": "astro dev",
-    "start": "astro dev --port $PORT",
+    "astro": "astro",
     "build": "astro check && astro build",
+    "dev": "astro dev",
     "preview": "astro preview --port $PORT",
-    "astro": "astro"
+    "start": "astro dev --port $PORT"
   },
   "dependencies": {
     "@astrojs/check": "^0.9.4",
-    "@astrojs/react": "^3.6.2",
     "@astrojs/node": "^8.3.4",
+    "@astrojs/react": "^3.6.2",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "astro": "^4.15.11",

diff --git a/integration/templates/astro-node/package.json b/integration/templates/astro-node/package.json
@@ -1,19 +1,19 @@
 {
   "name": "astro-clerk-playground",
-  "type": "module",
   "version": "0.0.1",
+  "type": "module",
   "scripts": {
-    "dev": "astro dev",
-    "start": "astro dev --port $PORT",
+    "astro": "astro",
     "build": "astro check && astro build",
+    "dev": "astro dev",
     "preview": "astro preview --port $PORT",
-    "astro": "astro"
+    "start": "astro dev --port $PORT"
   },
   "dependencies": {
     "@astrojs/check": "^0.9.4",
+    "@astrojs/node": "^8.3.4",
     "@astrojs/react": "^3.6.2",
     "@astrojs/tailwind": "^5.1.1",
-    "@astrojs/node": "^8.3.4",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "astro": "^4.15.11",

diff --git a/integration/templates/expo-web/package.json b/integration/templates/expo-web/package.json
@@ -1,12 +1,13 @@
 {
   "name": "expo-web",
-  "main": "expo-router/entry",
   "version": "1.0.0",
+  "private": true,
+  "main": "expo-router/entry",
   "scripts": {
-    "dev": "RCT_METRO_PORT=$PORT expo start --web --port $PORT",
     "build": "expo export -p web",
-    "start": "npx serve dist --single",
-    "lint": "expo lint"
+    "dev": "RCT_METRO_PORT=$PORT expo start --web --port $PORT",
+    "lint": "expo lint",
+    "start": "npx serve dist --single"
   },
   "jest": {
     "preset": "jest-expo"
@@ -30,8 +31,8 @@
     "react-native-reanimated": "~3.10.1",
     "react-native-safe-area-context": "4.10.9",
     "react-native-screens": "~3.31.1",
-    "react-native-web": "~0.19.6",
-    "react-native-url-polyfill": "^2.0.0"
+    "react-native-url-polyfill": "^2.0.0",
+    "react-native-web": "~0.19.6"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
@@ -42,6 +43,5 @@
     "jest-expo": "~51.0.3",
     "react-test-renderer": "18.2.0",
     "typescript": "~5.6.2"
-  },
-  "private": true
+  }
 }
diff --git a/integration/templates/tanstack-router/package.json b/integration/templates/tanstack-router/package.json
@@ -3,8 +3,8 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite --port=$PORT",
     "build": "vite build",
+    "dev": "vite --port=$PORT",
     "serve": "vite preview --port=$PORT",
     "start": "vite"
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,20 +31,20 @@
     "test": "FORCE_COLOR=1 turbo test --concurrency=${TURBO_CONCURRENCY:-80%}",
     "test:cache:clear": "FORCE_COLOR=1 turbo test:cache:clear --continue --concurrency=${TURBO_CONCURRENCY:-80%}",
     "test:integration:ap-flows": "npm run test:integration:base -- --grep @ap-flows",
+    "test:integration:astro": "E2E_APP_ID=astro.* npm run test:integration:base -- --grep @astro",
     "test:integration:base": "npx playwright test --config integration/playwright.config.ts",
     "test:integration:cleanup": "npx playwright test --config integration/playwright.cleanup.config.ts",
     "test:integration:deployment:nextjs": "npx playwright test --config integration/playwright.deployments.config.ts",
     "test:integration:elements": "E2E_APP_ID=elements.* npm run test:integration:base -- --grep @elements",
+    "test:integration:expo-web": "E2E_APP_ID=expo.expo-web npm run test:integration:base -- --grep @expo-web",
     "test:integration:express": "E2E_APP_ID=express.* npm run test:integration:base -- --grep @express",
     "test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* npm run test:integration:base -- --grep @generic",
     "test:integration:nextjs": "E2E_APP_ID=next.appRouter.* npm run test:integration:base -- --grep @nextjs",
-    "test:integration:astro": "E2E_APP_ID=astro.* npm run test:integration:base -- --grep @astro",
-    "test:integration:expo-web": "E2E_APP_ID=expo.expo-web npm run test:integration:base -- --grep @expo-web",
     "test:integration:quickstart": "E2E_APP_ID=quickstart.* npm run test:integration:base -- --grep @quickstart",
+    "test:integration:remix": "echo 'placeholder'",
     "test:integration:sessions": "npm run test:integration:base -- --grep @sessions",
-    "test:integration:tanstack-start": "E2E_APP_ID=tanstack.start npm run test:integration:base -- --grep @tanstack-start",
     "test:integration:tanstack-router": "E2E_APP_ID=tanstack.router npm run test:integration:base -- --grep @tanstack-router",
-    "test:integration:remix": "echo 'placeholder'",
+    "test:integration:tanstack-start": "E2E_APP_ID=tanstack.start npm run test:integration:base -- --grep @tanstack-start",
     "turbo:clean": "turbo daemon clean",
     "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo",
     "version": "changeset version && npm install --package-lock-only --engine-strict=false",
@@ -90,7 +90,8 @@
     "jest-chrome": "^0.8.0",
     "jest-environment-jsdom": "^29.3.1",
     "lint-staged": "^14.0.1",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
+    "prettier-plugin-packagejson": "^2.5.3",
     "prettier-plugin-tailwindcss": "^0.6.3",
     "publint": "^0.2.4",
     "react": "18.3.1",