Skip to content

Commit

Permalink
Fix: reactjs-social-login causing conflicting peer dependency with re…
Browse files Browse the repository at this point in the history
…act 19
  • Loading branch information
aelassas committed Jan 1, 2025
1 parent 6eaf447 commit 435fbd9
Show file tree
Hide file tree
Showing 25 changed files with 11,944 additions and 29 deletions.
14 changes: 0 additions & 14 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"version": "4.2.0",
"type": "module",
"scripts": {
"install:dependencies": "cd ../packages/currency-converter && npm i && cd ../movinin-helper && npm i && cd ../../frontend",
"install:currency-converter": "cd ../packages/currency-converter && npm i && cd ../movinin-helper && npm i && cd ../../frontend",
"install:reactjs-social-login": "cd ../packages/reactjs-social-login && npm i && cd ../../frontend",
"install:dependencies": "npm run install:currency-converter && npm run install:reactjs-social-login",
"ts:build": "npm run install:dependencies && tsc --build --verbose",
"build": "npm run ts:build && cross-env NODE_OPTIONS=--max-old-space-size=1024 vite build",
"dev": "npm run ts:build && vite",
Expand Down Expand Up @@ -57,7 +59,6 @@
"react-router-dom": "^7.1.1",
"react-slick": "^0.30.3",
"react-toastify": "^11.0.2",
"reactjs-social-login": "^2.6.3",
"slick-carousel": "^1.8.1",
"typescript": "^5.2.2",
"validator": "^13.12.0",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/SocialLogin.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react'
import { useNavigate } from 'react-router-dom'
import {
IResolveParams,
LoginSocialFacebook,
LoginSocialApple,
LoginSocialGoogle,
} from 'reactjs-social-login'
} from ':reactjs-social-login'
import * as movininTypes from ':movinin-types'
import { IResolveParams } from '@/types'
import { strings as commonStrings } from '@/lang/common'
import env from '@/config/env.config'
import * as UserService from '@/services/UserService'
Expand Down
8 changes: 0 additions & 8 deletions frontend/src/types/index.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion frontend/src/types/reactjs-social-login.d.ts

This file was deleted.

6 changes: 4 additions & 2 deletions frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@
"@/*": ["./src/*"],
":movinin-types": ["../packages/movinin-types"],
":movinin-helper": ["../packages/movinin-helper"],
":disable-react-devtools": ["../packages/disable-react-devtools"]
":disable-react-devtools": ["../packages/disable-react-devtools"],
":reactjs-social-login": ["../packages/reactjs-social-login"],
},
},
"include": ["src"],
"references": [
{ "path": "./tsconfig.node.json" },
{ "path": "../packages/movinin-types" },
{ "path": "../packages/movinin-helper" },
{ "path": "../packages/disable-react-devtools" }
{ "path": "../packages/disable-react-devtools" },
{ "path": "../packages/reactjs-social-login" },
]
}
1 change: 1 addition & 0 deletions frontend/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export default ({ mode }: { mode: string }) => {
':movinin-helper': path.resolve(__dirname, '../packages/movinin-helper'),
':disable-react-devtools': path.resolve(__dirname, '../packages/disable-react-devtools'),
':currency-converter': path.resolve(__dirname, '../packages/currency-converter'),
':reactjs-social-login': path.resolve(__dirname, '../packages/reactjs-social-login'),
},
},

Expand Down
25 changes: 25 additions & 0 deletions packages/reactjs-social-login/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
node_modules

# builds
build
dist
.rpt2_cache

# misc
.DS_Store
.env
.env.local
.env.production
.env.development
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
/src/helper/constants.ts
Loading

0 comments on commit 435fbd9

Please sign in to comment.