From afab8669d22001f4c027640b8de643fa45a7a361 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Mon, 10 Oct 2022 09:13:32 -0400 Subject: [PATCH] Move devpanel to top-level --- extension/src/browser/views/remote.pug | 22 ++++++------ extension/src/browser/views/window.pug | 34 +++++++++---------- .../{browser/views => devpanel}/devpanel.pug | 30 ++++++++-------- .../extension => }/devpanel/index.tsx | 8 ++--- .../store/panelReducer.ts} | 0 .../stores => devpanel/store}/panelStore.ts | 4 +-- .../store/panelSyncMiddleware.ts} | 0 .../{browser/views/includes => }/style.pug | 0 extension/webpack/base.config.js | 2 +- 9 files changed, 50 insertions(+), 50 deletions(-) rename extension/src/{browser/views => devpanel}/devpanel.pug (82%) rename extension/src/{browser/extension => }/devpanel/index.tsx (92%) rename extension/src/{app/reducers/panel/index.ts => devpanel/store/panelReducer.ts} (100%) rename extension/src/{app/stores => devpanel/store}/panelStore.ts (86%) rename extension/src/{app/middlewares/panelSync.ts => devpanel/store/panelSyncMiddleware.ts} (100%) rename extension/src/{browser/views/includes => }/style.pug (100%) diff --git a/extension/src/browser/views/remote.pug b/extension/src/browser/views/remote.pug index c70bc7f5..c3e59689 100644 --- a/extension/src/browser/views/remote.pug +++ b/extension/src/browser/views/remote.pug @@ -1,11 +1,11 @@ -doctype html - -html - head - meta(charset='UTF-8') - title RemoteDev - include ./includes/style.pug - - body - #root - script(src='/remote.bundle.js') +doctype html + +html + head + meta(charset='UTF-8') + title RemoteDev + include ../../style.pug + + body + #root + script(src='/remote.bundle.js') diff --git a/extension/src/browser/views/window.pug b/extension/src/browser/views/window.pug index 4ea83033..773d0449 100644 --- a/extension/src/browser/views/window.pug +++ b/extension/src/browser/views/window.pug @@ -1,17 +1,17 @@ -doctype html - -html - head - meta(charset='UTF-8') - title Redux DevTools - include ./includes/style.pug - - body - #root - div(style='position: relative') - img( - src='/img/loading.svg', - height=300, width=350, - style='position: absolute; top: 50%; left: 50%; margin-top: -175px; margin-left: -175px;' - ) - script(src='/window.bundle.js') +doctype html + +html + head + meta(charset='UTF-8') + title Redux DevTools + include ../../style.pug + + body + #root + div(style='position: relative') + img( + src='/img/loading.svg', + height=300, width=350, + style='position: absolute; top: 50%; left: 50%; margin-top: -175px; margin-left: -175px;' + ) + script(src='/window.bundle.js') diff --git a/extension/src/browser/views/devpanel.pug b/extension/src/devpanel/devpanel.pug similarity index 82% rename from extension/src/browser/views/devpanel.pug rename to extension/src/devpanel/devpanel.pug index ee41747c..4aa1268d 100644 --- a/extension/src/browser/views/devpanel.pug +++ b/extension/src/devpanel/devpanel.pug @@ -1,15 +1,15 @@ -doctype html - -html - head - meta(charset='UTF-8') - title Redux DevTools - include ./includes/style.pug - style. - body { - min-height: 100px; - } - - body - #root - script(src='/devpanel.bundle.js') +doctype html + +html + head + meta(charset='UTF-8') + title Redux DevTools + include ../style.pug + style. + body { + min-height: 100px; + } + + body + #root + script(src='/devpanel.bundle.js') diff --git a/extension/src/browser/extension/devpanel/index.tsx b/extension/src/devpanel/index.tsx similarity index 92% rename from extension/src/browser/extension/devpanel/index.tsx rename to extension/src/devpanel/index.tsx index ae740870..edcb1610 100644 --- a/extension/src/browser/extension/devpanel/index.tsx +++ b/extension/src/devpanel/index.tsx @@ -3,13 +3,13 @@ import { createRoot, Root } from 'react-dom/client'; import { Provider } from 'react-redux'; import { Persistor } from 'redux-persist'; import { REMOVE_INSTANCE, StoreAction } from '@redux-devtools/app'; -import App from '../../../app/containers/App'; -import configureStore from '../../../app/stores/panelStore'; +import App from '../app/containers/App'; +import configureStore from './store/panelStore'; import '../../views/devpanel.pug'; import { Action, Store } from 'redux'; -import type { PanelMessage } from '../../../background/store/apiMiddleware'; -import { StoreStateWithoutSocket } from '../../../app/reducers/panel'; +import type { PanelMessage } from '../background/store/apiMiddleware'; +import type { StoreStateWithoutSocket } from './store/panelReducer'; import { PersistGate } from 'redux-persist/integration/react'; const position = location.hash; diff --git a/extension/src/app/reducers/panel/index.ts b/extension/src/devpanel/store/panelReducer.ts similarity index 100% rename from extension/src/app/reducers/panel/index.ts rename to extension/src/devpanel/store/panelReducer.ts diff --git a/extension/src/app/stores/panelStore.ts b/extension/src/devpanel/store/panelStore.ts similarity index 86% rename from extension/src/app/stores/panelStore.ts rename to extension/src/devpanel/store/panelStore.ts index 873e7284..f8b8e622 100644 --- a/extension/src/app/stores/panelStore.ts +++ b/extension/src/devpanel/store/panelStore.ts @@ -2,8 +2,8 @@ import { createStore, applyMiddleware, Reducer } from 'redux'; import localForage from 'localforage'; import { persistReducer, persistStore } from 'redux-persist'; import { exportStateMiddleware, StoreAction } from '@redux-devtools/app'; -import panelDispatcher from '../middlewares/panelSync'; -import rootReducer, { StoreStateWithoutSocket } from '../reducers/panel'; +import panelDispatcher from './panelSyncMiddleware'; +import rootReducer, { StoreStateWithoutSocket } from './panelReducer'; const persistConfig = { key: 'redux-devtools', diff --git a/extension/src/app/middlewares/panelSync.ts b/extension/src/devpanel/store/panelSyncMiddleware.ts similarity index 100% rename from extension/src/app/middlewares/panelSync.ts rename to extension/src/devpanel/store/panelSyncMiddleware.ts diff --git a/extension/src/browser/views/includes/style.pug b/extension/src/style.pug similarity index 100% rename from extension/src/browser/views/includes/style.pug rename to extension/src/style.pug diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js index 545ae745..441e8b16 100644 --- a/extension/webpack/base.config.js +++ b/extension/webpack/base.config.js @@ -14,7 +14,7 @@ const baseConfig = (params) => ({ options: [mock, `${extpath}options/index`], window: [`${extpath}window/index`], remote: [`${extpath}window/remote`], - devpanel: [mock, `${extpath}devpanel/index`], + devpanel: [mock, '../src/devpanel/index'], devtools: [`${extpath}devtools/index`], content: [mock, `${extpath}inject/contentScript`], pagewrap: [`${extpath}inject/pageScriptWrap`],