From 0da80217f808f1b27bd35d02c776d3ae63f5ef76 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Sat, 1 Jul 2023 00:28:33 -0400 Subject: [PATCH] refactor: remove unnecessary extension pages --- package.json | 4 +-- src/manifest.ts | 8 ----- src/pages/background/index.ts | 0 src/pages/devtools/index.html | 10 ------- src/pages/devtools/index.ts | 5 ---- src/pages/newtab/Newtab.css | 38 ------------------------ src/pages/newtab/Newtab.tsx | 24 --------------- src/pages/newtab/index.css | 13 -------- src/pages/newtab/index.html | 12 -------- src/pages/newtab/index.tsx | 13 -------- src/pages/panel/Panel.css | 7 ----- src/pages/panel/Panel.tsx | 10 ------- src/pages/panel/index.css | 0 src/pages/panel/index.html | 12 -------- src/pages/panel/index.tsx | 13 -------- src/pages/popup/components/home/Home.tsx | 1 - vite.config.ts | 7 ++--- 17 files changed, 4 insertions(+), 173 deletions(-) delete mode 100644 src/pages/background/index.ts delete mode 100644 src/pages/devtools/index.html delete mode 100644 src/pages/devtools/index.ts delete mode 100644 src/pages/newtab/Newtab.css delete mode 100644 src/pages/newtab/Newtab.tsx delete mode 100644 src/pages/newtab/index.css delete mode 100644 src/pages/newtab/index.html delete mode 100644 src/pages/newtab/index.tsx delete mode 100644 src/pages/panel/Panel.css delete mode 100644 src/pages/panel/Panel.tsx delete mode 100644 src/pages/panel/index.css delete mode 100644 src/pages/panel/index.html delete mode 100644 src/pages/panel/index.tsx diff --git a/package.json b/package.json index 6590066..955a504 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "masked-email-manager", - "displayName": "Fastmail Masked Email Manager", + "displayName": "Masked Email Manager", + "description": "A web extension to manage your Fastmail masked emails", "version": "1.0.0-beta.34", - "description": "A web extension to manage your fastmail masked emails", "license": "MIT", "repository": { "type": "git", diff --git a/src/manifest.ts b/src/manifest.ts index cc11add..98ee3e3 100755 --- a/src/manifest.ts +++ b/src/manifest.ts @@ -9,10 +9,6 @@ const manifest: Manifest.WebExtensionManifest = { options_ui: { page: 'src/pages/options/index.html' }, - background: { - service_worker: 'src/pages/background/index.js', - type: 'module' - }, action: { default_popup: 'src/pages/popup/index.html', default_icon: 'icon34.png' @@ -23,7 +19,6 @@ const manifest: Manifest.WebExtensionManifest = { '128': 'icon128.png' }, permissions: ['storage', 'tabs'], - devtools_page: 'src/pages/devtools/index.html', web_accessible_resources: [ { resources: [ @@ -41,9 +36,6 @@ const isFirefox = process.env.BROWSER === 'firefox'; // Firefox does not support background.service_worker, so convert to the firefox compatible background.scripts if (isFirefox) { const extensionId = 'c48d361c-1173-11ee-be56-0242ac120002'; - manifest.background = { - scripts: ['src/pages/background/index.js'] - }; manifest.browser_specific_settings = { gecko: { id: `{${extensionId}}` diff --git a/src/pages/background/index.ts b/src/pages/background/index.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/devtools/index.html b/src/pages/devtools/index.html deleted file mode 100644 index 666bb68..0000000 --- a/src/pages/devtools/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Devtools - - - - - diff --git a/src/pages/devtools/index.ts b/src/pages/devtools/index.ts deleted file mode 100644 index 0c9e117..0000000 --- a/src/pages/devtools/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import Browser from 'webextension-polyfill'; - -Browser.devtools.panels - .create('Dev Tools', 'icon-34.png', 'src/pages/panel/index.html') - .catch(console.error); diff --git a/src/pages/newtab/Newtab.css b/src/pages/newtab/Newtab.css deleted file mode 100644 index 74b5e05..0000000 --- a/src/pages/newtab/Newtab.css +++ /dev/null @@ -1,38 +0,0 @@ -.App { - text-align: center; -} - -.App-logo { - height: 40vmin; - pointer-events: none; -} - -@media (prefers-reduced-motion: no-preference) { - .App-logo { - animation: App-logo-spin infinite 20s linear; - } -} - -.App-header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.App-link { - color: #61dafb; -} - -@keyframes App-logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/src/pages/newtab/Newtab.tsx b/src/pages/newtab/Newtab.tsx deleted file mode 100644 index ffab840..0000000 --- a/src/pages/newtab/Newtab.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import React from 'react'; -import icon from '@assets/img/icon.svg'; -import '@pages/newtab/Newtab.css'; - -export default function Newtab(): JSX.Element { - return ( -
-
- logo -

- Edit src/pages/newtab/Newtab.tsx and save to reload. -

- - Learn React! - -
-
- ); -} diff --git a/src/pages/newtab/index.css b/src/pages/newtab/index.css deleted file mode 100644 index ec2585e..0000000 --- a/src/pages/newtab/index.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} diff --git a/src/pages/newtab/index.html b/src/pages/newtab/index.html deleted file mode 100644 index e794ed9..0000000 --- a/src/pages/newtab/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - New tab - - - -
- - - diff --git a/src/pages/newtab/index.tsx b/src/pages/newtab/index.tsx deleted file mode 100644 index c817af1..0000000 --- a/src/pages/newtab/index.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; -import { createRoot } from 'react-dom/client'; -import Newtab from '@pages/newtab/Newtab'; -import '@pages/newtab/index.css'; - -function init() { - const rootContainer = document.querySelector('#__root'); - if (!rootContainer) throw new Error("Can't find Newtab root element"); - const root = createRoot(rootContainer); - root.render(); -} - -init(); diff --git a/src/pages/panel/Panel.css b/src/pages/panel/Panel.css deleted file mode 100644 index 843f23e..0000000 --- a/src/pages/panel/Panel.css +++ /dev/null @@ -1,7 +0,0 @@ -body { - background-color: #242424; -} - -.container { - color: #ffffff; -} \ No newline at end of file diff --git a/src/pages/panel/Panel.tsx b/src/pages/panel/Panel.tsx deleted file mode 100644 index 44eb2ed..0000000 --- a/src/pages/panel/Panel.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import React from 'react'; -import '@pages/panel/Panel.css'; - -export default function Panel(): JSX.Element { - return ( -
-

Dev Tools Panel

-
- ); -} diff --git a/src/pages/panel/index.css b/src/pages/panel/index.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/panel/index.html b/src/pages/panel/index.html deleted file mode 100644 index 7aa306d..0000000 --- a/src/pages/panel/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - Devtools Panel - - - -
- - - diff --git a/src/pages/panel/index.tsx b/src/pages/panel/index.tsx deleted file mode 100644 index fa9b324..0000000 --- a/src/pages/panel/index.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; -import { createRoot } from 'react-dom/client'; -import Panel from '@pages/panel/Panel'; -import '@pages/panel/index.css'; - -function init() { - const rootContainer = document.querySelector('#__root'); - if (!rootContainer) throw new Error("Can't find Panel root element"); - const root = createRoot(rootContainer); - root.render(); -} - -init(); diff --git a/src/pages/popup/components/home/Home.tsx b/src/pages/popup/components/home/Home.tsx index d357ecf..7370893 100644 --- a/src/pages/popup/components/home/Home.tsx +++ b/src/pages/popup/components/home/Home.tsx @@ -51,7 +51,6 @@ export default function HomeComponent({ onLogout }: HomeComponentProps) { active: true, lastFocusedWindow: true }); - // Check if tabs exist if (tabs.length > 0) { const activeTabUrl = tabs[0].url; diff --git a/vite.config.ts b/vite.config.ts index 0bb95ab..317f795 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -3,9 +3,10 @@ import { resolve } from 'path'; import { defineConfig } from 'vite'; import { outputFolderName } from './utils/constants/constants'; +import makeManifest from './utils/plugins/make-manifest'; + const isFirefox = process.env.BROWSER === 'firefox'; const firefoxOutDir = resolve(__dirname, 'dist-firefox'); -import makeManifest from './utils/plugins/make-manifest'; const root = resolve(__dirname, 'src'); const pagesDir = resolve(root, 'pages'); @@ -29,11 +30,7 @@ export default defineConfig({ emptyOutDir: false, rollupOptions: { input: { - devtools: resolve(pagesDir, 'devtools', 'index.html'), - panel: resolve(pagesDir, 'panel', 'index.html'), - background: resolve(pagesDir, 'background', 'index.ts'), popup: resolve(pagesDir, 'popup', 'index.html'), - newtab: resolve(pagesDir, 'newtab', 'index.html'), options: resolve(pagesDir, 'options', 'index.html') }, output: {