Merge pull request Expensify#32548 from software-mansion-labs/@szymcz…

…ak/change-webpack-config [NoQA] change webpack config and rename .web files to .website files
software-mansion-labs · Dec 7, 2023 · 10727a7 · 10727a7
2 parents b0268fa + cd7ba79
commit 10727a7
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -211,7 +211,21 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
         // This is also why we have to use .website.js for our own web-specific files...
         // Because desktop also relies on "web-specific" module implementations
         // This also skips packing web only dependencies to desktop and vice versa
-        extensions: ['.web.js', platform === 'web' ? '.website.js' : '.desktop.js', '.js', '.jsx', '.web.ts', platform === 'web' ? '.website.ts' : '.desktop.ts', '.ts', '.web.tsx', '.tsx'],
+        extensions: [
+            '.web.js',
+            ...(platform === 'desktop' ? ['.desktop.js'] : []),
+            '.website.js',
+            '.js',
+            '.jsx',
+            '.web.ts',
+            ...(platform === 'desktop' ? ['.desktop.ts'] : []),
+            '.website.ts',
+            ...(platform === 'desktop' ? ['.desktop.tsx'] : []),
+            '.website.tsx',
+            '.ts',
+            '.web.tsx',
+            '.tsx',
+        ],
         fallback: {
             'process/browser': require.resolve('process/browser'),
         },

diff --git a/src/components/MapView/Direction.web.tsx → src/components/MapView/Direction.website.tsx b/src/components/MapView/Direction.web.tsx → src/components/MapView/Direction.website.tsx
diff --git a/src/components/MapView/MapView.web.tsx → src/components/MapView/MapView.website.tsx b/src/components/MapView/MapView.web.tsx → src/components/MapView/MapView.website.tsx
diff --git a/...ailsTooltip/BaseUserDetailsTooltip.web.js → ...Tooltip/BaseUserDetailsTooltip.website.js b/...ailsTooltip/BaseUserDetailsTooltip.web.js → ...Tooltip/BaseUserDetailsTooltip.website.js
diff --git a/src/libs/Browser/index.web.ts → src/libs/Browser/index.website.ts b/src/libs/Browser/index.web.ts → src/libs/Browser/index.website.ts
diff --git a/src/libs/StatusBar/index.web.ts → src/libs/StatusBar/index.website.ts b/src/libs/StatusBar/index.web.ts → src/libs/StatusBar/index.website.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -47,5 +47,5 @@
         }
     },
     "exclude": ["**/node_modules/*", "**/dist/*", ".github/actions/**/index.js", "**/docs/*"],
-    "include": ["src", "desktop", "web", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*"]
+    "include": ["src", "desktop", "web", "website", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*"]
 }