From f5ca76e6bb402df7f94244fc40837491055a4730 Mon Sep 17 00:00:00 2001
From: Tony Air <tony@thewebdevelopmentagency.com>
Date: Wed, 27 Nov 2019 12:30:48 +0700
Subject: [PATCH] Minor improvements

---
 .eslintrc                           | 6 ++++++
 app/client/src/js/_layout.js        | 5 -----
 app/client/src/js/app.js            | 3 ++-
 app/client/src/scss/_variables.scss | 3 ---
 package.json                        | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index ca37688..3c43d62 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,6 +2,12 @@
   // http://eslint.org/docs/rules/
   "extends": "eslint:recommended",
 
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+  
   "env": {
     "browser": true,     // browser global variables.
     "node": true,        // Node.js global variables and Node.js-specific rules.
diff --git a/app/client/src/js/_layout.js b/app/client/src/js/_layout.js
index a3851dc..8bea994 100644
--- a/app/client/src/js/_layout.js
+++ b/app/client/src/js/_layout.js
@@ -3,11 +3,6 @@
 import $ from 'jquery';
 
 import Events from '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_events';
-import Spinner from '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.spinner';
-import FormDatetime from '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.form.datetime';
-import FormStepped from '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.form.stepped';
-
-//import Multislider from '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.multislider';
 
 const LayoutUI = (($) => {
   // Constants
diff --git a/app/client/src/js/app.js b/app/client/src/js/app.js
index 1f74daf..116e9b2 100644
--- a/app/client/src/js/app.js
+++ b/app/client/src/js/app.js
@@ -31,6 +31,8 @@ import 'bootstrap/js/dist/scrollspy';
 import 'bootstrap/js/dist/tab';
 //
 
+import Spinner from '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.spinner';
+//import Multislider from '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.multislider';
 
 // Offcanvas menu
 //import 'offcanvas-bootstrap/dist/js/bootstrap.offcanvas';
@@ -38,7 +40,6 @@ import 'bootstrap/js/dist/tab';
 // Uncomment it to enable meta-lightbox zooming on hover
 //import 'jquery-zoom/jquery.zoom';
 
-
 // Toggle bootstrap form fields
 //import FormToggleUI from '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.form.fields.toggle';
 
diff --git a/app/client/src/scss/_variables.scss b/app/client/src/scss/_variables.scss
index 23fe9c1..4e1d7f4 100644
--- a/app/client/src/scss/_variables.scss
+++ b/app/client/src/scss/_variables.scss
@@ -11,9 +11,6 @@ $grid-gutter-width: 2rem;
 $grid-gutter-height: 2rem;
 
 @import "~@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/scss/_variables";
-@import "~bootstrap/scss/functions";
-@import "~bootstrap/scss/variables";
-@import "~bootstrap/scss/mixins";
 
 // Add your site-wide + content editor typography styling
 
diff --git a/package.json b/package.json
index 0c94342..3395b73 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ss-webpack-boilerplate",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Lets you create SilverStripe faster",
   "author": "Tony Air <tony@twma.pro>",
   "license": "MIT",