From 790be9efed6ff69b631ced8e8f4164f705c76be4 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Mon, 10 Oct 2022 09:48:10 -0400
Subject: [PATCH] Move pageScript to top-level

---
 .../src/app/{containers => }/Actions.tsx      |  4 ++--
 extension/src/app/{containers => }/App.tsx    |  0
 extension/src/app/stores/createStore.ts       | 15 --------------
 .../src/background/store/apiMiddleware.ts     |  4 ++--
 extension/src/contentScript/index.ts          |  2 +-
 extension/src/devpanel/index.tsx              |  2 +-
 extension/src/options/FilterGroup.tsx         |  2 +-
 extension/src/options/syncOptions.ts          |  2 +-
 .../{app/service => pageScript}/Monitor.ts    |  0
 .../src/{app => pageScript}/api/filters.ts    |  0
 .../api/generateInstanceId.ts                 |  0
 .../{app => pageScript}/api/importState.ts    |  5 +----
 .../src/{app => pageScript}/api/index.ts      |  2 +-
 .../{app => pageScript}/api/notifyErrors.ts   |  0
 .../src/{app => pageScript}/api/openWindow.ts |  0
 .../stores => pageScript}/enhancerStore.ts    |  2 +-
 .../pageScript.ts => pageScript/index.ts}     | 20 +++++++++----------
 .../extension/inject => }/pageScriptWrap.ts   |  0
 extension/src/window/index.tsx                |  2 +-
 extension/webpack/base.config.js              |  4 +---
 extension/webpack/dev.config.babel.js         |  2 +-
 extension/webpack/prod.config.babel.js        |  2 +-
 extension/webpack/wrap.config.babel.js        |  2 +-
 23 files changed, 26 insertions(+), 46 deletions(-)
 rename extension/src/app/{containers => }/Actions.tsx (96%)
 rename extension/src/app/{containers => }/App.tsx (100%)
 delete mode 100644 extension/src/app/stores/createStore.ts
 rename extension/src/{app/service => pageScript}/Monitor.ts (100%)
 rename extension/src/{app => pageScript}/api/filters.ts (100%)
 rename extension/src/{app => pageScript}/api/generateInstanceId.ts (100%)
 rename extension/src/{app => pageScript}/api/importState.ts (95%)
 rename extension/src/{app => pageScript}/api/index.ts (99%)
 rename extension/src/{app => pageScript}/api/notifyErrors.ts (100%)
 rename extension/src/{app => pageScript}/api/openWindow.ts (100%)
 rename extension/src/{app/stores => pageScript}/enhancerStore.ts (93%)
 rename extension/src/{browser/extension/inject/pageScript.ts => pageScript/index.ts} (96%)
 rename extension/src/{browser/extension/inject => }/pageScriptWrap.ts (100%)

diff --git a/extension/src/app/containers/Actions.tsx b/extension/src/app/Actions.tsx
similarity index 96%
rename from extension/src/app/containers/Actions.tsx
rename to extension/src/app/Actions.tsx
index 987a1459..bf1c6f39 100644
--- a/extension/src/app/containers/Actions.tsx
+++ b/extension/src/app/Actions.tsx
@@ -19,8 +19,8 @@ import {
 } from '@redux-devtools/app';
 import { GoRadioTower } from 'react-icons/go';
 import { MdBorderBottom, MdBorderLeft, MdBorderRight } from 'react-icons/md';
-import { Position } from '../api/openWindow';
-import type { SingleMessage } from '../../background/store/apiMiddleware';
+import type { Position } from '../pageScript/api/openWindow';
+import type { SingleMessage } from '../background/store/apiMiddleware';
 
 type StateProps = ReturnType<typeof mapStateToProps>;
 type DispatchProps = ResolveThunks<typeof actionCreators>;
diff --git a/extension/src/app/containers/App.tsx b/extension/src/app/App.tsx
similarity index 100%
rename from extension/src/app/containers/App.tsx
rename to extension/src/app/App.tsx
diff --git a/extension/src/app/stores/createStore.ts b/extension/src/app/stores/createStore.ts
deleted file mode 100644
index f91dd548..00000000
--- a/extension/src/app/stores/createStore.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {
-  Action,
-  createStore,
-  PreloadedState,
-  Reducer,
-  StoreEnhancer,
-} from 'redux';
-
-export default function configureStore<S, A extends Action<unknown>>(
-  reducer: Reducer<S, A>,
-  initialState: PreloadedState<S> | undefined,
-  enhance: () => StoreEnhancer
-) {
-  return createStore(reducer, initialState, enhance());
-}
diff --git a/extension/src/background/store/apiMiddleware.ts b/extension/src/background/store/apiMiddleware.ts
index 3023ed7a..fb132e1d 100644
--- a/extension/src/background/store/apiMiddleware.ts
+++ b/extension/src/background/store/apiMiddleware.ts
@@ -27,10 +27,10 @@ import type {
   ErrorMessage,
   PageScriptToContentScriptMessageForwardedToMonitors,
   PageScriptToContentScriptMessageWithoutDisconnectOrInitInstance,
-} from '../../app/api';
+} from '../../pageScript/api';
 import { LiftedState } from '@redux-devtools/instrument';
 import type { BackgroundAction, LiftedActionAction } from './backgroundStore';
-import type { Position } from '../../app/api/openWindow';
+import type { Position } from '../../pageScript/api/openWindow';
 import type { BackgroundState } from './backgroundReducer';
 
 interface TabMessageBase {
diff --git a/extension/src/contentScript/index.ts b/extension/src/contentScript/index.ts
index 8f02c3f2..2c65ee14 100644
--- a/extension/src/contentScript/index.ts
+++ b/extension/src/contentScript/index.ts
@@ -8,7 +8,7 @@ import type {
   PageScriptToContentScriptMessage,
   PageScriptToContentScriptMessageWithoutDisconnect,
   PageScriptToContentScriptMessageWithoutDisconnectOrInitInstance,
-} from '../app/api';
+} from '../pageScript/api';
 import { Action } from 'redux';
 import {
   CustomAction,
diff --git a/extension/src/devpanel/index.tsx b/extension/src/devpanel/index.tsx
index edcb1610..22ac800e 100644
--- a/extension/src/devpanel/index.tsx
+++ b/extension/src/devpanel/index.tsx
@@ -3,7 +3,7 @@ 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 App from '../app/App';
 import configureStore from './store/panelStore';
 
 import '../../views/devpanel.pug';
diff --git a/extension/src/options/FilterGroup.tsx b/extension/src/options/FilterGroup.tsx
index 610ed36d..792ca9f4 100644
--- a/extension/src/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 '../pageScript/api/filters';
 import { OptionsProps } from './Options';
 
 export default ({ options, saveOption }: OptionsProps) => {
diff --git a/extension/src/options/syncOptions.ts b/extension/src/options/syncOptions.ts
index 2b427bbd..e523c598 100644
--- a/extension/src/options/syncOptions.ts
+++ b/extension/src/options/syncOptions.ts
@@ -1,4 +1,4 @@
-import { FilterState, FilterStateValue } from '../app/api/filters';
+import { FilterState, FilterStateValue } from '../pageScript/api/filters';
 
 export interface Options {
   readonly useEditor: number;
diff --git a/extension/src/app/service/Monitor.ts b/extension/src/pageScript/Monitor.ts
similarity index 100%
rename from extension/src/app/service/Monitor.ts
rename to extension/src/pageScript/Monitor.ts
diff --git a/extension/src/app/api/filters.ts b/extension/src/pageScript/api/filters.ts
similarity index 100%
rename from extension/src/app/api/filters.ts
rename to extension/src/pageScript/api/filters.ts
diff --git a/extension/src/app/api/generateInstanceId.ts b/extension/src/pageScript/api/generateInstanceId.ts
similarity index 100%
rename from extension/src/app/api/generateInstanceId.ts
rename to extension/src/pageScript/api/generateInstanceId.ts
diff --git a/extension/src/app/api/importState.ts b/extension/src/pageScript/api/importState.ts
similarity index 95%
rename from extension/src/app/api/importState.ts
rename to extension/src/pageScript/api/importState.ts
index 21e587e2..ae818149 100644
--- a/extension/src/app/api/importState.ts
+++ b/extension/src/pageScript/api/importState.ts
@@ -1,9 +1,6 @@
 import jsan from 'jsan';
 import { immutableSerialize } from '@redux-devtools/serialize';
-import type {
-  Config,
-  SerializeWithImmutable,
-} from '../../browser/extension/inject/pageScript';
+import type { Config, SerializeWithImmutable } from '../index';
 import Immutable from 'immutable';
 import { LiftedState } from '@redux-devtools/instrument';
 import { Action } from 'redux';
diff --git a/extension/src/app/api/index.ts b/extension/src/pageScript/api/index.ts
similarity index 99%
rename from extension/src/app/api/index.ts
rename to extension/src/pageScript/api/index.ts
index bee3ba25..ed062fe9 100644
--- a/extension/src/app/api/index.ts
+++ b/extension/src/pageScript/api/index.ts
@@ -5,7 +5,7 @@ import { getActionsArray, getLocalFilter } from '@redux-devtools/utils';
 import { isFiltered, PartialLiftedState } from './filters';
 import importState from './importState';
 import generateId from './generateInstanceId';
-import type { Config } from '../../browser/extension/inject/pageScript';
+import type { Config } from '../index';
 import { Action } from 'redux';
 import { LiftedState, PerformAction } from '@redux-devtools/instrument';
 import { LibConfig } from '@redux-devtools/app';
diff --git a/extension/src/app/api/notifyErrors.ts b/extension/src/pageScript/api/notifyErrors.ts
similarity index 100%
rename from extension/src/app/api/notifyErrors.ts
rename to extension/src/pageScript/api/notifyErrors.ts
diff --git a/extension/src/app/api/openWindow.ts b/extension/src/pageScript/api/openWindow.ts
similarity index 100%
rename from extension/src/app/api/openWindow.ts
rename to extension/src/pageScript/api/openWindow.ts
diff --git a/extension/src/app/stores/enhancerStore.ts b/extension/src/pageScript/enhancerStore.ts
similarity index 93%
rename from extension/src/app/stores/enhancerStore.ts
rename to extension/src/pageScript/enhancerStore.ts
index 532cfccb..5961292f 100644
--- a/extension/src/app/stores/enhancerStore.ts
+++ b/extension/src/pageScript/enhancerStore.ts
@@ -1,7 +1,7 @@
 import { Action, compose, Reducer, StoreEnhancerStoreCreator } from 'redux';
 import { instrument } from '@redux-devtools/instrument';
 import { persistState } from '@redux-devtools/core';
-import { ConfigWithExpandedMaxAge } from '../../browser/extension/inject/pageScript';
+import type { ConfigWithExpandedMaxAge } from './index';
 
 export function getUrlParam(key: string) {
   const matches = window.location.href.match(
diff --git a/extension/src/browser/extension/inject/pageScript.ts b/extension/src/pageScript/index.ts
similarity index 96%
rename from extension/src/browser/extension/inject/pageScript.ts
rename to extension/src/pageScript/index.ts
index 6280c448..2b875ff1 100644
--- a/extension/src/browser/extension/inject/pageScript.ts
+++ b/extension/src/pageScript/index.ts
@@ -27,19 +27,19 @@ import {
   LibConfig,
   Features,
 } from '@redux-devtools/app';
-import configureStore, { getUrlParam } from '../../../app/stores/enhancerStore';
-import { isAllowed, Options } from '../../../options/syncOptions';
-import Monitor from '../../../app/service/Monitor';
+import configureStore, { getUrlParam } from './enhancerStore';
+import { isAllowed, Options } from '../options/syncOptions';
+import Monitor from './Monitor';
 import {
   noFiltersApplied,
   isFiltered,
   filterState,
   startingFrom,
-} from '../../../app/api/filters';
-import notifyErrors from '../../../app/api/notifyErrors';
-import importState from '../../../app/api/importState';
-import openWindow, { Position } from '../../../app/api/openWindow';
-import generateId from '../../../app/api/generateInstanceId';
+} from './api/filters';
+import notifyErrors from './api/notifyErrors';
+import importState from './api/importState';
+import openWindow, { Position } from './api/openWindow';
+import generateId from './api/generateInstanceId';
 import {
   toContentScript,
   sendMessage,
@@ -51,8 +51,8 @@ import {
   Serialize,
   StructuralPerformAction,
   ConnectResponse,
-} from '../../../app/api';
-import type { ContentScriptToPageScriptMessage } from '../../../contentScript';
+} from './api';
+import type { ContentScriptToPageScriptMessage } from '../contentScript';
 
 type EnhancedStoreWithInitialDispatch<
   S,
diff --git a/extension/src/browser/extension/inject/pageScriptWrap.ts b/extension/src/pageScriptWrap.ts
similarity index 100%
rename from extension/src/browser/extension/inject/pageScriptWrap.ts
rename to extension/src/pageScriptWrap.ts
diff --git a/extension/src/window/index.tsx b/extension/src/window/index.tsx
index ea87aad8..c74e33a1 100644
--- a/extension/src/window/index.tsx
+++ b/extension/src/window/index.tsx
@@ -3,7 +3,7 @@ import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
 import { UPDATE_STATE } from '@redux-devtools/app';
-import App from '../app/containers/App';
+import App from '../app/App';
 import configureStore from './store/windowStore';
 import type { MonitorMessage } from '../background/store/apiMiddleware';
 
diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js
index f04be04b..3c49e22c 100644
--- a/extension/webpack/base.config.js
+++ b/extension/webpack/base.config.js
@@ -3,8 +3,6 @@ import webpack from 'webpack';
 import CopyPlugin from 'copy-webpack-plugin';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 
-const extpath = path.join(__dirname, '../src/browser/extension/');
-
 const baseConfig = (params) => ({
   // devtool: 'source-map',
   mode: params.mode,
@@ -16,7 +14,7 @@ const baseConfig = (params) => ({
     devpanel: ['../src/chromeApiMock', '../src/devpanel/index'],
     devtools: ['../src/devtools/index'],
     content: ['../src/chromeApiMock', '../src/contentScript/index'],
-    pagewrap: [`${extpath}inject/pageScriptWrap`],
+    pagewrap: ['../src/pageScriptWrap'],
     ...params.inputExtra,
   },
   output: {
diff --git a/extension/webpack/dev.config.babel.js b/extension/webpack/dev.config.babel.js
index bb7d0215..6abb9178 100644
--- a/extension/webpack/dev.config.babel.js
+++ b/extension/webpack/dev.config.babel.js
@@ -5,7 +5,7 @@ import baseConfig from './base.config';
 let config = baseConfig({
   mode: 'development',
   inputExtra: {
-    page: [path.join(__dirname, '../src/browser/extension/inject/pageScript')],
+    page: [path.join(__dirname, '../src/pageScript')],
   },
   output: { path: path.join(__dirname, '../dev') },
   globals: {
diff --git a/extension/webpack/prod.config.babel.js b/extension/webpack/prod.config.babel.js
index 99684617..c29e9924 100644
--- a/extension/webpack/prod.config.babel.js
+++ b/extension/webpack/prod.config.babel.js
@@ -4,7 +4,7 @@ import baseConfig from './base.config';
 export default baseConfig({
   mode: 'production',
   inputExtra: {
-    page: [path.join(__dirname, '../src/browser/extension/inject/pageScript')],
+    page: [path.join(__dirname, '../src/pageScript')],
   },
   output: { path: path.join(__dirname, '../build/extension') },
   globals: {
diff --git a/extension/webpack/wrap.config.babel.js b/extension/webpack/wrap.config.babel.js
index 25b57d11..ced8a881 100644
--- a/extension/webpack/wrap.config.babel.js
+++ b/extension/webpack/wrap.config.babel.js
@@ -4,7 +4,7 @@ import baseConfig from './base.config';
 export default baseConfig({
   mode: 'production',
   input: {
-    page: [path.join(__dirname, '../src/browser/extension/inject/pageScript')],
+    page: [path.join(__dirname, '../src/pageScript')],
   },
   output: { path: path.join(__dirname, '../build/tmp') },
   globals: {