PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-24 05:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge branch 'feature-remote-dev' of https://github.com/Poniverse/Pony.fm"

Browse source 
This reverts commit 1a77341ce2, reversing
changes made to d01b24a91f.
This commit is contained in:
Josef Citrine 2016-05-16 01:00:37 +01:00
parent 17a9f6e50c
commit 0c2b46dd20
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Library/Assets.php
View file

@ -33,14 +33,14 @@ class Assets
foreach ($scripts as $filename) { foreach ($scripts as $filename) {
if (Config::get('app.debug') && $filename !== 'templates.js') { if (Config::get('app.debug') && $filename !== 'templates.js') {
$scriptTags .= "<script src='" . env('APP_URL') . ":61999/build/scripts/{$filename}'></script>"; $scriptTags .= "<script src='http://localhost:61999/build/scripts/{$filename}'></script>";
} else { } else {
$scriptTags .= "<script src='/build/scripts/{$filename}?" . filemtime(public_path("build/scripts/{$filename}")) . "'></script>"; $scriptTags .= "<script src='/build/scripts/{$filename}?" . filemtime(public_path("build/scripts/{$filename}")) . "'></script>";
} }
} }
if (Config::get('app.debug')) { if (Config::get('app.debug')) {
$scriptTags .= '<script src="' . env('APP_URL') . ':61999/webpack-dev-server.js"></script>'; $scriptTags .= '<script src="http://localhost:61999/webpack-dev-server.js"></script>';
} }
return $scriptTags; return $scriptTags;

4
gulpfile.js
View file

@ -69,12 +69,12 @@ gulp.task("webpack-dev-server", function () {
new WebpackDevServer(compiler, { new WebpackDevServer(compiler, {
// server and middleware options, currently blank // server and middleware options, currently blank
}).listen(webpackDevConfig.devPort, webpackDevConfig.devHost, function (err) { }).listen(61999, "localhost", function (err) {
if (err) if (err)
throw new gutil.PluginError("webpack-dev-server", err); throw new gutil.PluginError("webpack-dev-server", err);
// Server listening // 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");
}); });
}); });

7
webpack.dev.config.js
View file

@ -6,12 +6,7 @@ var webpackBaseConfig = require('./webpack.base.config.js');
var config = _.clone(webpackBaseConfig); var config = _.clone(webpackBaseConfig);
config.devtool = 'eval-source-map'; config.devtool = 'eval-source-map';
config.output.publicPath = 'http://localhost:61999/build/';
config.devHost = 'localhost';
config.devPort = '6199';
config.devUrl = 'http://' + config.devHost + ':' + (config.devPort == '80' ? '' : config.devPort);
config.output.publicPath = config.devUrl + '/build/';
module.exports = config; module.exports = config;