Add Prettier (OctoLinker#380)

* Add prettier * Bypass prettier issue with eslint disable line comments Basically I changed all eslint-disable-line comments to eslint-disable-next-line See prettier/prettier#1267 for details * Reformat code with prettier
DevhanDod · Oct 6, 2017 · f808918 · f808918
1 parent e4bd3de
commit f808918
Show file tree

Hide file tree

Showing 70 changed files with 598 additions and 571 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,11 +1,15 @@
 module.exports = {
-  extends: ['airbnb-base', 'plugin:import/errors'],
-  plugins: ['mocha'],
+  extends: ['airbnb-base', 'plugin:import/errors', 'prettier'],
+  plugins: ['prettier', 'mocha'],
   env: {
     browser: true,
     mocha: true
   },
   rules: {
+    'prettier/prettier': ['error', {
+      singleQuote: true,
+      trailingComma: 'all',
+    }],
     'func-names': 0,
     'id-length': [1, {'exceptions': ['$']}],
     'new-cap': [2, {'capIsNewExceptions': ['Deferred']}],

diff --git a/karma.conf.js b/karma.conf.js
@@ -1,4 +1,3 @@
-
 const webpackConfig = require('./webpack.config');
 
 webpackConfig.devtool = 'inline-source-map';
@@ -7,15 +6,15 @@ if (process.env.APPVEYOR) {
   require('phantomjs-prebuilt').path = ''; // eslint-disable-line
 }
 
-module.exports = function (config) {
+module.exports = function(config) {
   config.set({
     basePath: '',
     frameworks: ['detectBrowsers', 'mocha', 'fixture'],
     detectBrowsers: {
       postDetection(availableBrowsers) {
         return availableBrowsers
           .filter(browser => ['Chrome', 'Firefox'].includes(browser))
-          .map((browser) => {
+          .map(browser => {
             if (browser === 'Chrome' && process.env.TRAVIS) {
               return 'Chrome_travis_ci';
             }

diff --git a/lib/background/insight.js b/lib/background/insight.js
@@ -38,9 +38,7 @@ class Insight {
     this.cid = clientId;
   }
 
-  track({
-    category, action, label, value,
-  }) {
+  track({ category, action, label, value }) {
     const params = {
       t: 'event',
       ec: category,
@@ -50,10 +48,13 @@ class Insight {
     if (label) params.el = label;
     if (value) params.ev = value;
 
-    return send({
-      tid: this.tid,
-      cid: this.cid,
-    }, params);
+    return send(
+      {
+        tid: this.tid,
+        cid: this.cid,
+      },
+      params,
+    );
   }
 }
 

diff --git a/lib/click-handler.js b/lib/click-handler.js
@@ -3,7 +3,7 @@ import { showTooltip } from './gh-interface.js';
 import * as storage from './options/storage.js';
 import fetch from './utils/fetch.js';
 
-const SORRY = 'I\'m sorry, unable to resolve this link  😱';
+const SORRY = "I'm sorry, unable to resolve this link  😱";
 const PROCESS = 'Processing  ⏳';
 const RESOLVED = 'Redirecting  🚀';
 
@@ -47,7 +47,7 @@ function getResolverUrls(dataAttr) {
     },
   });
 
-  return [].concat(resolver(dataAttr)).map((url) => {
+  return [].concat(resolver(dataAttr)).map(url => {
     if (!url) {
       return null;
     }
@@ -111,7 +111,11 @@ async function onClick(event) {
     track('success');
     showTooltip($tooltipTarget, RESOLVED);
 
-    const newWindow = (storage.get('newWindow') || event.metaKey || event.ctrlKey || event.which === 2);
+    const newWindow =
+      storage.get('newWindow') ||
+      event.metaKey ||
+      event.ctrlKey ||
+      event.which === 2;
     const newWindowActive = storage.get('newWindowActive');
     openUrl((res || {}).url || url, newWindow, newWindowActive);
   } catch (err) {
@@ -122,7 +126,7 @@ async function onClick(event) {
   }
 }
 
-export default function (_pluginManager) {
+export default function(_pluginManager) {
   $body.undelegate(LINK_SELECTOR, 'click', onClick);
   $body.undelegate(LINK_SELECTOR, 'mouseup', onClick);
 

diff --git a/lib/debug-mode.js b/lib/debug-mode.js
@@ -1,4 +1,4 @@
-export default function (enable = false) {
+export default function(enable = false) {
   if (!enable) {
     return;
   }

diff --git a/lib/insert-link.js b/lib/insert-link.js
@@ -119,7 +119,10 @@ function wrapsInnerString(text, matchValue, dataAttrObject) {
   const [leftSide, rightSide] = text.split(matchValue);
   const openingQuote = getQuoteAtPos(matchValue, 0);
   const closingQuote = getQuoteAtPos(matchValue, matchValue.length - 1);
-  const linkText = matchValue.slice(openingQuote ? 1 : 0, closingQuote ? matchValue.length - 1 : undefined);
+  const linkText = matchValue.slice(
+    openingQuote ? 1 : 0,
+    closingQuote ? matchValue.length - 1 : undefined,
+  );
 
   if (leftSide) parent.appendChild(document.createTextNode(leftSide));
   if (openingQuote) parent.appendChild(document.createTextNode(openingQuote));
@@ -131,7 +134,8 @@ function wrapsInnerString(text, matchValue, dataAttrObject) {
 
 function replace(portion, match, dataAttr, captureGroup) {
   const { text, node, indexInMatch } = portion;
-  const isAlreadyWrapped = (node.parentNode.parentNode || node.parentNode).classList.contains(CLASS_NAME);
+  const isAlreadyWrapped = (node.parentNode.parentNode || node.parentNode
+  ).classList.contains(CLASS_NAME);
   if (isAlreadyWrapped) {
     return text;
   }
@@ -143,7 +147,11 @@ function replace(portion, match, dataAttr, captureGroup) {
     return wrapsInnerString(text, matchValue, dataAttrObject);
   }
 
-  const { valueStartPos, valueEndPos, portionEndPos } = getIndexes(portion, match[0], matchValue);
+  const { valueStartPos, valueEndPos, portionEndPos } = getIndexes(
+    portion,
+    match[0],
+    matchValue,
+  );
   if (valueStartPos === indexInMatch) {
     if (portionEndPos === valueEndPos) {
       return createLinkElement(text, dataAttrObject);
@@ -156,7 +164,7 @@ function replace(portion, match, dataAttr, captureGroup) {
   return text;
 }
 
-export default function (el, regex, mapping, captureGroup = '$1') {
+export default function(el, regex, mapping, captureGroup = '$1') {
   if (!(el instanceof HTMLElement)) {
     throw new Error('must be called with a DOM element');
   }

diff --git a/lib/load-plugins.js b/lib/load-plugins.js
@@ -1,11 +1,12 @@
-
 // Load all plugins from /lib/plugins/*/index.js.
 // For more information about dynamic require see
 // https://webpack.github.io/docs/context.html
 
 export default function loadPlugins() {
   function requireAll(requireContext) {
-    return requireContext.keys().map(pluginPath => requireContext(pluginPath).default);
+    return requireContext
+      .keys()
+      .map(pluginPath => requireContext(pluginPath).default);
   }
 
   return requireAll(require.context('./plugins', false, /[^/]*.js$/));

diff --git a/lib/notification.js b/lib/notification.js
@@ -1,9 +1,12 @@
 import { showNotification } from './gh-interface';
 import * as storage from './options/storage.js';
 
-const pkgVersion = require('../package.json').version.split('.').slice(0, -1).join('.');
+const pkgVersion = require('../package.json')
+  .version.split('.')
+  .slice(0, -1)
+  .join('.');
 
-export default async function () {
+export default async function() {
   const showUpdateNotification = storage.get('showUpdateNotification');
 
   if (!showUpdateNotification) {
@@ -15,7 +18,9 @@ export default async function () {
   storage.set('version', pkgVersion);
 
   if (installedVersion && installedVersion !== pkgVersion) {
-    const response = await fetch('https://api.github.com/repos/octolinker/browser-extension/releases/latest');
+    const response = await fetch(
+      'https://api.github.com/repos/octolinker/browser-extension/releases/latest',
+    );
     const json = await response.json();
     const description = json.body.split('\n')[0];
     const url = json.html_url;

diff --git a/lib/octo-linker.js b/lib/octo-linker.js
@@ -8,7 +8,6 @@ import debugMode from './debug-mode.js';
 import loadPlugins from './load-plugins';
 import * as storage from './options/storage.js';
 
-
 function initialize(self) {
   debugMode(storage.get('debugMode'));
   notification();
@@ -25,18 +24,18 @@ function run(self) {
 
   self._blobReader.read();
 
-  self._blobReader.forEach((blob) => {
+  self._blobReader.forEach(blob => {
     const plugins = self._pluginManager.get(blob.path, blob.el.classList);
 
     if (!plugins.length) {
       return;
     }
 
-    plugins.forEach((plugin) => {
+    plugins.forEach(plugin => {
       if (plugin.parseBlob) {
         plugin.parseBlob(blob);
       } else if (plugin.getLinkRegexes) {
-        [].concat(plugin.getLinkRegexes(blob)).forEach((regex) => {
+        [].concat(plugin.getLinkRegexes(blob)).forEach(regex => {
           insertLink(blob.el, regex, {
             pluginName: plugin.name,
             target: '$1',

diff --git a/lib/options/components/checkbox.js b/lib/options/components/checkbox.js
@@ -1,7 +1,5 @@
-export default ({
-  name, label, value, defaultValue, description,
-}) => {
-  const val = (value === undefined) ? defaultValue : value;
+export default ({ name, label, value, defaultValue, description }) => {
+  const val = value === undefined ? defaultValue : value;
   const note = description ? `<p class="note">${description}</p>` : '';
 
   return `<div class="form-checkbox">

diff --git a/lib/options/components/index.js b/lib/options/components/index.js
@@ -1,7 +1,7 @@
 import checkbox from './checkbox';
 import input from './input';
 
-export default function ({ type, ...rest }) {
+export default function({ type, ...rest }) {
   if (type === 'checkbox') {
     return checkbox(rest);
   } else if (type === 'text' || type === 'password') {

diff --git a/lib/options/components/input.js b/lib/options/components/input.js
@@ -1,7 +1,5 @@
-export default ({
-  type, name, label, value, defaultValue, description,
-}) => {
-  const val = (value === undefined) ? defaultValue : value;
+export default ({ type, name, label, value, defaultValue, description }) => {
+  const val = value === undefined ? defaultValue : value;
   const note = description ? `<p class="note">${description}</p>` : '';
 
   return `<dl class="form-group">

diff --git a/lib/options/options.js b/lib/options/options.js
@@ -4,7 +4,8 @@ export const options = [
     name: 'githubToken',
     label: 'Access token',
     sensitiveData: true,
-    description: 'If you want better <strong>Sass, Less or Haskell support</strong> for private repositories, you\'ll need to <a href="https://github.com/settings/tokens/new?scopes=repo&description=OctoLinker%20browser%20extension">create a token</a> with the repo permissions.',
+    description:
+      'If you want better <strong>Sass, Less or Haskell support</strong> for private repositories, you\'ll need to <a href="https://github.com/settings/tokens/new?scopes=repo&description=OctoLinker%20browser%20extension">create a token</a> with the repo permissions.',
     defaultValue: '',
   },
   {

diff --git a/lib/options/page.js b/lib/options/page.js
@@ -9,7 +9,7 @@ import { options } from './options';
 const formEl = document.querySelector('#options');
 
 storage.load().then(() => {
-  options.forEach((item) => {
+  options.forEach(item => {
     formEl.innerHTML += components({
       ...item,
       value: storage.get(item.name),

diff --git a/lib/options/storage.js b/lib/options/storage.js
@@ -6,7 +6,7 @@ const chromep = new ChromePromise();
 const store = {};
 const defaults = {};
 
-options.forEach((item) => {
+options.forEach(item => {
   if (item.sensitiveData) {
     return;
   }

diff --git a/lib/plugin-manager.js b/lib/plugin-manager.js
@@ -19,16 +19,16 @@ function updatePluginsForKey(lookup, plugin, key) {
 function buildPluginCache(plugins) {
   const lookup = new Map();
 
-  plugins.forEach((plugin) => {
-    plugin.getPattern().pathPatterns.forEach((pattern) => {
+  plugins.forEach(plugin => {
+    plugin.getPattern().pathPatterns.forEach(pattern => {
       updatePluginsForKey(lookup, plugin, RegExp(pattern));
     });
 
     if (!plugin.getPattern().githubClasses) {
       return;
     }
 
-    plugin.getPattern().githubClasses.forEach((githubClass) => {
+    plugin.getPattern().githubClasses.forEach(githubClass => {
       updatePluginsForKey(lookup, plugin, githubClass);
     });
   });
@@ -47,7 +47,9 @@ function getPluginsForPath(plugins, filepath) {
 }
 
 function getPluginsForGithubClasses(plugins, classList) {
-  return flattenAndCompact(Array.from(classList).map(plugins.get.bind(plugins)));
+  return flattenAndCompact(
+    Array.from(classList).map(plugins.get.bind(plugins)),
+  );
 }
 
 export default class {

diff --git a/lib/plugins/bower-manifest.js b/lib/plugins/bower-manifest.js
@@ -41,10 +41,7 @@ export default {
       return liveResolverQuery({ type: 'bower', target });
     }
 
-    return [
-      gitUrl({ target }),
-      githubShorthand({ target }),
-    ];
+    return [gitUrl({ target }), githubShorthand({ target })];
   },
 
   getPattern() {

diff --git a/lib/plugins/css.js b/lib/plugins/css.js
@@ -5,18 +5,13 @@ export default {
   name: 'CSS',
 
   resolve({ target, path }) {
-    return [
-      relativeFile({ path, target }),
-    ];
+    return [relativeFile({ path, target })];
   },
 
   getPattern() {
     return {
       pathPatterns: ['.css$'],
-      githubClasses: [
-        'type-css',
-        'highlight-source-css',
-      ],
+      githubClasses: ['type-css', 'highlight-source-css'],
     };
   },
 

diff --git a/lib/plugins/docker.js b/lib/plugins/docker.js
@@ -11,18 +11,13 @@ export default {
       isOffical = false;
     }
 
-    return [
-      `https://hub.docker.com/${isOffical ? '_' : 'r'}/${imageName}`,
-    ];
+    return [`https://hub.docker.com/${isOffical ? '_' : 'r'}/${imageName}`];
   },
 
   getPattern() {
     return {
       pathPatterns: ['/Dockerfile$'],
-      githubClasses: [
-        'type-dockerfile',
-        'highlight-source-dockerfile',
-      ],
+      githubClasses: ['type-dockerfile', 'highlight-source-dockerfile'],
     };
   },
 

diff --git a/lib/plugins/go.js b/lib/plugins/go.js
@@ -47,19 +47,13 @@ export default {
       return githubUrls(target);
     }
 
-    return [
-      `https://${target}`,
-      `https://golang.org/pkg/${target}`,
-    ];
+    return [`https://${target}`, `https://golang.org/pkg/${target}`];
   },
 
   getPattern() {
     return {
       pathPatterns: ['.go$'],
-      githubClasses: [
-        'type-go',
-        'highlight-source-go',
-      ],
+      githubClasses: ['type-go', 'highlight-source-go'],
     };
   },