feat: support file-loader v5

gregberge · gregberge · commit 7f258ab3cfec · 2019-12-18T17:07:00.000+01:00
Fixes #367
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "codecov": "^3.5.0",
     "conventional-github-releaser": "^3.1.3",
     "eslint": "^6.0.1",
-    "eslint-config-airbnb": "^17.1.0",
+    "eslint-config-airbnb": "^18.0.1",
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-import": "^2.17.3",
     "eslint-plugin-jsx-a11y": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -31,8 +31,8 @@
     "@svgr/plugin-prettier": "^4.3.2",
     "@svgr/plugin-svgo": "^4.3.1",
     "camelcase": "^5.3.1",
-    "chalk": "^2.4.2",
-    "commander": "^2.20.0",
+    "chalk": "^3.0.0",
+    "commander": "^4.0.1",
     "dashify": "^2.0.0",
     "glob": "^7.1.4",
     "output-file-sync": "^2.0.1",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -27,6 +27,6 @@
   "dependencies": {
     "@svgr/plugin-jsx": "^4.3.3",
     "camelcase": "^5.3.1",
-    "cosmiconfig": "^5.2.1"
+    "cosmiconfig": "^6.0.0"
   }
 }
diff --git a/packages/core/src/config.js b/packages/core/src/config.js
@@ -1,4 +1,4 @@
-import cosmiconfig from 'cosmiconfig'
+import { cosmiconfig, cosmiconfigSync } from 'cosmiconfig'
 
 export const DEFAULT_CONFIG = {
   h2xConfig: null,
@@ -25,6 +25,12 @@ const explorer = cosmiconfig('svgr', {
   rcExtensions: true,
 })
 
+const explorerSync = cosmiconfigSync('svgr', {
+  sync: true,
+  cache: true,
+  rcExtensions: true,
+})
+
 export async function resolveConfig(searchFrom, configFile) {
   if (configFile == null) {
     const result = await explorer.search(searchFrom)
@@ -36,10 +42,10 @@ export async function resolveConfig(searchFrom, configFile) {
 
 resolveConfig.sync = (searchFrom, configFile) => {
   if (configFile == null) {
-    const result = explorer.searchSync(searchFrom)
+    const result = explorerSync.search(searchFrom)
     return result ? result.config : null
   }
-  const result = explorer.loadSync(configFile)
+  const result = explorerSync.load(configFile)
   return result ? result.config : null
 }
 
@@ -49,7 +55,7 @@ export async function resolveConfigFile(filePath) {
 }
 
 resolveConfigFile.sync = filePath => {
-  const result = explorer.searchSync(filePath)
+  const result = explorerSync.search(filePath)
   return result ? result.filepath : null
 }
 
diff --git a/packages/parcel-plugin-svgr/package.json b/packages/parcel-plugin-svgr/package.json
@@ -28,10 +28,10 @@
     "parcel-bundler": "^1.10.0"
   },
   "dependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-transform-react-constant-elements": "^7.0.0",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/core": "^7.7.5",
+    "@babel/plugin-transform-react-constant-elements": "^7.7.4",
+    "@babel/preset-env": "^7.7.6",
+    "@babel/preset-react": "^7.7.4",
     "@svgr/core": "^4.3.3",
     "@svgr/plugin-jsx": "^4.3.3",
     "@svgr/plugin-svgo": "^4.3.1"
diff --git a/packages/plugin-jsx/package.json b/packages/plugin-jsx/package.json
@@ -21,9 +21,9 @@
     "prepublishOnly": "yarn run build"
   },
   "dependencies": {
-    "@babel/core": "^7.4.5",
+    "@babel/core": "^7.7.5",
     "@svgr/babel-preset": "^4.3.3",
     "@svgr/hast-util-to-babel-ast": "^4.3.2",
-    "svg-parser": "^2.0.0"
+    "svg-parser": "^2.0.2"
   }
 }
diff --git a/packages/plugin-svgo/package.json b/packages/plugin-svgo/package.json
@@ -21,7 +21,7 @@
     "prepublishOnly": "yarn run build"
   },
   "dependencies": {
-    "cosmiconfig": "^5.2.1",
+    "cosmiconfig": "^6.0.0",
     "merge-deep": "^3.0.2",
     "svgo": "^1.2.2"
   }
diff --git a/packages/plugin-svgo/src/index.js b/packages/plugin-svgo/src/index.js
@@ -1,9 +1,9 @@
 /* eslint-disable no-underscore-dangle */
 import SVGO from 'svgo'
-import cosmiconfig from 'cosmiconfig'
+import { cosmiconfigSync } from 'cosmiconfig'
 import mergeDeep from 'merge-deep'
 
-const explorer = cosmiconfig('svgo', {
+const explorer = cosmiconfigSync('svgo', {
   searchPlaces: [
     'package.json',
     '.svgorc',
@@ -114,7 +114,7 @@ function getInfo(state) {
 export default function svgoPlugin(code, config, state) {
   if (!config.svgo) return code
   const filePath = getFilePath(state)
-  const svgoRcConfig = config.runtimeConfig ? explorer.searchSync(filePath) : {}
+  const svgoRcConfig = config.runtimeConfig ? explorer.search(filePath) : {}
   const svgo = createSvgo(config, svgoRcConfig)
   const { data } = optimizeSync.call(svgo, code, getInfo(state))
   return data
diff --git a/packages/rollup/package.json b/packages/rollup/package.json
@@ -25,18 +25,18 @@
     "prepublishOnly": "yarn run build"
   },
   "dependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-transform-react-constant-elements": "^7.0.0",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/core": "^7.7.5",
+    "@babel/plugin-transform-react-constant-elements": "^7.7.4",
+    "@babel/preset-env": "^7.7.6",
+    "@babel/preset-react": "^7.7.4",
     "@svgr/core": "^4.3.3",
     "@svgr/plugin-jsx": "^4.3.3",
     "@svgr/plugin-svgo": "^4.3.1",
-    "rollup-pluginutils": "^2.8.1"
+    "rollup-pluginutils": "^2.8.2"
   },
   "devDependencies": {
     "rollup": "^1.14.2",
     "rollup-plugin-image": "^1.0.2",
-    "rollup-plugin-url": "^2.2.1"
+    "rollup-plugin-url": "^3.0.1"
   }
 }
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -36,8 +36,8 @@
   },
   "devDependencies": {
     "babel-loader": "^8.0.6",
-    "memory-fs": "^0.4.1",
-    "url-loader": "^2.0.0",
+    "memory-fs": "^0.5.0",
+    "url-loader": "^3.0.0",
     "webpack": "^4.33.0"
   }
 }
diff --git a/packages/webpack/src/index.js b/packages/webpack/src/index.js
@@ -29,12 +29,16 @@ function svgrLoader(source) {
       })
     })
 
-  const exportMatches = source
-    .toString('utf-8')
-    .match(/^module.exports\s*=\s*(.*)/)
-  const previousExport = exportMatches
-    ? `export default ${exportMatches[1]}`
-    : null
+  const previousExport = (() => {
+    if (source.toString('utf-8').startsWith('export ')) {
+      return source
+    }
+
+    const exportMatches = source
+      .toString('utf-8')
+      .match(/^module.exports\s*=\s*(.*)/)
+    return exportMatches ? `export default ${exportMatches[1]}` : null
+  })()
 
   const tranformSvg = svg =>
     convert(svg, options, {
@@ -52,7 +56,7 @@ function svgrLoader(source) {
       .then(result => callback(null, result))
       .catch(err => callback(err))
 
-  if (exportMatches) {
+  if (previousExport) {
     readSvg().then(tranformSvg)
   } else {
     tranformSvg(source)
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@`
`27`	`27`	`"dependencies": {`
`28`	`28`	`"@svgr/plugin-jsx": "^4.3.3",`
`29`	`29`	`"camelcase": "^5.3.1",`
`30`		`- "cosmiconfig": "^5.2.1"`
	`30`	`+ "cosmiconfig": "^6.0.0"`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`	`"prepublishOnly": "yarn run build"`
`22`	`22`	`},`
`23`	`23`	`"dependencies": {`
`24`		`- "@babel/core": "^7.4.5",`
	`24`	`+ "@babel/core": "^7.7.5",`
`25`	`25`	`"@svgr/babel-preset": "^4.3.3",`
`26`	`26`	`"@svgr/hast-util-to-babel-ast": "^4.3.2",`
`27`		`- "svg-parser": "^2.0.0"`
	`27`	`+ "svg-parser": "^2.0.2"`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"prepublishOnly": "yarn run build"`
`22`	`22`	`},`
`23`	`23`	`"dependencies": {`
`24`		`- "cosmiconfig": "^5.2.1",`
	`24`	`+ "cosmiconfig": "^6.0.0",`
`25`	`25`	`"merge-deep": "^3.0.2",`
`26`	`26`	`"svgo": "^1.2.2"`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`	`},`
`37`	`37`	`"devDependencies": {`
`38`	`38`	`"babel-loader": "^8.0.6",`
`39`		`- "memory-fs": "^0.4.1",`
`40`		`- "url-loader": "^2.0.0",`
	`39`	`+ "memory-fs": "^0.5.0",`
	`40`	`+ "url-loader": "^3.0.0",`
`41`	`41`	`"webpack": "^4.33.0"`
`42`	`42`	`}`
`43`	`43`	`}`