Merge branch 'develop'

praxisnetau · Oct 8, 2017 · 218ff9f · 218ff9f
2 parents f1b9f23 + 06ba8e7
commit 218ff9f
Show file tree

Hide file tree

Showing 8 changed files with 1,014 additions and 544 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-google
  */
-
-// Define Module Constants:
-
-if (!defined('SILVERWARE_GOOGLE_DIR')) {
-    define('SILVERWARE_GOOGLE_DIR', basename(__DIR__));
-}
-
-if (!defined('SILVERWARE_GOOGLE_PATH')) {
-    define('SILVERWARE_GOOGLE_PATH', realpath(__DIR__));
-}
diff --git a/_config/config.yml b/_config/config.yml
@@ -12,7 +12,7 @@ Page:
 
 SilverStripe\CMS\Controllers\ContentController:
   required_js:
-    - silverware-google/client/dist/js/bundle.js
+    - "silverware/google: client/dist/js/bundle.js"
 
 # Configure Site Configuration:
 

diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "silverware/google",
-  "type": "silverstripe-module",
+  "type": "silverstripe-vendormodule",
   "description": "SilverWare Google Module.",
   "homepage": "https://github.com/praxisnetau/silverware-google",
   "keywords": [
@@ -32,7 +32,10 @@
     "branch-alias": {
       "dev-master": "1.0.x-dev"
     },
-    "installer-name": "silverware-google"
+    "expose": [
+      "admin/client/dist",
+      "client/dist"
+    ]
   },
   "minimum-stability": "dev",
   "prefer-stable": true

diff --git a/package.json b/package.json
@@ -33,26 +33,26 @@
   },
   "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",
-    "copy-webpack-plugin": "^4.0.1",
-    "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",
+    "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.19.0",
+    "url-loader": "^0.6.2",
+    "webpack": "^3.6.0"
   },
   "babel": {
     "presets": [
       [
-        "es2015",
+        "env",
         {
           "modules": false
         }

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,13 +20,13 @@ 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-google/admin/client/dist/'
+    PUBLIC: '/resources/silverware/google/admin/client/dist/'
   },
   MODULE: {
     SRC: path.resolve(__dirname, 'client/src'),
     DIST: path.resolve(__dirname, 'client/dist'),
     BUNDLES: path.resolve(__dirname, 'client/src/bundles'),
-    PUBLIC: '/silverware-google/client/dist/',
+    PUBLIC: '/resources/silverware/google/client/dist/',
   },
   MODULES: path.resolve(__dirname, 'node_modules')
 };
@@ -59,7 +60,10 @@ const rules = (env) => {
           loader: 'css-loader'
         },
         {
-          loader: 'postcss-loader'
+          loader: 'postcss-loader',
+          options: {
+            plugins: [ autoprefixer ] // see "browserslist" in package.json
+          }
         }
       ])
     },
@@ -70,7 +74,10 @@ const rules = (env) => {
           loader: 'css-loader'
         },
         {
-          loader: 'postcss-loader'
+          loader: 'postcss-loader',
+          options: {
+            plugins: [ autoprefixer ] // see "browserslist" in package.json
+          }
         },
         {
           loader: 'sass-loader',
@@ -173,7 +180,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,
@@ -200,7 +207,8 @@ const config = (env) => {
       plugins: plugins(env, PATHS.MODULE.SRC, PATHS.MODULE.DIST),
       resolve: {
         alias: {
-          'silverware-theme': path.resolve(process.env.PWD, '../themes/silverware-theme/source')
+          'bootstrap': path.resolve(process.env.PWD, '../../../themes/silverware-theme/node_modules/bootstrap'),
+          'silverware-theme': path.resolve(process.env.PWD, '../../../themes/silverware-theme/source')
         },
         modules: [
           PATHS.MODULE.SRC,