fix: resolve all ESM module if possible (#915)

PlasmoHQ · Mar 20, 2024 · b13e4a8 · b13e4a8
1 parent 2876857
commit b13e4a8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/cli/create-plasmo/package.json b/cli/create-plasmo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-plasmo",
-  "version": "0.85.0",
+  "version": "0.85.1",
   "description": "Create Plasmo Framework Browser Extension",
   "main": "dist/index.js",
   "bin": "bin/index.mjs",

diff --git a/cli/plasmo/package.json b/cli/plasmo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plasmo",
-  "version": "0.85.0",
+  "version": "0.85.1",
   "description": "The Plasmo Framework CLI",
   "publishConfig": {
     "types": "dist/type.d.ts"

diff --git a/core/parcel-config/package.json b/core/parcel-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plasmohq/parcel-config",
-  "version": "0.40.3",
+  "version": "0.40.4",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/core/parcel-resolver-post/package.json b/core/parcel-resolver-post/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plasmohq/parcel-resolver-post",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Plasmo Parcel Resolver Post-processing",
   "files": [
     "dist"

diff --git a/core/parcel-resolver-post/src/handle-module-exports.ts b/core/parcel-resolver-post/src/handle-module-exports.ts
@@ -1,8 +1,5 @@
 import type { ResolverProps, ResolverResult } from "./shared"
 
-// TODO: move this stuff into plasmo.config.ts
-const knownEsmPackageSet = new Set(["firebase-admin", "svelte", "ai"])
-
 // Last resort resolver for weird packages:
 export async function handleModuleExport({
   specifier,
@@ -14,16 +11,12 @@ export async function handleModuleExport({
   }
 
   try {
-    const segments = specifier.split("/")
-
-    if (segments.length > 2 || knownEsmPackageSet.has(segments[0])) {
-      const filePath = require.resolve(specifier, {
-        paths: [dependency.resolveFrom]
-      })
+    const filePath = require.resolve(specifier, {
+      paths: [dependency.resolveFrom]
+    })
 
-      return {
-        filePath
-      }
+    return {
+      filePath
     }
   } catch {}
 

diff --git a/core/parcel-resolver-post/src/index.ts b/core/parcel-resolver-post/src/index.ts
@@ -7,9 +7,9 @@ import { handleTsPath } from "./handle-ts-path"
 export default new Resolver({
   async resolve(props) {
     return (
+      (await handleHacks(props)) ||
       (await handleTsPath(props)) ||
       (await handleModuleExport(props)) ||
-      (await handleHacks(props)) ||
       null
     )
   }