Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redo fix deps #13837

Merged
merged 3 commits into from
Sep 21, 2018
+297 −260
Merged

Redo fix deps #13837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aaa2b6
WIP
chrisnojima Sep 19, 2018
054b50e
WIP
chrisnojima Sep 19, 2018
08898d9
roll react back 16.5.0
chrisnojima Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 53 additions & 53 deletions shared/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,16 @@
"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",
"exif-js": "2.3.0",
"flow-watch": "1.1.3",
"framed-msgpack-rpc": "1.1.13",
"getenv": "0.7.0",
"glamor": "2.20.40",
"glamorous": "4.13.1",
"glamorous-native": "1.4.0",
"iced-runtime": "1.0.3",
"immutable": "git://github.com/keybase/immutable-sorted#2a5895d4a5b36e632f833aec2cc84d2ad319bf71",
"jsonfile": "^4.0.0",
"jsonfile": "4.0.0",
"lodash-es": "4.17.11",
"menubar": "5.2.3",
"mkdirp": "0.5.1",
Expand All @@ -155,21 +155,21 @@
"purepack": "1.0.4",
"qrcode-generator": "git://github.com/keybase/qrcode-generator#keybase-changes-off-140",
"re-reselect": "2.1.0",
"react": "16.5.1",
"react-dom": "16.5.1",
"react": "16.5.0",
"react-dom": "16.5.0",
"react-gateway": "3.0.0",
"react-list": "0.8.10",
"react-measure": "^2.1.2",
"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-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.4.0",
"react-waypoint": "^8.0.3",
"react-waypoint": "8.0.3",
"recompose": "0.30.0",
"redux": "4.0.0",
"redux-batched-subscribe": "0.1.6",
Expand All @@ -179,23 +179,23 @@
"rn-fetch-blob": "0.10.13",
"semver": "5.5.1",
"shallowequal": "1.1.0",
"terser-webpack-plugin": "^1.1.0",
"tlds": "^1.203.1",
"terser-webpack-plugin": "1.1.0",
"tlds": "1.203.1",
"typedarray-to-buffer": "3.1.5",
"url-parse": "^1.4.3",
"url-parse": "1.4.3",
"util": "0.11.0",
"uuid": "^3.3.2"
"uuid": "3.3.2"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/node": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-transform-flow-strip-types": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/types": "^7.0.0",
"@babel/cli": "7.1.0",
"@babel/core": "7.1.0",
"@babel/node": "7.0.0",
"@babel/plugin-proposal-class-properties": "7.1.0",
"@babel/plugin-proposal-object-rest-spread": "7.0.0",
"@babel/plugin-transform-flow-strip-types": "7.0.0",
"@babel/preset-env": "7.1.0",
"@babel/preset-react": "7.0.0",
"@babel/types": "7.0.0",
"@storybook/addon-actions": "4.0.0-alpha.21",
"@storybook/addon-storyshots": "4.0.0-alpha.21",
"@storybook/addons": "4.0.0-alpha.21",
Expand All @@ -204,8 +204,8 @@
"@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",
"babel-jest": "23.6.0",
"babel-loader": "8.0.2",
"css-loader": "1.0.0",
"del": "3.0.0",
"devtron": "1.4.0",
Expand All @@ -217,19 +217,19 @@
"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-flowtype": "2.50.1",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-node": "7.0.1",
"eslint-plugin-promise": "4.0.1",
"eslint-plugin-react": "7.11.1",
"eslint-plugin-standard": "4.0.0",
"file-loader": "2.0.0",
"flow-bin": "0.81.0",
"flow-typed": "^2.5.1",
"flow-typed": "2.5.1",
"fs-extra": "7.0.0",
"jest": "23.6.0",
"jest-glamor-react": "4.3.1",
"jsc-android": "^216113.0.0",
"jsc-android": "216113.0.0",
"json5": "2.0.1",
"klaw-sync": "5.0.0",
"minimist": "1.2.0",
Expand All @@ -239,14 +239,14 @@
"pegjs": "0.10.0",
"raf": "3.4.0",
"react-hot-loader": "4.3.8",
"react-test-renderer": "16.5.1",
"react-test-renderer": "16.5.0",
"redux-logger": "3.0.6",
"source-map-support": "0.5.9",
"style-loader": "0.23.0",
"tls": "git://github.com/keybase/nullModule",
"webfonts-generator": "^0.4.0",
"webpack": "4.19.0",
"webpack-cli": "^3.1.0",
"webfonts-generator": "0.4.0",
"webpack": "4.19.1",
"webpack-cli": "3.1.0",
"webpack-dashboard": "2.0.0",
"webpack-dev-server": "3.1.8",
"webpack-merge": "4.1.4"
Expand All @@ -257,32 +257,32 @@
},
"resolutions": {
"**/@babel/code-frame": "7.0.0",
"**/@babel/core": "7.0.0",
"**/@babel/core": "7.1.0",
"**/@babel/generator": "7.0.0",
"**/@babel/helper-annotate-as-pure": "7.0.0",
"**/@babel/helper-builder-binary-assignment-operator-visitor": "7.0.0",
"**/@babel/helper-builder-binary-assignment-operator-visitor": "7.1.0",
"**/@babel/helper-builder-react-jsx": "7.0.0",
"**/@babel/helper-call-delegate": "7.0.0",
"**/@babel/helper-define-map": "7.0.0",
"**/@babel/helper-explode-assignable-expression": "7.0.0",
"**/@babel/helper-function-name": "7.0.0",
"**/@babel/helper-call-delegate": "7.1.0",
"**/@babel/helper-define-map": "7.1.0",
"**/@babel/helper-explode-assignable-expression": "7.1.0",
"**/@babel/helper-function-name": "7.1.0",
"**/@babel/helper-get-function-arity": "7.0.0",
"**/@babel/helper-hoist-variables": "7.0.0",
"**/@babel/helper-member-expression-to-functions": "7.0.0",
"**/@babel/helper-module-imports": "7.0.0",
"**/@babel/helper-module-transforms": "7.0.0",
"**/@babel/helper-module-transforms": "7.1.0",
"**/@babel/helper-optimise-call-expression": "7.0.0",
"**/@babel/helper-plugin-utils": "7.0.0",
"**/@babel/helper-regex": "7.0.0",
"**/@babel/helper-remap-async-to-generator": "7.0.0",
"**/@babel/helper-replace-supers": "7.0.0",
"**/@babel/helper-simple-access": "7.0.0",
"**/@babel/helper-remap-async-to-generator": "7.1.0",
"**/@babel/helper-replace-supers": "7.1.0",
"**/@babel/helper-simple-access": "7.1.0",
"**/@babel/helper-split-export-declaration": "7.0.0",
"**/@babel/helper-wrap-function": "7.0.0",
"**/@babel/helpers": "7.0.0",
"**/@babel/parser": "7.0.0",
"**/@babel/helper-wrap-function": "7.1.0",
"**/@babel/helpers": "7.1.0",
"**/@babel/parser": "7.1.0",
"**/@babel/plugin-external-helpers": "7.0.0",
"**/@babel/plugin-proposal-class-properties": "7.0.0",
"**/@babel/plugin-proposal-class-properties": "7.1.0",
"**/@babel/plugin-proposal-nullish-coalescing-operator": "7.0.0",
"**/@babel/plugin-proposal-object-rest-spread": "7.0.0",
"**/@babel/plugin-proposal-optional-catch-binding": "7.0.0",
Expand All @@ -297,19 +297,19 @@
"**/@babel/plugin-syntax-optional-chaining": "7.0.0",
"**/@babel/plugin-syntax-typescript": "7.0.0",
"**/@babel/plugin-transform-arrow-functions": "7.0.0",
"**/@babel/plugin-transform-async-to-generator": "7.0.0",
"**/@babel/plugin-transform-async-to-generator": "7.1.0",
"**/@babel/plugin-transform-block-scoping": "7.0.0",
"**/@babel/plugin-transform-classes": "7.0.0",
"**/@babel/plugin-transform-classes": "7.1.0",
"**/@babel/plugin-transform-computed-properties": "7.0.0",
"**/@babel/plugin-transform-destructuring": "7.0.0",
"**/@babel/plugin-transform-exponentiation-operator": "7.0.0",
"**/@babel/plugin-transform-exponentiation-operator": "7.1.0",
"**/@babel/plugin-transform-flow-strip-types": "7.0.0",
"**/@babel/plugin-transform-for-of": "7.0.0",
"**/@babel/plugin-transform-function-name": "7.0.0",
"**/@babel/plugin-transform-function-name": "7.1.0",
"**/@babel/plugin-transform-literals": "7.0.0",
"**/@babel/plugin-transform-modules-commonjs": "7.0.0",
"**/@babel/plugin-transform-modules-commonjs": "7.1.0",
"**/@babel/plugin-transform-object-assign": "7.0.0",
"**/@babel/plugin-transform-parameters": "7.0.0",
"**/@babel/plugin-transform-parameters": "7.1.0",
"**/@babel/plugin-transform-react-display-name": "7.0.0",
"**/@babel/plugin-transform-react-jsx": "7.0.0",
"**/@babel/plugin-transform-react-jsx-source": "7.0.0",
Expand All @@ -318,11 +318,11 @@
"**/@babel/plugin-transform-spread": "7.0.0",
"**/@babel/plugin-transform-sticky-regex": "7.0.0",
"**/@babel/plugin-transform-template-literals": "7.0.0",
"**/@babel/plugin-transform-typescript": "7.0.0",
"**/@babel/plugin-transform-typescript": "7.1.0",
"**/@babel/plugin-transform-unicode-regex": "7.0.0",
"**/@babel/register": "7.0.0",
"**/@babel/template": "7.0.0",
"**/@babel/traverse": "7.0.0",
"**/@babel/template": "7.1.0",
"**/@babel/traverse": "7.1.0",
"**/@babel/types": "7.0.0",
"babel-core": "7.0.0-bridge.0"
}
Expand Down
10 changes: 3 additions & 7 deletions shared/react-native/ios/Keybase.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
A969A40A1CF65C9C00F273F2 /* LogSend.m in Sources */ = {isa = PBXBuildFile; fileRef = A969A4091CF65C9C00F273F2 /* LogSend.m */; };
A9BB30DF1E6A274900E713E5 /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BB30C51E6A273A00E713E5 /* libRCTCameraRoll.a */; };
C3A47BFE1E8B148A00974A63 /* keybasemessage.wav in Resources */ = {isa = PBXBuildFile; fileRef = C3A47BFD1E8B148A00974A63 /* keybasemessage.wav */; };
C9F3BE08C6BB407385237F20 /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45B8357E4AAA4F5F8AD11213 /* libRNCamera.a */; };
DB0846051BA75DC800F54960 /* keybase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB0846041BA75DC800F54960 /* keybase.framework */; };
DB27DE571D747A6C003DE8BC /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = DB27DE561D747A6C003DE8BC /* Utils.m */; };
DB2BD1E51DE7D9A600BB7989 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DB2BD1961DE7D96200BB7989 /* libRCTActionSheet.a */; };
Expand All @@ -52,6 +51,7 @@
DB75391D1D776CC400AFA61B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DBDCF3081B8D03DD00BA95D8 /* Images.xcassets */; };
DB7539351D777E7100AFA61B /* Engine-Test.m in Sources */ = {isa = PBXBuildFile; fileRef = DB7539341D777E7100AFA61B /* Engine-Test.m */; };
DB7539371D777E8400AFA61B /* LogSend-Test.m in Sources */ = {isa = PBXBuildFile; fileRef = DB7539361D777E8400AFA61B /* LogSend-Test.m */; };
DB788EF32152F47400699A23 /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 374A785F2108C2000053E19E /* libRNCamera.a */; };
DBBCC6131D9C4A8100312652 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DBBCC6121D9C4A8100312652 /* AppDelegate.m */; };
DBBCC6181D9C5C6A00312652 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DBBCC6171D9C5C6A00312652 /* main.m */; };
DBCE36251B90F14800ECADDE /* Engine.m in Sources */ = {isa = PBXBuildFile; fileRef = DBCE36241B90F14800ECADDE /* Engine.m */; };
Expand Down Expand Up @@ -450,14 +450,12 @@
3791A87220C71DAA001C2E86 /* PushPrompt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PushPrompt.h; sourceTree = "<group>"; };
3791A8A020C71DC0001C2E86 /* PushPrompt.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PushPrompt.m; sourceTree = "<group>"; };
3791A8A220C71FE6001C2E86 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
45B8357E4AAA4F5F8AD11213 /* libRNCamera.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCamera.a; sourceTree = "<group>"; };
6266E16BBFF8461CAF2DDCB9 /* RCTContacts.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTContacts.xcodeproj; path = "../../node_modules/react-native-contacts/ios/RCTContacts.xcodeproj"; sourceTree = "<group>"; };
A90CD4A61FCE1D0A00F97901 /* NativeLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NativeLogger.m; sourceTree = "<group>"; };
A90CD4A71FCE1D0A00F97901 /* NativeLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeLogger.h; sourceTree = "<group>"; };
A969A4091CF65C9C00F273F2 /* LogSend.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogSend.m; sourceTree = "<group>"; };
A969A4161CF65CB200F273F2 /* LogSend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LogSend.h; sourceTree = "<group>"; };
A9BB30BC1E6A273A00E713E5 /* RCTCameraRoll.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTCameraRoll.xcodeproj; path = "../../node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj"; sourceTree = "<group>"; };
B77D36F6B3B04107BB7524A1 /* libRCTWKWebView.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTWKWebView.a; sourceTree = "<group>"; };
C3A47BFD1E8B148A00974A63 /* keybasemessage.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = keybasemessage.wav; path = ../../../sounds/keybasemessage.wav; sourceTree = "<group>"; };
C57EB246A82A498E96C1AD22 /* RNCamera.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCamera.xcodeproj; path = "../../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = "<group>"; };
DB0500F31F10114D000B54AD /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -525,6 +523,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DB788EF32152F47400699A23 /* libRNCamera.a in Frameworks */,
DB5E9BB2212A0CAC00F903B3 /* libRNFetchBlob.a in Frameworks */,
3791A8A320C71FE6001C2E86 /* UserNotifications.framework in Frameworks */,
DB61D78F201BA2BD0008C059 /* libRCTWebSocket.a in Frameworks */,
Expand All @@ -542,7 +541,6 @@
DB2BD1EF1DE7D9A600BB7989 /* libReact.a in Frameworks */,
DB0846051BA75DC800F54960 /* keybase.framework in Frameworks */,
A9BB30DF1E6A274900E713E5 /* libRCTCameraRoll.a in Frameworks */,
C9F3BE08C6BB407385237F20 /* libRNCamera.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -717,8 +715,6 @@
DB090F7F1F719A2F007E4E1B /* Recovered References */ = {
isa = PBXGroup;
children = (
B77D36F6B3B04107BB7524A1 /* libRCTWKWebView.a */,
45B8357E4AAA4F5F8AD11213 /* libRNCamera.a */,
);
name = "Recovered References";
sourceTree = "<group>";
Expand Down Expand Up @@ -1526,7 +1522,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# uncomment this if you want to skip bundling\n# export SKIP_BUNDLING=1\nexport BABEL_PLATFORM=ReactNative\n../../node_modules/react-native/scripts/react-native-xcode.sh";
shellScript = "# uncomment this if you want to skip bundling\n# export SKIP_BUNDLING=1\nexport BABEL_PLATFORM=ReactNative\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
};
DB75391E1D776CC400AFA61B /* Bundle React Native code and images */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
Loading