feat(external_messaging): Adds external messaging resolver

.github/workflows/test-examples.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: "latest"
+          version: v9.0.6
           run_install: false
 
       - name: Get pnpm store directory

cli/create-plasmo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmo",
-  "version": "0.85.2",
+  "version": "0.86.0",
   "description": "Create Plasmo Framework Browser Extension",
   "main": "dist/index.js",
   "bin": "bin/index.mjs",

cli/plasmo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plasmo",
-  "version": "0.85.2",
+  "version": "0.86.0",
   "description": "The Plasmo Framework CLI",
   "publishConfig": {
     "types": "dist/type.d.ts"

cli/plasmo/src/features/background-service-worker/bgsw-messaging.ts

@@ -21,7 +21,8 @@ const state = {
 // TODO: cache these?
 const createEntryCode = (
   importSection: string,
-  switchCaseSection: string,
+  messageSection: string,
+  externalMessageSection: string,
   portSection: string
 ) => `// @ts-nocheck
 globalThis.__plasmoInternalPortMap = new Map()
@@ -30,7 +31,7 @@ ${importSection}
 
 chrome.runtime.onMessageExternal.addListener((request, sender, sendResponse) => {
   switch (request.name) {
-    ${switchCaseSection}
+    ${externalMessageSection}
     default:
       break
   }
@@ -40,7 +41,7 @@ chrome.runtime.onMessageExternal.addListener((request, sender, sendResponse) =>
 
 chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
   switch (request.name) {
-    ${switchCaseSection}
+    ${messageSection}
     default:
       break
   }
@@ -63,7 +64,7 @@ chrome.runtime.onConnect.addListener(function(port) {
 
 const getHandlerList = async (
   plasmoManifest: PlasmoManifest,
-  dirName: "messages" | "ports"
+  dirName: "messages" | "messages/external" | "ports"
 ) => {
   const handlerDir = join(
     plasmoManifest.projectPath.backgroundDirectory,
@@ -114,14 +115,18 @@ const getPortCode = (name: string, importName: string) => `case "${name}":
 
 export const createBgswMessaging = async (plasmoManifest: PlasmoManifest) => {
   try {
-    const [messageHandlerList, portHandlerList] = await Promise.all([
+    const handlerLists = await Promise.all([
       getHandlerList(plasmoManifest, "messages"),
+      getHandlerList(plasmoManifest, "messages/external"),
       getHandlerList(plasmoManifest, "ports")
     ])
 
-    vLog({ messageHandlerList, portHandlerList })
+    const [messageHandlerList, externalMessageHandlerList, portHandlerList] =
+      handlerLists
 
-    if (messageHandlerList.length === 0 && portHandlerList.length === 0) {
+    vLog({ messageHandlerList, externalMessageHandlerList, portHandlerList })
+
+    if (handlerLists.every((list) => list.length === 0)) {
       return false
     }
 
@@ -145,12 +150,15 @@ export const createBgswMessaging = async (plasmoManifest: PlasmoManifest) => {
     state.md5Hash = declarationMd5Hash
 
     const entryCode = createEntryCode(
-      [...messageHandlerList, ...portHandlerList]
+      [...messageHandlerList, ...externalMessageHandlerList, ...portHandlerList]
         .map((code) => code.importCode)
         .join("\n"),
       messageHandlerList
         .map((code) => getMessageCode(code.name, code.importName))
         .join("\n"),
+      externalMessageHandlerList
+        .map((code) => getMessageCode(code.name, code.importName))
+        .join("\n"),
       portHandlerList
         .map((code) => getPortCode(code.name, code.importName))
         .join("\n")

package.json

@@ -61,5 +61,5 @@
     "npm": ">=9.5.0",
     "node": ">=18.0.0"
   },
-  "packageManager": "pnpm@8.15.0"
+  "packageManager": "pnpm@9.0.6"
 }