chore(repo): Fix rebase inconsistency

package.json

@@ -1,47 +1,42 @@
 {
   "name": "@clerk/javascript",
+  "version": "0.0.0",
+  "private": true,
+  "license": "MIT",
   "workspaces": {
     "packages": [
       "packages/*"
     ]
   },
-  "license": "MIT",
-  "version": "0.0.0",
-  "private": true,
-  "packageManager": "[email protected]",
-  "engines": {
-    "node": ">=16.8.0",
-    "npm": ">=8.5.0"
-  },
   "scripts": {
     "build": "FORCE_COLOR=1 turbo build --concurrency=${TURBO_CONCURRENCY:-80%}",
     "bundlewatch": "turbo bundlewatch",
-    "changeset": "npx changeset",
+    "changeset": "changeset",
     "changeset:empty": "npm run changeset -- --empty",
     "clean": "turbo clean",
     "dev": "FORCE_COLOR=1 turbo dev --filter=@clerk/* --filter=!@clerk/expo",
     "dev:js": "FORCE_COLOR=1 turbo dev:current --filter=@clerk/clerk-js",
-    "format": "npx prettier --write .",
-    "format:check": "npx prettier --cache --check .",
+    "format": "prettier --write .",
+    "format:check": "prettier --cache --check .",
     "lint": "FORCE_COLOR=1 turbo lint",
     "lint:attw": "FORCE_COLOR=1 turbo lint:attw",
     "lint:fix": "FORCE_COLOR=1 turbo lint -- --fix",
     "lint:publint": "FORCE_COLOR=1 turbo lint:publint",
     "nuke": "./scripts/nuke.sh",
     "prepare": "husky install",
-    "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags",
-    "release:snapshot": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag",
-    "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag",
-    "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi",
+    "release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && changeset publish && git push --follow-tags",
+    "release:snapshot": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && changeset publish --tag snapshot --no-git-tag",
+    "release:staging": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && changeset publish --tag staging --no-git-tag",
+    "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_FORCE=true TURBO_CONCURRENCY=4 npm run build && changeset publish --no-git-tag; fi",
     "test": "FORCE_COLOR=1 turbo test --concurrency=${TURBO_CONCURRENCY:-80%}",
     "test:ci": "FORCE_COLOR=1 turbo test --concurrency=${TURBO_CONCURRENCY:-80%}",
     "test:integration:base": "DEBUG=1 npx playwright test --config integration/playwright.config.ts",
     "test:integration:deployment:nextjs": "DEBUG=1 npx playwright test --config integration/playwright.deployments.config.ts",
     "test:integration:generic": "E2E_APP_ID=react.vite.* npm run test:integration:base -- --grep @generic",
-    "test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep @generic",
+    "test:integration:nextjs": "E2E_APP_ID=next.appRouter.withEmailCodes npm run test:integration:base -- --grep \"@generic|@nextjs\"",
     "test:integration:remix": "echo 'placeholder'",
     "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo",
-    "version": "npx changeset version && ./scripts/version-info.sh",
+    "version": "changeset version && ./scripts/version-info.sh",
     "version:snapshot": "./scripts/snapshot.mjs",
     "version:staging": "./scripts/staging.mjs",
     "yalc:all": "for d in packages/*/; do echo $d; cd $d; yalc push --replace --sig; cd '../../'; done"
@@ -93,5 +88,10 @@
     "typescript": "^5.2.2",
     "verdaccio": "^5.26.3",
     "zx": "^7.2.3"
+  },
+  "packageManager": "[email protected]",
+  "engines": {
+    "node": ">=16.8.0",
+    "npm": ">=8.5.0"
   }
 }