diff --git a/app/Library/Assets.php b/app/Library/Assets.php index 70340dda..5c3c1404 100644 --- a/app/Library/Assets.php +++ b/app/Library/Assets.php @@ -33,14 +33,14 @@ class Assets foreach ($scripts as $filename) { if (Config::get('app.debug') && $filename !== 'templates.js') { - $scriptTags .= ""; + $scriptTags .= ""; } else { $scriptTags .= ""; } } if (Config::get('app.debug')) { - $scriptTags .= ''; + $scriptTags .= ''; } return $scriptTags; diff --git a/gulpfile.js b/gulpfile.js index 48d3f434..021c3417 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -69,12 +69,12 @@ gulp.task("webpack-dev-server", function () { new WebpackDevServer(compiler, { // server and middleware options, currently blank - }).listen(webpackDevConfig.devPort, webpackDevConfig.devHost, function (err) { + }).listen(61999, "localhost", function (err) { if (err) throw new gutil.PluginError("webpack-dev-server", err); // Server listening - gutil.log("[webpack-dev-server]", webpackDevConfig.devUrl + "/webpack-dev-server/index.html"); + gutil.log("[webpack-dev-server]", "http://localhost:61999/webpack-dev-server/index.html"); }); }); diff --git a/webpack.dev.config.js b/webpack.dev.config.js index 8cde089c..54a6a69c 100644 --- a/webpack.dev.config.js +++ b/webpack.dev.config.js @@ -6,12 +6,7 @@ var webpackBaseConfig = require('./webpack.base.config.js'); var config = _.clone(webpackBaseConfig); config.devtool = 'eval-source-map'; - -config.devHost = 'localhost'; -config.devPort = '6199'; -config.devUrl = 'http://' + config.devHost + ':' + (config.devPort == '80' ? '' : config.devPort); - -config.output.publicPath = config.devUrl + '/build/'; +config.output.publicPath = 'http://localhost:61999/build/'; module.exports = config;