Skip to content

Commit 102941f

Browse files
hiroppyevilebottnawi
authored andcommitted
style: allow comma-dangle in eslintrc because compete with prettier (#1649)
1 parent 4a04864 commit 102941f

File tree

69 files changed

+293
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+293
-293
lines changed

.eslintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"sourceType": "script"
99
},
1010
"rules": {
11-
"comma-dangle": ["error", "never"],
1211
"consistent-return": "off",
1312
"no-param-reassign": "off",
1413
"no-underscore-dangle": "off",

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
client-src/live/web_modules/
22
node_modules
33
CHANGELOG.md
4+
*.bundle.js

bin/options.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,44 @@ const BASIC_GROUP = 'Basic options:';
1515
const options = {
1616
bonjour: {
1717
type: 'boolean',
18-
describe: 'Broadcasts the server via ZeroConf networking on start'
18+
describe: 'Broadcasts the server via ZeroConf networking on start',
1919
},
2020
lazy: {
2121
type: 'boolean',
22-
describe: 'Lazy'
22+
describe: 'Lazy',
2323
},
2424
inline: {
2525
type: 'boolean',
2626
default: true,
2727
describe:
28-
'Inline mode (set to false to disable including client scripts like livereload)'
28+
'Inline mode (set to false to disable including client scripts like livereload)',
2929
},
3030
progress: {
3131
type: 'boolean',
3232
describe: 'Print compilation progress in percentage',
33-
group: BASIC_GROUP
33+
group: BASIC_GROUP,
3434
},
3535
'hot-only': {
3636
type: 'boolean',
3737
describe: 'Do not refresh page if HMR fails',
38-
group: ADVANCED_GROUP
38+
group: ADVANCED_GROUP,
3939
},
4040
stdin: {
4141
type: 'boolean',
42-
describe: 'close when stdin ends'
42+
describe: 'close when stdin ends',
4343
},
4444
open: {
4545
type: 'string',
46-
describe: 'Open the default browser, or optionally specify a browser name'
46+
describe: 'Open the default browser, or optionally specify a browser name',
4747
},
4848
useLocalIp: {
4949
type: 'boolean',
50-
describe: 'Open default browser with local IP'
50+
describe: 'Open default browser with local IP',
5151
},
5252
'open-page': {
5353
type: 'string',
5454
describe: 'Open default browser with the specified page',
55-
requiresArg: true
55+
requiresArg: true,
5656
},
5757
color: {
5858
type: 'boolean',
@@ -63,106 +63,106 @@ const options = {
6363
return require('supports-color').stdout;
6464
},
6565
group: DISPLAY_GROUP,
66-
describe: 'Enables/Disables colors on the console'
66+
describe: 'Enables/Disables colors on the console',
6767
},
6868
info: {
6969
type: 'boolean',
7070
group: DISPLAY_GROUP,
7171
default: true,
72-
describe: 'Info'
72+
describe: 'Info',
7373
},
7474
quiet: {
7575
type: 'boolean',
7676
group: DISPLAY_GROUP,
77-
describe: 'Quiet'
77+
describe: 'Quiet',
7878
},
7979
'client-log-level': {
8080
type: 'string',
8181
group: DISPLAY_GROUP,
8282
default: 'info',
83-
describe: 'Log level in the browser (info, warning, error or none)'
83+
describe: 'Log level in the browser (info, warning, error or none)',
8484
},
8585
https: {
8686
type: 'boolean',
8787
group: SSL_GROUP,
88-
describe: 'HTTPS'
88+
describe: 'HTTPS',
8989
},
9090
key: {
9191
type: 'string',
9292
describe: 'Path to a SSL key.',
93-
group: SSL_GROUP
93+
group: SSL_GROUP,
9494
},
9595
cert: {
9696
type: 'string',
9797
describe: 'Path to a SSL certificate.',
98-
group: SSL_GROUP
98+
group: SSL_GROUP,
9999
},
100100
cacert: {
101101
type: 'string',
102102
describe: 'Path to a SSL CA certificate.',
103-
group: SSL_GROUP
103+
group: SSL_GROUP,
104104
},
105105
pfx: {
106106
type: 'string',
107107
describe: 'Path to a SSL pfx file.',
108-
group: SSL_GROUP
108+
group: SSL_GROUP,
109109
},
110110
'pfx-passphrase': {
111111
type: 'string',
112112
describe: 'Passphrase for pfx file.',
113-
group: SSL_GROUP
113+
group: SSL_GROUP,
114114
},
115115
'content-base': {
116116
type: 'string',
117117
describe: 'A directory or URL to serve HTML content from.',
118-
group: RESPONSE_GROUP
118+
group: RESPONSE_GROUP,
119119
},
120120
'watch-content-base': {
121121
type: 'boolean',
122122
describe: 'Enable live-reloading of the content-base.',
123-
group: RESPONSE_GROUP
123+
group: RESPONSE_GROUP,
124124
},
125125
'history-api-fallback': {
126126
type: 'boolean',
127127
describe: 'Fallback to /index.html for Single Page Applications.',
128-
group: RESPONSE_GROUP
128+
group: RESPONSE_GROUP,
129129
},
130130
compress: {
131131
type: 'boolean',
132132
describe: 'Enable gzip compression',
133-
group: RESPONSE_GROUP
133+
group: RESPONSE_GROUP,
134134
},
135135
port: {
136136
describe: 'The port',
137-
group: CONNECTION_GROUP
137+
group: CONNECTION_GROUP,
138138
},
139139
'disable-host-check': {
140140
type: 'boolean',
141141
describe: 'Will not check the host',
142-
group: CONNECTION_GROUP
142+
group: CONNECTION_GROUP,
143143
},
144144
socket: {
145145
type: 'String',
146146
describe: 'Socket to listen',
147-
group: CONNECTION_GROUP
147+
group: CONNECTION_GROUP,
148148
},
149149
public: {
150150
type: 'string',
151151
describe: 'The public hostname/ip address of the server',
152-
group: CONNECTION_GROUP
152+
group: CONNECTION_GROUP,
153153
},
154154
host: {
155155
type: 'string',
156156
default: 'localhost',
157157
describe: 'The hostname/ip address the server will bind to',
158-
group: CONNECTION_GROUP
158+
group: CONNECTION_GROUP,
159159
},
160160
'allowed-hosts': {
161161
type: 'string',
162162
describe:
163163
'A comma-delimited string of hosts that are allowed to access the dev server',
164-
group: CONNECTION_GROUP
165-
}
164+
group: CONNECTION_GROUP,
165+
},
166166
};
167167

168168
module.exports = options;

bin/utils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const colors = {
2525
}
2626

2727
return msg;
28-
}
28+
},
2929
};
3030

3131
// eslint-disable-next-line
@@ -103,7 +103,7 @@ function bonjour(options) {
103103
name: 'Webpack Dev Server',
104104
port: options.port,
105105
type: 'http',
106-
subtypes: ['webpack']
106+
subtypes: ['webpack'],
107107
});
108108

109109
process.on('exit', () => {
@@ -118,5 +118,5 @@ module.exports = {
118118
colors,
119119
version,
120120
bonjour,
121-
defaultTo
121+
defaultTo,
122122
};

bin/webpack-dev-server.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ yargs.options(options);
8686
const argv = yargs.argv;
8787

8888
const config = require('webpack-cli/bin/convert-argv')(yargs, argv, {
89-
outputFilename: '/bundle.js'
89+
outputFilename: '/bundle.js',
9090
});
9191
// Taken out of yargs because we must know if
9292
// it wasn't given by the user, in which case
@@ -201,7 +201,7 @@ function processOptions(config) {
201201
if (!options.stats) {
202202
options.stats = {
203203
cached: false,
204-
cachedAssets: false
204+
cachedAssets: false,
205205
};
206206
}
207207

@@ -313,7 +313,7 @@ function startDevServer(config, options) {
313313

314314
if (options.progress) {
315315
new webpack.ProgressPlugin({
316-
profile: argv.profile
316+
profile: argv.profile,
317317
}).apply(compiler);
318318
}
319319

client-src/default/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function sendMsg(type, data) {
7171
self.postMessage(
7272
{
7373
type: `webpack${type}`,
74-
data
74+
data,
7575
},
7676
'*'
7777
);
@@ -176,7 +176,7 @@ const onSocketMsg = {
176176
close() {
177177
log.error('[WDS] Disconnected!');
178178
sendMsg('Close');
179-
}
179+
},
180180
};
181181

182182
let hostname = urlParts.hostname;
@@ -215,7 +215,7 @@ const socketUrl = url.format({
215215
pathname:
216216
urlParts.path == null || urlParts.path === '/'
217217
? '/sockjs-node'
218-
: querystring.parse(urlParts.path).sockPath || urlParts.path
218+
: querystring.parse(urlParts.path).sockPath || urlParts.path,
219219
});
220220

221221
socket(socketUrl, onSocketMsg);

client-src/default/overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const colors = {
1818
magenta: '7FACCA',
1919
cyan: 'C3C2EF',
2020
lightgrey: 'EBE7E3',
21-
darkgrey: '6D7891'
21+
darkgrey: '6D7891',
2222
};
2323
ansiHTML.setColors(colors);
2424

client-src/default/webpack.config.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ module.exports = {
99
exclude: /node_modules|web_modules/,
1010
use: [
1111
{
12-
loader: 'babel-loader'
13-
}
14-
]
15-
}
16-
]
17-
}
12+
loader: 'babel-loader',
13+
},
14+
],
15+
},
16+
],
17+
},
1818
};

client-src/live/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $(() => {
2626
$errors.hide();
2727
iframe.hide();
2828
header.css({
29-
borderColor: '#96b5b4'
29+
borderColor: '#96b5b4',
3030
});
3131

3232
const onSocketMsg = {
@@ -38,7 +38,7 @@ $(() => {
3838
okness.text('');
3939
status.text('App updated. Recompiling...');
4040
header.css({
41-
borderColor: '#96b5b4'
41+
borderColor: '#96b5b4',
4242
});
4343
$errors.hide();
4444
if (!hot) iframe.hide();
@@ -50,7 +50,7 @@ $(() => {
5050
okness.text('');
5151
status.text('App ready.');
5252
header.css({
53-
borderColor: ''
53+
borderColor: '',
5454
});
5555
$errors.hide();
5656
if (!hot) iframe.show();
@@ -70,7 +70,7 @@ $(() => {
7070
okness.text('Errors while compiling.');
7171
$errors.text(`\n${stripAnsi(errors.join('\n\n\n'))}\n\n`);
7272
header.css({
73-
borderColor: '#ebcb8b'
73+
borderColor: '#ebcb8b',
7474
});
7575
$errors.show();
7676
iframe.hide();
@@ -82,19 +82,19 @@ $(() => {
8282
'\n\n\n Lost connection to webpack-dev-server.\n Please restart the server to reestablish connection...\n\n\n\n'
8383
);
8484
header.css({
85-
borderColor: '#ebcb8b'
85+
borderColor: '#ebcb8b',
8686
});
8787
$errors.show();
8888
iframe.hide();
89-
}
89+
},
9090
};
9191

9292
socket('/sockjs-node', onSocketMsg);
9393

9494
iframe.on('load', () => {
9595
status.text('App ready.');
9696
header.css({
97-
borderColor: ''
97+
borderColor: '',
9898
});
9999
iframe.show();
100100
});
@@ -114,7 +114,7 @@ $(() => {
114114
} else {
115115
status.text('App updated. Reloading app...');
116116
header.css({
117-
borderColor: '#96b5b4'
117+
borderColor: '#96b5b4',
118118
});
119119
try {
120120
let old = `${iframe[0].contentWindow.location}`;

0 commit comments

Comments
 (0)