Skip to content

Commit

Permalink
Update deps: fix teams add contacts (#13777)
Browse files Browse the repository at this point in the history
* update deps

* fix redbox

* dont allow dupes in contacts

* another teams fix

* use terser instead

* update storybook. expected change from emoji mart: missive/emoji-mart@385cb8f

* android p fling bug (#13782)

* WIP

* WIP
  • Loading branch information
chrisnojima committed Sep 18, 2018
1 parent d5742aa commit 12aeecf
Show file tree
Hide file tree
Showing 10 changed files with 687 additions and 1,273 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Expand Up @@ -84,7 +84,8 @@
"standard/array-bracket-even-spacing": "off",
"standard/computed-property-even-spacing": ["error", "never"],
"standard/no-callback-literal": "off",
"standard/object-curly-even-spacing": ["error", "never"],
"object-curly-spacing": "off",
"object-curly-even-spacing": "off",
"strict": ["error", "global"],
"yield-star-spacing": "off"
}
Expand Down
2 changes: 1 addition & 1 deletion shared/.flowconfig
Expand Up @@ -89,4 +89,4 @@ untyped-import
untyped-type-import

[version]
^0.80.0
^0.81.0
2 changes: 1 addition & 1 deletion shared/actions/teams.js
Expand Up @@ -51,7 +51,7 @@ const _createNewTeam = function*(action: TeamsGen.CreateNewTeamPayload) {
Saga.put(
RouteTreeGen.createNavigateTo({
path: isMobile ? [chatTab] : [{props: {teamname}, selected: 'team'}],
parentPath: [teamsTab],
parentPath: isMobile ? [] : [teamsTab],
})
),
// Show the avatar editor on desktop.
Expand Down
6 changes: 3 additions & 3 deletions shared/desktop/webpack.config.babel.js
Expand Up @@ -3,7 +3,7 @@
* We build:
* Electron main thread / render threads for the main window and remote windows (menubar, trackers, etc)
*/
import UglifyJSPlugin from 'uglifyjs-webpack-plugin'
import TerserPlugin from 'terser-webpack-plugin'
import getenv from 'getenv'
import merge from 'webpack-merge'
import path from 'path'
Expand Down Expand Up @@ -124,11 +124,11 @@ const config = (_, {mode}) => {
: {
optimization: {
minimizer: [
new UglifyJSPlugin({
new TerserPlugin({
cache: true,
parallel: true,
sourceMap: true,
uglifyOptions: {
terserOptions: {
compress: {
inline: false, // uglify has issues inlining code and handling variables https://github.com/mishoo/UglifyJS2/issues/2842
},
Expand Down
3 changes: 0 additions & 3 deletions shared/libs/flow-interface.js.flow
Expand Up @@ -292,9 +292,6 @@ declare module 'react-navigation/src/views/CardStack/CardStackTransitioner' {
declare module 'react-navigation' {
declare module.exports: any
}
declare module 'react-virtualized' {
declare module.exports: any
}
declare module 'react-waypoint' {
declare module.exports: any
}
Expand Down
95 changes: 47 additions & 48 deletions shared/package.json
Expand Up @@ -128,12 +128,12 @@
"dependencies": {
"applescript": "1.0.0",
"base64-js": "1.3.0",
"buffer": "5.2.0",
"buffer": "5.2.1",
"core-js": "2.5.7",
"cross-env": "5.1.6",
"emoji-datasource": "4.0.4",
"emoji-datasource-apple": "4.0.4",
"emoji-mart": "2.6.1",
"cross-env": "5.2.0",
"emoji-datasource": "4.1.0",
"emoji-datasource-apple": "4.1.0",
"emoji-mart": "2.8.1",
"exif-js": "^2.3.0",
"flow-watch": "^1.1.3",
"framed-msgpack-rpc": "1.1.13",
Expand All @@ -144,47 +144,47 @@
"iced-runtime": "1.0.3",
"immutable": "git://github.com/keybase/immutable-sorted#2a5895d4a5b36e632f833aec2cc84d2ad319bf71",
"jsonfile": "^4.0.0",
"lodash-es": "4.17.10",
"lodash-es": "4.17.11",
"menubar": "5.2.3",
"mkdirp": "0.5.1",
"moment": "2.22.2",
"mousetrap": "1.6.2",
"path-parse": "1.0.5",
"path-parse": "1.0.6",
"prettier": "1.12.1",
"prop-types": "15.6.1",
"prop-types": "15.6.2",
"purepack": "1.0.4",
"qrcode-generator": "git://github.com/keybase/qrcode-generator#keybase-changes-off-140",
"re-reselect": "2.1.0",
"react": "16.5.0",
"react-dom": "16.5.0",
"react": "16.5.1",
"react-dom": "16.5.1",
"react-gateway": "3.0.0",
"react-list": "0.8.9",
"react-measure": "^2.0.0",
"react-native": "0.57.0",
"react-native-camera": "1.1.4",
"react-native-contacts": "2.2.0",
"react-list": "0.8.10",
"react-measure": "^2.1.2",
"react-native": "git://github.com/keybase/react-native#keybase-fixes-off-570",
"react-native-camera": "1.2.0",
"react-native-contacts": "2.2.3",
"react-native-image-picker": "git://github.com/keybase/react-native-image-picker#b70affdef548c355c4dc864cd72a2bc79666649e",
"react-native-mime-types": "^2.2.1",
"react-native-push-notification": "git://github.com/keybase/react-native-push-notification#keybase-fixes-off-311",
"react-navigation": "git://github.com/keybase/react-navigation#keybase-fixes-off-beta-12",
"react-redux": "5.0.7",
"react-transition-group": "2.3.1",
"react-virtualized": "9.19.1",
"react-waypoint": "^8.0.1",
"recompose": "0.27.1",
"react-transition-group": "2.4.0",
"react-waypoint": "^8.0.3",
"recompose": "0.30.0",
"redux": "4.0.0",
"redux-batched-subscribe": "0.1.6",
"redux-saga": "0.16.0",
"redux-thunk": "2.3.0",
"reselect": "3.0.1",
"rn-fetch-blob": "0.10.12",
"semver": "5.5.0",
"shallowequal": "1.0.2",
"rn-fetch-blob": "0.10.13",
"semver": "5.5.1",
"shallowequal": "1.1.0",
"terser-webpack-plugin": "^1.1.0",
"tlds": "^1.203.1",
"typedarray-to-buffer": "3.1.5",
"url-parse": "^1.4.1",
"url-parse": "^1.4.3",
"util": "0.11.0",
"uuid": "^3.2.1"
"uuid": "^3.3.2"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
Expand All @@ -196,60 +196,59 @@
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/types": "^7.0.0",
"@storybook/addons": "4.0.0-alpha.21",
"@storybook/addon-actions": "4.0.0-alpha.21",
"@storybook/addon-storyshots": "4.0.0-alpha.21",
"@storybook/addons": "4.0.0-alpha.21",
"@storybook/channels": "4.0.0-alpha.21",
"@storybook/react": "4.0.0-alpha.21",
"@storybook/react-native": "4.0.0-alpha.21",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "9.0.0",
"babel-jest": "^23.4.2",
"babel-loader": "^8.0.0",
"css-loader": "0.28.11",
"css-loader": "1.0.0",
"del": "3.0.0",
"devtron": "1.4.0",
"electron": "2.0.8",
"electron-packager": "12.1.1",
"eslint": "5.3.0",
"eslint-config-standard": "12.0.0-alpha.0",
"eslint-config-standard-jsx": "5.0.0",
"eslint-config-standard-react": "6.0.0",
"eslint-plugin-babel": "5.1.0",
"electron": "2.0.9",
"electron-packager": "12.1.2",
"eslint": "5.6.0",
"eslint-config-standard": "12.0.0",
"eslint-config-standard-jsx": "6.0.2",
"eslint-config-standard-react": "7.0.2",
"eslint-plugin-babel": "5.2.0",
"eslint-plugin-filenames": "1.3.2",
"eslint-plugin-flowtype": "2.50.0",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-node": "7.0.1",
"eslint-plugin-promise": "3.8.0",
"eslint-plugin-promise": "4.0.1",
"eslint-plugin-react": "7.11.1",
"eslint-plugin-standard": "3.1.0",
"file-loader": "1.1.11",
"flow-bin": "0.80.0",
"eslint-plugin-standard": "4.0.0",
"file-loader": "2.0.0",
"flow-bin": "0.81.0",
"flow-typed": "^2.5.1",
"fs-extra": "6.0.1",
"jest": "23.5.0",
"jsc-android": "^216113.0.0",
"fs-extra": "7.0.0",
"jest": "23.6.0",
"jest-glamor-react": "4.3.1",
"json5": "1.0.1",
"klaw-sync": "4.0.0",
"jsc-android": "^216113.0.0",
"json5": "2.0.1",
"klaw-sync": "5.0.0",
"minimist": "1.2.0",
"msgpack": "git://github.com/keybase/nullModule",
"net": "git://github.com/keybase/nullModule",
"null-loader": "0.1.1",
"pegjs": "0.10.0",
"raf": "3.4.0",
"react-hot-loader": "4.3.5",
"react-test-renderer": "16.4.2",
"react-hot-loader": "4.3.8",
"react-test-renderer": "16.5.1",
"redux-logger": "3.0.6",
"source-map-support": "0.5.9",
"style-loader": "0.21.0",
"style-loader": "0.23.0",
"tls": "git://github.com/keybase/nullModule",
"uglifyjs-webpack-plugin": "1.2.5",
"webfonts-generator": "^0.4.0",
"webpack": "4.17.1",
"webpack": "4.19.0",
"webpack-cli": "^3.1.0",
"webpack-dashboard": "2.0.0",
"webpack-dev-server": "3.1.6",
"webpack-dev-server": "3.1.8",
"webpack-merge": "4.1.4"
},
"optionalDependencies": {
Expand Down

0 comments on commit 12aeecf

Please sign in to comment.