All of lint, jest and webpack are happy

bjacobel · May 14, 2024 · 11ac5e1 · 11ac5e1
1 parent 57c63b9
commit 11ac5e1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/app/babel.config.js → app/.babelrc.js b/app/babel.config.js → app/.babelrc.js
@@ -8,12 +8,7 @@ module.exports = api => ({
         modules: api.env('test') ? 'commonjs' : false,
       },
     ],
-    [
-      '@babel/preset-react',
-      {
-        runtime: 'automatic',
-      },
-    ],
+    ['@babel/preset-react', { runtime: 'automatic' }],
     '@babel/preset-typescript',
     '@wyw-in-js',
   ],

diff --git a/app/jest.config.js b/app/jest.config.js
@@ -1,3 +1,5 @@
+const path = require('path'); // eslint-disable-line
+
 const esmDependencies = ['wouter', '@micro-sentry/core', '@micro-sentry/breadcrumbs-plugin'];
 
 module.exports = {
@@ -10,5 +12,5 @@ module.exports = {
     url: 'http://localhost',
   },
   transformIgnorePatterns: [`/node_modules/(?!(${esmDependencies.join('|')}))`],
-  transform: { '\\.[jt]sx?$': ['babel-jest', { rootMode: 'upward' }] },
+  transform: { '\\.[jt]sx?$': ['babel-jest', { configFile: path.join(__dirname, '.babelrc.js') }] },
 };
diff --git a/app/webpack.config.ts b/app/webpack.config.ts
@@ -41,16 +41,13 @@ export default (env: Record<string, unknown> = {}, { mode }: { mode?: string } =
           test: /\.[jt]sx?$/,
           include: path.join(__dirname, 'src'),
           use: [
+            'babel-loader',
             {
               loader: '@wyw-in-js/webpack-loader',
               options: {
                 sourceMap: !isProd,
               },
             },
-            {
-              loader: 'babel-loader',
-              options: { root: __dirname, rootMode: 'upward' },
-            },
           ],
         },
         {