Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(repo): Merge v2 changes into next #90

Merged
merged 58 commits into from
Mar 8, 2022
Merged

Conversation

nikosdouvlis
Copy link
Member

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/types
  • @clerk/clerk-expo
  • @clerk/backend-core
  • @clerk/clerk-sdk-node
  • @clerk/edge
  • build/tooling/chore

Description

  • npm test runs as expected.
  • npm run build runs as expected.

Merge latest v2 changes

igneel64 and others added 30 commits February 22, 2022 15:29
Type fixes and sign-in loading screen
 - @clerk/clerk-js@2.15.0
 - @clerk/clerk-expo@0.8.7
 - @clerk/nextjs@2.11.5
 - @clerk/clerk-react@2.11.5
 - @clerk/shared@0.0.6
 - @clerk/types@1.26.0
fix(clerk-js): Clear invalid invitation token value
Introduce declarations for supporting Notion OAuth
 - @clerk/clerk-js@2.16.0
 - @clerk/clerk-expo@0.8.8
 - @clerk/nextjs@2.11.6
 - @clerk/clerk-react@2.11.6
 - @clerk/shared@0.0.7
 - @clerk/types@1.27.0
…rovider_types

fix(types): Consolidate oauth provider types
 - @clerk/clerk-js@2.16.1
 - @clerk/clerk-expo@0.8.9
 - @clerk/nextjs@2.11.7
 - @clerk/clerk-react@2.11.7
 - @clerk/shared@0.0.8
 - @clerk/types@1.27.1
…mechanism alignment

Fix state clearing of organizationInvitationToken
feat(clerk-js): Add organization basic resources
fix(clerk-js): Don't use ResizeObserver on old browsers
…guard

fix(types): Guarantee elements not in oauth sorting array will be sor…
 - @clerk/clerk-js@2.17.0
 - @clerk/clerk-expo@0.8.10
 - @clerk/nextjs@2.11.8
 - @clerk/clerk-react@2.12.0
 - @clerk/shared@0.0.9
 - @clerk/types@1.28.0
gkats and others added 25 commits March 4, 2022 14:59
feat(backend-core): Organizations API
fix(clerk-react,clerk-js): Crate of API feedback fixes
 - @clerk/backend-core@0.5.0
 - @clerk/clerk-js@2.17.1
 - @clerk/edge@0.3.5
 - @clerk/clerk-expo@0.8.11
 - @clerk/nextjs@2.11.9
 - @clerk/clerk-react@2.12.1
 - @clerk/clerk-sdk-node@2.9.5
 - @clerk/shared@0.0.10
 - @clerk/types@1.28.1
fix(backend-core): Add JWTPayload orgs claim type
 - @clerk/backend-core@0.5.1
 - @clerk/edge@0.3.6
 - @clerk/nextjs@2.11.10
 - @clerk/clerk-sdk-node@2.9.6
fix(types): Revoke typing on organizationInvitation
Invitations can optionally carry metadata that will eventually end up in the created user once they sign up.
The metadata must be a well-formed JSON object. In order to add metadata to an invitation, you can use the
public_metadata property when the invitation is created:

https://docs.clerk.dev/popular-guides/invitations#invitation-metadata
feat(types,backend-core,clerk-js): Add external account properties username, publicMetadata & label
 - @clerk/clerk-js@2.16.1-staging.0
 - @clerk/clerk-expo@0.8.9-staging.0
 - @clerk/nextjs@2.11.7-staging.0
 - @clerk/clerk-react@2.11.7-staging.0
 - @clerk/shared@0.0.8-staging.0
 - @clerk/types@1.27.1-staging.0
 - @clerk/clerk-js@2.16.2-staging.0
 - @clerk/clerk-expo@0.8.10-staging.0
 - @clerk/nextjs@2.11.8-staging.0
 - @clerk/clerk-react@2.11.8-staging.0
 - @clerk/shared@0.0.9-staging.0
 - @clerk/types@1.27.2-staging.0
 - @clerk/clerk-js@2.16.3-staging.0
 - @clerk/clerk-expo@0.8.11-staging.0
 - @clerk/nextjs@2.11.9-staging.0
 - @clerk/clerk-react@2.11.9-staging.0
 - @clerk/shared@0.0.10-staging.0
 - @clerk/types@1.27.3-staging.0
 - @clerk/backend-core@0.4.5-staging.0
 - @clerk/clerk-js@2.17.1-staging.0
 - @clerk/edge@0.3.5-staging.0
 - @clerk/clerk-expo@0.8.11-staging.0
 - @clerk/nextjs@2.11.9-staging.0
 - @clerk/clerk-react@2.12.1-staging.0
 - @clerk/clerk-sdk-node@2.9.5-staging.0
 - @clerk/shared@0.0.10-staging.0
 - @clerk/types@1.28.1-staging.0
 - @clerk/backend-core@0.5.2-staging.0
 - @clerk/clerk-js@2.17.2-staging.0
 - @clerk/edge@0.3.7-staging.0
 - @clerk/clerk-expo@0.8.12-staging.0
 - @clerk/nextjs@2.11.11-staging.0
 - @clerk/clerk-react@2.12.2-staging.0
 - @clerk/clerk-sdk-node@2.9.7-staging.0
 - @clerk/shared@0.0.11-staging.0
 - @clerk/types@1.28.2-staging.0
# Conflicts:
#	package-lock.json
#	packages/clerk-js/CHANGELOG.md
#	packages/clerk-js/package.json
#	packages/clerk-js/src/core/resources/ExternalAccount.ts
#	packages/expo/CHANGELOG.md
#	packages/expo/package.json
#	packages/nextjs/CHANGELOG.md
#	packages/nextjs/package.json
#	packages/react/CHANGELOG.md
#	packages/react/package.json
#	packages/react/src/hooks/index.ts
#	packages/react/src/index.ts
#	packages/react/src/info.ts
#	packages/react/src/isomorphicClerk.ts
#	packages/shared/CHANGELOG.md
#	packages/shared/package.json
#	packages/types/CHANGELOG.md
#	packages/types/package.json
#	packages/types/src/externalAccount.ts
#	packages/types/src/json.ts
#	packages/types/src/oauth.ts
# Conflicts:
#	package-lock.json
#	packages/clerk-js/package.json
#	packages/clerk-js/src/ui/signIn/SignIn.test.tsx
#	packages/clerk-js/src/ui/signUp/SignUp.test.tsx
#	packages/clerk-js/src/ui/signUp/SignUpStart.test.tsx
#	packages/clerk-js/src/ui/userProfile/UserProfile.test.tsx
#	packages/expo/package.json
#	packages/nextjs/package.json
#	packages/react/package.json
#	packages/react/src/info.ts
#	packages/shared/package.json
#	packages/types/package.json
#	packages/types/src/json.ts
@nikosdouvlis nikosdouvlis self-assigned this Mar 8, 2022
@nikosdouvlis nikosdouvlis changed the title Update next from main chore(repo): Merge v2 changes into next Mar 8, 2022
@nikosdouvlis nikosdouvlis merged commit 1026da8 into next Mar 8, 2022
@nikosdouvlis nikosdouvlis deleted the update_next_from_main branch March 8, 2022 20:01
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants