Merge branch 'main' of github.com:margelo/expensify-app-fork into per…

…f/memoize-sidebar
Expensify · Oct 29, 2022 · e780a7e · e780a7e
2 parents 83efc2b + 62ff507
commit e780a7e
Show file tree

Hide file tree

Showing 43 changed files with 1,292 additions and 1,558 deletions.
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -42,6 +42,15 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
         path: path.resolve(__dirname, '../../dist'),
         publicPath: '/',
     },
+    stats: {
+        warningsFilter: [
+            // @react-navigation for web uses the legacy modules (related to react-native-reanimated)
+            // This results in 33 warnings with stack traces that appear during build and each time we make a change
+            // We can't do anything about the warnings, and they only get in the way, so we suppress them
+            './node_modules/@react-navigation/drawer/lib/module/views/legacy/Drawer.js',
+            './node_modules/@react-navigation/drawer/lib/module/views/legacy/Overlay.js',
+        ],
+    },
     plugins: [
         new CleanWebpackPlugin(),
         new HtmlWebpackPlugin({
@@ -110,18 +119,6 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                     new RegExp(`node_modules/(?!(${includeModules})/).*|.native.js$`),
                 ],
             },
-            {
-                test: /\.js$/,
-                loader: 'eslint-loader',
-                exclude: [
-                    /node_modules|\.native\.js$/,
-                ],
-                options: {
-                    cache: false,
-                    emitWarning: true,
-                    configFile: path.resolve(__dirname, '../../.eslintrc.js'),
-                },
-            },
 
             // Rule for react-native-web-webview
             {
@@ -178,11 +175,6 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
             'process/browser': require.resolve('process/browser'),
         },
     },
-    devServer: {
-        client: {
-            overlay: false,
-        },
-    },
 });
 
 module.exports = webpackConfig;
diff --git a/config/webpack/webpack.dev.js b/config/webpack/webpack.dev.js
@@ -2,6 +2,7 @@ const path = require('path');
 const portfinder = require('portfinder');
 const {DefinePlugin} = require('webpack');
 const {merge} = require('webpack-merge');
+const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const getCommonConfig = require('./webpack.common');
 
 const BASE_PORT = 8080;
@@ -25,14 +26,18 @@ module.exports = (env = {}) => portfinder.getPortPromise({port: BASE_PORT})
             };
 
         const baseConfig = getCommonConfig(env);
+        const speedMeasure = new SpeedMeasurePlugin();
 
-        return merge(baseConfig, {
+        const config = merge(baseConfig, {
             mode: 'development',
             devtool: 'eval-source-map',
             devServer: {
                 static: {
                     directory: path.join(__dirname, '../../dist'),
                 },
+                client: {
+                    overlay: false,
+                },
                 hot: true,
                 ...proxySettings,
                 historyApiFallback: true,
@@ -43,5 +48,16 @@ module.exports = (env = {}) => portfinder.getPortPromise({port: BASE_PORT})
                     'process.env.PORT': port,
                 }),
             ],
+            cache: {
+                type: 'filesystem',
+                name: env.platform || 'default',
+                buildDependencies: {
+                    // By default, webpack and loaders are build dependencies
+                    // This (also) makes all dependencies of this config file - build dependencies
+                    config: [__filename],
+                },
+            },
         });
+
+        return speedMeasure.wrap(config);
     });
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -4,6 +4,7 @@ description: Got a question about receipts, expenses, corporate cards, or anythi
 url: help.expensify.com
 author: Expensify
 logo: /assets/images/expensify-help.svg
+open_url: true
 
 defaults:
   - scope:

diff --git a/docs/_includes/request-money-lhn.html b/docs/_includes/request-money-lhn.html
@@ -18,16 +18,7 @@
             <!-- Add content below, more instructions in the README.md file
                 https://github.com/Expensify/App/blob/main/docs/README.md#add-a-new-entry-in-the-lhn-page
             -->
-
-            <!-- Stage title anchor -->
-            <li><a href="#request-money">Request money</a>
-                <ul>
-                    <!-- Article links -->
-                    <li><a href="/articles/request-money/SmartScan">SmartScan</a></li>
-                    <!-- More Article links here (if required)... -->
-                </ul>
-            </li>
-
+
             <!-- More Stage title anchors here... -->
         </ul>
     </li>

diff --git a/docs/_includes/send-money-lhn.html b/docs/_includes/send-money-lhn.html
@@ -12,6 +12,17 @@
             <!-- Add content below, more instructions in the README.md file
                 https://github.com/Expensify/App/blob/main/docs/README.md#add-a-new-entry-in-the-lhn-page
             -->
+
+            <!-- Stage title anchor -->
+            <li><a href="#workspaces">Workspaces</a>
+                <ul>
+                    <!-- Article links -->
+                    <li><a href="/articles/send-money/The-Free-Plan">The Free Plan</a></li>
+                    <!-- More Article links here (if required)... -->
+                </ul>
+            </li>
+
+            <!-- More Stage title anchors here... -->
         </ul>
     </li>
     <li>

diff --git a/docs/articles/request-money/SmartScan.md b/docs/articles/request-money/SmartScan.md
diff --git a/docs/hubs/request-money.html b/docs/hubs/request-money.html
@@ -14,26 +14,3 @@ <h1 class="title">
 </p>
 
 <!-- Add content below, more instructions here https://github.com/Expensify/App/blob/main/docs/README.md#add-a-new-entry-in-the-hub-page -->
-
-<!-- Stage title -->
-<h2 id="request-money">
-    Request Money
-</h2>
-
-<!-- Group of Card buttons -->
-<div class="cards-group">
-
-    <!-- Card buttons -->
-
-    <a class="card" href="/articles/request-money/SmartScan">
-        <div class="body">
-            <h3 class="title">SmartScan</h3>
-        </div>
-        <div class="right-icon">
-            <i class="fa-solid fa-angle-right icon"></i>
-        </div>
-    </a>
-
-    <!-- More Card buttons here... -->
-
-</div>
diff --git a/docs/hubs/send-money.html b/docs/hubs/send-money.html
@@ -8,7 +8,28 @@ <h1 class="title">
     Send Money page
 </h1>
 
-<!-- TODO: remove the following text, added just for testing -->
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices. Nullam sed vestibulum purus, in auctor libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas dolor metus,
-
 <!-- Add content below, more instructions here https://github.com/Expensify/App/blob/main/docs/README.md#add-a-new-entry-in-the-hub-page -->
+
+
+<!-- Stage title -->
+<h2 id="workspaces">
+    Workspaces
+</h2>
+
+<!-- Group of Card buttons -->
+<div class="cards-group">
+
+    <!-- Card buttons -->
+
+    <a class="card" href="/articles/send-money/The-Free-Plan">
+        <div class="body">
+            <h3 class="title">The Free Plan</h3>
+        </div>
+        <div class="right-icon">
+            <i class="fa-solid fa-angle-right icon"></i>
+        </div>
+    </a>
+
+    <!-- More Card buttons here... -->
+
+</div>
diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -750,7 +750,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -775,7 +775,6 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -812,7 +811,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -829,7 +828,6 @@
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
-				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

diff --git a/ios/NewExpensify.xcworkspace/contents.xcworkspacedata b/ios/NewExpensify.xcworkspace/contents.xcworkspacedata