fix: new file structure

nobkd · Mar 30, 2023 · df611d8 · df611d8
1 parent 2abbf49
commit df611d8
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 node_modules
-web-ext-artifacts
 dist
+out
 public/leaflet.css
 public/images
diff --git a/.prettierignore b/.prettierignore
@@ -1,5 +1,6 @@
 package-lock.json
 *.md
 dist
+out
 public/leaflet.css
 public/images
diff --git a/package.json b/package.json
@@ -14,14 +14,15 @@
         "url": "git+https://github.com/nobkd/replace-maps.git"
     },
     "scripts": {
-        "leaflet": "cp ./node_modules/leaflet/dist/leaflet.css ./public/leaflet.css && cp -r ./node_modules/leaflet/dist/images ./public/images",
+        "leaflet": "cp node_modules/leaflet/dist/leaflet.css public/leaflet.css && cp -r node_modules/leaflet/dist/images public",
         "icons": "svgexport icons/plain.svg public/icons/48.png 48:48 && svgexport icons/plain.svg public/icons/96.png 96:96",
         "format": "prettier . --write",
         "build": "nr leaflet && tsc && vite build",
         "watch": "nr leaflet && vite build --watch --mode development --minify false",
         "dev": "nr leaflet && vite",
         "serve:firefox": "web-ext run -s ./dist/",
-        "serve:chrome": "web-ext run -t chromium -s ./dist/"
+        "serve:chrome": "web-ext run -t chromium -s dist",
+        "bundle": "web-ext build -s dist -a out"
     },
     "devDependencies": {
         "@antfu/ni": "^0.21.2",

diff --git a/public/manifest.json b/public/manifest.json
@@ -17,7 +17,7 @@
         "https://*/maps*?*output=embed*"
     ],
     "background": {
-        "page": "background.html"
+        "page": "bg.html"
     },
-    "web_accessible_resources": ["res/map.html"]
+    "web_accessible_resources": ["map.html"]
 }
diff --git a/src/background.html → src/bg.html b/src/background.html → src/bg.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <head>
     <meta charset="UTF-8" />
-    <script src="background.ts" type="module"></script>
+    <script src="bg/bg.ts" type="module"></script>
 </head>
diff --git a/src/background.ts → src/bg/bg.ts b/src/background.ts → src/bg/bg.ts
@@ -18,7 +18,7 @@ function redirect(
 ): browser.WebRequest.BlockingResponse {
     if (req.url.match(matcher)) {
         return {
-            redirectUrl: browser.runtime.getURL('res/map.html?' + req.url.split('?')[1]),
+            redirectUrl: browser.runtime.getURL('map.html?' + req.url.split('?')[1]),
         };
     }
     return {};

diff --git a/src/res/map.html → src/map.html b/src/res/map.html → src/map.html
@@ -25,6 +25,6 @@
 
     <body>
         <div id="map"></div>
-        <script src="map.ts" type="module"></script>
+        <script src="map/map.ts" type="module"></script>
     </body>
 </html>
diff --git a/src/res/map.ts → src/map/map.ts b/src/res/map.ts → src/map/map.ts
diff --git a/src/res/utils/parseDMS.ts → src/map/utils/parseDMS.ts b/src/res/utils/parseDMS.ts → src/map/utils/parseDMS.ts
diff --git a/src/res/utils/parsePB.ts → src/map/utils/parsePB.ts b/src/res/utils/parsePB.ts → src/map/utils/parsePB.ts
diff --git a/src/res/utils/read.ts → src/map/utils/read.ts b/src/res/utils/read.ts → src/map/utils/read.ts
diff --git a/vite.config.ts b/vite.config.ts
@@ -9,8 +9,8 @@ export default defineConfig({
         emptyOutDir: true,
         rollupOptions: {
             input: {
-                bg: resolve(__dirname, 'src/background.html'),
-                map: resolve(__dirname, 'src/res/map.html'),
+                bg: resolve(__dirname, 'src/bg.html'),
+                map: resolve(__dirname, 'src/map.html'),
             },
         },
     },