Set dynamically aboslute public path on 'npm run watch'; fix http/htt… (#1696)

* Set dynamically aboslute public path on 'npm run watch'; fix http/https hardcoded in watch.js

* WEBPACK_PUBLIC_PATH fix
This commit is contained in:
Patrick Vézina
2016-08-26 13:45:50 -04:00
committed by Ben Word
parent 97c1a307ec
commit 7623ad0511
4 changed files with 13 additions and 7 deletions

View File

@@ -1,6 +1,7 @@
{
"entry": {
"main": [
"./scripts/util/public-path.js",
"./scripts/main.js",
"./styles/main.scss"
],

View File

@@ -0,0 +1,8 @@
/* globals WEBPACK_PUBLIC_PATH */
// Dynamically set absolute public path from current protocol and host
if (WEBPACK_PUBLIC_PATH !== false) {
/* eslint-disable no-undef */
__webpack_public_path__ = location.protocol + '//' + location.host + WEBPACK_PUBLIC_PATH;
/*eslint-enable no-undef*/
}

View File

@@ -9,15 +9,9 @@ var webpackConfig = require('./webpack.config'),
config = require('./assets/config');
// Internal variables
var host = 'http://localhost',
port = config.devPort || '3000',
compiler;
webpackConfig.output.publicPath = host + ':' + port + config.output.publicPath;
compiler = webpack(webpackConfig);
var compiler = webpack(webpackConfig);
browserSync.init({
port: port,
proxy: {
target: config.devUrl,
middleware: [

View File

@@ -191,6 +191,9 @@ webpackConfig = {
'window.jQuery': 'jquery',
'Tether': 'tether',
'window.Tether': 'tether'
}),
new webpack.DefinePlugin({
WEBPACK_PUBLIC_PATH: (argv.watch === true) ? JSON.stringify(path.join(config.publicPath, dist)) : false
})
],
postcss: [