Merge branch 'develop'

praxisnetau · Oct 8, 2017 · 738b876 · 738b876
2 parents 909c1b3 + a39bebc
commit 738b876
Show file tree

Hide file tree

Showing 9 changed files with 370 additions and 336 deletions.
diff --git a/_config.php b/_config.php
@@ -14,13 +14,3 @@
  * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
  * @link https://github.com/praxisnetau/silverware-legals
  */
-
-// Define Module Constants:
-
-if (!defined('SILVERWARE_LEGALS_DIR')) {
-    define('SILVERWARE_LEGALS_DIR', basename(__DIR__));
-}
-
-if (!defined('SILVERWARE_LEGALS_PATH')) {
-    define('SILVERWARE_LEGALS_PATH', realpath(__DIR__));
-}
diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "silverware/legals",
-  "type": "silverstripe-module",
+  "type": "silverstripe-vendormodule",
   "description": "SilverWare Legals Module.",
   "homepage": "https://github.com/praxisnetau/silverware-legals",
   "keywords": [
@@ -19,7 +19,7 @@
   ],
   "require": {
     "php": ">=5.6.0",
-    "silverware/silverware": "^1.2"
+    "silverware/silverware": "^1.3"
   },
   "autoload": {
     "psr-4": {
@@ -30,7 +30,9 @@
     "branch-alias": {
       "dev-master": "1.0.x-dev"
     },
-    "installer-name": "silverware-legals"
+    "expose": [
+      "admin/client/dist"
+    ]
   },
   "minimum-stability": "dev",
   "prefer-stable": true

diff --git a/package.json b/package.json
@@ -33,26 +33,26 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "autoprefixer": "^7.1.3",
+    "autoprefixer": "^7.1.5",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
-    "babel-preset-es2015": "^6.24.1",
-    "clean-webpack-plugin": "^0.1.16",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.28.5",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^0.11.2",
+    "babel-preset-env": "^1.6.0",
+    "clean-webpack-plugin": "^0.1.17",
+    "copy-webpack-plugin": "^4.1.1",
+    "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.18.2",
-    "url-loader": "^0.5.9",
-    "webpack": "^3.5.5"
+    "style-loader": "^0.19.0",
+    "url-loader": "^0.6.2",
+    "webpack": "^3.6.0"
   },
   "babel": {
     "presets": [
       [
-        "es2015",
+        "env",
         {
           "modules": false
         }

diff --git a/src/Pages/CopyrightPage.php b/src/Pages/CopyrightPage.php
@@ -61,7 +61,7 @@ class CopyrightPage extends LegalPage
      * @var string
      * @config
      */
-    private static $icon = 'silverware-legals/admin/client/dist/images/icons/CopyrightPage.png';
+    private static $icon = 'silverware/legals: admin/client/dist/images/icons/CopyrightPage.png';
 
     /**
      * Defines an ancestor class to hide from the admin interface.

diff --git a/src/Pages/DisclaimerPage.php b/src/Pages/DisclaimerPage.php
@@ -60,7 +60,7 @@ class DisclaimerPage extends LegalPage
      * @var string
      * @config
      */
-    private static $icon = 'silverware-legals/admin/client/dist/images/icons/DisclaimerPage.png';
+    private static $icon = 'silverware/legals: admin/client/dist/images/icons/DisclaimerPage.png';
 
     /**
      * Defines an ancestor class to hide from the admin interface.

diff --git a/src/Pages/PrivacyPage.php b/src/Pages/PrivacyPage.php
@@ -58,7 +58,7 @@ class PrivacyPage extends LegalPage
      * @var string
      * @config
      */
-    private static $icon = 'silverware-legals/admin/client/dist/images/icons/PrivacyPage.png';
+    private static $icon = 'silverware/legals: admin/client/dist/images/icons/PrivacyPage.png';
 
     /**
      * Defines an ancestor class to hide from the admin interface.

diff --git a/webpack.config.js b/webpack.config.js
@@ -5,6 +5,7 @@
 
 const path = require('path');
 const webpack = require('webpack');
+const autoprefixer = require('autoprefixer');
 
 // Load Plugin Modules:
 
@@ -19,7 +20,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-legals/admin/client/dist/'
+    PUBLIC: '/resources/silverware/legals/admin/client/dist/'
   },
   MODULES: path.resolve(__dirname, 'node_modules')
 };
@@ -53,7 +54,10 @@ const rules = (env) => {
           loader: 'css-loader'
         },
         {
-          loader: 'postcss-loader'
+          loader: 'postcss-loader',
+          options: {
+            plugins: [ autoprefixer ] // see "browserslist" in package.json
+          }
         }
       ])
     },
@@ -64,7 +68,10 @@ const rules = (env) => {
           loader: 'css-loader'
         },
         {
-          loader: 'postcss-loader'
+          loader: 'postcss-loader',
+          options: {
+            plugins: [ autoprefixer ] // see "browserslist" in package.json
+          }
         },
         {
           loader: 'sass-loader',
@@ -167,7 +174,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,