Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
981edd9
Use Reanimated 2 for Drawer navigator
marcaaron Sep 29, 2022
a431679
Upgrade other related packages
marcaaron Sep 29, 2022
d7ad9c1
Enable modern Drawer in react-navigation
marcaaron Sep 30, 2022
7e3e110
update versions
marcaaron Sep 30, 2022
126fa16
Fix drawer navigator translate on mobile web
marcaaron Oct 3, 2022
182c7f2
Do not unmount report on navigate
marcaaron Oct 3, 2022
d759446
remove log
marcaaron Oct 3, 2022
64f9fcb
fix conflicts
marcaaron Oct 3, 2022
79b7207
Improve transition
marcaaron Oct 3, 2022
b7d7ddd
remove loader
marcaaron Oct 3, 2022
6739b75
Wait for the report in the ReportScreen to match the report in url
marcaaron Oct 3, 2022
1a9bab9
Remove logs
marcaaron Oct 3, 2022
81ede8a
Just wait for the report to be the correct one
marcaaron Oct 3, 2022
411472b
Offline some Onyx connections in HeaderView to ReportScreen
marcaaron Oct 4, 2022
b6654e6
add flipper and some temp logs
marcaaron Oct 6, 2022
c5f0ec6
fix conflicts
marcaaron Oct 6, 2022
a9ce8e6
Revert stuff
marcaaron Oct 6, 2022
70a553f
use constant and remove console.log
marcaaron Oct 6, 2022
3c422bc
use const
marcaaron Oct 6, 2022
e828558
Remove isLoading stuff
marcaaron Oct 6, 2022
1294644
remove more isloading
marcaaron Oct 6, 2022
ab38a7f
Make sure to wait for new report data
marcaaron Oct 6, 2022
5084f31
ios podfile changes
marcaaron Oct 6, 2022
0b74a4f
Merge remote-tracking branch 'origin' into marcaaron-enableNonLegacyD…
marcaaron Oct 6, 2022
660059f
upgrade onyx remove keys
marcaaron Oct 7, 2022
97820ea
Merge remote-tracking branch 'origin' into marcaaron-enableNonLegacyD…
marcaaron Oct 7, 2022
9591146
Use react-freeze
marcaaron Oct 7, 2022
f036ef9
Merge remote-tracking branch 'origin' into marcaaron-enableNonLegacyD…
marcaaron Oct 11, 2022
e3d776d
Only freeze on small screens
marcaaron Oct 11, 2022
5b8c1ca
Fix tests
marcaaron Oct 12, 2022
c5008f6
Merge remote-tracking branch 'origin' into marcaaron-enableNonLegacyD…
marcaaron Oct 13, 2022
86a9bf3
Merge remote-tracking branch 'origin' into marcaaron-enableNonLegacyD…
marcaaron Oct 13, 2022
71fe675
Use placeholder in react-freeze. remove unneeded package. make reques…
marcaaron Oct 13, 2022
4dfd52a
Add skeleton loaders
marcaaron Oct 13, 2022
cfe6b13
dry up screen wrapper
marcaaron Oct 14, 2022
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
6 changes: 6 additions & 0 deletions __mocks__/react-freeze.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const Freeze = props => props.children;

export {
// eslint-disable-next-line import/prefer-default-export
Freeze,
};
14 changes: 10 additions & 4 deletions config/webpack/webpack.common.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const path = require('path');
const {IgnorePlugin, DefinePlugin, ProvidePlugin} = require('webpack');
const {
IgnorePlugin, DefinePlugin, ProvidePlugin, EnvironmentPlugin,
} = require('webpack');
const {CleanWebpackPlugin} = require('clean-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CopyPlugin = require('copy-webpack-plugin');
Expand All @@ -18,6 +20,7 @@ const includeModules = [
'react-native-gesture-handler',
'react-native-flipper',
'react-native-google-places-autocomplete',
'@react-navigation/drawer',
].join('|');

/**
Expand All @@ -30,9 +33,10 @@ const includeModules = [
const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
mode: 'production',
devtool: 'source-map',
entry: {
app: './index.js',
},
entry: [
'babel-polyfill',
'./index.js',
],
output: {
filename: '[name]-[contenthash].bundle.js',
path: path.resolve(__dirname, '../../dist'),
Expand Down Expand Up @@ -66,12 +70,14 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
{from: 'node_modules/pdfjs-dist/cmaps/', to: 'cmaps/'},
],
}),
new EnvironmentPlugin({JEST_WORKER_ID: null}),
new IgnorePlugin({
resourceRegExp: /^\.\/locale$/,
contextRegExp: /moment$/,
}),
...(platform === 'web' ? [new CustomVersionFilePlugin()] : []),
new DefinePlugin({
...(platform === 'desktop' ? {} : {process: {env: {}}}),
__REACT_WEB_CONFIG__: JSON.stringify(
dotenv.config({path: envFile}).parsed,
),
Expand Down
16 changes: 10 additions & 6 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,12 @@ PODS:
- React-Core
- react-native-render-html (6.3.1):
- React-Core
- react-native-safe-area-context (3.4.1):
- react-native-safe-area-context (4.4.1):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React-Core
- ReactCommon/turbomodule/core
- react-native-webview (11.23.0):
- React-Core
- React-perflogger (0.70.4)
Expand Down Expand Up @@ -617,7 +621,7 @@ PODS:
- React-RCTText
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.15.0):
- RNScreens (3.17.0):
- React-Core
- React-RCTImage
- RNSVG (12.4.4):
Expand Down Expand Up @@ -916,7 +920,7 @@ SPEC CHECKSUMS:
Airship: 4657c3d5118441240e04674d9445cbd6e363c956
boost: a7c83b31436843459a1961bfd74b96033dc77234
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
FBLazyVector: 8a28262f61fbe40c04ce8677b8d835d97c18f1b3
FBReactNativeSpec: b475991eb2d8da6a4ec32d09a8df31b0247fa87d
Firebase: 629510f1a9ddb235f3a7c5c8ceb23ba887f0f814
Expand All @@ -938,7 +942,7 @@ SPEC CHECKSUMS:
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
glog: 5337263514dd6f09803962437687240c5dc39aa4
GoogleAppMeasurement: 5ba1164e3c844ba84272555e916d0a6d3d977e91
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
Expand Down Expand Up @@ -983,7 +987,7 @@ SPEC CHECKSUMS:
react-native-progress-bar-android: be43138ab7da30d51fc038bafa98e9ed594d0c40
react-native-progress-view: 4d3bbe6a099ba027b1fedb1548c2c87f74249b70
react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
react-native-webview: e771bc375f789ebfa02a26939a57dbc6fa897336
React-perflogger: 5e41b01b35d97cc1b0ea177181eb33b5c77623b6
React-RCTActionSheet: 48949f30b24200c82f3dd27847513be34e06a3ae
Expand All @@ -1010,7 +1014,7 @@ SPEC CHECKSUMS:
RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c
RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
RNReanimated: 60e291d42c77752a0f6d6f358387bdf225a87c6e
RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9
RNSVG: ecd661f380a07ba690c9c5929c475a44f432d674
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
Expand Down
Loading