Merge branch 'develop'

package.json

@@ -35,25 +35,25 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "autoprefixer": "^6.7.6",
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.3.2",
-    "babel-preset-es2015": "^6.22.0",
-    "clean-webpack-plugin": "^0.1.15",
-    "css-loader": "^0.26.2",
-    "extract-text-webpack-plugin": "^2.0.0",
-    "file-loader": "^0.10.1",
-    "node-sass": "^4.5.0",
-    "postcss-loader": "^1.3.3",
-    "sass-loader": "^6.0.2",
-    "style-loader": "^0.13.2",
-    "url-loader": "^0.5.8",
-    "webpack": "^2.2.1"
+    "autoprefixer": "^7.1.5",
+    "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",
+    "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": {
     "presets": [
       [
-        "es2015",
+        "env",
         {
           "modules": false
         }

webpack.config.js

@@ -5,6 +5,7 @@
 
 const path = require('path');
 const webpack = require('webpack');
+const autoprefixer = require('autoprefixer');
 
 // Load Plugin Modules:
 
@@ -18,7 +19,7 @@ const PATHS = {
     SRC: path.resolve(__dirname, 'admin/client/src'),
     DIST: path.resolve(__dirname, 'admin/client/dist'),
     BUNDLES: path.resolve(__dirname, 'admin/client/src/bundles'),
-    PUBLIC: '/silverware-model-filters/admin/client/dist/'
+    PUBLIC: '/resources/silverware/model-filters/admin/client/dist/'
   },
   MODULES: path.resolve(__dirname, 'node_modules')
 };
@@ -52,7 +53,10 @@ const rules = (env) => {
           loader: 'css-loader'
         },
         {
-          loader: 'postcss-loader'
+          loader: 'postcss-loader',
+          options: {
+            plugins: [ autoprefixer ] // see "browserslist" in package.json
+          }
         }
       ])
     },
@@ -63,7 +67,10 @@ const rules = (env) => {
           loader: 'css-loader'
         },
         {
-          loader: 'postcss-loader'
+          loader: 'postcss-loader',
+          options: {
+            plugins: [ autoprefixer ] // see "browserslist" in package.json
+          }
         },
         {
           loader: 'sass-loader',
@@ -156,7 +163,7 @@ const config = (env) => {
       plugins: plugins(env, PATHS.ADMIN.SRC, PATHS.ADMIN.DIST),
       resolve: {
         alias: {
-          'silverstripe-admin': path.resolve(process.env.PWD, '../silverstripe-admin/client/src')
+          'silverstripe-admin': path.resolve(process.env.PWD, '../../silverstripe/admin/client/src')
         },
         modules: [
           PATHS.ADMIN.SRC,