Merge branch 'main' into main

PlasmoHQ · Nov 10, 2023 · c23a077 · c23a077
2 parents 1d38d10 + 8dc9191
commit c23a077
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/api/messaging/package.json b/api/messaging/package.json
@@ -101,7 +101,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/PlasmoHQ/plasmo.git"
+    "url": "https://github.com/PlasmoHQ/plasmo.git",
+    "directory": "api/messaging"
   },
   "license": "MIT",
   "keywords": [

diff --git a/api/messaging/src/index.ts b/api/messaging/src/index.ts
@@ -27,7 +27,11 @@ export const sendToBackground: PlasmoMessaging.SendFx<MessageName> = async (
  */
 export const sendToContentScript: PlasmoMessaging.SendFx = async (req) => {
   const tabId =
-    typeof req.tabId === "number" ? req.tabId : (await getActiveTab()).id
+    typeof req.tabId === "number" ? req.tabId : (await getActiveTab())?.id
+
+  if (!tabId) {
+    throw new Error("No active tab found to send message to.")
+  }
 
   return getExtTabs().sendMessage(tabId, req)
 }

diff --git a/api/messaging/src/utils.ts b/api/messaging/src/utils.ts
@@ -27,7 +27,7 @@ export const getActiveTab = async () => {
     active: true,
     currentWindow: true
   })
-  return tab
+  return tab as chrome.tabs.Tab | undefined
 }
 
 export const isSameOrigin = (

diff --git a/api/persistent/package.json b/api/persistent/package.json
@@ -52,7 +52,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/PlasmoHQ/plasmo.git"
+    "url": "https://github.com/PlasmoHQ/plasmo.git",
+    "directory": "api/persistent"
   },
   "license": "MIT",
   "keywords": [

diff --git a/api/selector/package.json b/api/selector/package.json
@@ -58,7 +58,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/PlasmoHQ/plasmo.git"
+    "url": "https://github.com/PlasmoHQ/plasmo.git",
+    "directory": "api/selector"
   },
   "license": "MIT",
   "keywords": [

diff --git a/cli/create-plasmo/package.json b/cli/create-plasmo/package.json
@@ -29,7 +29,8 @@
   "homepage": "https://docs.plasmo.com/",
   "repository": {
     "type": "git",
-    "url": "https://github.com/PlasmoHQ/plasmo.git"
+    "url": "https://github.com/PlasmoHQ/plasmo.git",
+    "directory": "cli/create-plasmo"
   },
   "license": "MIT",
   "keywords": [

diff --git a/cli/plasmo/package.json b/cli/plasmo/package.json
@@ -28,7 +28,8 @@
   "homepage": "https://docs.plasmo.com/",
   "repository": {
     "type": "git",
-    "url": "https://github.com/PlasmoHQ/plasmo.git"
+    "url": "https://github.com/PlasmoHQ/plasmo.git",
+    "directory": "cli/plasmo"
   },
   "license": "MIT",
   "keywords": [

diff --git a/core/parcel-runtime/src/utils/loading-indicator.ts b/core/parcel-runtime/src/utils/loading-indicator.ts
@@ -10,6 +10,11 @@
 
 const LOADING_ID = "__plasmo-loading__"
 
+const trustedPolicy = typeof trustedTypes !== "undefined"
+  ? trustedTypes
+    .createPolicy(`trusted-html-${LOADING_ID}`, { createHTML: str => str })
+  : undefined
+
 function getLoader() {
   return document.getElementById(LOADING_ID)
 }
@@ -22,7 +27,7 @@ function createLoader() {
   const loadingEl = document.createElement("div")
   loadingEl.id = LOADING_ID
 
-  loadingEl.innerHTML = `
+  const htmlText = `
   <style>
     #${LOADING_ID} {
       background: #f3f3f3;
@@ -72,6 +77,8 @@ function createLoader() {
   <span class="hidden">Context Invalidated, Press to Reload</span>
   `
 
+  loadingEl.innerHTML = trustedPolicy ? trustedPolicy.createHTML(htmlText) : htmlText
+
   loadingEl.style.pointerEvents = "none"
 
   loadingEl.style.position = "fixed"