framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2062 from roots/auto-detect-proxyurl-scheme

Browse Source 
Auto-detect proxyUrl scheme
This commit is contained in:
Ben Word
2018-04-25 15:57:46 -06:00
committed by GitHub
parent 571c49f698 922ed72ad9
commit 8d001c7571
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,4 +1,5 @@
### HEAD ### 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)) * 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)) * 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)) * Change inline `@php` directive to full form ([#2042](https://github.com/roots/sage/pull/2042))

2
resources/assets/build/webpack.config.watch.js
View File

@@ -11,6 +11,8 @@ const target = process.env.DEVURL || config.devUrl;
*/ */
if (url.parse(target).protocol === 'https:') { if (url.parse(target).protocol === 'https:') {
process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0; process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0;
config.proxyUrl = config.proxyUrl.replace('http:', 'https:');
} }
module.exports = { module.exports = {