Skip to content

Commit

Permalink
update deps (keybase#24530)
Browse files Browse the repository at this point in the history
* update some deps
  • Loading branch information
chrisnojima authored Jun 11, 2021
1 parent 33dfbe9 commit bccaf04
Show file tree
Hide file tree
Showing 5 changed files with 364 additions and 457 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
command: yarn install --pure-lockfile --ignore-engines --network-concurrency 1
- run:
working_directory: shared
command: yarn global add react-native-cli npm
command: yarn global add --ignore-engines react-native-cli npm
- run:
working_directory: shared
command: yarn run rn-gobuild-android
Expand Down
3 changes: 1 addition & 2 deletions shared/desktop/yarn-helper/build.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ const commands = {

function hotServer(info: any, exec: Function) {
exec('yarn run _helper build-dev', {...info.env, BEFORE_HOT: 'true', HOT: 'true'})
const dash = process.env['NO_DASHBOARD'] ? '' : 'webpack-dashboard --'
exec(`${dash} webpack-dev-server --mode development --config=./desktop/webpack.config.babel.js`, {
exec(`webpack-dev-server --mode development --config=./desktop/webpack.config.babel.js`, {
...info.env,
HOT: 'true',
})
Expand Down
11 changes: 5 additions & 6 deletions shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"iced-runtime": "1.0.3",
"immer": "6.0.2",
"lag-radar": "git://github.com/mobz/lag-radar",
"lodash": "4.17.15",
"lodash": "4.17.21",
"lottie-react-native": "3.3.2",
"lottie-react-web": "git://github.com/keybase/lottie-react-web#nojima/keybase-fixes-off-214",
"memoize-one": "5.1.1",
Expand All @@ -120,7 +120,7 @@
"react-native-screens": "git://github.com/keybase/react-native-screens#keybase-changes-off-alpha-23",
"react-native-unimodules": "0.7.0-rc.1",
"react-native-video": "5.0.2",
"react-native-webview": "8.0.5",
"react-native-webview": "11.6.2",
"react-navigation-stack": "git://github.com/keybase/stack#danny/marco-animated-background-plus-darkmode",
"react-navigation-tabs": "2.2.0",
"react-redux": "7.2.0",
Expand All @@ -136,7 +136,7 @@
"simple-markdown": "0.7.2",
"typedarray-to-buffer": "3.1.5",
"unidecode": "0.1.8",
"url-parse": "1.4.7",
"url-parse": "1.5.1",
"use-memo-one": "1.1.1",
"whatwg-url": "7.0.0"
},
Expand Down Expand Up @@ -230,13 +230,12 @@
"redux-logger": "3.0.6",
"rimraf": "2.6.3",
"style-loader": "1.0.0",
"terser-webpack-plugin": "2.1.0",
"terser-webpack-plugin": "2.3.8",
"tls": "git://github.com/keybase/nullModule",
"typescript": "3.9.1-rc",
"v8-android-nointl": "git://github.com/keybase/v8-android-nointl#v8.80.1",
"webpack": "4.41.0",
"webpack-cli": "3.3.9",
"webpack-dashboard": "3.2.0",
"webpack-dev-server": "3.8.1",
"webpack-merge": "4.2.2"
},
Expand Down Expand Up @@ -270,7 +269,7 @@
"**/@babel/traverse": "7.6.2",
"**/@babel/types": "7.6.1",
"**/logkitty": "0.7.1",
"**/lottie-react-web/**/lodash": "4.17.15",
"**/lottie-react-web/**/lodash": "4.17.21",
"**/lottie-react-web/**/minimatch": "3.0.4",
"**/@types/react-native": "0.62",
"**/@types/react": "16.9.27",
Expand Down

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

Loading

0 comments on commit bccaf04

Please sign in to comment.