extension-develop 2.0.0 → 2.0.1

package/dist/inject-firefox-client-loader.js

@@ -1,50 +1,167 @@
-"use strict";var M=Object.create;var u=Object.defineProperty;var j=Object.getOwnPropertyDescriptor;var T=Object.getOwnPropertyNames;var N=Object.getPrototypeOf,S=Object.prototype.hasOwnProperty;var O=(e,n)=>{for(var r in n)u(e,r,{get:n[r],enumerable:!0})},g=(e,n,r,a)=>{if(n&&typeof n=="object"||typeof n=="function")for(let s of T(n))!S.call(e,s)&&s!==r&&u(e,s,{get:()=>n[s],enumerable:!(a=j(n,s))||a.enumerable});return e};var c=(e,n,r)=>(r=e!=null?M(N(e)):{},g(n||!e||!e.__esModule?u(r,"default",{value:e,enumerable:!0}):r,e)),_=e=>g(u({},"__esModule",{value:!0}),e);var B={};O(B,{default:()=>H});module.exports=_(B);var f=c(require("path")),b=require("loader-utils"),v=require("schema-utils");var P=c(require("path")),U=c(require("fs")),A=require("child_process"),L=require("package-manager-detector");var I=c(require("path")),t=require("@colors/colors/safe");var h=c(require("path")),k=h.default.join(process.cwd(),"node_modules/extension-develop/dist/certs"),p=["chrome","edge"],D=["firefox"],J=[...p,...D];var R=require("console");function C(e,n){return n==="error"?`${(0,t.bold)((0,t.red)("ERROR"))} in ${e} ${(0,t.red)("\u2716\uFE0E\u2716\uFE0E\u2716\uFE0E")}`:n==="warn"?`${e} ${(0,t.brightYellow)("\u2716\uFE0E\u2716\uFE0E\u2716\uFE0E")}`:`${n==="info"?(0,t.cyan)("\u25BA\u25BA\u25BA"):(0,t.brightGreen)("\u25BA\u25BA\u25BA")} ${(0,t.cyan)(e)}`}function $(){return`${C("Firefox runner","error")} No Service Worker Support
-
-Firefox does not support the ${(0,t.brightYellow)("background.service_worker")} field yet.
-Update your manifest.json file to use ${(0,t.brightYellow)("background.scripts")} instead.
-If you really need to keep the ${(0,t.brightYellow)("service_worker")} field, prefix it with
-${(0,t.brightYellow)("chromium:")} so it can target only Chromium-based browsers.
-
-Mozilla bug: ${(0,t.underline)("https://bugzilla.mozilla.org/show_bug.cgi?id=1573659")}.`}function y(e,n){return JSON.parse(JSON.stringify(e),function(s,l){let o=s.indexOf(":");if(o===-1)return l;let i=s.substring(0,o);(i===n||i==="chromium"&&p.includes(n)||i==="chromium"&&n.includes("chromium")||i==="gecko"&&n.includes("gecko"))&&(this[s.substring(o+1)]=l)})}var W={type:"object",properties:{test:{type:"string"},manifestPath:{type:"string"}}};function H(e){let n=this.getOptions(),r=n.manifestPath,a=n.browser,s=f.default.dirname(r),l=require(r),o=y(l,a);(0,v.validate)(W,n,{name:"reload:inject-background-client",baseDataPath:"options"});let i=(0,b.urlToRequest)(this.resourcePath),w=`
-;browser.runtime.onMessageExternal.addListener(async (request, _sender) => {
-  const managementInfo = await browser.management.getSelf()
-
-  // Ping-pong between the user extension background page(this)
-  // and the middleware socket client (reloadService.ts),
-  // which will then send a message to the server
-  // (startServer.ts) so it can display the extension info.
-  if (request.initialLoadData) {
-    return {
-      id: browser.runtime.id,
-      manifest: browser.runtime.getManifest(),
-      management: managementInfo
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    default: ()=>inject_firefox_client_loader
+});
+const external_path_namespaceObject = require("path");
+const external_fs_namespaceObject = require("fs");
+const external_loader_utils_namespaceObject = require("loader-utils");
+const external_schema_utils_namespaceObject = require("schema-utils");
+require("child_process");
+require("package-manager-detector");
+require("pintor");
+external_path_namespaceObject.join(process.cwd(), 'node_modules/extension-develop/dist/certs');
+const CHROMIUM_BASED_BROWSERS = [
+    'chrome',
+    'edge'
+];
+const GECKO_BASED_BROWSERS = [
+    'firefox'
+];
+[
+    ...CHROMIUM_BASED_BROWSERS,
+    ...GECKO_BASED_BROWSERS
+];
+function filterKeysForThisBrowser(manifest, browser) {
+    const patchedManifest = JSON.parse(JSON.stringify(manifest), function(key, value) {
+        const indexOfColon = key.indexOf(':');
+        if (-1 === indexOfColon) return value;
+        const prefix = key.substring(0, indexOfColon);
+        if (prefix === browser || 'chromium' === prefix && CHROMIUM_BASED_BROWSERS.includes(browser) || 'chromium' === prefix && browser.includes('chromium') || 'gecko' === prefix && browser.includes('gecko')) this[key.substring(indexOfColon + 1)] = value;
+    });
+    return patchedManifest;
+}
+const schema = {
+    type: 'object',
+    properties: {
+        test: {
+            type: 'string'
+        },
+        manifestPath: {
+            type: 'string'
+        }
     }
-  }
-
-  // Reload the extension runtime if the manifest or
-  // service worker changes.
-  if (
-    request.changedFile === 'manifest.json' ||
-    request.changedFile === 'service_worker' ||
-    request.changedFile === '_locales'
-  ) {
-    setTimeout(() => {
-      browser.runtime.reload()
-    }, 750)
-  }
-
-  // Reload all tabs if the contextMenus code changes.
-  if (request.changedFile === "contextMenus") {
-    browser.tabs.query({}, (tabs) => {
-      if (!tabs) return;
-      tabs.forEach((tab) => browser.tabs.reload(tab.id));
+};
+function inject_firefox_client_loader(source) {
+    const options = this.getOptions();
+    const manifestPath = options.manifestPath;
+    const browser = options.browser;
+    const projectPath = external_path_namespaceObject.dirname(manifestPath);
+    const manifest = JSON.parse(external_fs_namespaceObject.readFileSync(manifestPath, 'utf-8'));
+    const patchedManifest = filterKeysForThisBrowser(manifest, browser);
+    (0, external_schema_utils_namespaceObject.validate)(schema, options, {
+        name: 'reload:inject-firefox-client',
+        baseDataPath: 'options'
     });
-  }
-
-  // Reload all tabs if the declarative_net_request code changes.
-  if (request.changedFile === 'declarative_net_request') {
-    browser.runtime.reload()
-  }
+    const url = (0, external_loader_utils_namespaceObject.urlToRequest)(this.resourcePath);
+    const firefoxReloadCode = `
+  // Firefox-specific reload handler
+  ;browser.runtime.onMessageExternal.addListener(
+    async (request, _sender, sendResponse) => {
+      const managementInfo = await new Promise((resolve) => {
+        browser.management.getSelf().then(resolve);
+      });
+ 
+      // Handle initial load data
+      if (request.initialLoadData) {
+        sendResponse({
+          id: browser.runtime.id,
+          manifest: browser.runtime.getManifest(),
+          management: managementInfo,
+        })
+        return true
+      }
+  
+      // Enhanced reload logic for critical files in Firefox
+      if (
+        request.changedFile === 'manifest.json' ||
+        request.changedFile === 'service_worker' ||
+        request.changedFile === '_locales'
+      ) {
+        console.log('Firefox: Reloading extension due to critical file change:', request.changedFile);
+        
+        try {
+          // Firefox-specific cache clearing
+          if (browser.storage && browser.storage.local) {
+            await browser.storage.local.clear();
+          }
+          
+          const timestamp = Date.now();
+          console.log('Firefox: Forcing extension reload at:', timestamp);
+          
+          sendResponse({reloaded: true, timestamp: timestamp})
+          browser.runtime.reload()
+        } catch (error) {
+          console.error('Firefox: Failed to reload extension:', error);
+          sendResponse({error: error.message})
+        }
+      }
 
-  return {reloaded: true}
-});`,d=o.background;if(o.service_worker)return console.log($()),e;if(d){let m=d?.scripts;if(m)for(let E of[m[0]]){let F=f.default.resolve(s,E);if(i.includes(F))return`${w}${e}`}}return e}
+      return true
+    }
+  );
+  
+  // Firefox-specific cache-busting mechanism
+  ;(function() {
+    const cacheBuster = Date.now();
+    console.log('Firefox background script loaded with cache buster:', cacheBuster);
+    
+    // Force reload if this script is older than 1 second (optimized for faster manifest reloads)
+    const scriptAge = Date.now() - cacheBuster;
+    if (scriptAge > 1000) {
+      console.log('Firefox background script is stale, forcing reload');
+      browser.runtime.reload();
+    }
+  })();
+  `;
+    let manifestBg = patchedManifest.background;
+    if (manifestBg) {
+        const backgroundScripts = null == manifestBg ? void 0 : manifestBg.scripts;
+        if (backgroundScripts) {
+            if (2 === patchedManifest.manifest_version) for (const bgScript of [
+                backgroundScripts[0]
+            ]){
+                const absoluteUrl = external_path_namespaceObject.resolve(projectPath, bgScript);
+                if (url.includes(absoluteUrl)) return `${firefoxReloadCode}${source}`;
+            }
+        }
+        const serviceWorker = null == manifestBg ? void 0 : manifestBg.service_worker;
+        if (serviceWorker) {
+            if (3 === patchedManifest.manifest_version) {
+                const absoluteUrl = external_path_namespaceObject.resolve(projectPath, serviceWorker);
+                if (url.includes(absoluteUrl)) return `${firefoxReloadCode}${source}`;
+            }
+        }
+    }
+    return source;
+}
+exports["default"] = __webpack_exports__["default"];
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "default"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/minimum-chromium-file.js

@@ -0,0 +1,25 @@
+var __webpack_exports__ = {};
+chrome.runtime.onMessageExternal.addListener(async (request, _sender, sendResponse)=>{
+    const managementInfo = await new Promise((resolve)=>{
+        chrome.management.getSelf(resolve);
+    });
+    if (request.initialLoadData) {
+        sendResponse({
+            id: chrome.runtime.id,
+            manifest: chrome.runtime.getManifest(),
+            management: managementInfo
+        });
+        return true;
+    }
+    if ('declarative_net_request' === request.changedFile || 'manifest.json' === request.changedFile || 'service_worker' === request.changedFile || '_locales' === request.changedFile) {
+        sendResponse({
+            reloaded: true
+        });
+        chrome.runtime.reload();
+    }
+    return true;
+});
+for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/minimum-content-file.js

@@ -0,0 +1,5 @@
+var __webpack_exports__ = {};
+for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/minimum-firefox-file.js

@@ -0,0 +1,17 @@
+var __webpack_exports__ = {};
+browser.runtime.onMessageExternal.addListener(async (request, _sender)=>{
+    const managementInfo = await browser.management.getSelf();
+    if (request.initialLoadData) return {
+        id: browser.runtime.id,
+        manifest: browser.runtime.getManifest(),
+        management: managementInfo
+    };
+    if ('declarative_net_request' === request.changedFile || 'manifest.json' === request.changedFile || 'service_worker' === request.changedFile || '_locales' === request.changedFile) browser.runtime.reload();
+    return {
+        reloaded: true
+    };
+});
+for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/minimum-script-file.js

@@ -0,0 +1,5 @@
+var __webpack_exports__ = {};
+for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/module.d.ts

@@ -1,95 +1,8 @@
-import { Configuration } from '@rspack/core';
-
-type BrowserType = 'chrome' | 'edge' | 'firefox' | 'chromium-based' | 'gecko-based';
-interface BrowserOptionsBase {
-    open?: boolean;
-    profile?: string;
-    startingUrl?: string;
-    browser: BrowserType;
-}
-interface ChromiumOptions extends BrowserOptionsBase {
-    browser: 'chromium-based';
-    chromiumBinary?: string;
-}
-interface GeckoOptions extends BrowserOptionsBase {
-    browser: 'gecko-based';
-    geckoBinary?: string;
-}
-interface DevOptions extends BrowserOptionsBase {
-    mode: 'development' | 'production' | 'none';
-    polyfill?: boolean;
-    chromiumBinary?: ChromiumOptions['chromiumBinary'];
-    geckoBinary?: GeckoOptions['geckoBinary'];
-}
-interface BuildOptions {
-    browser: BrowserOptionsBase['browser'];
-    zipFilename?: string;
-    zip?: boolean;
-    zipSource?: boolean;
-    polyfill?: boolean;
-    silent?: boolean;
-}
-interface PreviewOptions extends BrowserOptionsBase {
-    mode: 'production';
-    chromiumBinary?: ChromiumOptions['chromiumBinary'];
-    geckoBinary?: GeckoOptions['geckoBinary'];
-}
-interface StartOptions extends BrowserOptionsBase {
-    mode: 'production';
-    polyfill?: boolean;
-    chromiumBinary?: ChromiumOptions['chromiumBinary'];
-    geckoBinary?: GeckoOptions['geckoBinary'];
-}
-interface BrowserConfig extends BrowserOptionsBase {
-    browserFlags?: string[];
-    preferences?: Record<string, unknown>;
-    chromiumBinary?: ChromiumOptions['chromiumBinary'];
-    geckoBinary?: GeckoOptions['geckoBinary'];
-}
-interface FileConfig {
-    browser?: {
-        chrome?: BrowserConfig;
-        firefox?: BrowserConfig;
-        edge?: BrowserConfig;
-        'chromium-based'?: BrowserConfig;
-        'gecko-based'?: BrowserConfig;
-    };
-    commands?: {
-        dev?: Pick<DevOptions, 'browser' | 'profile' | 'chromiumBinary' | 'geckoBinary' | 'open' | 'polyfill'> & {
-            browserFlags?: string[];
-            preferences?: Record<string, unknown>;
-        };
-        start?: Pick<StartOptions, 'browser' | 'profile' | 'chromiumBinary' | 'geckoBinary' | 'polyfill'> & {
-            browserFlags?: string[];
-            preferences?: Record<string, unknown>;
-        };
-        preview?: Pick<PreviewOptions, 'browser' | 'profile' | 'chromiumBinary' | 'geckoBinary'> & {
-            browserFlags?: string[];
-            preferences?: Record<string, unknown>;
-        };
-        build?: Pick<BuildOptions, 'browser' | 'zipFilename' | 'zip' | 'zipSource' | 'polyfill'>;
-    };
-    config?: (config: Configuration) => Configuration;
-}
-
-declare function extensionBuild(pathOrRemoteUrl: string | undefined, buildOptions?: BuildOptions): Promise<void>;
-
-declare function extensionDev(pathOrRemoteUrl: string | undefined, devOptions: DevOptions): Promise<void>;
-
-declare function extensionPreview(pathOrRemoteUrl: string | undefined, previewOptions: PreviewOptions): Promise<void>;
-
-declare function extensionStart(pathOrRemoteUrl: string | undefined, startOptions: StartOptions): Promise<void>;
-
-type ChromeManifest = Partial<chrome.runtime.ManifestV2> & Partial<chrome.runtime.ManifestV3> & {
-    browser_action?: {
-        theme_icons?: ThemeIcon[];
-    };
-};
-type Manifest = ChromeManifest;
-interface ThemeIcon {
-    light: string;
-    dark: string;
-    size?: number;
-}
-
-export { type BuildOptions, type DevOptions, type FileConfig, type Manifest, type PreviewOptions, type StartOptions, extensionBuild, extensionDev, extensionPreview, extensionStart };
+import { extensionBuild } from './build';
+import { extensionDev } from './dev';
+import { extensionPreview } from './preview';
+import { extensionStart } from './start';
+import { cleanupCommand } from './cleanup';
+import { type FileConfig, type BuildOptions, type DevOptions, type PreviewOptions, type StartOptions } from './develop-lib/config-types';
+import { type Manifest } from './webpack/webpack-types';
+export { extensionBuild, BuildOptions, extensionDev, DevOptions, extensionStart, StartOptions, extensionPreview, PreviewOptions, cleanupCommand, FileConfig, Manifest };