Skip to content

Commit

Permalink
Apply prettier formatting updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Glen Mailer committed Jan 31, 2021
1 parent b81cfd5 commit 04fa8c8
Show file tree
Hide file tree
Showing 17 changed files with 215 additions and 210 deletions.
22 changes: 9 additions & 13 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
{
"extends": "eslint:recommended",
"env": {
"node": true
},
"plugins": [
"prettier"
],
"rules": {
"no-console": "off",
"prettier/prettier": [
"error"
]
}
"extends": "eslint:recommended",
"env": {
"node": true
},
"plugins": ["prettier"],
"rules": {
"no-console": "off",
"prettier/prettier": ["error"]
}
}
6 changes: 3 additions & 3 deletions .mocharc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"reporter": "spec",
"exit": true
}
"reporter": "spec",
"exit": true
}
4 changes: 2 additions & 2 deletions client-overlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var entities = new Entities();

function showProblems(type, lines) {
clientOverlay.innerHTML = '';
lines.forEach(function(msg) {
lines.forEach(function (msg) {
msg = ansiHTML(entities.encode(msg));
var div = document.createElement('div');
div.style.marginBottom = '26px';
Expand Down Expand Up @@ -73,7 +73,7 @@ function problemType(type) {
);
}

module.exports = function(options) {
module.exports = function (options) {
for (var color in options.ansiColors) {
if (color in colors) {
colors[color] = options.ansiColors[color];
Expand Down
14 changes: 7 additions & 7 deletions client.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function EventSourceWrapper() {
var listeners = [];

init();
var timer = setInterval(function() {
var timer = setInterval(function () {
if (new Date() - lastActivity > options.timeout) {
handleDisconnect();
}
Expand Down Expand Up @@ -110,7 +110,7 @@ function EventSourceWrapper() {
}

return {
addMessageListener: function(fn) {
addMessageListener: function (fn) {
listeners.push(fn);
},
};
Expand Down Expand Up @@ -176,7 +176,7 @@ function createReporter() {
var previousProblems = null;
function log(type, obj) {
var newProblems = obj[type]
.map(function(msg) {
.map(function (msg) {
return strip(msg);
})
.join('\n');
Expand Down Expand Up @@ -205,10 +205,10 @@ function createReporter() {
}

return {
cleanProblemsCache: function() {
cleanProblemsCache: function () {
previousProblems = null;
},
problems: function(type, obj) {
problems: function (type, obj) {
if (options.warn) {
log(type, obj);
}
Expand All @@ -221,10 +221,10 @@ function createReporter() {
}
return true;
},
success: function() {
success: function () {
if (overlay) overlay.clear();
},
useCustomOverlay: function(customOverlay) {
useCustomOverlay: function (customOverlay) {
overlay = customOverlay;
},
};
Expand Down
4 changes: 2 additions & 2 deletions example/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var time = document.getElementById('time');
var timer = setInterval(updateClock, 1000);

function updateClock() {
time.innerHTML = (new Date()).toString();
time.innerHTML = new Date().toString();
}

// Edit these styles to see them take effect immediately
Expand All @@ -28,7 +28,7 @@ require('assert');

if (module.hot) {
module.hot.accept();
module.hot.dispose(function() {
module.hot.dispose(function () {
clearInterval(timer);
});
}
30 changes: 16 additions & 14 deletions example/index-multientry.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name=viewport content="width=device-width, initial-scale=1">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Webpack Hot Middleware Multiple Entry Point Example</title>
</head>
<body>
<div id="app">
<p id="time">Date</p>
<input
type="text" size="40" style="text-align: center"
</head>
<body>
<div id="app">
<p id="time">Date</p>
<input
type="text"
size="40"
style="text-align: center"
placeholder="Type something in here to prove state isn't lost"
/>
</div>
<script src="/client.js"></script>
<script src="/extra.js"></script>
</body>
/>
</div>
<script src="/client.js"></script>
<script src="/extra.js"></script>
</body>
</html>
28 changes: 15 additions & 13 deletions example/index.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name=viewport content="width=device-width, initial-scale=1">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Webpack Hot Middleware Example</title>
</head>
<body>
<div id="app">
<p id="time">Date</p>
<input
type="text" size="40" style="text-align: center"
</head>
<body>
<div id="app">
<p id="time">Date</p>
<input
type="text"
size="40"
style="text-align: center"
placeholder="Type something in here to prove state isn't lost"
/>
</div>
<script src="/bundle.js"></script>
</body>
/>
</div>
<script src="/bundle.js"></script>
</body>
</html>
36 changes: 22 additions & 14 deletions example/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var http = require('http');

var express = require('express');

require('console-stamp')(console, "HH:MM:ss.l");
require('console-stamp')(console, 'HH:MM:ss.l');

var app = express();

Expand All @@ -11,36 +11,44 @@ app.use(require('morgan')('short'));
// ************************************
// This is the real meat of the example
// ************************************
(function() {

(function () {
// Step 1: Create & configure a webpack compiler
var webpack = require('webpack');
var webpackConfig = require(process.env.WEBPACK_CONFIG ? process.env.WEBPACK_CONFIG : './webpack.config');
var webpackConfig = require(process.env.WEBPACK_CONFIG
? process.env.WEBPACK_CONFIG
: './webpack.config');
var compiler = webpack(webpackConfig);

// Step 2: Attach the dev middleware to the compiler & the server
app.use(require("webpack-dev-middleware")(compiler, {
logLevel: 'warn', publicPath: webpackConfig.output.publicPath
}));
app.use(
require('webpack-dev-middleware')(compiler, {
logLevel: 'warn',
publicPath: webpackConfig.output.publicPath,
})
);

// Step 3: Attach the hot middleware to the compiler & the server
app.use(require("webpack-hot-middleware")(compiler, {
log: console.log, path: '/__webpack_hmr', heartbeat: 10 * 1000
}));
app.use(
require('webpack-hot-middleware')(compiler, {
log: console.log,
path: '/__webpack_hmr',
heartbeat: 10 * 1000,
})
);
})();

// Do anything you like with the rest of your express application.

app.get("/", function(req, res) {
app.get('/', function (req, res) {
res.sendFile(__dirname + '/index.html');
});
app.get("/multientry", function(req, res) {
app.get('/multientry', function (req, res) {
res.sendFile(__dirname + '/index-multientry.html');
});

if (require.main === module) {
var server = http.createServer(app);
server.listen(process.env.PORT || 1616, function() {
console.log("Listening on %j", server.address());
server.listen(process.env.PORT || 1616, function () {
console.log('Listening on %j', server.address());
});
}
6 changes: 3 additions & 3 deletions example/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ module.exports = {
// useful if you run your app from another point like django
'webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000',
// And then the actual application
'./client.js'
'./client.js',
],
output: {
path: __dirname,
publicPath: '/',
filename: 'bundle.js'
filename: 'bundle.js',
},
devtool: '#source-map',
plugins: [
new webpack.HotModuleReplacementPlugin(),
new webpack.NoEmitOnErrorsPlugin()
new webpack.NoEmitOnErrorsPlugin(),
],
};
9 changes: 5 additions & 4 deletions example/webpack.config.multientry.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var webpack = require('webpack');
var hotMiddlewareScript = 'webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000&reload=true';
var hotMiddlewareScript =
'webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000&reload=true';

module.exports = {
mode: 'development',
Expand All @@ -8,17 +9,17 @@ module.exports = {
entry: {
// Add the client which connects to our middleware
client: ['./client.js', hotMiddlewareScript],
extra: ['./extra.js', hotMiddlewareScript]
extra: ['./extra.js', hotMiddlewareScript],
},
output: {
path: __dirname,
publicPath: '/',
filename: '[name].js'
filename: '[name].js',
},
devtool: '#source-map',
plugins: [
new webpack.optimize.OccurrenceOrderPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoEmitOnErrorsPlugin()
new webpack.NoEmitOnErrorsPlugin(),
],
};
2 changes: 1 addition & 1 deletion helpers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var parse = require('url').parse;

exports.pathMatch = function(url, path) {
exports.pathMatch = function (url, path) {
try {
return parse(url).pathname === path;
} catch (e) {
Expand Down

0 comments on commit 04fa8c8

Please sign in to comment.