Move fonts into folders, update webpack and native configs.

orshikh-dev · Dec 15, 2022 · 525b99f · 525b99f
1 parent 67072a8
commit 525b99f
Show file tree

Hide file tree

Showing 24 changed files with 3 additions and 3 deletions.
diff --git a/assets/fonts/ExpensifyMono-Bold.otf → assets/fonts/native/ExpensifyMono-Bold.otf b/assets/fonts/ExpensifyMono-Bold.otf → assets/fonts/native/ExpensifyMono-Bold.otf
diff --git a/assets/fonts/ExpensifyMono-Regular.otf → ...ts/fonts/native/ExpensifyMono-Regular.otf b/assets/fonts/ExpensifyMono-Regular.otf → ...ts/fonts/native/ExpensifyMono-Regular.otf
diff --git a/assets/fonts/ExpensifyNeue-Bold.otf → assets/fonts/native/ExpensifyNeue-Bold.otf b/assets/fonts/ExpensifyNeue-Bold.otf → assets/fonts/native/ExpensifyNeue-Bold.otf
diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.otf → ...fonts/native/ExpensifyNeue-BoldItalic.otf b/assets/fonts/ExpensifyNeue-BoldItalic.otf → ...fonts/native/ExpensifyNeue-BoldItalic.otf
diff --git a/assets/fonts/ExpensifyNeue-Italic.otf → assets/fonts/native/ExpensifyNeue-Italic.otf b/assets/fonts/ExpensifyNeue-Italic.otf → assets/fonts/native/ExpensifyNeue-Italic.otf
diff --git a/assets/fonts/ExpensifyNeue-Regular.otf → ...ts/fonts/native/ExpensifyNeue-Regular.otf b/assets/fonts/ExpensifyNeue-Regular.otf → ...ts/fonts/native/ExpensifyNeue-Regular.otf
diff --git a/assets/fonts/ExpensifyNewKansas-Medium.otf → ...onts/native/ExpensifyNewKansas-Medium.otf b/assets/fonts/ExpensifyNewKansas-Medium.otf → ...onts/native/ExpensifyNewKansas-Medium.otf
diff --git a/...fonts/ExpensifyNewKansas-MediumItalic.otf → ...ative/ExpensifyNewKansas-MediumItalic.otf b/...fonts/ExpensifyNewKansas-MediumItalic.otf → ...ative/ExpensifyNewKansas-MediumItalic.otf
diff --git a/assets/fonts/ExpensifyMono-Bold.woff → assets/fonts/web/ExpensifyMono-Bold.woff b/assets/fonts/ExpensifyMono-Bold.woff → assets/fonts/web/ExpensifyMono-Bold.woff
diff --git a/assets/fonts/ExpensifyMono-Bold.woff2 → assets/fonts/web/ExpensifyMono-Bold.woff2 b/assets/fonts/ExpensifyMono-Bold.woff2 → assets/fonts/web/ExpensifyMono-Bold.woff2
diff --git a/assets/fonts/ExpensifyMono-Regular.woff → assets/fonts/web/ExpensifyMono-Regular.woff b/assets/fonts/ExpensifyMono-Regular.woff → assets/fonts/web/ExpensifyMono-Regular.woff
diff --git a/assets/fonts/ExpensifyMono-Regular.woff2 → assets/fonts/web/ExpensifyMono-Regular.woff2 b/assets/fonts/ExpensifyMono-Regular.woff2 → assets/fonts/web/ExpensifyMono-Regular.woff2
diff --git a/assets/fonts/ExpensifyNeue-Bold.woff → assets/fonts/web/ExpensifyNeue-Bold.woff b/assets/fonts/ExpensifyNeue-Bold.woff → assets/fonts/web/ExpensifyNeue-Bold.woff
diff --git a/assets/fonts/ExpensifyNeue-Bold.woff2 → assets/fonts/web/ExpensifyNeue-Bold.woff2 b/assets/fonts/ExpensifyNeue-Bold.woff2 → assets/fonts/web/ExpensifyNeue-Bold.woff2
diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.woff → ...s/fonts/web/ExpensifyNeue-BoldItalic.woff b/assets/fonts/ExpensifyNeue-BoldItalic.woff → ...s/fonts/web/ExpensifyNeue-BoldItalic.woff
diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.woff2 → .../fonts/web/ExpensifyNeue-BoldItalic.woff2 b/assets/fonts/ExpensifyNeue-BoldItalic.woff2 → .../fonts/web/ExpensifyNeue-BoldItalic.woff2
diff --git a/assets/fonts/ExpensifyNeue-Italic.woff → assets/fonts/web/ExpensifyNeue-Italic.woff b/assets/fonts/ExpensifyNeue-Italic.woff → assets/fonts/web/ExpensifyNeue-Italic.woff
diff --git a/assets/fonts/ExpensifyNeue-Italic.woff2 → assets/fonts/web/ExpensifyNeue-Italic.woff2 b/assets/fonts/ExpensifyNeue-Italic.woff2 → assets/fonts/web/ExpensifyNeue-Italic.woff2
diff --git a/assets/fonts/ExpensifyNeue-Regular.woff → assets/fonts/web/ExpensifyNeue-Regular.woff b/assets/fonts/ExpensifyNeue-Regular.woff → assets/fonts/web/ExpensifyNeue-Regular.woff
diff --git a/assets/fonts/ExpensifyNeue-Regular.woff2 → assets/fonts/web/ExpensifyNeue-Regular.woff2 b/assets/fonts/ExpensifyNeue-Regular.woff2 → assets/fonts/web/ExpensifyNeue-Regular.woff2
diff --git a/assets/fonts/web/ExpensifyNewKansas-Medium.otf b/assets/fonts/web/ExpensifyNewKansas-Medium.otf
diff --git a/assets/fonts/web/ExpensifyNewKansas-MediumItalic.otf b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.otf
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -90,7 +90,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                 {from: 'web/favicon-unread.png'},
                 {from: 'web/og-preview-image.png'},
                 {from: 'assets/css', to: 'css'},
-                {from: 'assets/fonts', to: 'fonts'},
+                {from: 'assets/fonts/web', to: 'fonts'},
                 {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},
                 {from: 'assets/images/shadow.png', to: 'images/shadow.png'},
                 {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association', toType: 'file'},
@@ -189,7 +189,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                 use: ['style-loader', 'css-loader'],
             },
             {
-                test: /\.(woff|woff2)$/i,
+                test: /\.(woff|woff2|otf)$/i,
                 type: 'asset',
             },
             {

diff --git a/react-native.config.js b/react-native.config.js
@@ -3,5 +3,5 @@ module.exports = {
         ios: {},
         android: {},
     },
-    assets: ['./assets/fonts/'],
+    assets: ['./assets/fonts/native'],
 };