From 19561e9ad6fb0e359fc80601d555b88e4a87e548 Mon Sep 17 00:00:00 2001 From: Ronan Jouchet Date: Sat, 21 Jul 2018 09:16:02 -0400 Subject: [PATCH] Make eslint happy --- app/src/components/mainWindow/mainWindow.js | 6 +++--- app/src/components/mainWindow/mainWindowHelpers.js | 2 +- app/src/components/trayIcon/trayIcon.js | 2 +- gulp/build/build-app.js | 2 +- gulp/build/build-cli.js | 4 ++-- gulp/build/build-static.js | 4 ++-- src/build/buildMain.js | 8 ++++---- src/build/iconBuild.js | 4 ++-- src/cli.js | 2 +- src/infer/inferIcon.js | 2 +- src/options/fields/icon.js | 2 +- src/options/fields/icon.test.js | 2 +- src/options/fields/name.js | 6 +++--- src/options/fields/name.test.js | 6 +++--- src/options/fields/userAgent.js | 2 +- src/options/fields/userAgent.test.js | 2 +- src/options/optionsMain.js | 6 +++--- src/utils/sanitizeFilename.js | 2 +- src/utils/sanitizeFilename.test.js | 2 +- webpack.config.js | 4 +--- 20 files changed, 34 insertions(+), 36 deletions(-) diff --git a/app/src/components/mainWindow/mainWindow.js b/app/src/components/mainWindow/mainWindow.js index d5bf72e..538c8a4 100644 --- a/app/src/components/mainWindow/mainWindow.js +++ b/app/src/components/mainWindow/mainWindow.js @@ -3,9 +3,9 @@ import path from 'path'; import { BrowserWindow, shell, ipcMain, dialog } from 'electron'; import windowStateKeeper from 'electron-window-state'; import mainWindowHelpers from './mainWindowHelpers'; -import helpers from './../../helpers/helpers'; -import createMenu from './../menu/menu'; -import initContextMenu from './../contextMenu/contextMenu'; +import helpers from '../../helpers/helpers'; +import createMenu from '../menu/menu'; +import initContextMenu from '../contextMenu/contextMenu'; const { isOSX, diff --git a/app/src/components/mainWindow/mainWindowHelpers.js b/app/src/components/mainWindow/mainWindowHelpers.js index 3e3ed43..dee75f4 100644 --- a/app/src/components/mainWindow/mainWindowHelpers.js +++ b/app/src/components/mainWindow/mainWindowHelpers.js @@ -1,4 +1,4 @@ -import helpers from './../../helpers/helpers'; +import helpers from '../../helpers/helpers'; const { linkIsInternal } = helpers; diff --git a/app/src/components/trayIcon/trayIcon.js b/app/src/components/trayIcon/trayIcon.js index c90e3a3..fd67ab2 100644 --- a/app/src/components/trayIcon/trayIcon.js +++ b/app/src/components/trayIcon/trayIcon.js @@ -1,4 +1,4 @@ -import helpers from './../../helpers/helpers'; +import helpers from '../../helpers/helpers'; const { app, Tray, Menu, ipcMain, nativeImage } = require('electron'); diff --git a/gulp/build/build-app.js b/gulp/build/build-app.js index b067c5e..aaa5dc9 100644 --- a/gulp/build/build-app.js +++ b/gulp/build/build-app.js @@ -1,6 +1,6 @@ import gulp from 'gulp'; import webpack from 'webpack-stream'; -import PATHS from './../helpers/src-paths'; +import PATHS from '../helpers/src-paths'; const webpackConfig = require('./../../webpack.config.js'); diff --git a/gulp/build/build-cli.js b/gulp/build/build-cli.js index 7ca52e0..991c7f0 100644 --- a/gulp/build/build-cli.js +++ b/gulp/build/build-cli.js @@ -1,6 +1,6 @@ import gulp from 'gulp'; -import PATHS from './../helpers/src-paths'; -import helpers from './../helpers/gulp-helpers'; +import PATHS from '../helpers/src-paths'; +import helpers from '../helpers/gulp-helpers'; const { buildES6 } = helpers; diff --git a/gulp/build/build-static.js b/gulp/build/build-static.js index 3a7b6e9..7d4cd3f 100644 --- a/gulp/build/build-static.js +++ b/gulp/build/build-static.js @@ -1,6 +1,6 @@ import gulp from 'gulp'; -import PATHS from './../helpers/src-paths'; -import helpers from './../helpers/gulp-helpers'; +import PATHS from '../helpers/src-paths'; +import helpers from '../helpers/gulp-helpers'; const { buildES6 } = helpers; diff --git a/src/build/buildMain.js b/src/build/buildMain.js index 1833a8a..bde1e3b 100644 --- a/src/build/buildMain.js +++ b/src/build/buildMain.js @@ -5,11 +5,11 @@ import ncp from 'ncp'; import async from 'async'; import hasBinary from 'hasbin'; import log from 'loglevel'; -import DishonestProgress from './../helpers/dishonestProgress'; -import optionsFactory from './../options/optionsMain'; +import DishonestProgress from '../helpers/dishonestProgress'; +import optionsFactory from '../options/optionsMain'; import iconBuild from './iconBuild'; -import helpers from './../helpers/helpers'; -import PackagerConsole from './../helpers/packagerConsole'; +import helpers from '../helpers/helpers'; +import PackagerConsole from '../helpers/packagerConsole'; import buildApp from './buildApp'; const copy = ncp.ncp; diff --git a/src/build/iconBuild.js b/src/build/iconBuild.js index ab574c2..4a1798f 100644 --- a/src/build/iconBuild.js +++ b/src/build/iconBuild.js @@ -1,7 +1,7 @@ import path from 'path'; import log from 'loglevel'; -import helpers from './../helpers/helpers'; -import iconShellHelpers from './../helpers/iconShellHelpers'; +import helpers from '../helpers/helpers'; +import iconShellHelpers from '../helpers/iconShellHelpers'; const { isOSX } = helpers; const { convertToPng, convertToIco, convertToIcns } = iconShellHelpers; diff --git a/src/cli.js b/src/cli.js index 07183b3..2662d42 100755 --- a/src/cli.js +++ b/src/cli.js @@ -5,8 +5,8 @@ import program from 'commander'; import nativefier from './index'; const dns = require('dns'); -const packageJson = require('./../package'); const log = require('loglevel'); +const packageJson = require('./../package'); function collect(val, memo) { memo.push(val); diff --git a/src/infer/inferIcon.js b/src/infer/inferIcon.js index 638e04c..fa5f86b 100644 --- a/src/infer/inferIcon.js +++ b/src/infer/inferIcon.js @@ -3,7 +3,7 @@ import path from 'path'; import fs from 'fs'; import tmp from 'tmp'; import gitCloud from 'gitcloud'; -import helpers from './../helpers/helpers'; +import helpers from '../helpers/helpers'; const { downloadFile, allowedIconFormats } = helpers; tmp.setGracefulCleanup(); diff --git a/src/options/fields/icon.js b/src/options/fields/icon.js index 577cc75..9303685 100644 --- a/src/options/fields/icon.js +++ b/src/options/fields/icon.js @@ -1,5 +1,5 @@ import log from 'loglevel'; -import { inferIcon } from './../../infer'; +import { inferIcon } from '../../infer'; export default function({ icon, targetUrl, platform }) { // Icon is the path to the icon diff --git a/src/options/fields/icon.test.js b/src/options/fields/icon.test.js index b65a6af..35f1c07 100644 --- a/src/options/fields/icon.test.js +++ b/src/options/fields/icon.test.js @@ -1,6 +1,6 @@ import log from 'loglevel'; import icon from './icon'; -import { inferIcon } from './../../infer'; +import { inferIcon } from '../../infer'; jest.mock('./../../infer/inferIcon'); jest.mock('loglevel'); diff --git a/src/options/fields/name.js b/src/options/fields/name.js index b3e9673..62c8c21 100644 --- a/src/options/fields/name.js +++ b/src/options/fields/name.js @@ -1,7 +1,7 @@ import log from 'loglevel'; -import { sanitizeFilename } from './../../utils'; -import { inferTitle } from './../../infer'; -import { DEFAULT_APP_NAME } from './../../constants'; +import { sanitizeFilename } from '../../utils'; +import { inferTitle } from '../../infer'; +import { DEFAULT_APP_NAME } from '../../constants'; function tryToInferName({ name, targetUrl }) { // .length also checks if its the commanderJS function or a string diff --git a/src/options/fields/name.test.js b/src/options/fields/name.test.js index d01ff79..12673ec 100644 --- a/src/options/fields/name.test.js +++ b/src/options/fields/name.test.js @@ -1,8 +1,8 @@ import log from 'loglevel'; import name from './name'; -import { DEFAULT_APP_NAME } from './../../constants'; -import { inferTitle } from './../../infer'; -import { sanitizeFilename } from './../../utils'; +import { DEFAULT_APP_NAME } from '../../constants'; +import { inferTitle } from '../../infer'; +import { sanitizeFilename } from '../../utils'; jest.mock('./../../infer/inferTitle'); jest.mock('./../../utils/sanitizeFilename'); diff --git a/src/options/fields/userAgent.js b/src/options/fields/userAgent.js index 6a26aaf..510d4b0 100644 --- a/src/options/fields/userAgent.js +++ b/src/options/fields/userAgent.js @@ -1,4 +1,4 @@ -import { inferUserAgent } from './../../infer'; +import { inferUserAgent } from '../../infer'; export default function({ userAgent, electronVersion, platform }) { if (userAgent) { diff --git a/src/options/fields/userAgent.test.js b/src/options/fields/userAgent.test.js index 3e9e1cf..eed6c62 100644 --- a/src/options/fields/userAgent.test.js +++ b/src/options/fields/userAgent.test.js @@ -1,5 +1,5 @@ import userAgent from './userAgent'; -import { inferUserAgent } from './../../infer'; +import { inferUserAgent } from '../../infer'; jest.mock('./../../infer/inferUserAgent'); diff --git a/src/options/optionsMain.js b/src/options/optionsMain.js index 3de9097..515efc1 100644 --- a/src/options/optionsMain.js +++ b/src/options/optionsMain.js @@ -1,9 +1,9 @@ import log from 'loglevel'; -import inferOs from './../infer/inferOs'; +import inferOs from '../infer/inferOs'; import normalizeUrl from './normalizeUrl'; -import packageJson from './../../package.json'; -import { ELECTRON_VERSION, PLACEHOLDER_APP_DIR } from './../constants'; +import packageJson from '../../package.json'; +import { ELECTRON_VERSION, PLACEHOLDER_APP_DIR } from '../constants'; import asyncConfig from './asyncConfig'; const { inferPlatform, inferArch } = inferOs; diff --git a/src/utils/sanitizeFilename.js b/src/utils/sanitizeFilename.js index 36c8e16..0fbb387 100644 --- a/src/utils/sanitizeFilename.js +++ b/src/utils/sanitizeFilename.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import sanitizeFilenameLib from 'sanitize-filename'; -import { DEFAULT_APP_NAME } from './../constants'; +import { DEFAULT_APP_NAME } from '../constants'; export default function(platform, str) { let result = sanitizeFilenameLib(str); diff --git a/src/utils/sanitizeFilename.test.js b/src/utils/sanitizeFilename.test.js index bbef768..3c67ba7 100644 --- a/src/utils/sanitizeFilename.test.js +++ b/src/utils/sanitizeFilename.test.js @@ -1,6 +1,6 @@ import sanitizeFilenameLib from 'sanitize-filename'; import sanitizeFilename from './sanitizeFilename'; -import { DEFAULT_APP_NAME } from './../constants'; +import { DEFAULT_APP_NAME } from '../constants'; jest.mock('sanitize-filename'); sanitizeFilenameLib.mockImplementation((str) => str); diff --git a/webpack.config.js b/webpack.config.js index e36a5b7..ad47a31 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -16,9 +16,7 @@ module.exports = { }, externals: nodeModules, module: { - rules: [ - { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' }, - ], + rules: [{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' }], }, devtool: 'source-map', mode: 'none',