From e4a47eda56e1dff5fc5e4002ba80d670f2219548 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 24 Nov 2018 00:25:59 -0700 Subject: [PATCH 1/4] Upgrade svgr to 4.0.3 --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index dfef220b781..cf14ee084e0 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -25,7 +25,7 @@ "types": "./lib/react-app.d.ts", "dependencies": { "@babel/core": "7.1.0", - "@svgr/webpack": "2.4.1", + "@svgr/webpack": "4.0.3", "babel-core": "7.0.0-bridge.0", "babel-eslint": "9.0.0", "babel-jest": "23.6.0", From ed473a411230a245ba3206ae97db575c17b0252d Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 24 Nov 2018 10:14:26 -0700 Subject: [PATCH 2/4] Upgrade svgr to 4.0.4 --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 5f06a416001..779356b59a5 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -25,7 +25,7 @@ "types": "./lib/react-app.d.ts", "dependencies": { "@babel/core": "7.1.6", - "@svgr/webpack": "4.0.3", + "@svgr/webpack": "4.0.4", "babel-core": "7.0.0-bridge.0", "babel-eslint": "9.0.0", "babel-jest": "23.6.0", From f97c0df2546d9c9e015d0fc782900c550d40e578 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 24 Nov 2018 12:00:51 -0700 Subject: [PATCH 3/4] Remove unnecessary prettier option --- .../babel-plugin-named-asset-import/index.test.js | 13 ++++++------- packages/react-scripts/config/webpack.config.js | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/babel-plugin-named-asset-import/index.test.js b/packages/babel-plugin-named-asset-import/index.test.js index f14139f0fd6..17b1927be16 100644 --- a/packages/babel-plugin-named-asset-import/index.test.js +++ b/packages/babel-plugin-named-asset-import/index.test.js @@ -6,7 +6,7 @@ pluginTester({ pluginOptions: { loaderMap: { svg: { - ReactComponent: '@svgr/webpack?-prettier,-svgo![path]', + ReactComponent: '@svgr/webpack?-svgo![path]', }, }, }, @@ -36,7 +36,7 @@ pluginTester({ svgReactComponentNamedImport: { code: 'import { ReactComponent as logo } from "logo.svg";', output: - 'import { ReactComponent as logo } from "@svgr/webpack?-prettier,-svgo!logo.svg";', + 'import { ReactComponent as logo } from "@svgr/webpack?-svgo!logo.svg";', }, svgMultipleImport: { code: @@ -44,7 +44,7 @@ pluginTester({ output: 'import logo from "logo.svg";\n' + 'import { logoUrl } from "logo.svg";\n' + - 'import { ReactComponent as Logo } from "@svgr/webpack?-prettier,-svgo!logo.svg";', + 'import { ReactComponent as Logo } from "@svgr/webpack?-svgo!logo.svg";', }, defaultExport: { code: 'export default logo;', @@ -81,18 +81,17 @@ pluginTester({ svgReactComponentNamedExport: { code: 'export { ReactComponent as Logo } from "logo.svg";', output: - 'export { ReactComponent as Logo } from "@svgr/webpack?-prettier,-svgo!logo.svg";', + 'export { ReactComponent as Logo } from "@svgr/webpack?-svgo!logo.svg";', }, svgReactComponentExport: { code: 'export { ReactComponent } from "logo.svg";', - output: - 'export { ReactComponent } from "@svgr/webpack?-prettier,-svgo!logo.svg";', + output: 'export { ReactComponent } from "@svgr/webpack?-svgo!logo.svg";', }, svgMultipleExport: { code: 'export { logoUrl , ReactComponent as Logo } from "logo.svg";', output: 'export { logoUrl } from "logo.svg";\n' + - 'export { ReactComponent as Logo } from "@svgr/webpack?-prettier,-svgo!logo.svg";', + 'export { ReactComponent as Logo } from "@svgr/webpack?-svgo!logo.svg";', }, }, }); diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js index 746884a03eb..3b9b4f7202a 100644 --- a/packages/react-scripts/config/webpack.config.js +++ b/packages/react-scripts/config/webpack.config.js @@ -378,8 +378,7 @@ module.exports = function(webpackEnv) { { loaderMap: { svg: { - ReactComponent: - '@svgr/webpack?-prettier,-svgo![path]', + ReactComponent: '@svgr/webpack?-svgo![path]', }, }, }, From 6041d9a0538d6a78b8d5efa5c36ac4719dfc93a6 Mon Sep 17 00:00:00 2001 From: Adam Laycock Date: Sun, 25 Nov 2018 15:28:49 -0700 Subject: [PATCH 4/4] Update to 4.1.0 --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 779356b59a5..c099f19fcd8 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -25,7 +25,7 @@ "types": "./lib/react-app.d.ts", "dependencies": { "@babel/core": "7.1.6", - "@svgr/webpack": "4.0.4", + "@svgr/webpack": "4.1.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "9.0.0", "babel-jest": "23.6.0",