wip

samuelmaddock · Jan 7, 2025 · efab96c · efab96c
1 parent 8f7a184
commit efab96c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/packages/electron-chrome-extensions/esbuild.config.js b/packages/electron-chrome-extensions/esbuild.config.js
@@ -3,7 +3,7 @@ const { createConfig, build, EXTERNAL_BASE } = require('../../build/esbuild/esbu
 
 console.log(`building ${packageJson.name}`)
 
-const external = [...EXTERNAL_BASE]
+const external = [...EXTERNAL_BASE, 'electron-chrome-extensions/preload']
 
 const browserConfig = createConfig({
   entryPoints: ['src/index.ts'],

diff --git a/packages/electron-chrome-extensions/package.json b/packages/electron-chrome-extensions/package.json
@@ -21,7 +21,7 @@
       "import": "./dist/esm/browser-action.mjs",
       "require": "./dist/cjs/browser-action.js"
     },
-    "./preload": "./chrome-extension-api.preload.js"
+    "./preload": "./dist/chrome-extension-api.preload.js"
   },
   "scripts": {
     "build": "yarn clean && tsc && node esbuild.config.js",

diff --git a/packages/electron-chrome-extensions/src/browser/index.ts b/packages/electron-chrome-extensions/src/browser/index.ts
@@ -85,9 +85,12 @@ export class ElectronChromeExtensions extends EventEmitter {
       store,
     }
 
-    console.log('***load', {
-      resolve: require.resolve('electron-chrome-extensions/preload'),
-      require: require('electron-chrome-extensions')
+    console.log('***extensions', {
+      modulePath,
+      resolve: require.resolve,
+      resolved: require.resolve('electron-chrome-extensions/preload'),
+      // resolvedPath: path.resolve(globalThis.require.resolve('electron-chrome-extensions/preload')),
+      require: globalThis.require,
     })
     this.modulePath = modulePath || __dirname
 

diff --git a/packages/electron-chrome-web-store/src/browser/index.ts b/packages/electron-chrome-web-store/src/browser/index.ts
@@ -19,7 +19,6 @@ const getDefaultModulePath = () => {
     return __dirname
   }
 }
-
 
 interface ElectronChromeWebStoreOptions {
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,6 @@ const getDefaultModulePath = () => { @@
         return __dirname
       }
     }
     interface ElectronChromeWebStoreOptions {
       /**
@@ Expand Down @@