From 1ef79c0dd1c3040680077fdd964fb3fa765401b5 Mon Sep 17 00:00:00 2001 From: Colin Tucker Date: Wed, 13 Jun 2018 22:28:36 +1000 Subject: [PATCH 1/3] Exposed theme production files in composer.json. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b84b4fe..8066aaf 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,8 @@ }, "expose": [ "app/admin/client/dist", - "app/client/dist" + "app/client/dist", + "themes/silverware-theme/production" ] }, "minimum-stability": "dev", From c45ec49ff57ce9cf1007ccfa98355ce680387e14 Mon Sep 17 00:00:00 2001 From: Colin Tucker Date: Wed, 1 Aug 2018 10:25:35 +1000 Subject: [PATCH 2/3] Fixed base path for webpack. --- app/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/webpack.config.js b/app/webpack.config.js index 68f28eb..d5c2e5b 100644 --- a/app/webpack.config.js +++ b/app/webpack.config.js @@ -15,7 +15,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); // Define Base: -const BASE = '/app'; +const BASE = '/resources/app'; // Define Paths: From dcb89bfaa49d72c832f08ac2439780fe6ab41dde Mon Sep 17 00:00:00 2001 From: Colin Tucker Date: Wed, 1 Aug 2018 10:31:30 +1000 Subject: [PATCH 3/3] Updated dependencies. --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 8066aaf..25ca139 100644 --- a/composer.json +++ b/composer.json @@ -19,18 +19,18 @@ ], "require": { "php": ">=5.6.0", - "silverstripe/admin": "^1.1", - "silverstripe/asset-admin": "^1.1", - "silverstripe/assets": "^1.1", - "silverstripe/campaign-admin": "^1.1", - "silverstripe/cms": "^4.1", + "silverstripe/admin": "^1.2", + "silverstripe/asset-admin": "^1.2", + "silverstripe/assets": "^1.2", + "silverstripe/campaign-admin": "^1.2", + "silverstripe/cms": "^4.2", "silverstripe/config": "^1.0", - "silverstripe/errorpage": "^1.1", - "silverstripe/framework": "^4.1", - "silverstripe/graphql": "^1.1", - "silverstripe/reports": "^4.1", - "silverstripe/siteconfig": "^4.1", - "silverstripe/versioned": "^1.1", + "silverstripe/errorpage": "^1.2", + "silverstripe/framework": "^4.2", + "silverstripe/graphql": "^2.0", + "silverstripe/reports": "^4.2", + "silverstripe/siteconfig": "^4.2", + "silverstripe/versioned": "^1.2", "silverware/admin": "^1.3", "silverware/calendar": "^1.0", "silverware/colorpicker": "^1.0",