Merge branch 'develop'

Author: colintucker

admin/client/dist/js/bundle.js

@@ -1,6 +1,10 @@
 /* SilverWare Calendar Admin Bundle
 ===================================================================================================================== */
 
+// Load Flatpickr Styles:
+
+require('flatpickr/dist/flatpickr.css');
+
 // Load Styles:
 
 require('styles/bundle.scss');

admin/client/dist/styles/bundle.css

@@ -12,10 +12,6 @@
 @import "~bootstrap/scss/functions";
 @import "~bootstrap/scss/variables";
 
-// Import Flatpickr Styles:
-
-@import "~flatpickr/dist/flatpickr";
-
 // Import Local Styles:
 
 @import "variables";

admin/client/src/bundles/bundle.js

@@ -1,6 +1,10 @@
 /* SilverWare Calendar Bundle
 ===================================================================================================================== */
 
+// Load Flatpickr Styles:
+
+require('flatpickr/dist/flatpickr.css');
+
 // Load Styles:
 
 require('styles/bundle.scss');

admin/client/src/styles/bundle.scss

@@ -12,10 +12,6 @@
 @import "~bootstrap/scss/functions";
 @import "~bootstrap/scss/variables";
 
-// Import Flatpickr Styles:
-
-@import "~flatpickr/dist/flatpickr";
-
 // Import Local Variables:
 
 @import "variables";

client/dist/js/bundle.js

@@ -18,7 +18,7 @@
     {
       "name": "Colin Tucker",
       "email": "[email protected]",
-      "url": "http://www.praxis.net.au"
+      "url": "https://www.praxis.net.au"
     }
   ],
   "repository": {
@@ -29,29 +29,34 @@
     "url": "https://github.com/praxisnetau/silverware-calendar/issues"
   },
   "engines": {
-    "node": "^4.2.0"
+    "node": "^8.x"
   },
   "scripts": {
     "watch": "webpack --env.development --colors --watch",
-    "build": "webpack --env.production --colors --optimize-minimize"
+    "build": "webpack --env.production --colors --progress --optimize-minimize"
   },
   "dependencies": {},
   "devDependencies": {
-    "autoprefixer": "^7.1.5",
+    "autoprefixer": "^8.2.0",
     "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
-    "babel-preset-env": "^1.6.0",
-    "clean-webpack-plugin": "^0.1.17",
-    "css-loader": "^0.28.7",
-    "extract-text-webpack-plugin": "^3.0.1",
-    "file-loader": "^1.1.5",
-    "flatpickr": "^3.0.7",
-    "node-sass": "^4.5.3",
-    "postcss-loader": "^2.0.6",
-    "sass-loader": "^6.0.6",
-    "style-loader": "^0.19.0",
-    "url-loader": "^0.6.2",
-    "webpack": "^3.6.0"
+    "babel-loader": "^7.1.4",
+    "babel-preset-env": "^1.6.1",
+    "clean-webpack-plugin": "^0.1.19",
+    "copy-webpack-plugin": "^4.5.1",
+    "css-loader": "^0.28.11",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^1.1.11",
+    "flatpickr": "^3.1.5",
+    "node-sass": "^4.8.3",
+    "postcss-loader": "^2.1.3",
+    "resolve-url-loader": "^2.3.0",
+    "sass-loader": "^6.0.7",
+    "style-loader": "^0.20.3",
+    "svgo": "^1.0.5",
+    "svgo-loader": "^2.1.0",
+    "uglifyjs-webpack-plugin": "^1.2.4",
+    "url-loader": "^1.0.1",
+    "webpack": "^3.11.0"
   },
   "babel": {
     "presets": [

client/dist/styles/bundle.css

@@ -1 +1,8 @@
-module.exports = {};
+/* PostCSS Configuration
+===================================================================================================================== */
+
+module.exports = {
+  plugins: [
+    require('autoprefixer')
+  ]
+};