diff --git a/dest/.web-extension-id b/static/.web-extension-id
similarity index 100%
rename from dest/.web-extension-id
rename to static/.web-extension-id
diff --git a/src/background.js b/static/background.js
similarity index 58%
rename from src/background.js
rename to static/background.js
index 1a282cb..9bc65a7 100644
--- a/src/background.js
+++ b/static/background.js
@@ -1,7 +1,8 @@
+/** @type {Map
} */
const ports = new Map();
chrome.runtime.onConnect.addListener((port) => {
- if (port.sender.url == chrome.runtime.getURL('/devtools/panel.html')) {
+ if (port.sender?.url === chrome.runtime.getURL('/index.html')) {
port.onMessage.addListener(handleToolsMessage);
} else {
// This is not an expected connection, so we just log an error and close it
@@ -10,9 +11,9 @@ chrome.runtime.onConnect.addListener((port) => {
}
});
+/** @type {Parameters[0]} */
function handleToolsMessage(msg, port) {
switch (msg.type) {
- // 'init' and 'reload' messages do not need to be delivered to content script
case 'init':
setup(msg.tabId, port, msg.profilerEnabled);
break;
@@ -25,23 +26,28 @@ function handleToolsMessage(msg, port) {
}
}
-// Receive messages from content scripts
-chrome.runtime.onMessage.addListener((msg, sender) => handlePageMessage(msg, sender.tab.id));
+// relay messages from content scripts to devtools page
+chrome.runtime.onMessage.addListener((msg, sender) => {
+ const port = sender.tab?.id && ports.get(sender.tab.id);
+ if (port) port.postMessage(msg);
+});
-function handlePageMessage(msg, tabId) {
- const tools = ports.get(tabId);
- if (tools) tools.postMessage(msg);
-}
+/** @type {Parameters[0]} */
+function attach(tabId, changed) {
+ if (!ports.has(tabId) || changed.status !== 'loading') return;
-function attachScript(tabId, changed) {
- const firefox = !window.chrome && !changed.url;
- if (!ports.has(tabId) || changed.status !== 'loading' || firefox) return;
chrome.tabs.executeScript(tabId, {
- file: '/privilegedContent.js',
+ file: '/courier.js',
runAt: 'document_start',
});
}
+/**
+ *
+ * @param {number} tabId
+ * @param {chrome.runtime.Port} port
+ * @param {boolean} profilerEnabled
+ */
function setup(tabId, port, profilerEnabled) {
chrome.tabs.executeScript(tabId, {
code: profilerEnabled
@@ -54,13 +60,13 @@ function setup(tabId, port, profilerEnabled) {
port.onDisconnect.addListener(() => {
ports.delete(tabId);
- chrome.tabs.onUpdated.removeListener(attachScript);
- // Inform content script that it background closed and it needs to clean up
+
+ chrome.tabs.onUpdated.removeListener(attach);
chrome.tabs.sendMessage(tabId, {
type: 'clear',
tabId: tabId,
});
});
- chrome.tabs.onUpdated.addListener(attachScript);
+ chrome.tabs.onUpdated.addListener(attach);
}
diff --git a/dest/devtools/index.html b/static/devtools/index.html
similarity index 100%
rename from dest/devtools/index.html
rename to static/devtools/index.html
diff --git a/dest/devtools/index.js b/static/devtools/index.js
similarity index 52%
rename from dest/devtools/index.js
rename to static/devtools/index.js
index 5ea3be0..0f60516 100644
--- a/dest/devtools/index.js
+++ b/static/devtools/index.js
@@ -1,14 +1,15 @@
chrome.devtools.panels.create(
'Svelte',
chrome.devtools.panels.themeName == 'dark'
- ? '/devtools/svelte-logo-dark.svg'
- : '/devtools/svelte-logo-light.svg',
- '/devtools/panel.html',
- (panel) =>
- panel.onShown.addListener(() =>
+ ? '/icons/svelte-logo-dark.svg'
+ : '/icons/svelte-logo-light.svg',
+ '/index.html',
+ (panel) => {
+ panel.onShown.addListener(() => {
chrome.devtools.inspectedWindow.eval(
'if (window.__svelte_devtools_select_element) window.__svelte_devtools_select_element($0)',
- (result, err) => err && console.error(err),
- ),
- ),
+ (_, err) => err && console.error(err),
+ );
+ });
+ },
);
diff --git a/dest/icons/128.png b/static/icons/128.png
similarity index 100%
rename from dest/icons/128.png
rename to static/icons/128.png
diff --git a/dest/icons/16.png b/static/icons/16.png
similarity index 100%
rename from dest/icons/16.png
rename to static/icons/16.png
diff --git a/dest/icons/24.png b/static/icons/24.png
similarity index 100%
rename from dest/icons/24.png
rename to static/icons/24.png
diff --git a/dest/icons/48.png b/static/icons/48.png
similarity index 100%
rename from dest/icons/48.png
rename to static/icons/48.png
diff --git a/dest/icons/96.png b/static/icons/96.png
similarity index 100%
rename from dest/icons/96.png
rename to static/icons/96.png
diff --git a/dest/devtools/svelte-logo-dark.svg b/static/icons/svelte-logo-dark.svg
similarity index 100%
rename from dest/devtools/svelte-logo-dark.svg
rename to static/icons/svelte-logo-dark.svg
diff --git a/dest/devtools/svelte-logo-light.svg b/static/icons/svelte-logo-light.svg
similarity index 100%
rename from dest/devtools/svelte-logo-light.svg
rename to static/icons/svelte-logo-light.svg
diff --git a/src/svelte-logo.svg b/static/icons/svelte-logo.svg
similarity index 100%
rename from src/svelte-logo.svg
rename to static/icons/svelte-logo.svg
diff --git a/dest/manifest.json b/static/manifest.json
similarity index 88%
rename from dest/manifest.json
rename to static/manifest.json
index 5ab3575..a27298e 100644
--- a/dest/manifest.json
+++ b/static/manifest.json
@@ -10,10 +10,11 @@
"96": "icons/96.png",
"128": "icons/128.png"
},
- "permissions": ["tabs", ""],
+
"background": {
"scripts": ["background.js"]
},
"devtools_page": "devtools/index.html",
- "web_accessible_resources": ["privilegedContent.js"]
+ "permissions": ["tabs", ""],
+ "web_accessible_resources": ["courier.js"]
}
diff --git a/svelte.config.js b/svelte.config.js
new file mode 100644
index 0000000..d5a9d0f
--- /dev/null
+++ b/svelte.config.js
@@ -0,0 +1,10 @@
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
+
+export default {
+ preprocess: vitePreprocess(),
+
+ onwarn(warning, handler) {
+ if (warning.message.includes('A11y')) return;
+ !warning.message.includes('chrome') && handler(warning);
+ },
+};
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..b8a3f8b
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,36 @@
+{
+ "compilerOptions": {
+ "target": "ESNext",
+ "module": "ESNext",
+ "moduleResolution": "bundler",
+ "resolveJsonModule": true,
+
+ "checkJs": true,
+ "strict": true,
+ "composite": true,
+ "noEmit": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "noImplicitReturns": true,
+
+ "skipLibCheck": true,
+ "isolatedModules": true,
+ "useDefineForClassFields": true,
+ "forceConsistentCasingInFileNames": true,
+
+ "paths": {
+ "$lib": ["./src/lib"],
+ "$lib/*": ["./src/lib/*"]
+ }
+ },
+ "include": [
+ "vite.config.ts",
+ // disable temporarily
+ // "src/**/*.d.ts",
+ // "src/**/*.ts",
+ // "src/**/*.js",
+ // "src/**/*.svelte",
+ "static/**/*.js"
+ ],
+ "exclude": ["static/courier.js"]
+}
diff --git a/vite.config.ts b/vite.config.ts
new file mode 100644
index 0000000..553a45c
--- /dev/null
+++ b/vite.config.ts
@@ -0,0 +1,21 @@
+import { resolve } from 'node:path';
+import { svelte } from '@sveltejs/vite-plugin-svelte';
+import { defineConfig } from 'vite';
+
+export default defineConfig(() => {
+ return {
+ plugins: [svelte()],
+
+ build: {
+ outDir: 'build',
+ },
+
+ publicDir: 'static',
+
+ resolve: {
+ alias: {
+ $lib: resolve(__dirname, 'src/lib'),
+ },
+ },
+ };
+});
+
+
+ 
+
+