From 388b3bf9084a2491e479a0baec8476a7ee28eba2 Mon Sep 17 00:00:00 2001
From: Andy Lindberg <andy.lindberg@shopify.com>
Date: Thu, 14 Apr 2022 08:49:56 -0600
Subject: [PATCH] Grafana/UI: Bundle raw SVG icon strings (#47665)

* Build: bundle raw svg icon strings in grafana/ui

* remove @rollup/plugin-image
---
 packages/grafana-ui/package.json     |  2 +-
 packages/grafana-ui/rollup.config.ts |  4 +--
 yarn.lock                            | 44 ++++++++++++++--------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index a9485cc8168..d73b877eb70 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -98,7 +98,6 @@
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@mdx-js/react": "1.6.22",
     "@rollup/plugin-commonjs": "21.0.2",
-    "@rollup/plugin-image": "2.1.1",
     "@rollup/plugin-node-resolve": "13.1.3",
     "@storybook/addon-a11y": "6.4.21",
     "@storybook/addon-actions": "6.4.21",
@@ -168,6 +167,7 @@
     "rimraf": "3.0.2",
     "rollup": "2.70.1",
     "rollup-plugin-sourcemaps": "0.6.3",
+    "rollup-plugin-svg-import": "^1.6.0",
     "rollup-plugin-terser": "7.0.2",
     "sass-loader": "12.6.0",
     "storybook-dark-mode": "1.0.9",
diff --git a/packages/grafana-ui/rollup.config.ts b/packages/grafana-ui/rollup.config.ts
index d40c5776084..71f712df14f 100644
--- a/packages/grafana-ui/rollup.config.ts
+++ b/packages/grafana-ui/rollup.config.ts
@@ -1,6 +1,6 @@
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
-import image from '@rollup/plugin-image';
+import svg from 'rollup-plugin-svg-import';
 import { terser } from 'rollup-plugin-terser';
 
 const pkg = require('./package.json');
@@ -41,7 +41,7 @@ const buildCjsPackage = ({ env }) => {
         include: /node_modules/,
       }),
       resolve(),
-      image(),
+      svg({ stringify: true }),
       env === 'production' && terser(),
     ],
   };
diff --git a/yarn.lock b/yarn.lock
index 1cd157ebdc3..5273232fb8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4366,7 +4366,6 @@ __metadata:
     "@react-aria/overlays": 3.8.1
     "@react-stately/menu": 3.2.6
     "@rollup/plugin-commonjs": 21.0.2
-    "@rollup/plugin-image": 2.1.1
     "@rollup/plugin-node-resolve": 13.1.3
     "@sentry/browser": 6.19.1
     "@storybook/addon-a11y": 6.4.21
@@ -4476,6 +4475,7 @@ __metadata:
     rimraf: 3.0.2
     rollup: 2.70.1
     rollup-plugin-sourcemaps: 0.6.3
+    rollup-plugin-svg-import: ^1.6.0
     rollup-plugin-terser: 7.0.2
     rxjs: 7.5.5
     sass-loader: 12.6.0
@@ -7256,18 +7256,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/plugin-image@npm:2.1.1":
-  version: 2.1.1
-  resolution: "@rollup/plugin-image@npm:2.1.1"
-  dependencies:
-    "@rollup/pluginutils": ^3.1.0
-    mini-svg-data-uri: ^1.2.3
-  peerDependencies:
-    rollup: ^1.20.0 || ^2.0.0
-  checksum: a629c8f22233ca159c23655fdbc3449dab3c939372178ed4462fc9c525cc4ecd8b11fae359eb94be4f769d26f48b85fb18eb16ce1fbc33ed16b6a7c1f84391f6
-  languageName: node
-  linkType: hard
-
 "@rollup/plugin-json@npm:4.1.0":
   version: 4.1.0
   resolution: "@rollup/plugin-json@npm:4.1.0"
@@ -7308,6 +7296,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/pluginutils@npm:^4.1.1":
+  version: 4.2.0
+  resolution: "@rollup/pluginutils@npm:4.2.0"
+  dependencies:
+    estree-walker: ^2.0.1
+    picomatch: ^2.2.2
+  checksum: 2e86d9bfb95919727bcba0bbbdbedc98e25a1e51fe3047f18ec6d85e0743d1c73e1c0de3f9fdbd2ff6b90c32f30d4b2706c9e794f3c2e7a80156980081558e2e
+  languageName: node
+  linkType: hard
+
 "@rtsao/plugin-proposal-class-properties@npm:7.0.1-patch.1":
   version: 7.0.1-patch.1
   resolution: "@rtsao/plugin-proposal-class-properties@npm:7.0.1-patch.1"
@@ -25960,15 +25958,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mini-svg-data-uri@npm:^1.2.3":
-  version: 1.4.3
-  resolution: "mini-svg-data-uri@npm:1.4.3"
-  bin:
-    mini-svg-data-uri: cli.js
-  checksum: bd1789c34907a36ae9157897b7c7f6ad700e71c8cb6d725bb2810ce6211abcaa3717333ca17408f6f8b2a44055e571cd5b78d478688e1864513cb7f8e023ae3f
-  languageName: node
-  linkType: hard
-
 "minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
@@ -32390,6 +32379,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup-plugin-svg-import@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "rollup-plugin-svg-import@npm:1.6.0"
+  dependencies:
+    "@rollup/pluginutils": ^4.1.1
+  peerDependencies:
+    rollup: ">=1.29.0 <3.0.0"
+  checksum: 453862c39d2301563d9d07f6647c295377ff66cf3174d2a0612389fda4bfd9fa72718d90279feb782d3525f1d6f9710e1dc78641cd9d4044360a0179f88054b0
+  languageName: node
+  linkType: hard
+
 "rollup-plugin-terser@npm:7.0.2":
   version: 7.0.2
   resolution: "rollup-plugin-terser@npm:7.0.2"