clean up slightly

PlasmoHQ · Jun 8, 2024 · f4bc50d · f4bc50d
1 parent 082f22d
commit f4bc50d
Show file tree

Hide file tree

Showing 4 changed files with 568 additions and 467 deletions.
diff --git a/cli/plasmo/src/features/manifest-factory/base.ts b/cli/plasmo/src/features/manifest-factory/base.ts
@@ -36,7 +36,7 @@ import {
 import { assertTruthy } from "@plasmo/utils/assert"
 import { injectEnv } from "@plasmo/utils/env"
 import { isDirectory, isReadable } from "@plasmo/utils/fs"
-import { vLog } from "@plasmo/utils/logging"
+import { vLog, wLog } from "@plasmo/utils/logging"
 import { getSubExt, toPosix } from "@plasmo/utils/path"
 
 import { loadEnvConfig, type EnvConfig } from "~features/env/env-config"
@@ -225,13 +225,13 @@ export abstract class PlasmoManifest<T extends ExtensionManifest = any> {
       })
     )
 
-    if (!process.env.POST_BUILD_SCRIPT)
+    if (!process.env.POST_BUILD_SCRIPT) {
       return
-
+    }
     const postBuildPath = resolve(process.env.POST_BUILD_SCRIPT)
 
     if (!existsSync(postBuildPath)) {
-      console.error("Post-build file does not exist or is not readable:", postBuildPath)
+      wLog("Post-build script is unavailable:", postBuildPath)
       return
     }
 
@@ -491,9 +491,8 @@ export abstract class PlasmoManifest<T extends ExtensionManifest = any> {
 
       const parsedModulePath = parse(scriptPath)
 
-      const { wereFilesWritten } = await this.scaffolder.createPageMount(
-        parsedModulePath
-      )
+      const { wereFilesWritten } =
+        await this.scaffolder.createPageMount(parsedModulePath)
 
       // if enabled, and the template file was written, invalidate hash!
       if (wereFilesWritten) {

diff --git a/core/parcel-runtime/package.json b/core/parcel-runtime/package.json
@@ -30,6 +30,7 @@
     "tsup": "7.2.0"
   },
   "dependencies": {
+    "@types/trusted-types": "2.0.7",
     "@parcel/core": "2.9.3",
     "@parcel/plugin": "2.9.3",
     "react-refresh": "0.14.0"

diff --git a/core/parcel-runtime/src/utils/loading-indicator.ts b/core/parcel-runtime/src/utils/loading-indicator.ts
@@ -12,27 +12,37 @@ const LOADING_ID = "__plasmo-loading__"
 
 // Function to update the CSP to allow the new trusted type policy
 function updateCSP() {
-  const cspMetaTag = document.querySelector('meta[http-equiv="Content-Security-Policy"]')
-
+  const cspMetaTag = document.querySelector(
+    'meta[http-equiv="Content-Security-Policy"]'
+  )
+
   if (!cspMetaTag) {
-    return true
+    return
   }
-  
-  const currentCSP = cspMetaTag.getAttribute('content')
+
+  const currentCSP = cspMetaTag.getAttribute("content")
   const newPolicy = ` trusted-html-${LOADING_ID}`
 
-  if (!currentCSP.includes(newPolicy)) {
-    const updatedCSP = currentCSP + newPolicy
-    cspMetaTag.setAttribute('content', updatedCSP)
+  if (currentCSP.includes(newPolicy)) {
+    return
   }
 
-  return true
+  const updatedCSP = currentCSP + newPolicy
+  cspMetaTag.setAttribute("content", updatedCSP)
+}
+
+function createTrustedPolicy() {
+  const trustedTypes = globalThis.window.trustedTypes
+  if (!trustedTypes) {
+    return undefined
+  }
+  updateCSP()
+  return trustedTypes.createPolicy(`trusted-html-${LOADING_ID}`, {
+    createHTML: (str) => str
+  })
 }
 
-const trustedPolicy = typeof trustedTypes !== "undefined"
-  ? updateCSP() && trustedTypes
-    .createPolicy(`trusted-html-${LOADING_ID}`, { createHTML: str => str })
-  : undefined
+const trustedPolicy = createTrustedPolicy()
 
 function getLoader() {
   return document.getElementById(LOADING_ID)
@@ -96,7 +106,9 @@ function createLoader() {
   <span class="hidden">Context Invalidated, Press to Reload</span>
   `
 
-  loadingEl.innerHTML = trustedPolicy ? trustedPolicy.createHTML(htmlText) : htmlText
+  loadingEl.innerHTML = trustedPolicy
+    ? (trustedPolicy.createHTML(htmlText) as any)
+    : htmlText
 
   loadingEl.style.pointerEvents = "none"
 
@@ -153,16 +165,19 @@ export const createLoadingIndicator = () => {
       await injectPromise
       const loadingEl = getLoader()
       loadingEl.style.opacity = "1"
-      if (reloadButton) {
-        loadingEl.onclick = (e) => {
-          e.stopPropagation()
-          globalThis.location.reload()
-        }
-        loadingEl.querySelector("span").classList.remove("hidden")
 
-        loadingEl.style.cursor = "pointer"
-        loadingEl.style.pointerEvents = "all"
+      if (!reloadButton) {
+        return
       }
+
+      loadingEl.onclick = (e) => {
+        e.stopPropagation()
+        globalThis.location.reload()
+      }
+      loadingEl.querySelector("span").classList.remove("hidden")
+
+      loadingEl.style.cursor = "pointer"
+      loadingEl.style.pointerEvents = "all"
     },
     hide: async () => {
       await injectPromise