From 922ed72ad999c829be80c7d1577326f29dd33ea8 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Wed, 25 Apr 2018 15:37:28 -0600 Subject: [PATCH] Auto-detect scheme --- CHANGELOG.md | 1 + resources/assets/build/webpack.config.watch.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2863191246..1c41f80524 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Auto-detect `proxyUrl` scheme ([#2062](https://github.com/roots/sage/pull/2062)) * Bump to Laravel 5.6 ([#2061](https://github.com/roots/sage/pull/2061)) * Update to Boostrap 4.1.0 ([#2056](https://github.com/roots/sage/pull/2056)) * Change inline `@php` directive to full form ([#2042](https://github.com/roots/sage/pull/2042)) diff --git a/resources/assets/build/webpack.config.watch.js b/resources/assets/build/webpack.config.watch.js index 04b5bf0d5f..d9e2aff1e1 100644 --- a/resources/assets/build/webpack.config.watch.js +++ b/resources/assets/build/webpack.config.watch.js @@ -11,6 +11,8 @@ const target = process.env.DEVURL || config.devUrl; */ if (url.parse(target).protocol === 'https:') { process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0; + + config.proxyUrl = config.proxyUrl.replace('http:', 'https:'); } module.exports = {