From 0a2292854a1cc2d9e9db40b5665e4a6042148605 Mon Sep 17 00:00:00 2001 From: Peter Perlepes Date: Thu, 24 Feb 2022 17:09:55 +0200 Subject: [PATCH 1/4] chore(repo): Allow staging version and publish --- lerna.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index d9473bcbac1..705baace6cd 100644 --- a/lerna.json +++ b/lerna.json @@ -8,14 +8,16 @@ "message": "chore(release): Publish", "allowBranch": [ "main", - "next" + "next", + "staging" ], "conventionalCommits": true }, "publish": { "allowBranch": [ "main", - "next" + "next", + "staging" ] } }, From 43f0b0603608866f6b9e0a37a284c0ea72c0004b Mon Sep 17 00:00:00 2001 From: Giannis Katsanos Date: Fri, 25 Feb 2022 11:18:00 +0200 Subject: [PATCH 2/4] fix(shared): Phone input should start blank The phone input component's initial value should be a blank string, until the input actually changes. --- .../shared/components/phoneInput/PhoneInput.test.tsx | 11 ++++++++--- packages/shared/components/phoneInput/PhoneInput.tsx | 3 +++ .../phoneInput/__snapshots__/PhoneInput.test.tsx.snap | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/shared/components/phoneInput/PhoneInput.test.tsx b/packages/shared/components/phoneInput/PhoneInput.test.tsx index 00c2c4816f2..387d2c21ca8 100644 --- a/packages/shared/components/phoneInput/PhoneInput.test.tsx +++ b/packages/shared/components/phoneInput/PhoneInput.test.tsx @@ -49,7 +49,7 @@ describe('', () => { expect(tree).toMatchSnapshot(); }); - it('renders the phone input when the is dropdown open', () => { + it('renders the phone input when the dropdown is open', () => { const { container } = render( , ); @@ -68,10 +68,15 @@ describe('', () => { expect(input).toHaveAttribute('maxlength', '25'); }); - it('emits phone number with country code and no formatting', async () => { + it('renders with an empty value', () => { + render(); + expect(handlePhoneChange).not.toHaveBeenCalled(); + }); + + it('emits phone number with country code and no formatting', () => { render(); const input = screen.getByRole('textbox'); - await userEvent.type(input, '2222222222'); + userEvent.type(input, '2222222222'); const lastCall = handlePhoneChange.mock.calls.pop(); expect(lastCall).toEqual(['+12222222222']); }); diff --git a/packages/shared/components/phoneInput/PhoneInput.tsx b/packages/shared/components/phoneInput/PhoneInput.tsx index ee1b82f4264..d0c1fb47823 100644 --- a/packages/shared/components/phoneInput/PhoneInput.tsx +++ b/packages/shared/components/phoneInput/PhoneInput.tsx @@ -80,6 +80,9 @@ export function PhoneInput({ }; React.useEffect(() => { + if (!phoneNumber) { + return; + } const dialCode = IsoToCountryMap.get(selectedIso)?.code || '1'; handlePhoneChange('+' + extractDigits(`${dialCode}${phoneNumber}`)); }, [handlePhoneChange, selectedIso, phoneNumber]); diff --git a/packages/shared/components/phoneInput/__snapshots__/PhoneInput.test.tsx.snap b/packages/shared/components/phoneInput/__snapshots__/PhoneInput.test.tsx.snap index 97f0ef59618..2abdb88e7ba 100644 --- a/packages/shared/components/phoneInput/__snapshots__/PhoneInput.test.tsx.snap +++ b/packages/shared/components/phoneInput/__snapshots__/PhoneInput.test.tsx.snap @@ -110,7 +110,7 @@ exports[` renders the phone input 1`] = ` `; -exports[` renders the phone input when the is dropdown open 1`] = ` +exports[` renders the phone input when the dropdown is open 1`] = `
Date: Wed, 23 Feb 2022 20:52:44 +0200 Subject: [PATCH 3/4] feat(types): Add support for oauth_microsoft --- packages/clerk-js/src/ui/common/constants.ts | 4 ++++ packages/types/src/oauth.ts | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/clerk-js/src/ui/common/constants.ts b/packages/clerk-js/src/ui/common/constants.ts index e999e29e67d..fb81a161cab 100644 --- a/packages/clerk-js/src/ui/common/constants.ts +++ b/packages/clerk-js/src/ui/common/constants.ts @@ -100,6 +100,10 @@ export const OAUTH_PROVIDERS: OAuthProviders = Object.freeze({ id: 'bitbucket', name: 'Bitbucket', }, + microsoft: { + id: 'microsoft', + name: 'Microsoft', + }, }); export function getOAuthProviderData( diff --git a/packages/types/src/oauth.ts b/packages/types/src/oauth.ts index 315e33412db..82136a75f6f 100644 --- a/packages/types/src/oauth.ts +++ b/packages/types/src/oauth.ts @@ -10,7 +10,8 @@ export type OAuthProvider = | 'twitch' | 'linkedin' | 'dropbox' - | 'bitbucket'; + | 'bitbucket' + | 'microsoft'; export type OAuthStrategy = `oauth_${OAuthProvider}`; From 535970ad4a2c1effbf2bbbb359c07a9463bb295d Mon Sep 17 00:00:00 2001 From: Sokratis Vidros Date: Tue, 1 Mar 2022 11:43:30 +0200 Subject: [PATCH 4/4] chore(release): Publish - @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 --- package-lock.json | 48 +++++++++++++++++----------------- packages/clerk-js/CHANGELOG.md | 9 +++++++ packages/clerk-js/package.json | 6 ++--- packages/expo/CHANGELOG.md | 8 ++++++ packages/expo/package.json | 8 +++--- packages/nextjs/CHANGELOG.md | 8 ++++++ packages/nextjs/package.json | 6 ++--- packages/react/CHANGELOG.md | 8 ++++++ packages/react/package.json | 4 +-- packages/react/src/info.ts | 2 +- packages/shared/CHANGELOG.md | 9 +++++++ packages/shared/package.json | 4 +-- packages/types/CHANGELOG.md | 9 +++++++ packages/types/package.json | 2 +- 14 files changed, 91 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0927a1473b3..1bbb1f2435d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22623,10 +22623,10 @@ }, "packages/clerk-js": { "name": "@clerk/clerk-js", - "version": "2.14.3", + "version": "2.15.0", "license": "MIT", "dependencies": { - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@popperjs/core": "^2.4.4", "browser-tabs-lock": "^1.2.15", "classnames": "^2.3.1", @@ -22646,7 +22646,7 @@ "@babel/preset-env": "^7.12.1", "@babel/preset-react": "^7.12.5", "@babel/preset-typescript": "^7.12.1", - "@clerk/shared": "^0.0.5", + "@clerk/shared": "^0.0.6", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.2", "@svgr/webpack": "^6.2.1", "@testing-library/dom": "^7.28.1", @@ -22764,15 +22764,15 @@ }, "packages/expo": { "name": "@clerk/clerk-expo", - "version": "0.8.6", + "version": "0.8.7", "license": "MIT", "dependencies": { - "@clerk/clerk-js": "^2.14.3", - "@clerk/clerk-react": "^2.11.4", + "@clerk/clerk-js": "^2.15.0", + "@clerk/clerk-react": "^2.11.5", "base-64": "^1.0.0" }, "devDependencies": { - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@types/jest": "^27.4.0", "@types/node": "^16.11.9", "@types/react": "^17.0.39", @@ -22799,12 +22799,12 @@ }, "packages/nextjs": { "name": "@clerk/nextjs", - "version": "2.11.4", + "version": "2.11.5", "license": "MIT", "dependencies": { - "@clerk/clerk-react": "^2.11.4", + "@clerk/clerk-react": "^2.11.5", "@clerk/clerk-sdk-node": "^2.9.4", - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "tslib": "^2.3.1" }, "devDependencies": { @@ -22834,10 +22834,10 @@ }, "packages/react": { "name": "@clerk/clerk-react", - "version": "2.11.4", + "version": "2.11.5", "license": "MIT", "dependencies": { - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "tslib": "^2.3.1" }, "devDependencies": { @@ -23151,12 +23151,12 @@ }, "packages/shared": { "name": "@clerk/shared", - "version": "0.0.5", + "version": "0.0.6", "devDependencies": { "@babel/core": "^7.13.14", "@babel/preset-env": "^7.13.12", "@babel/preset-react": "^7.13.13", - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@popperjs/core": "^2.5.4", "@sentry/browser": "^6.3.0", "@svgr/webpack": "^6.2.1", @@ -23210,7 +23210,7 @@ }, "packages/types": { "name": "@clerk/types", - "version": "1.25.4", + "version": "1.26.0", "license": "MIT", "devDependencies": { "@types/jest": "^27.4.0", @@ -24484,9 +24484,9 @@ "@clerk/clerk-expo": { "version": "file:packages/expo", "requires": { - "@clerk/clerk-js": "^2.14.3", - "@clerk/clerk-react": "^2.11.4", - "@clerk/types": "^1.25.4", + "@clerk/clerk-js": "^2.15.0", + "@clerk/clerk-react": "^2.11.5", + "@clerk/types": "^1.26.0", "@types/jest": "^27.4.0", "@types/node": "^16.11.9", "@types/react": "^17.0.39", @@ -24517,8 +24517,8 @@ "@babel/preset-env": "^7.12.1", "@babel/preset-react": "^7.12.5", "@babel/preset-typescript": "^7.12.1", - "@clerk/shared": "^0.0.5", - "@clerk/types": "^1.25.4", + "@clerk/shared": "^0.0.6", + "@clerk/types": "^1.26.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.2", "@popperjs/core": "^2.4.4", "@svgr/webpack": "^6.2.1", @@ -24608,7 +24608,7 @@ "@clerk/clerk-react": { "version": "file:packages/react", "requires": { - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@testing-library/dom": "^7.28.1", "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.1", @@ -24862,9 +24862,9 @@ "@clerk/nextjs": { "version": "file:packages/nextjs", "requires": { - "@clerk/clerk-react": "^2.11.4", + "@clerk/clerk-react": "^2.11.5", "@clerk/clerk-sdk-node": "^2.9.4", - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@types/jest": "^27.4.0", "@types/node": "^16.11.9", "@types/react": "^17.0.39", @@ -24892,7 +24892,7 @@ "@babel/core": "^7.13.14", "@babel/preset-env": "^7.13.12", "@babel/preset-react": "^7.13.13", - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@popperjs/core": "^2.5.4", "@sentry/browser": "^6.3.0", "@svgr/webpack": "^6.2.1", diff --git a/packages/clerk-js/CHANGELOG.md b/packages/clerk-js/CHANGELOG.md index 52d52d3ccc4..2b2ae2e2620 100644 --- a/packages/clerk-js/CHANGELOG.md +++ b/packages/clerk-js/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.15.0](https://github.com/clerkinc/javascript/compare/@clerk/clerk-js@2.14.3...@clerk/clerk-js@2.15.0) (2022-03-01) + + +### Features + +* **types:** Add support for oauth_microsoft ([96c1cc6](https://github.com/clerkinc/javascript/commit/96c1cc6817b9bbc6917ea2773498299c1ff9b951)) + + + ### [2.14.3](https://github.com/clerkinc/javascript/compare/@clerk/clerk-js@2.14.3-staging.0...@clerk/clerk-js@2.14.3) (2022-02-24) **Note:** Version bump only for package @clerk/clerk-js diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json index db57ae58d3b..5e7d96cb97a 100644 --- a/packages/clerk-js/package.json +++ b/packages/clerk-js/package.json @@ -1,6 +1,6 @@ { "name": "@clerk/clerk-js", - "version": "2.14.3", + "version": "2.15.0", "license": "MIT", "description": "Clerk.dev JS library", "keywords": [ @@ -38,7 +38,7 @@ "test:coverage": "jest --collectCoverage" }, "dependencies": { - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@popperjs/core": "^2.4.4", "browser-tabs-lock": "^1.2.15", "classnames": "^2.3.1", @@ -58,7 +58,7 @@ "@babel/preset-env": "^7.12.1", "@babel/preset-react": "^7.12.5", "@babel/preset-typescript": "^7.12.1", - "@clerk/shared": "^0.0.5", + "@clerk/shared": "^0.0.6", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.2", "@svgr/webpack": "^6.2.1", "@testing-library/dom": "^7.28.1", diff --git a/packages/expo/CHANGELOG.md b/packages/expo/CHANGELOG.md index c0f17594178..b2d6590e5ad 100644 --- a/packages/expo/CHANGELOG.md +++ b/packages/expo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.8.7](https://github.com/clerkinc/javascript/compare/@clerk/clerk-expo@0.8.6...@clerk/clerk-expo@0.8.7) (2022-03-01) + +**Note:** Version bump only for package @clerk/clerk-expo + + + + + ### [0.8.6](https://github.com/clerkinc/javascript/compare/@clerk/clerk-expo@0.8.6-staging.0...@clerk/clerk-expo@0.8.6) (2022-02-24) **Note:** Version bump only for package @clerk/clerk-expo diff --git a/packages/expo/package.json b/packages/expo/package.json index 4683507ed84..bafde0826e9 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -1,6 +1,6 @@ { "name": "@clerk/clerk-expo", - "version": "0.8.6", + "version": "0.8.7", "license": "MIT", "description": "Clerk.dev React Native/Expo library", "keywords": [ @@ -26,12 +26,12 @@ "dev": "tsc -p tsconfig.build.json --watch" }, "dependencies": { - "@clerk/clerk-js": "^2.14.3", - "@clerk/clerk-react": "^2.11.4", + "@clerk/clerk-js": "^2.15.0", + "@clerk/clerk-react": "^2.11.5", "base-64": "^1.0.0" }, "devDependencies": { - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@types/jest": "^27.4.0", "@types/node": "^16.11.9", "@types/react": "^17.0.39", diff --git a/packages/nextjs/CHANGELOG.md b/packages/nextjs/CHANGELOG.md index 8ff1c226742..664a8f14231 100644 --- a/packages/nextjs/CHANGELOG.md +++ b/packages/nextjs/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [2.11.5](https://github.com/clerkinc/javascript/compare/@clerk/nextjs@2.11.4...@clerk/nextjs@2.11.5) (2022-03-01) + +**Note:** Version bump only for package @clerk/nextjs + + + + + ### [2.11.4](https://github.com/clerkinc/javascript/compare/@clerk/nextjs@2.11.4-staging.0...@clerk/nextjs@2.11.4) (2022-02-24) **Note:** Version bump only for package @clerk/nextjs diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index adb78ae6647..2abda9feee3 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@clerk/nextjs", - "version": "2.11.4", + "version": "2.11.5", "license": "MIT", "description": "Clerk.dev SDK for NextJS", "keywords": [ @@ -30,9 +30,9 @@ "dev": "tsc -p tsconfig.build.json --watch" }, "dependencies": { - "@clerk/clerk-react": "^2.11.4", + "@clerk/clerk-react": "^2.11.5", "@clerk/clerk-sdk-node": "^2.9.4", - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "tslib": "^2.3.1" }, "devDependencies": { diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 7b73e135b0f..f4c4d473008 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [2.11.5](https://github.com/clerkinc/javascript/compare/@clerk/clerk-react@2.11.4...@clerk/clerk-react@2.11.5) (2022-03-01) + +**Note:** Version bump only for package @clerk/clerk-react + + + + + ### [2.11.4](https://github.com/clerkinc/javascript/compare/@clerk/clerk-react@2.11.4-staging.0...@clerk/clerk-react@2.11.4) (2022-02-24) **Note:** Version bump only for package @clerk/clerk-react diff --git a/packages/react/package.json b/packages/react/package.json index 74eb571dc1a..b9b2231b636 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@clerk/clerk-react", - "version": "2.11.4", + "version": "2.11.5", "license": "MIT", "description": "Clerk.dev React library", "keywords": [ @@ -28,7 +28,7 @@ "test": "jest" }, "dependencies": { - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "tslib": "^2.3.1" }, "devDependencies": { diff --git a/packages/react/src/info.ts b/packages/react/src/info.ts index c3ae16de298..abadd9503c4 100644 --- a/packages/react/src/info.ts +++ b/packages/react/src/info.ts @@ -1,4 +1,4 @@ /** DO NOT EDIT: This file is automatically generated by ../scripts/info.js */ -export const LIB_VERSION='2.11.4'; +export const LIB_VERSION='2.11.5'; export const LIB_NAME='@clerk/clerk-react'; diff --git a/packages/shared/CHANGELOG.md b/packages/shared/CHANGELOG.md index dc0b639681e..cf50c7c4e13 100644 --- a/packages/shared/CHANGELOG.md +++ b/packages/shared/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +### [0.0.6](https://github.com/clerkinc/clerk_docker/compare/@clerk/shared@0.0.5...@clerk/shared@0.0.6) (2022-03-01) + + +### Bug Fixes + +* **shared:** Phone input should start blank ([43f0b06](https://github.com/clerkinc/clerk_docker/commit/43f0b0603608866f6b9e0a37a284c0ea72c0004b)) + + + ### [0.0.5](https://github.com/clerkinc/clerk_docker/compare/@clerk/shared@0.0.5-staging.0...@clerk/shared@0.0.5) (2022-02-24) **Note:** Version bump only for package @clerk/shared diff --git a/packages/shared/package.json b/packages/shared/package.json index 9fe3e75b6eb..c302d99334d 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@clerk/shared", - "version": "0.0.5", + "version": "0.0.6", "private": true, "main": "index.js", "module": "index.js", @@ -26,7 +26,7 @@ "@babel/core": "^7.13.14", "@babel/preset-env": "^7.13.12", "@babel/preset-react": "^7.13.13", - "@clerk/types": "^1.25.4", + "@clerk/types": "^1.26.0", "@popperjs/core": "^2.5.4", "@sentry/browser": "^6.3.0", "@svgr/webpack": "^6.2.1", diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index ea2ecc5c4cf..eacad5e15d2 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.26.0](https://github.com/clerkinc/javascript/compare/@clerk/types@1.25.4...@clerk/types@1.26.0) (2022-03-01) + + +### Features + +* **types:** Add support for oauth_microsoft ([96c1cc6](https://github.com/clerkinc/javascript/commit/96c1cc6817b9bbc6917ea2773498299c1ff9b951)) + + + ### [1.25.4](https://github.com/clerkinc/javascript/compare/@clerk/types@1.25.4-staging.0...@clerk/types@1.25.4) (2022-02-24) **Note:** Version bump only for package @clerk/types diff --git a/packages/types/package.json b/packages/types/package.json index 00c7d10240e..837196e7e1e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@clerk/types", - "version": "1.25.4", + "version": "1.26.0", "license": "MIT", "description": "Typings for Clerk libraries.", "keywords": [