From c97b049ed027bd1736d641e556fb7da227087f90 Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Wed, 5 Feb 2025 13:57:49 +0100
Subject: [PATCH] Refactor folder structure to prevent having src output dir
 (#541)

---
 browser-extensions/chrome/{src => }/background.ts    | 10 +++++-----
 browser-extensions/chrome/{src => }/contentScript.ts |  8 ++++----
 browser-extensions/chrome/{src => }/manifest.json    |  4 ++--
 browser-extensions/chrome/tailwind.content.config.js |  2 +-
 browser-extensions/chrome/vite.config.js             |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename browser-extensions/chrome/{src => }/background.ts (97%)
 rename browser-extensions/chrome/{src => }/contentScript.ts (99%)
 rename browser-extensions/chrome/{src => }/manifest.json (92%)

diff --git a/browser-extensions/chrome/src/background.ts b/browser-extensions/chrome/background.ts
similarity index 97%
rename from browser-extensions/chrome/src/background.ts
rename to browser-extensions/chrome/background.ts
index 3654ca87a..aef10a0e1 100644
--- a/browser-extensions/chrome/src/background.ts
+++ b/browser-extensions/chrome/background.ts
@@ -1,8 +1,8 @@
-import { Vault } from './types/webapi/Vault';
-import EncryptionUtility from './utils/EncryptionUtility';
-import SqliteClient from './utils/SqliteClient';
-import { WebApiService } from './utils/WebApiService';
-import { PasswordGenerator } from './generators/Password/PasswordGenerator';
+import { Vault } from './src/types/webapi/Vault';
+import EncryptionUtility from './src/utils/EncryptionUtility';
+import SqliteClient from './src/utils/SqliteClient';
+import { WebApiService } from './src/utils/WebApiService';
+import { PasswordGenerator } from './src/generators/Password/PasswordGenerator';
 
 let vaultState: {
   derivedKey: string | null;
diff --git a/browser-extensions/chrome/src/contentScript.ts b/browser-extensions/chrome/contentScript.ts
similarity index 99%
rename from browser-extensions/chrome/src/contentScript.ts
rename to browser-extensions/chrome/contentScript.ts
index dbe780c38..0d463bad5 100644
--- a/browser-extensions/chrome/src/contentScript.ts
+++ b/browser-extensions/chrome/contentScript.ts
@@ -1,7 +1,7 @@
-import { FormDetector } from './utils/form-detector/FormDetector';
-import { Credential } from './types/Credential';
-import { IdentityGeneratorEn } from './generators/Identity/implementations/IdentityGeneratorEn';
-import { PasswordGenerator } from './generators/Password/PasswordGenerator';
+import { FormDetector } from './src/utils/form-detector/FormDetector';
+import { Credential } from './src/types/Credential';
+import { IdentityGeneratorEn } from './src/generators/Identity/implementations/IdentityGeneratorEn';
+import { PasswordGenerator } from './src/generators/Password/PasswordGenerator';
 
 type CredentialResponse = {
   status: 'OK' | 'LOCKED';
diff --git a/browser-extensions/chrome/src/manifest.json b/browser-extensions/chrome/manifest.json
similarity index 92%
rename from browser-extensions/chrome/src/manifest.json
rename to browser-extensions/chrome/manifest.json
index 403244d59..46f3ae317 100644
--- a/browser-extensions/chrome/src/manifest.json
+++ b/browser-extensions/chrome/manifest.json
@@ -19,7 +19,7 @@
         "512": "assets/icons/icon-512.png"
     },
     "background": {
-      "service_worker": "src/background.ts",
+      "service_worker": "background.ts",
       "type": "module"
     },
     "permissions": [
@@ -31,7 +31,7 @@
     "content_scripts": [
       {
         "matches": ["<all_urls>"],
-        "js": ["src/contentScript.ts"],
+        "js": ["contentScript.ts"],
         "css": ["src/styles/contentScript.css"]
       }
     ],
diff --git a/browser-extensions/chrome/tailwind.content.config.js b/browser-extensions/chrome/tailwind.content.config.js
index 9141b5767..6293db655 100644
--- a/browser-extensions/chrome/tailwind.content.config.js
+++ b/browser-extensions/chrome/tailwind.content.config.js
@@ -1,7 +1,7 @@
 /** @type {import('tailwindcss').Config} */
 export default {
   content: [
-    "./src/contentScript.ts",
+    "./contentScript.ts",
   ],
   theme: {
     extend: {},
diff --git a/browser-extensions/chrome/vite.config.js b/browser-extensions/chrome/vite.config.js
index d31da6daf..d77f696c4 100644
--- a/browser-extensions/chrome/vite.config.js
+++ b/browser-extensions/chrome/vite.config.js
@@ -11,7 +11,7 @@ export default defineConfig({
     react(),
     dictionaryLoader(),
     webExtension({
-      manifest: 'src/manifest.json',
+      manifest: 'manifest.json',
     }),
     viteStaticCopy({
       targets: [
@@ -25,7 +25,7 @@ export default defineConfig({
         },
         {
           src: 'node_modules/sql.js/dist/sql-wasm.wasm',
-          dest: 'src/src'
+          dest: 'src'
         }
       ]
     })