From da036409286549922f04a5014e275058554caf87 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Mon, 10 Oct 2022 09:20:29 -0400 Subject: [PATCH] Move options to top-level --- extension/src/background/index.ts | 2 +- .../src/background/store/apiMiddleware.ts | 2 +- .../browser/extension/inject/contentScript.ts | 2 +- .../browser/extension/inject/pageScript.ts | 2 +- .../options/AllowToRunGroup.tsx | 0 .../options/ContextMenuGroup.tsx | 0 .../extension => }/options/EditorGroup.tsx | 0 .../extension => }/options/FilterGroup.tsx | 2 +- .../options/MiscellaneousGroup.tsx | 0 .../extension => }/options/Options.tsx | 0 .../{browser/extension => }/options/index.tsx | 2 +- .../{browser/views => options}/options.pug | 186 +++++++++--------- .../extension => }/options/syncOptions.ts | 2 +- extension/webpack/base.config.js | 4 +- 14 files changed, 102 insertions(+), 102 deletions(-) rename extension/src/{browser/extension => }/options/AllowToRunGroup.tsx (100%) rename extension/src/{browser/extension => }/options/ContextMenuGroup.tsx (100%) rename extension/src/{browser/extension => }/options/EditorGroup.tsx (100%) rename extension/src/{browser/extension => }/options/FilterGroup.tsx (97%) rename extension/src/{browser/extension => }/options/MiscellaneousGroup.tsx (100%) rename extension/src/{browser/extension => }/options/Options.tsx (100%) rename extension/src/{browser/extension => }/options/index.tsx (95%) rename extension/src/{browser/views => options}/options.pug (95%) rename extension/src/{browser/extension => }/options/syncOptions.ts (98%) diff --git a/extension/src/background/index.ts b/extension/src/background/index.ts index 57c58d6e..c7236e2e 100644 --- a/extension/src/background/index.ts +++ b/extension/src/background/index.ts @@ -2,7 +2,7 @@ import { Store } from 'redux'; import configureStore, { BackgroundAction } from './store/backgroundStore'; import openDevToolsWindow, { DevToolsPosition } from './openWindow'; import { createMenu, removeMenu } from './contextMenus'; -import syncOptions from '../browser/extension/options/syncOptions'; +import syncOptions from '../options/syncOptions'; import { BackgroundState } from './store/backgroundReducer'; declare global { diff --git a/extension/src/background/store/apiMiddleware.ts b/extension/src/background/store/apiMiddleware.ts index 3209228e..b10f98a4 100644 --- a/extension/src/background/store/apiMiddleware.ts +++ b/extension/src/background/store/apiMiddleware.ts @@ -15,7 +15,7 @@ import syncOptions, { Options, OptionsMessage, SyncOptions, -} from '../../browser/extension/options/syncOptions'; +} from '../../options/syncOptions'; import openDevToolsWindow, { DevToolsPosition } from '../openWindow'; import { getReport } from '../logging'; import { Action, Dispatch, MiddlewareAPI } from 'redux'; diff --git a/extension/src/browser/extension/inject/contentScript.ts b/extension/src/browser/extension/inject/contentScript.ts index b9a71c4a..b5c2e5b4 100644 --- a/extension/src/browser/extension/inject/contentScript.ts +++ b/extension/src/browser/extension/inject/contentScript.ts @@ -2,7 +2,7 @@ import { injectOptions, getOptionsFromBg, isAllowed, -} from '../options/syncOptions'; +} from '../../../options/syncOptions'; import type { TabMessage } from '../../../background/store/apiMiddleware'; import { PageScriptToContentScriptMessage, diff --git a/extension/src/browser/extension/inject/pageScript.ts b/extension/src/browser/extension/inject/pageScript.ts index a0d48399..99dc12a9 100644 --- a/extension/src/browser/extension/inject/pageScript.ts +++ b/extension/src/browser/extension/inject/pageScript.ts @@ -28,7 +28,7 @@ import { Features, } from '@redux-devtools/app'; import configureStore, { getUrlParam } from '../../../app/stores/enhancerStore'; -import { isAllowed, Options } from '../options/syncOptions'; +import { isAllowed, Options } from '../../../options/syncOptions'; import Monitor from '../../../app/service/Monitor'; import { noFiltersApplied, diff --git a/extension/src/browser/extension/options/AllowToRunGroup.tsx b/extension/src/options/AllowToRunGroup.tsx similarity index 100% rename from extension/src/browser/extension/options/AllowToRunGroup.tsx rename to extension/src/options/AllowToRunGroup.tsx diff --git a/extension/src/browser/extension/options/ContextMenuGroup.tsx b/extension/src/options/ContextMenuGroup.tsx similarity index 100% rename from extension/src/browser/extension/options/ContextMenuGroup.tsx rename to extension/src/options/ContextMenuGroup.tsx diff --git a/extension/src/browser/extension/options/EditorGroup.tsx b/extension/src/options/EditorGroup.tsx similarity index 100% rename from extension/src/browser/extension/options/EditorGroup.tsx rename to extension/src/options/EditorGroup.tsx diff --git a/extension/src/browser/extension/options/FilterGroup.tsx b/extension/src/options/FilterGroup.tsx similarity index 97% rename from extension/src/browser/extension/options/FilterGroup.tsx rename to extension/src/options/FilterGroup.tsx index 56c050f1..610ed36d 100644 --- a/extension/src/browser/extension/options/FilterGroup.tsx +++ b/extension/src/options/FilterGroup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FilterState } from '../../../app/api/filters'; +import { FilterState } from '../app/api/filters'; import { OptionsProps } from './Options'; export default ({ options, saveOption }: OptionsProps) => { diff --git a/extension/src/browser/extension/options/MiscellaneousGroup.tsx b/extension/src/options/MiscellaneousGroup.tsx similarity index 100% rename from extension/src/browser/extension/options/MiscellaneousGroup.tsx rename to extension/src/options/MiscellaneousGroup.tsx diff --git a/extension/src/browser/extension/options/Options.tsx b/extension/src/options/Options.tsx similarity index 100% rename from extension/src/browser/extension/options/Options.tsx rename to extension/src/options/Options.tsx diff --git a/extension/src/browser/extension/options/index.tsx b/extension/src/options/index.tsx similarity index 95% rename from extension/src/browser/extension/options/index.tsx rename to extension/src/options/index.tsx index b344b86b..181fa1b1 100644 --- a/extension/src/browser/extension/options/index.tsx +++ b/extension/src/options/index.tsx @@ -3,7 +3,7 @@ import { createRoot } from 'react-dom/client'; import OptionsComponent from './Options'; import { Options } from './syncOptions'; -import '../../views/options.pug'; +import './options.pug'; chrome.runtime.getBackgroundPage((background) => { const syncOptions = background!.syncOptions; diff --git a/extension/src/browser/views/options.pug b/extension/src/options/options.pug similarity index 95% rename from extension/src/browser/views/options.pug rename to extension/src/options/options.pug index 6e2dda01..48192b6a 100644 --- a/extension/src/browser/views/options.pug +++ b/extension/src/options/options.pug @@ -1,93 +1,93 @@ -doctype html - -html - head - meta(charset='UTF-8') - title Redux DevTools Options - style. - body { - padding: 2px; - min-width: 380px; - } - - .option-group { - /* Reset the default fieldset styles */ - margin: initial; - border: initial; - padding: initial; - } - - .option-group + .option-group { - margin-top: 30px; - } - - .option-group__title { - /* Reset the default legend styles */ - margin: initial; - padding: initial; - - margin-bottom: 8px; - font-weight: bold; - font-size: 30px; - } - - .option + .option { - margin-top: 5px; - } - - .option__textarea { - margin-top: 2px; - width: 300px; - min-height: 50px; - } - - .option__hint { - margin-top: 2px; - font-size: 10px; - } - - .option__textarea + .option__hint { - margin-top: -2px; - } - - /* Checkbox and radio styling */ - .option_type_checkbox .option__element, - .option_type_radio .option__element { - vertical-align: bottom; - } - - .option_type_checkbox .option__label, - .option_type_radio .option__label { - margin-left: 4px; - } - - .option_type_checkbox .option__textarea, - .option_type_checkbox .option__hint, - .option_type_radio .option__textarea, - .option_type_radio .option__hint { - margin-left: 20px; - } - - - /* Checkbox styling */ - .option_type_checkbox .option__element { - /* Checkboxes in Chrome are 2px narrower than radio buttons. - These margins align them. */ - margin-left: 1px; - /* ...margin-right is 2px instead of 1px - because both radios and checkboxes have initial margin-right of 1px */ - margin-right: 2px; - } - - /* Value-based styling */ - .option_value_max-age { - margin-left: 20px; - } - - .option_value_max-age .option__element { - width: 50px; - } - - body - #root - script(src='/options.bundle.js') +doctype html + +html + head + meta(charset='UTF-8') + title Redux DevTools Options + style. + body { + padding: 2px; + min-width: 380px; + } + + .option-group { + /* Reset the default fieldset styles */ + margin: initial; + border: initial; + padding: initial; + } + + .option-group + .option-group { + margin-top: 30px; + } + + .option-group__title { + /* Reset the default legend styles */ + margin: initial; + padding: initial; + + margin-bottom: 8px; + font-weight: bold; + font-size: 30px; + } + + .option + .option { + margin-top: 5px; + } + + .option__textarea { + margin-top: 2px; + width: 300px; + min-height: 50px; + } + + .option__hint { + margin-top: 2px; + font-size: 10px; + } + + .option__textarea + .option__hint { + margin-top: -2px; + } + + /* Checkbox and radio styling */ + .option_type_checkbox .option__element, + .option_type_radio .option__element { + vertical-align: bottom; + } + + .option_type_checkbox .option__label, + .option_type_radio .option__label { + margin-left: 4px; + } + + .option_type_checkbox .option__textarea, + .option_type_checkbox .option__hint, + .option_type_radio .option__textarea, + .option_type_radio .option__hint { + margin-left: 20px; + } + + + /* Checkbox styling */ + .option_type_checkbox .option__element { + /* Checkboxes in Chrome are 2px narrower than radio buttons. + These margins align them. */ + margin-left: 1px; + /* ...margin-right is 2px instead of 1px + because both radios and checkboxes have initial margin-right of 1px */ + margin-right: 2px; + } + + /* Value-based styling */ + .option_value_max-age { + margin-left: 20px; + } + + .option_value_max-age .option__element { + width: 50px; + } + + body + #root + script(src='/options.bundle.js') diff --git a/extension/src/browser/extension/options/syncOptions.ts b/extension/src/options/syncOptions.ts similarity index 98% rename from extension/src/browser/extension/options/syncOptions.ts rename to extension/src/options/syncOptions.ts index ede4b150..2b427bbd 100644 --- a/extension/src/browser/extension/options/syncOptions.ts +++ b/extension/src/options/syncOptions.ts @@ -1,4 +1,4 @@ -import { FilterState, FilterStateValue } from '../../../app/api/filters'; +import { FilterState, FilterStateValue } from '../app/api/filters'; export interface Options { readonly useEditor: number; diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js index 441e8b16..a8f14022 100644 --- a/extension/webpack/base.config.js +++ b/extension/webpack/base.config.js @@ -11,11 +11,11 @@ const baseConfig = (params) => ({ mode: params.mode, entry: params.input || { background: [mock, '../src/background/index'], - options: [mock, `${extpath}options/index`], + options: [mock, '../src/options/index'], window: [`${extpath}window/index`], remote: [`${extpath}window/remote`], devpanel: [mock, '../src/devpanel/index'], - devtools: [`${extpath}devtools/index`], + devtools: ['../src/devtools/index'], content: [mock, `${extpath}inject/contentScript`], pagewrap: [`${extpath}inject/pageScriptWrap`], ...params.inputExtra,