From a929729e6a86c0d1b8422dcbf62352cd68307e18 Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <xxnerowingerxx@gmail.com>
Date: Wed, 10 Apr 2019 20:34:27 +0200
Subject: [PATCH] Use file loader to load demo cursor

---
 app/package.json                         |   1 +
 app/src/components/Demo/Mouse.tsx        |   3 ++-
 app/{ => src/components/Demo}/cursor.png | Bin
 app/webpack.config.js                    |   9 +++++++++
 app/yarn.lock                            |  10 +++++++++-
 5 files changed, 21 insertions(+), 2 deletions(-)
 rename app/{ => src/components/Demo}/cursor.png (100%)

diff --git a/app/package.json b/app/package.json
index b74a12f..d713820 100644
--- a/app/package.json
+++ b/app/package.json
@@ -19,6 +19,7 @@
     "copy-text-to-clipboard": "^1.0.4",
     "diff": "^4.0.1",
     "electron-telemetry": "git+https://github.com/thomasnordquist/electron-telemetry.git#dist",
+    "file-loader": "^3.0.1",
     "get-value": "^3.0.1",
     "immutable": "^4.0.0-rc.12",
     "js-base64": "^2.5.1",
diff --git a/app/src/components/Demo/Mouse.tsx b/app/src/components/Demo/Mouse.tsx
index 5a5fc7f..c1bf40d 100644
--- a/app/src/components/Demo/Mouse.tsx
+++ b/app/src/components/Demo/Mouse.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react'
 import { Theme, withStyles } from '@material-ui/core'
+const cursor = require('./cursor.png')
 
 interface State {
   enabled: boolean
@@ -64,7 +65,7 @@ class Demo extends React.Component<{classes: any}, State> {
     }
 
     return (
-      <img src="../cursor.png" style={cursorStyle} className={this.props.classes.cursor} />
+      <img src={cursor} style={cursorStyle} className={this.props.classes.cursor} />
     )
   }
 }
diff --git a/app/cursor.png b/app/src/components/Demo/cursor.png
similarity index 100%
rename from app/cursor.png
rename to app/src/components/Demo/cursor.png
diff --git a/app/webpack.config.js b/app/webpack.config.js
index 050a957..dd44ef1 100644
--- a/app/webpack.config.js
+++ b/app/webpack.config.js
@@ -68,6 +68,15 @@ module.exports = {
         test: /\.css$/,
         use: ['style-loader', 'css-loader'],
       },
+      {
+        test: /\.(png|jpg|gif)$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {},
+          },
+        ],
+      },
     ],
   },
 
diff --git a/app/yarn.lock b/app/yarn.lock
index 86e85dc..d4fbfb4 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -1980,6 +1980,14 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
+file-loader@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
+  integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^1.0.0"
+
 filesize@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
@@ -2988,7 +2996,7 @@ loader-runner@^2.3.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==