From 930cf3c8337d76a3cdab63197649f9331f580f9d Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sat, 31 Oct 2020 07:28:25 -0500 Subject: [PATCH] prettier --- extension/gulpfile.babel.js | 67 +++++++++++-------- extension/src/app/api/filters.js | 3 +- extension/src/app/api/index.js | 2 +- extension/src/app/api/notifyErrors.js | 2 +- .../browser/extension/background/logging.js | 2 +- .../src/browser/extension/chromeAPIMock.js | 2 +- .../src/browser/extension/devtools/index.js | 2 +- .../src/browser/extension/inject/index.js | 2 +- .../browser/extension/inject/pageScript.js | 8 ++- .../extension/inject/pageScriptWrap.js | 2 +- .../browser/extension/options/syncOptions.js | 2 +- .../src/browser/extension/window/remote.js | 8 +-- extension/test/chrome/extension.spec.js | 2 +- extension/test/electron/devpanel.spec.js | 4 +- extension/test/utils/e2e.js | 6 +- extension/webpack/base.config.js | 18 ++--- 16 files changed, 72 insertions(+), 60 deletions(-) diff --git a/extension/gulpfile.babel.js b/extension/gulpfile.babel.js index 8f5c9522..6b394182 100644 --- a/extension/gulpfile.babel.js +++ b/extension/gulpfile.babel.js @@ -170,33 +170,42 @@ gulp.task('test:electron', () => { .on('end', () => crdv.stop()); }); -gulp.task('default', gulp.parallel( - 'replace-webpack-code', - 'webpack:dev', - 'views:dev', - 'copy:dev', - 'views:watch', - 'copy:watch', -)); -gulp.task('build:extension', gulp.parallel( - 'replace-webpack-code', - 'webpack:build:extension', - 'views:build:extension', - 'copy:build:extension', -)); -gulp.task('copy:build:firefox', gulp.series('build:extension', (done) => { - gulp - .src([ - './build/extension/**', - '!./build/extension/js/redux-devtools-extension.js', - ]) - .pipe(gulp.dest('./build/firefox')) - .on('finish', function() { - gulp - .src('./src/browser/firefox/manifest.json') - .pipe(gulp.dest('./build/firefox')); - }); - copy('./build/firefox'); - done(); -})); +gulp.task( + 'default', + gulp.parallel( + 'replace-webpack-code', + 'webpack:dev', + 'views:dev', + 'copy:dev', + 'views:watch', + 'copy:watch' + ) +); +gulp.task( + 'build:extension', + gulp.parallel( + 'replace-webpack-code', + 'webpack:build:extension', + 'views:build:extension', + 'copy:build:extension' + ) +); +gulp.task( + 'copy:build:firefox', + gulp.series('build:extension', (done) => { + gulp + .src([ + './build/extension/**', + '!./build/extension/js/redux-devtools-extension.js', + ]) + .pipe(gulp.dest('./build/firefox')) + .on('finish', function () { + gulp + .src('./src/browser/firefox/manifest.json') + .pipe(gulp.dest('./build/firefox')); + }); + copy('./build/firefox'); + done(); + }) +); gulp.task('build:firefox', gulp.series('copy:build:firefox')); diff --git a/extension/src/app/api/filters.js b/extension/src/app/api/filters.js index 7cbdf7b0..609dcac4 100644 --- a/extension/src/app/api/filters.js +++ b/extension/src/app/api/filters.js @@ -70,8 +70,7 @@ export function filterState( ) { if (type === 'ACTION') { return !stateSanitizer ? state : stateSanitizer(state, nextActionId - 1); - } - else if (type !== 'STATE') return state; + } else if (type !== 'STATE') return state; if (predicate || !noFiltersApplied(localFilter)) { const filteredStagedActionIds = []; diff --git a/extension/src/app/api/index.js b/extension/src/app/api/index.js index ad8d8f4d..3c6ff30d 100644 --- a/extension/src/app/api/index.js +++ b/extension/src/app/api/index.js @@ -372,7 +372,7 @@ export function connect(preConfig) { } export function updateStore(stores) { - return function(newStore, instanceId) { + return function (newStore, instanceId) { /* eslint-disable no-console */ console.warn( '`__REDUX_DEVTOOLS_EXTENSION__.updateStore` is deprecated, remove it and just use ' + diff --git a/extension/src/app/api/notifyErrors.js b/extension/src/app/api/notifyErrors.js index b4d0b391..49235a42 100644 --- a/extension/src/app/api/notifyErrors.js +++ b/extension/src/app/api/notifyErrors.js @@ -3,7 +3,7 @@ let lastTime = 0; function createExpBackoffTimer(step) { let count = 1; - return function(reset) { + return function (reset) { // Reset call if (reset) { count = 1; diff --git a/extension/src/browser/extension/background/logging.js b/extension/src/browser/extension/background/logging.js index 67e31e51..ed937e9a 100644 --- a/extension/src/browser/extension/background/logging.js +++ b/extension/src/browser/extension/background/logging.js @@ -28,7 +28,7 @@ export function getReport(reportId, tabId, instanceId) { instanceId: `${tabId}/${instanceId}`, }); }) - .catch(function(err) { + .catch(function (err) { /* eslint-disable no-console */ console.warn(err); /* eslint-enable no-console */ diff --git a/extension/src/browser/extension/chromeAPIMock.js b/extension/src/browser/extension/chromeAPIMock.js index 6d2bd6a7..78c74017 100644 --- a/extension/src/browser/extension/chromeAPIMock.js +++ b/extension/src/browser/extension/chromeAPIMock.js @@ -76,7 +76,7 @@ if (window.isElectron) { } // Avoid error: chrome.runtime.sendMessage is not supported responseCallback const originSendMessage = chrome.runtime.sendMessage; - chrome.runtime.sendMessage = function() { + chrome.runtime.sendMessage = function () { if (process.env.NODE_ENV === 'development') { return originSendMessage(...arguments); } diff --git a/extension/src/browser/extension/devtools/index.js b/extension/src/browser/extension/devtools/index.js index 22db878e..e6ec1278 100644 --- a/extension/src/browser/extension/devtools/index.js +++ b/extension/src/browser/extension/devtools/index.js @@ -3,7 +3,7 @@ function createPanel(url) { 'Redux', 'img/logo/scalable.png', url, - function() {} + function () {} ); } diff --git a/extension/src/browser/extension/inject/index.js b/extension/src/browser/extension/inject/index.js index 823bfac6..34f0debc 100644 --- a/extension/src/browser/extension/inject/index.js +++ b/extension/src/browser/extension/inject/index.js @@ -8,7 +8,7 @@ require('./pageScript'); chrome.runtime.sendMessage( window.devToolsExtensionID, { type: 'GET_OPTIONS' }, - function(response) { + function (response) { if (!response.options.inject) { const urls = response.options.urls.split('\n').filter(Boolean).join('|'); if (!location.href.match(new RegExp(urls))) return; diff --git a/extension/src/browser/extension/inject/pageScript.js b/extension/src/browser/extension/inject/pageScript.js index 13139042..7f3df58f 100644 --- a/extension/src/browser/extension/inject/pageScript.js +++ b/extension/src/browser/extension/inject/pageScript.js @@ -38,7 +38,7 @@ function deprecateParam(oldParam, newParam) { /* eslint-enable no-console */ } -const __REDUX_DEVTOOLS_EXTENSION__ = function( +const __REDUX_DEVTOOLS_EXTENSION__ = function ( reducer, preloadedState, config @@ -299,7 +299,11 @@ const __REDUX_DEVTOOLS_EXTENSION__ = function( const filteredActionIds = []; // simple circular buffer of non-excluded actions with fixed maxAge-1 length const getMaxAge = (liftedAction, liftedState) => { let m = (config && config.maxAge) || window.devToolsOptions.maxAge || 50; - if (!liftedAction || noFiltersApplied(localFilter) || !liftedAction.action) { + if ( + !liftedAction || + noFiltersApplied(localFilter) || + !liftedAction.action + ) { return m; } if (!maxAge || maxAge < m) maxAge = m; // it can be modified in process on options page diff --git a/extension/src/browser/extension/inject/pageScriptWrap.js b/extension/src/browser/extension/inject/pageScriptWrap.js index 614b4964..e2c0d7ba 100644 --- a/extension/src/browser/extension/inject/pageScriptWrap.js +++ b/extension/src/browser/extension/inject/pageScriptWrap.js @@ -8,7 +8,7 @@ if (process.env.NODE_ENV === 'production') { s.parentNode.removeChild(s); } else { s.src = chrome.extension.getURL('js/page.bundle.js'); - s.onload = function() { + s.onload = function () { this.parentNode.removeChild(this); }; (document.head || document.documentElement).appendChild(s); diff --git a/extension/src/browser/extension/options/syncOptions.js b/extension/src/browser/extension/options/syncOptions.js index 5a8a40d1..ac483fe4 100644 --- a/extension/src/browser/extension/options/syncOptions.js +++ b/extension/src/browser/extension/options/syncOptions.js @@ -47,7 +47,7 @@ const get = (callback) => { '^https?://localhost|0\\.0\\.0\\.0:\\d+\n^https?://.+\\.github\\.io', showContextMenus: true, }, - function(items) { + function (items) { options = migrateOldOptions(items); callback(options); } diff --git a/extension/src/browser/extension/window/remote.js b/extension/src/browser/extension/window/remote.js index 5b9e4e52..847de889 100644 --- a/extension/src/browser/extension/window/remote.js +++ b/extension/src/browser/extension/window/remote.js @@ -22,10 +22,10 @@ chrome.storage.local.get( socketOptions={ options['s:hostname'] && options['s:port'] ? { - hostname: options['s:hostname'], - port: options['s:port'], - secure: options['s:secure'], - } + hostname: options['s:hostname'], + port: options['s:port'], + secure: options['s:secure'], + } : undefined } />, diff --git a/extension/test/chrome/extension.spec.js b/extension/test/chrome/extension.spec.js index 83bd848d..82d353b1 100644 --- a/extension/test/chrome/extension.spec.js +++ b/extension/test/chrome/extension.spec.js @@ -8,7 +8,7 @@ const path = resolve('build/extension'); const extensionId = 'lmhkpmbekcpmknklioeibfkpmmfibljd'; const actionsPattern = /^@@INIT(.|\n)+@@reduxReactRouter\/routerDidChange(.|\n)+@@reduxReactRouter\/initRoutes(.|\n)+$/; -describe('Chrome extension', function() { +describe('Chrome extension', function () { this.timeout(20000); before(async () => { diff --git a/extension/test/electron/devpanel.spec.js b/extension/test/electron/devpanel.spec.js index 4f29ccf3..0201ae37 100644 --- a/extension/test/electron/devpanel.spec.js +++ b/extension/test/electron/devpanel.spec.js @@ -7,7 +7,7 @@ import { switchMonitorTests, delay } from '../utils/e2e'; const port = 9515; const devPanelPath = 'chrome-extension://redux-devtools/devpanel.html'; -describe('DevTools panel for Electron', function() { +describe('DevTools panel for Electron', function () { this.timeout(10000); before(async () => { @@ -36,7 +36,7 @@ describe('DevTools panel for Electron', function() { await this.driver.manage().timeouts().pageLoadTimeout(5000); - const id = await this.driver.executeAsyncScript(function(callback) { + const id = await this.driver.executeAsyncScript(function (callback) { let attempts = 5; function showReduxPanel() { if (attempts === 0) { diff --git a/extension/test/utils/e2e.js b/extension/test/utils/e2e.js index b9dce31c..5fd33abb 100644 --- a/extension/test/utils/e2e.js +++ b/extension/test/utils/e2e.js @@ -4,7 +4,7 @@ export const delay = (time) => new Promise((resolve) => setTimeout(resolve, time)); export const switchMonitorTests = { - 'should switch to Log Monitor': async function() { + 'should switch to Log Monitor': async function () { await this.driver .findElement(webdriver.By.xpath('//div[text()="Inspector"]')) .click(); @@ -19,7 +19,7 @@ export const switchMonitorTests = { await delay(500); }, - 'should switch to Chart Monitor': async function() { + 'should switch to Chart Monitor': async function () { await this.driver .findElement(webdriver.By.xpath('//div[text()="Log monitor"]')) .click(); @@ -34,7 +34,7 @@ export const switchMonitorTests = { await delay(500); // Wait till menu is closed }, - 'should switch back to Inspector Monitor': async function() { + 'should switch back to Inspector Monitor': async function () { await this.driver .findElement(webdriver.By.xpath('//div[text()="Chart"]')) .click(); diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js index 5b1445a5..45cde89f 100644 --- a/extension/webpack/base.config.js +++ b/extension/webpack/base.config.js @@ -34,9 +34,9 @@ const baseConfig = (params) => ({ ...(params.plugins ? params.plugins : [ - new webpack.optimize.ModuleConcatenationPlugin(), - new webpack.optimize.OccurrenceOrderPlugin(), - ]), + new webpack.optimize.ModuleConcatenationPlugin(), + new webpack.optimize.OccurrenceOrderPlugin(), + ]), ], optimization: { minimizer: [ @@ -67,12 +67,12 @@ const baseConfig = (params) => ({ ...(params.loaders ? params.loaders : [ - { - test: /\.js$/, - use: 'babel-loader', - exclude: /(node_modules|tmp\/page\.bundle)/, - }, - ]), + { + test: /\.js$/, + use: 'babel-loader', + exclude: /(node_modules|tmp\/page\.bundle)/, + }, + ]), { test: /\.css?$/, use: ['style-loader', 'raw-loader'],