fix(babel): fix configuration of babel module resolver with eslint

alleyinteractive · May 25, 2021 · 82c2dbc · 82c2dbc
1 parent 2678665
commit 82c2dbc
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 43 deletions.
diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const getModuleResolverOptions = require('./config/getModuleResolverOptions');
 
 module.exports = {
   extends: 'airbnb',
@@ -23,12 +24,13 @@ module.exports = {
   },
   settings: {
     'import/resolver': {
-      'babel-module': {},
+      'babel-module': getModuleResolverOptions('web'),
     },
   },
   globals: {},
   rules: {
     'import/no-extraneous-dependencies': [0],
+    'import/prefer-default-export': [0],
     'react/state-in-constructor': [1, 'never'],
   },
 };
diff --git a/packages/core/babel.config.node.js b/packages/core/babel.config.node.js
@@ -1,15 +1,9 @@
 const path = require('path');
-const fs = require('fs');
 const { getValueFromFiles } = require('./config/irving/getValueFromFiles');
-const getServiceAliases = require('./config/irving/getServiceAliases');
+const getModuleResolverOptions = require('./config/getModuleResolverOptions');
 const {
   buildContext,
 } = require('./config/paths');
-const aliases = require('./config/aliases');
-const scopeDir = path.join(__dirname, '../');
-const packageDirs = fs.readdirSync(scopeDir);
-const packageRoots = ! packageDirs.length ? [] :
-  packageDirs.map((dir) => path.join(scopeDir, dir));
 const shimPath = path.join(
   buildContext,
   'node_modules/@irvingjs/core/utils/shimDom'
@@ -19,17 +13,7 @@ const config = {
   plugins: [
     [
       'module-resolver',
-      {
-        root: [
-          buildContext,
-          ...packageRoots,
-        ],
-        cwd: 'packagejson',
-        alias: {
-          ...getServiceAliases('node'),
-          ...aliases,
-        },
-      },
+      getModuleResolverOptions('node'),
     ],
     ['transform-globals', {
       require: {

diff --git a/packages/core/babel.config.web.js b/packages/core/babel.config.web.js
@@ -1,15 +1,6 @@
-const path = require('path');
-const fs = require('fs');
 const { getValueFromFiles } = require('./config/irving/getValueFromFiles');
-const getServiceAliases = require('./config/irving/getServiceAliases');
-const {
-  buildContext,
-} = require('./config/paths');
-const aliases = require('./config/aliases');
-const scopeDir = path.join(__dirname, '../');
-const packageDirs = fs.readdirSync(scopeDir);
-const packageRoots = ! packageDirs.length ? [] :
-  packageDirs.map((dir) => path.join(scopeDir, dir));
+const { buildContext } = require('./config/paths');
+const getModuleResolverOptions = require('./config/getModuleResolverOptions');
 
 const config = (api) => {
   api.cache.using(() => process.env.NODE_ENV);
@@ -18,17 +9,7 @@ const config = (api) => {
     plugins: [
       [
         'module-resolver',
-        {
-          root: [
-            buildContext,
-            ...packageRoots,
-          ],
-          cwd: 'packagejson',
-          alias: {
-            ...getServiceAliases('web'),
-            ...aliases,
-          },
-        },
+        getModuleResolverOptions('web'),
       ],
       [
         'react-remove-properties',

diff --git a/packages/core/config/getModuleResolverOptions.js b/packages/core/config/getModuleResolverOptions.js
@@ -0,0 +1,21 @@
+const path = require('path');
+const fs = require('fs');
+const { buildContext } = require('./paths');
+const getServiceAliases = require('./irving/getServiceAliases');
+const aliases = require('./aliases');
+const scopeDir = path.join(__dirname, '../../');
+const packageDirs = fs.readdirSync(scopeDir);
+const packageRoots = ! packageDirs.length ? [] :
+  packageDirs.map((dir) => path.join(scopeDir, dir));
+
+module.exports = (target) => ({
+  root: [
+    buildContext,
+    ...packageRoots,
+  ],
+  cwd: 'packagejson',
+  alias: {
+    ...getServiceAliases(target),
+    ...aliases,
+  },
+});
diff --git a/packages/wordpress/config/webpack.config.multi.js b/packages/wordpress/config/webpack.config.multi.js
@@ -41,7 +41,7 @@ module.exports = (multiConfig) => {
     {
       name: 'editor',
       entry: {
-        blockEditor: path.join(__dirname, '../blockEditor.js'),
+        blockEditor: path.join(__dirname, '../blockEditor.jsx'),
       },
       mode: 'production',
       devtool: 'source-map',
@@ -62,13 +62,14 @@ module.exports = (multiConfig) => {
 
       resolve: {
         alias: aliases,
+        extensions: ['.js', '.jsx', '.json'],
       },
 
       // Loaders
       module: {
         rules: [
           {
-            test: /\.js$/,
+            test: /\.jsx?$/,
             include: (filepath) => (
               (
                 (