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

---
 extension/src/app/api/index.ts                            | 2 +-
 extension/src/background/store/apiMiddleware.ts           | 4 ++--
 extension/src/browser/extension/inject/pageScript.ts      | 2 +-
 .../inject/contentScript.ts => contentScript/index.ts}    | 8 ++++----
 extension/webpack/base.config.js                          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename extension/src/{browser/extension/inject/contentScript.ts => contentScript/index.ts} (98%)

diff --git a/extension/src/app/api/index.ts b/extension/src/app/api/index.ts
index 47ba7d5c..bee3ba25 100644
--- a/extension/src/app/api/index.ts
+++ b/extension/src/app/api/index.ts
@@ -12,7 +12,7 @@ import { LibConfig } from '@redux-devtools/app';
 import type {
   ContentScriptToPageScriptMessage,
   ListenerMessage,
-} from '../../browser/extension/inject/contentScript';
+} from '../../contentScript';
 import type { Position } from './openWindow';
 
 const listeners: {
diff --git a/extension/src/background/store/apiMiddleware.ts b/extension/src/background/store/apiMiddleware.ts
index b10f98a4..3023ed7a 100644
--- a/extension/src/background/store/apiMiddleware.ts
+++ b/extension/src/background/store/apiMiddleware.ts
@@ -19,10 +19,10 @@ import syncOptions, {
 import openDevToolsWindow, { DevToolsPosition } from '../openWindow';
 import { getReport } from '../logging';
 import { Action, Dispatch, MiddlewareAPI } from 'redux';
-import {
+import type {
   ContentScriptToBackgroundMessage,
   SplitMessage,
-} from '../../browser/extension/inject/contentScript';
+} from '../../contentScript';
 import type {
   ErrorMessage,
   PageScriptToContentScriptMessageForwardedToMonitors,
diff --git a/extension/src/browser/extension/inject/pageScript.ts b/extension/src/browser/extension/inject/pageScript.ts
index 99dc12a9..6280c448 100644
--- a/extension/src/browser/extension/inject/pageScript.ts
+++ b/extension/src/browser/extension/inject/pageScript.ts
@@ -52,7 +52,7 @@ import {
   StructuralPerformAction,
   ConnectResponse,
 } from '../../../app/api';
-import { ContentScriptToPageScriptMessage } from './contentScript';
+import type { ContentScriptToPageScriptMessage } from '../../../contentScript';
 
 type EnhancedStoreWithInitialDispatch<
   S,
diff --git a/extension/src/browser/extension/inject/contentScript.ts b/extension/src/contentScript/index.ts
similarity index 98%
rename from extension/src/browser/extension/inject/contentScript.ts
rename to extension/src/contentScript/index.ts
index b5c2e5b4..8f02c3f2 100644
--- a/extension/src/browser/extension/inject/contentScript.ts
+++ b/extension/src/contentScript/index.ts
@@ -2,13 +2,13 @@ import {
   injectOptions,
   getOptionsFromBg,
   isAllowed,
-} from '../../../options/syncOptions';
-import type { TabMessage } from '../../../background/store/apiMiddleware';
-import {
+} from '../options/syncOptions';
+import type { TabMessage } from '../background/store/apiMiddleware';
+import type {
   PageScriptToContentScriptMessage,
   PageScriptToContentScriptMessageWithoutDisconnect,
   PageScriptToContentScriptMessageWithoutDisconnectOrInitInstance,
-} from '../../../app/api';
+} from '../app/api';
 import { Action } from 'redux';
 import {
   CustomAction,
diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js
index fd69d016..f04be04b 100644
--- a/extension/webpack/base.config.js
+++ b/extension/webpack/base.config.js
@@ -15,7 +15,7 @@ const baseConfig = (params) => ({
     remote: ['../src/remote/index'],
     devpanel: ['../src/chromeApiMock', '../src/devpanel/index'],
     devtools: ['../src/devtools/index'],
-    content: ['../src/chromeApiMock', `${extpath}inject/contentScript`],
+    content: ['../src/chromeApiMock', '../src/contentScript/index'],
     pagewrap: [`${extpath}inject/pageScriptWrap`],
     ...params.inputExtra,
   },