Skip to content

Commit

Permalink
Merge branch 'master' into FR-14232-stepup-onredirecturl-support
Browse files Browse the repository at this point in the history
  • Loading branch information
doregg committed Dec 20, 2023
2 parents da4baf6 + f0673ee commit 7246bb0
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 33 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## [6.0.15](https://github.com/frontegg/frontegg-react/compare/v6.0.14...v6.0.15) (2023-12-17)

- FR-10692 - Remove the ability to select a full category on webhooks page



## [6.0.14](https://github.com/frontegg/frontegg-react/compare/v6.0.13...v6.0.14) (2023-12-12)

- FR-14324 - Fix android native module and add option for direct social login
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "6.0.14",
"version": "6.0.15",
"npmClient": "yarn",
"useWorkspaces": true,
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/demo-saas/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@frontegg/demo-saas",
"version": "6.0.14",
"version": "6.0.15",
"private": true,
"author": "Frontegg LTD",
"scripts": {
Expand All @@ -10,7 +10,7 @@
"test": "echo 'No Unit Tests'"
},
"dependencies": {
"@frontegg/react": "^6.0.14",
"@frontegg/react": "^6.0.15",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-router-dom": "^5.3.3"
Expand Down
6 changes: 3 additions & 3 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@frontegg/react",
"libName": "FronteggReact",
"version": "6.0.14",
"version": "6.0.15",
"author": "Frontegg LTD",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -10,8 +10,8 @@
"build:watch": "rm -rf dist && mkdir dist && rollup -w -c ./rollup.config.js"
},
"dependencies": {
"@frontegg/js": "6.162.0-alpha.2",
"@frontegg/react-hooks": "6.162.0-alpha.2"
"@frontegg/js": "6.163.0",
"@frontegg/react-hooks": "6.163.0"
},
"peerDependencies": {
"react": ">16.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/sdkVersion.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default { version: '6.0.14' };
export default { version: '6.0.15' };
2 changes: 1 addition & 1 deletion packages/sanity-check/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "frontegg-react-sanity-check",
"private": true,
"version": "6.0.14",
"version": "6.0.15",
"scripts": {
"build": "docker-compose build test",
"build:dev": "docker-compose build test --no-cache",
Expand Down
53 changes: 28 additions & 25 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2378,51 +2378,54 @@
resolved "https://registry.yarnpkg.com/@frontegg/entitlements-javascript-commons/-/entitlements-javascript-commons-1.0.1.tgz#038a5b86166bd00cfd3afa942de361434c34ea04"
integrity sha512-Ny9M9wLcA6/p9OD09plK3ETy5zyTWpgFoIorAYYYxk4J3S6ardsUOai2MlBmXqbG9J1uxD66rdFF5qr4bwqgyw==

"@frontegg/js@6.162.0-alpha.2":
version "6.162.0-alpha.2"
resolved "https://registry.yarnpkg.com/@frontegg/js/-/js-6.162.0-alpha.2.tgz#c404aec6eb9648823d5e2bfe600da70ebde1fc80"
integrity sha512-gS6wZzP4JNYd2cyM5aDJIlEElhQWdDjpNtC03hzqvrVciH+a4Mh8wR800isOpQE6Mdvv3lSob0z3ROQ9ftQTaw==
"@frontegg/js@6.163.0":
version "6.163.0"
resolved "https://registry.yarnpkg.com/@frontegg/js/-/js-6.163.0.tgz#1cba457d8ec8727e5ec2880b0937570a14555493"
integrity sha512-z61qkcrE/GIQKEk87Ijp6/q5Jl6mGjHNpVA1rCf0I7uck5dkZ3MkTFZ2cgP2cJEd8EW93UgtVxTcA7zo1jnOGQ==
dependencies:
"@babel/runtime" "^7.18.6"
"@frontegg/types" "6.162.0-alpha.2"
"@frontegg/types" "6.163.0"

"@frontegg/react-hooks@6.162.0-alpha.2":
version "6.162.0-alpha.2"
resolved "https://registry.yarnpkg.com/@frontegg/react-hooks/-/react-hooks-6.162.0-alpha.2.tgz#e1fd7d10b7e25eaf1a3571d47e66327dc2a8488d"
integrity sha512-8QlEeiqc2gUAEP+gAP0hC0BOXLPKXLDvMs7MYSVfea4qB1q3WPcy8dNnpXpW+ra65gI6VveCNG6CBm1cuMp95A==
"@frontegg/react-hooks@6.163.0":
version "6.163.0"
resolved "https://registry.yarnpkg.com/@frontegg/react-hooks/-/react-hooks-6.163.0.tgz#f42028be2188b90c4d511a0f3445d51c22f912f9"
integrity sha512-/gTpAdHRC6mHJrWoNoSnXFzzMc5Fsy2XjIHGZtJu04FpA1t44boSDHz/4j29gfIVgsedj3NBN+AZKi3f2/j95g==
dependencies:
"@babel/runtime" "^7.18.6"
"@frontegg/redux-store" "6.162.0-alpha.2"
"@frontegg/types" "6.162.0-alpha.2"
"@frontegg/redux-store" "6.163.0"
"@frontegg/types" "6.163.0"
"@types/react" "*"
get-value "^3.0.1"
react-redux "^7.x"

"@frontegg/redux-store@6.162.0-alpha.2":
version "6.162.0-alpha.2"
resolved "https://registry.yarnpkg.com/@frontegg/redux-store/-/redux-store-6.162.0-alpha.2.tgz#5e6e452a4bebf214acc06ff55647d5cb5fd7b16d"
integrity sha512-Gy3h/mMvnGaxnb5XQe9he1YveD/Th2w95IaDPfzst9enHscde1zrlOHKwuZi+W1k7CnNgElQhsTGvn2Zf08EzQ==
"@frontegg/redux-store@6.163.0":
version "6.163.0"
resolved "https://registry.yarnpkg.com/@frontegg/redux-store/-/redux-store-6.163.0.tgz#a629b2f16594761bf1ae24753c9073af620a3015"
integrity sha512-rrw8ONv44ZxOw3+rLVlZJwWaBHcyIE4BOpnRJhzYjXKas5hIAtnLLUKGOTlUIxNK2WzdnbGwTlRbE/gFSXulyQ==
dependencies:
"@babel/runtime" "^7.18.6"
"@frontegg/entitlements-javascript-commons" "1.0.1"
"@frontegg/rest-api" "3.1.48"
"@frontegg/rest-api" "3.1.53"
"@reduxjs/toolkit" "1.8.5"
fast-deep-equal "3.1.3"
redux-saga "^1.2.1"
uuid "^8.3.2"

"@frontegg/rest-api@3.1.48":
version "3.1.48"
resolved "https://registry.yarnpkg.com/@frontegg/rest-api/-/rest-api-3.1.48.tgz#78947faa40dca6a7aac27928e7ef3a62a8f29159"
integrity sha512-/fcBufYuGL1zOeC9q2dGvXaNPxwff4Ppol7aHZDR3cYSTli6iaOAk+h1qNBTYWR3s20oRGMRR4UR8epROGyU/g==
"@frontegg/rest-api@3.1.53":
version "3.1.53"
resolved "https://registry.yarnpkg.com/@frontegg/rest-api/-/rest-api-3.1.53.tgz#c45ac6daf8fae53c2332a71abdc4e705318da075"
integrity sha512-1UY+vaqgKNbjsK1w0aCw0bBju7ACNl34LsrFqK44F10AUzM+1u03tZNQfM/3JM0y9zlEpiwhap/SddrBGu1U6g==
dependencies:
"@babel/runtime" "^7.17.2"
"@frontegg/entitlements-javascript-commons" "1.0.1"

"@frontegg/types@6.162.0-alpha.2":
version "6.162.0-alpha.2"
resolved "https://registry.yarnpkg.com/@frontegg/types/-/types-6.162.0-alpha.2.tgz#de4345c352f598bed1524b1146783cf762adb6e9"
integrity sha512-3SDLdryIiUJnPOAZjCVx60ouCkbN0vXiG2RzBviq7miZLhsGGGr5Rvsd5Wvc8vHwtDJ3cWE6tl7VCViwi06pww==
"@frontegg/types@6.163.0":
version "6.163.0"
resolved "https://registry.yarnpkg.com/@frontegg/types/-/types-6.163.0.tgz#39c4c72c14154f9d37322f21f707a70299c0d9aa"
integrity sha512-4z3vC9spAOUDa6wTwEJ/n3GuDHJpwr2bf9bMq4LWJ55RzV9uYTXWydCdciCpA4PRb4IBj7NIEBVCHKisXtcIpg==
dependencies:
"@babel/runtime" "^7.18.6"
"@frontegg/redux-store" "6.162.0-alpha.2"
"@frontegg/redux-store" "6.163.0"
csstype "^3.0.9"
deepmerge "^4.2.2"

Expand Down

0 comments on commit 7246bb0

Please sign in to comment.