extension-develop 2.0.0-rc.10 → 2.0.0-rc.12

package/dist/extensions/chrome-manager-extension/reload-service.js

@@ -31,7 +31,7 @@ export async function connect() {
         `[Reload Service] Changes detected on ${message.changedFile}. Reloading extension...`
       )
 
-      await messageAllExtensions(message.changedFile)
+      await hardReloadAllExtensions(message.changedFile)
     }
   }
 
@@ -64,13 +64,15 @@ async function getDevExtensions() {
   })
 }
 
-async function messageAllExtensions(changedFile) {
+async function hardReloadAllExtensions(changedFile) {
   // Check if the external extension is ready
   const isExtensionReady = await checkExtensionReadiness()
 
   if (isExtensionReady) {
     const devExtensions = await getDevExtensions()
-    const reloadAll = devExtensions.map((extension) => {
+    const reloadAll = devExtensions.map(async (extension) => {
+      await hardReloadExtension(extension.id)
+
       chrome.runtime.sendMessage(extension.id, {changedFile}, (response) => {
         if (response) {
           console.info('[Reload Service] Extension reloaded and ready.')
@@ -143,3 +145,17 @@ export function keepAlive() {
     }
   }, TEN_SECONDS_MS)
 }
+
+const toggleExtensionState = (extensionId, enabled) => {
+  if (extensionId === chrome.runtime.id) {
+    return Promise.resolve()
+  }
+  return new Promise((resolve) => {
+    chrome.management.setEnabled(extensionId, enabled, resolve)
+  })
+}
+
+async function hardReloadExtension(extensionId) {
+  await toggleExtensionState(extensionId, false)
+  await toggleExtensionState(extensionId, true)
+}

package/dist/extensions/chromium-based-manager-extension/reload-service.js

@@ -31,7 +31,7 @@ export async function connect() {
         `[Reload Service] Changes detected on ${message.changedFile}. Reloading extension...`
       )
 
-      await messageAllExtensions(message.changedFile)
+      await hardReloadAllExtensions(message.changedFile)
     }
   }
 
@@ -64,13 +64,15 @@ async function getDevExtensions() {
   })
 }
 
-async function messageAllExtensions(changedFile) {
+async function hardReloadAllExtensions(changedFile) {
   // Check if the external extension is ready
   const isExtensionReady = await checkExtensionReadiness()
 
   if (isExtensionReady) {
     const devExtensions = await getDevExtensions()
-    const reloadAll = devExtensions.map((extension) => {
+    const reloadAll = devExtensions.map(async (extension) => {
+      await hardReloadExtension(extension.id)
+
       chrome.runtime.sendMessage(extension.id, {changedFile}, (response) => {
         if (response) {
           console.info('[Reload Service] Extension reloaded and ready.')
@@ -143,3 +145,17 @@ export function keepAlive() {
     }
   }, TEN_SECONDS_MS)
 }
+
+const toggleExtensionState = (extensionId, enabled) => {
+  if (extensionId === chrome.runtime.id) {
+    return Promise.resolve()
+  }
+  return new Promise((resolve) => {
+    chrome.management.setEnabled(extensionId, enabled, resolve)
+  })
+}
+
+async function hardReloadExtension(extensionId) {
+  await toggleExtensionState(extensionId, false)
+  await toggleExtensionState(extensionId, true)
+}

package/dist/extensions/edge-manager-extension/reload-service.js

@@ -31,7 +31,7 @@ export async function connect() {
         `[Reload Service] Changes detected on ${message.changedFile}. Reloading extension...`
       )
 
-      await messageAllExtensions(message.changedFile)
+      await hardReloadAllExtensions(message.changedFile)
     }
   }
 
@@ -64,13 +64,15 @@ async function getDevExtensions() {
   })
 }
 
-async function messageAllExtensions(changedFile) {
+async function hardReloadAllExtensions(changedFile) {
   // Check if the external extension is ready
   const isExtensionReady = await checkExtensionReadiness()
 
   if (isExtensionReady) {
     const devExtensions = await getDevExtensions()
-    const reloadAll = devExtensions.map((extension) => {
+    const reloadAll = devExtensions.map(async (extension) => {
+      await hardReloadExtension(extension.id)
+
       chrome.runtime.sendMessage(extension.id, {changedFile}, (response) => {
         if (response) {
           console.info('[Reload Service] Extension reloaded and ready.')
@@ -143,3 +145,17 @@ export function keepAlive() {
     }
   }, TEN_SECONDS_MS)
 }
+
+const toggleExtensionState = (extensionId, enabled) => {
+  if (extensionId === chrome.runtime.id) {
+    return Promise.resolve()
+  }
+  return new Promise((resolve) => {
+    chrome.management.setEnabled(extensionId, enabled, resolve)
+  })
+}
+
+async function hardReloadExtension(extensionId) {
+  await toggleExtensionState(extensionId, false)
+  await toggleExtensionState(extensionId, true)
+}

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

@@ -1,4 +1,4 @@
-"use strict";var F=Object.create;var u=Object.defineProperty;var M=Object.getOwnPropertyDescriptor;var j=Object.getOwnPropertyNames;var T=Object.getPrototypeOf,N=Object.prototype.hasOwnProperty;var _=(e,n)=>{for(var t in n)u(e,t,{get:n[t],enumerable:!0})},x=(e,n,t,a)=>{if(n&&typeof n=="object"||typeof n=="function")for(let r of j(n))!N.call(e,r)&&r!==t&&u(e,r,{get:()=>n[r],enumerable:!(a=M(n,r))||a.enumerable});return e};var c=(e,n,t)=>(t=e!=null?F(T(e)):{},x(n||!e||!e.__esModule?u(t,"default",{value:e,enumerable:!0}):t,e)),O=e=>x(u({},"__esModule",{value:!0}),e);var H={};_(H,{default:()=>W});module.exports=O(H);var p=c(require("path")),b=require("loader-utils"),E=require("schema-utils");var C=c(require("path")),P=c(require("fs")),U=require("child_process"),A=require("package-manager-detector");var R=c(require("path")),s=require("@colors/colors/safe");var y=c(require("path")),S=y.default.join(process.cwd(),"node_modules/extension-develop/dist/certs"),m=["chrome","edge"],k=["firefox"],z=[...m,...k];var D=require("console");function v(e,n){return JSON.parse(JSON.stringify(e),function(r,l){let o=r.indexOf(":");if(o===-1)return l;let i=r.substring(0,o);(i===n||i==="chromium"&&m.includes(n)||i==="chromium"&&n.includes("chromium")||i==="gecko"&&n.includes("gecko"))&&(this[r.substring(o+1)]=l)})}var q={type:"object",properties:{test:{type:"string"},manifestPath:{type:"string"}}};function W(e){let n=this.getOptions(),t=n.manifestPath,a=n.browser,r=p.default.dirname(t),l=require(t),o=v(l,a);(0,E.validate)(q,n,{name:"reload:inject-background-client",baseDataPath:"options"});let i=(0,b.urlToRequest)(this.resourcePath),g=`
+"use strict";var F=Object.create;var u=Object.defineProperty;var j=Object.getOwnPropertyDescriptor;var M=Object.getOwnPropertyNames;var N=Object.getPrototypeOf,T=Object.prototype.hasOwnProperty;var O=(e,n)=>{for(var t in n)u(e,t,{get:n[t],enumerable:!0})},x=(e,n,t,a)=>{if(n&&typeof n=="object"||typeof n=="function")for(let r of M(n))!T.call(e,r)&&r!==t&&u(e,r,{get:()=>n[r],enumerable:!(a=j(n,r))||a.enumerable});return e};var c=(e,n,t)=>(t=e!=null?F(N(e)):{},x(n||!e||!e.__esModule?u(t,"default",{value:e,enumerable:!0}):t,e)),S=e=>x(u({},"__esModule",{value:!0}),e);var H={};O(H,{default:()=>W});module.exports=S(H);var p=c(require("path")),b=require("loader-utils"),E=require("schema-utils");var C=c(require("path")),P=c(require("fs")),U=require("child_process"),A=require("package-manager-detector");var D=c(require("path")),s=require("@colors/colors/safe");var y=c(require("path")),_=y.default.join(process.cwd(),"node_modules/extension-develop/dist/certs"),m=["chrome","edge"],k=["firefox"],z=[...m,...k];var R=require("console");function v(e,n){return JSON.parse(JSON.stringify(e),function(r,l){let o=r.indexOf(":");if(o===-1)return l;let i=r.substring(0,o);(i===n||i==="chromium"&&m.includes(n)||i==="chromium"&&n.includes("chromium")||i==="gecko"&&n.includes("gecko"))&&(this[r.substring(o+1)]=l)})}var q={type:"object",properties:{test:{type:"string"},manifestPath:{type:"string"}}};function W(e){let n=this.getOptions(),t=n.manifestPath,a=n.browser,r=p.default.dirname(t),l=require(t),o=v(l,a);(0,E.validate)(q,n,{name:"reload:inject-background-client",baseDataPath:"options"});let i=(0,b.urlToRequest)(this.resourcePath),g=`
   ;chrome.runtime.onMessageExternal.addListener(
     async (request, _sender, sendResponse) => {
       const managementInfo = await new Promise((resolve) => {
@@ -21,31 +21,15 @@
       // Reload the extension runtime if the manifest or
       // service worker changes. 
       if (
+        request.changedFile === 'declarative_net_request' ||
         request.changedFile === 'manifest.json' ||
         request.changedFile === 'service_worker' ||
         request.changedFile === '_locales'
       ) {
-        setTimeout(() => {
-          sendResponse({reloaded: true})
-          chrome.runtime.reload()
-        }, 750)
-      }
-
-      // Reload all tabs if the contextMenus code changes.
-      if (request.changedFile === 'contextMenus') {
-        sendResponse({reloaded: true})
-        chrome.tabs.query({}, (tabs) => {
-          if (!tabs) return
-          tabs.forEach((tab) => chrome.tabs.reload(tab.id))
-        })
-      }
-
-      // Reload all tabs if the declarative_net_request code changes.
-      if (request.changedFile === 'declarative_net_request') {
         sendResponse({reloaded: true})
         chrome.runtime.reload()
       }
-  
+
       return true
     }
   );

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

@@ -1,11 +1,11 @@
-"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
+"use strict";var j=Object.create;var u=Object.defineProperty;var M=Object.getOwnPropertyDescriptor;var N=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,T=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 o of N(n))!T.call(e,o)&&o!==r&&u(e,o,{get:()=>n[o],enumerable:!(a=M(n,o))||a.enumerable});return e};var c=(e,n,r)=>(r=e!=null?j(S(e)):{},g(n||!e||!e.__esModule?u(r,"default",{value:e,enumerable:!0}):r,e)),k=e=>g(u({},"__esModule",{value:!0}),e);var B={};O(B,{default:()=>H});module.exports=k(B);var f=c(require("path")),v=require("loader-utils"),b=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")),_=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=`
+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(o,l){let s=o.indexOf(":");if(s===-1)return l;let i=o.substring(0,s);(i===n||i==="chromium"&&p.includes(n)||i==="chromium"&&n.includes("chromium")||i==="gecko"&&n.includes("gecko"))&&(this[o.substring(s+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,o=f.default.dirname(r),l=require(r),s=y(l,a);(0,b.validate)(W,n,{name:"reload:inject-background-client",baseDataPath:"options"});let i=(0,v.urlToRequest)(this.resourcePath),w=`
 ;browser.runtime.onMessageExternal.addListener(async (request, _sender) => {
   const managementInfo = await browser.management.getSelf()
 
@@ -24,27 +24,13 @@ Mozilla bug: ${(0,t.underline)("https://bugzilla.mozilla.org/show_bug.cgi?id=157
   // Reload the extension runtime if the manifest or
   // service worker changes.
   if (
+    request.changedFile === 'declarative_net_request' ||
     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));
-    });
-  }
-
-  // Reload all tabs if the declarative_net_request code changes.
-  if (request.changedFile === 'declarative_net_request') {
     browser.runtime.reload()
   }
 
   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}
+});`,d=s.background;if(s.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(o,E);if(i.includes(F))return`${w}${e}`}}return e}

package/dist/minimum-chromium-file.mjs

@@ -1 +1 @@
-chrome.runtime.onMessageExternal.addListener(async(e,i,a)=>{let r=await new Promise(n=>{chrome.management.getSelf(n)});return e.initialLoadData?(a({id:chrome.runtime.id,manifest:chrome.runtime.getManifest(),management:r}),!0):((e.changedFile==="manifest.json"||e.changedFile==="service_worker"||e.changedFile==="_locales")&&setTimeout(()=>{a({reloaded:!0}),chrome.runtime.reload()},750),e.changedFile==="declarative_net_request"&&(a({reloaded:!0}),chrome.runtime.reload()),!0)});
+chrome.runtime.onMessageExternal.addListener(async(e,r,a)=>{let n=await new Promise(i=>{chrome.management.getSelf(i)});return e.initialLoadData?(a({id:chrome.runtime.id,manifest:chrome.runtime.getManifest(),management:n}),!0):((e.changedFile==="declarative_net_request"||e.changedFile==="manifest.json"||e.changedFile==="service_worker"||e.changedFile==="_locales")&&(a({reloaded:!0}),chrome.runtime.reload()),!0)});

package/dist/minimum-firefox-file.mjs

@@ -1 +1 @@
-browser.runtime.onMessageExternal.addListener(async(e,a)=>{let n=await browser.management.getSelf();return e.initialLoadData?{id:browser.runtime.id,manifest:browser.runtime.getManifest(),management:n}:((e.changedFile==="manifest.json"||e.changedFile==="service_worker"||e.changedFile==="_locales")&&setTimeout(()=>{browser.runtime.reload()},750),e.changedFile==="declarative_net_request"&&browser.runtime.reload(),{reloaded:!0})});
+browser.runtime.onMessageExternal.addListener(async(e,a)=>{let n=await browser.management.getSelf();return e.initialLoadData?{id:browser.runtime.id,manifest:browser.runtime.getManifest(),management:n}:((e.changedFile==="declarative_net_request"||e.changedFile==="manifest.json"||e.changedFile==="service_worker"||e.changedFile==="_locales")&&browser.runtime.reload(),{reloaded:!0})});