style: allow comma-dangle in eslintrc because compete with prettier (#…

…1649)
webpack · Feb 5, 2019 · 102941f · 102941f
1 parent 4a04864
commit 102941f
Show file tree

Hide file tree

Showing 69 changed files with 293 additions and 293 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -8,7 +8,6 @@
     "sourceType": "script"
   },
   "rules": {
-    "comma-dangle": ["error", "never"],
     "consistent-return": "off",
     "no-param-reassign": "off",
     "no-underscore-dangle": "off",

diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,4 @@
 client-src/live/web_modules/
 node_modules
 CHANGELOG.md
+*.bundle.js
diff --git a/bin/options.js b/bin/options.js
@@ -15,44 +15,44 @@ const BASIC_GROUP = 'Basic options:';
 const options = {
   bonjour: {
     type: 'boolean',
-    describe: 'Broadcasts the server via ZeroConf networking on start'
+    describe: 'Broadcasts the server via ZeroConf networking on start',
   },
   lazy: {
     type: 'boolean',
-    describe: 'Lazy'
+    describe: 'Lazy',
   },
   inline: {
     type: 'boolean',
     default: true,
     describe:
-      'Inline mode (set to false to disable including client scripts like livereload)'
+      'Inline mode (set to false to disable including client scripts like livereload)',
   },
   progress: {
     type: 'boolean',
     describe: 'Print compilation progress in percentage',
-    group: BASIC_GROUP
+    group: BASIC_GROUP,
   },
   'hot-only': {
     type: 'boolean',
     describe: 'Do not refresh page if HMR fails',
-    group: ADVANCED_GROUP
+    group: ADVANCED_GROUP,
   },
   stdin: {
     type: 'boolean',
-    describe: 'close when stdin ends'
+    describe: 'close when stdin ends',
   },
   open: {
     type: 'string',
-    describe: 'Open the default browser, or optionally specify a browser name'
+    describe: 'Open the default browser, or optionally specify a browser name',
   },
   useLocalIp: {
     type: 'boolean',
-    describe: 'Open default browser with local IP'
+    describe: 'Open default browser with local IP',
   },
   'open-page': {
     type: 'string',
     describe: 'Open default browser with the specified page',
-    requiresArg: true
+    requiresArg: true,
   },
   color: {
     type: 'boolean',
@@ -63,106 +63,106 @@ const options = {
       return require('supports-color').stdout;
     },
     group: DISPLAY_GROUP,
-    describe: 'Enables/Disables colors on the console'
+    describe: 'Enables/Disables colors on the console',
   },
   info: {
     type: 'boolean',
     group: DISPLAY_GROUP,
     default: true,
-    describe: 'Info'
+    describe: 'Info',
   },
   quiet: {
     type: 'boolean',
     group: DISPLAY_GROUP,
-    describe: 'Quiet'
+    describe: 'Quiet',
   },
   'client-log-level': {
     type: 'string',
     group: DISPLAY_GROUP,
     default: 'info',
-    describe: 'Log level in the browser (info, warning, error or none)'
+    describe: 'Log level in the browser (info, warning, error or none)',
   },
   https: {
     type: 'boolean',
     group: SSL_GROUP,
-    describe: 'HTTPS'
+    describe: 'HTTPS',
   },
   key: {
     type: 'string',
     describe: 'Path to a SSL key.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   cert: {
     type: 'string',
     describe: 'Path to a SSL certificate.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   cacert: {
     type: 'string',
     describe: 'Path to a SSL CA certificate.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   pfx: {
     type: 'string',
     describe: 'Path to a SSL pfx file.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   'pfx-passphrase': {
     type: 'string',
     describe: 'Passphrase for pfx file.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   'content-base': {
     type: 'string',
     describe: 'A directory or URL to serve HTML content from.',
-    group: RESPONSE_GROUP
+    group: RESPONSE_GROUP,
   },
   'watch-content-base': {
     type: 'boolean',
     describe: 'Enable live-reloading of the content-base.',
-    group: RESPONSE_GROUP
+    group: RESPONSE_GROUP,
   },
   'history-api-fallback': {
     type: 'boolean',
     describe: 'Fallback to /index.html for Single Page Applications.',
-    group: RESPONSE_GROUP
+    group: RESPONSE_GROUP,
   },
   compress: {
     type: 'boolean',
     describe: 'Enable gzip compression',
-    group: RESPONSE_GROUP
+    group: RESPONSE_GROUP,
   },
   port: {
     describe: 'The port',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   'disable-host-check': {
     type: 'boolean',
     describe: 'Will not check the host',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   socket: {
     type: 'String',
     describe: 'Socket to listen',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   public: {
     type: 'string',
     describe: 'The public hostname/ip address of the server',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   host: {
     type: 'string',
     default: 'localhost',
     describe: 'The hostname/ip address the server will bind to',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   'allowed-hosts': {
     type: 'string',
     describe:
       'A comma-delimited string of hosts that are allowed to access the dev server',
-    group: CONNECTION_GROUP
-  }
+    group: CONNECTION_GROUP,
+  },
 };
 
 module.exports = options;
diff --git a/bin/utils.js b/bin/utils.js
@@ -25,7 +25,7 @@ const colors = {
     }
 
     return msg;
-  }
+  },
 };
 
 // eslint-disable-next-line
@@ -103,7 +103,7 @@ function bonjour(options) {
     name: 'Webpack Dev Server',
     port: options.port,
     type: 'http',
-    subtypes: ['webpack']
+    subtypes: ['webpack'],
   });
 
   process.on('exit', () => {
@@ -118,5 +118,5 @@ module.exports = {
   colors,
   version,
   bonjour,
-  defaultTo
+  defaultTo,
 };
diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js
@@ -86,7 +86,7 @@ yargs.options(options);
 const argv = yargs.argv;
 
 const config = require('webpack-cli/bin/convert-argv')(yargs, argv, {
-  outputFilename: '/bundle.js'
+  outputFilename: '/bundle.js',
 });
 // Taken out of yargs because we must know if
 // it wasn't given by the user, in which case
@@ -201,7 +201,7 @@ function processOptions(config) {
   if (!options.stats) {
     options.stats = {
       cached: false,
-      cachedAssets: false
+      cachedAssets: false,
     };
   }
 
@@ -313,7 +313,7 @@ function startDevServer(config, options) {
 
   if (options.progress) {
     new webpack.ProgressPlugin({
-      profile: argv.profile
+      profile: argv.profile,
     }).apply(compiler);
   }
 

diff --git a/client-src/default/index.js b/client-src/default/index.js
@@ -71,7 +71,7 @@ function sendMsg(type, data) {
     self.postMessage(
       {
         type: `webpack${type}`,
-        data
+        data,
       },
       '*'
     );
@@ -176,7 +176,7 @@ const onSocketMsg = {
   close() {
     log.error('[WDS] Disconnected!');
     sendMsg('Close');
-  }
+  },
 };
 
 let hostname = urlParts.hostname;
@@ -215,7 +215,7 @@ const socketUrl = url.format({
   pathname:
     urlParts.path == null || urlParts.path === '/'
       ? '/sockjs-node'
-      : querystring.parse(urlParts.path).sockPath || urlParts.path
+      : querystring.parse(urlParts.path).sockPath || urlParts.path,
 });
 
 socket(socketUrl, onSocketMsg);

diff --git a/client-src/default/overlay.js b/client-src/default/overlay.js
@@ -18,7 +18,7 @@ const colors = {
   magenta: '7FACCA',
   cyan: 'C3C2EF',
   lightgrey: 'EBE7E3',
-  darkgrey: '6D7891'
+  darkgrey: '6D7891',
 };
 ansiHTML.setColors(colors);
 

diff --git a/client-src/default/webpack.config.js b/client-src/default/webpack.config.js
@@ -9,10 +9,10 @@ module.exports = {
         exclude: /node_modules|web_modules/,
         use: [
           {
-            loader: 'babel-loader'
-          }
-        ]
-      }
-    ]
-  }
+            loader: 'babel-loader',
+          },
+        ],
+      },
+    ],
+  },
 };
diff --git a/client-src/live/index.js b/client-src/live/index.js
@@ -26,7 +26,7 @@ $(() => {
   $errors.hide();
   iframe.hide();
   header.css({
-    borderColor: '#96b5b4'
+    borderColor: '#96b5b4',
   });
 
   const onSocketMsg = {
@@ -38,7 +38,7 @@ $(() => {
       okness.text('');
       status.text('App updated. Recompiling...');
       header.css({
-        borderColor: '#96b5b4'
+        borderColor: '#96b5b4',
       });
       $errors.hide();
       if (!hot) iframe.hide();
@@ -50,7 +50,7 @@ $(() => {
       okness.text('');
       status.text('App ready.');
       header.css({
-        borderColor: ''
+        borderColor: '',
       });
       $errors.hide();
       if (!hot) iframe.show();
@@ -70,7 +70,7 @@ $(() => {
       okness.text('Errors while compiling.');
       $errors.text(`\n${stripAnsi(errors.join('\n\n\n'))}\n\n`);
       header.css({
-        borderColor: '#ebcb8b'
+        borderColor: '#ebcb8b',
       });
       $errors.show();
       iframe.hide();
@@ -82,19 +82,19 @@ $(() => {
         '\n\n\n  Lost connection to webpack-dev-server.\n  Please restart the server to reestablish connection...\n\n\n\n'
       );
       header.css({
-        borderColor: '#ebcb8b'
+        borderColor: '#ebcb8b',
       });
       $errors.show();
       iframe.hide();
-    }
+    },
   };
 
   socket('/sockjs-node', onSocketMsg);
 
   iframe.on('load', () => {
     status.text('App ready.');
     header.css({
-      borderColor: ''
+      borderColor: '',
     });
     iframe.show();
   });
@@ -114,7 +114,7 @@ $(() => {
     } else {
       status.text('App updated. Reloading app...');
       header.css({
-        borderColor: '#96b5b4'
+        borderColor: '#96b5b4',
       });
       try {
         let old = `${iframe[0].contentWindow.location}`;