merge branch main

Expensify · Feb 7, 2023 · 5760a30 · 5760a30
2 parents 2171bce + c775563
commit 5760a30
Show file tree

Hide file tree

Showing 25 changed files with 2,080 additions and 76 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001026501
-        versionName "1.2.65-1"
+        versionCode 1001026600
+        versionName "1.2.66-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -8,6 +8,7 @@ const CopyPlugin = require('copy-webpack-plugin');
 const dotenv = require('dotenv');
 const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
 const HtmlInlineScriptPlugin = require('html-inline-script-webpack-plugin');
+const FontPreloadPlugin = require('webpack-font-preload-plugin');
 const CustomVersionFilePlugin = require('./CustomVersionFilePlugin');
 
 const includeModules = [
@@ -79,6 +80,9 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
         new HtmlInlineScriptPlugin({
             scriptMatchPattern: [/splash.+[.]js$/],
         }),
+        new FontPreloadPlugin({
+            extensions: ['woff2'],
+        }),
         new ProvidePlugin({
             process: 'process/browser',
         }),
@@ -152,22 +156,16 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
             // Rule for react-native-web-webview
             {
                 test: /postMock.html$/,
-                use: {
-                    loader: 'file-loader',
-                    options: {
-                        name: '[name].[ext]',
-                    },
+                type: 'asset',
+                generator: {
+                    filename: '[name].[ext]',
                 },
             },
 
             // Gives the ability to load local images
             {
                 test: /\.(png|jpe?g|gif)$/i,
-                use: [
-                    {
-                        loader: 'file-loader',
-                    },
-                ],
+                type: 'asset',
             },
 
             // Load svg images

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.65</string>
+	<string>1.2.66</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.65.1</string>
+	<string>1.2.66.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.65</string>
+	<string>1.2.66</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.65.1</string>
+	<string>1.2.66.0</string>
 </dict>
 </plist>