for #950, remove @babel/core from devDependencies (so it's only in de…

…pendencies) and change babel-loader config to use .babelrc
processing · May 21, 2019 · a92f28a · a92f28a
1 parent c15b401
commit a92f28a
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 50 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,7 +38,6 @@
     "url": "git+https://github.com/catarak/p5.js-web-editor.git"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-decorators": "^7.0.0",
     "@babel/plugin-proposal-do-expressions": "^7.0.0",

diff --git a/webpack/config.dev.js b/webpack/config.dev.js
@@ -120,12 +120,9 @@ module.exports = [{
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        query: {
-          presets: [
-            '@babel/preset-react',
-            '@babel/preset-env'
-          ]
-        },
+        options: {
+          babelrc: true
+        }
       }
     ],
   },

diff --git a/webpack/config.examples.js b/webpack/config.examples.js
@@ -27,12 +27,9 @@ module.exports = [{
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        query: {
-          presets: [
-            '@babel/preset-react',
-            '@babel/preset-env'
-          ]
-        },
+        options: {
+          babelrc: true
+        }
       }
     ],
   },
@@ -63,12 +60,9 @@ module.exports = [{
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        query: {
-          presets: [
-            '@babel/preset-react',
-            '@babel/preset-env'
-          ]
-        },
+        options: {
+          babelrc: true
+        }
       }
     ],
   },
@@ -99,12 +93,9 @@ module.exports = [{
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        query: {
-          presets: [
-            '@babel/preset-react',
-            '@babel/preset-env'
-          ]
-        },
+        options: {
+          babelrc: true
+        }
       }
     ],
   },

diff --git a/webpack/config.prod.js b/webpack/config.prod.js
@@ -167,7 +167,10 @@ module.exports = [{
       {
         test: /\.jsx?$/,
         exclude: /node_modules/,
-        loader: 'babel-loader'
+        loader: 'babel-loader',
+        options: {
+          babelrc: true
+        }
       }
     ]
   },

diff --git a/webpack/config.server.js b/webpack/config.server.js
@@ -33,12 +33,9 @@ module.exports = {
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        query: {
-          presets: [
-            '@babel/preset-react',
-            '@babel/preset-env'
-          ]
-        },
+        options: {
+          babelrc: true
+        }
       }, {
         test: /\.json$/,
         loader: 'json-loader',