Merge pull request #25 from smooth-code/webpack-usage

feat: simplify webpack usage

.npmignore

@@ -2,3 +2,4 @@
 !/lib/*.js
 !/bin/svgr
 *.test.js
+!/webpack.js

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,
             },

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"
   }
 }

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

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,
                     },

webpack.js

@@ -1,2 +1,2 @@
 /* eslint-disable import/no-unresolved */
-module.exports = require('./lib/webpack')
+module.exports = require('./lib/webpack').svgrLoader