From 7ac643e77d26c0d9956490a375a96bc9b5385247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Berg=C3=A9?= <berge.greg@gmail.com>
Date: Mon, 4 Dec 2017 18:00:02 +0100
Subject: [PATCH] feat: simplify webpack usage

You can now use Webpack loader using "svgr/webpack".
---
 .npmignore          |  1 +
 README.md           |  4 ++--
 package.json        |  4 ++--
 src/webpack.js      | 10 +++++++++-
 src/webpack.test.js |  2 +-
 webpack.js          |  2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.npmignore b/.npmignore
index cbbe057d..ca3de7d6 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,3 +2,4 @@
 !/lib/*.js
 !/bin/svgr
 *.test.js
+!/webpack.js
diff --git a/README.md b/README.md
index 84f07895..c73b7ce8 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,7 @@ module.exports = {
     rules: [
       {
         test: /\.svg$/,
-        use: ['babel-loader', 'svgr/lib/webpack'],
+        use: ['babel-loader', 'svgr/webpack'],
       },
     ],
   },
@@ -220,7 +220,7 @@ module.exports = {
         use: [
           'babel-loader',
           {
-            loader: 'svgr/lib/webpack',
+            loader: 'svgr/webpack',
             options: {
               svgo: false,
             },
diff --git a/package.json b/package.json
index f1ae3630..066a6d88 100644
--- a/package.json
+++ b/package.json
@@ -65,12 +65,12 @@
   },
   "scripts": {
     "build": "rm -rf lib/ && NODE_ENV=production babel src -d lib",
-    "ci": "yarn lint && yarn test",
+    "ci": "yarn lint && yarn build && yarn test",
     "format": "prettier --write \"src/**/*.js\"",
     "lint": "eslint .",
     "release": "yarn build && standard-version && conventional-github-releaser",
     "clear": "rm -rf __fixtures_build__ lib",
-    "test": "npm run clear && jest --runInBand --coverage && codecov",
+    "test": "jest --runInBand --coverage && codecov",
     "prepublishOnly": "yarn run build"
   }
 }
diff --git a/src/webpack.js b/src/webpack.js
index 78f9e949..04ddff6f 100644
--- a/src/webpack.js
+++ b/src/webpack.js
@@ -9,4 +9,12 @@ function svgrLoader(source) {
     .catch(err => callback(err))
 }
 
-export default svgrLoader
+function svgrLoaderWithWarning(source) {
+  console.warn(
+    'Using "svgr/lib/webpack" is deprecated and will be removed in v2. Please use "svgr/webpack" instead.',
+  )
+  return svgrLoader.call(this, source)
+}
+
+export { svgrLoader }
+export default svgrLoaderWithWarning
diff --git a/src/webpack.test.js b/src/webpack.test.js
index 6da1e84a..e5b52c75 100644
--- a/src/webpack.test.js
+++ b/src/webpack.test.js
@@ -36,7 +36,7 @@ describe('webpack loader', () => {
                     },
                   },
                   {
-                    loader: path.resolve(__dirname, 'webpack.js'),
+                    loader: path.resolve(__dirname, '../webpack.js'),
                     options: {
                       expandProps: false,
                     },
diff --git a/webpack.js b/webpack.js
index 67e56f54..c4b4bf23 100644
--- a/webpack.js
+++ b/webpack.js
@@ -1,2 +1,2 @@
 /* eslint-disable import/no-unresolved */
-module.exports = require('./lib/webpack')
+module.exports = require('./lib/webpack').svgrLoader