From 055f9f0d64177ef79bd5d465ff8951965f513835 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Wed, 7 Feb 2018 11:29:20 +0700 Subject: [PATCH] HTTPS webpack server + minor fixtures --- package.json | 2 +- site/code/WebpackTemplateProvider.php | 3 ++- site/templates/Page.ss | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index aa58383..1c066ff 100755 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "yarn": ">= 1.0.0" }, "scripts": { - "start": "cross-env NODE_ENV=development webpack-dev-server -d --config webpack.config.dev.js", + "start": "cross-env NODE_ENV=development webpack-dev-server --https -d --config webpack.config.dev.js", "dash": "cross-env NODE_ENV=development webpack-dashboard -- webpack-dev-server --config webpack.config.dev.js", "prebuild": "rimraf build", "build": "cross-env NODE_ENV=production webpack -p --config webpack.config.prod.js --progress" diff --git a/site/code/WebpackTemplateProvider.php b/site/code/WebpackTemplateProvider.php index 0c94b65..e1125a8 100644 --- a/site/code/WebpackTemplateProvider.php +++ b/site/code/WebpackTemplateProvider.php @@ -75,7 +75,8 @@ class WebpackTemplateProvider extends Object implements TemplateGlobalProvider { $class = __CLASS__; return sprintf( - 'http://%s:%s/%s', + '%s%s:%s/%s', + Director::protocol(), $class::config()->get('hostname'), $class::config()->get('port'), $path diff --git a/site/templates/Page.ss b/site/templates/Page.ss index 23012d1..561edbc 100644 --- a/site/templates/Page.ss +++ b/site/templates/Page.ss @@ -3,6 +3,7 @@ <%-- manifest="/cache.appcache" --%> $MetaTags + @@ -18,21 +19,21 @@ - - - - + + + + <% base_tag %> - - - - + + + + - +