From 0bbeaa7246cb05ecf6f853553eb6e097d86a3e4f Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Tue, 2 Jul 2019 11:35:29 +0800 Subject: [PATCH] Make front end assets URL flexible --- app/helpers.php | 3 ++- resources/assets/src/scripts/public-path.ts | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/helpers.php b/app/helpers.php index b6c798dc..1001484e 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -9,7 +9,8 @@ if (! function_exists('webpack_assets')) { function webpack_assets($relativeUri) { if (app()->environment('development')) { - return "http://127.0.0.1:8080/$relativeUri"; // @codeCoverageIgnore + $host = parse_url(url('/'), PHP_URL_HOST); + return "http://$host:8080/$relativeUri"; // @codeCoverageIgnore } else { $path = app('webpack')->$relativeUri; $cdn = option('cdn_address'); diff --git a/resources/assets/src/scripts/public-path.ts b/resources/assets/src/scripts/public-path.ts index 9a7c940d..80fd6ba5 100644 --- a/resources/assets/src/scripts/public-path.ts +++ b/resources/assets/src/scripts/public-path.ts @@ -1,6 +1,10 @@ /* eslint-disable prefer-const */ /* eslint-disable camelcase */ declare let __webpack_public_path__: string + +const url = new URL(blessing.base_url) +url.port = '8080' + __webpack_public_path__ = process.env.NODE_ENV === 'development' - ? 'http://127.0.0.1:8080/' + ? url.toString() : `${blessing.base_url}/app/`