electron-panel - npm Package Compare versions

Comparing version 1.2.1 to 1.3.0

CHANGELOG.md

 ## CHANGELOG
 
+### v1.3.0
+
+  - Add version conflict protection.
+  - Change ipc message header from `panel:` to `electron-panel:`.
+
 ### v1.2.1
@@ -4,0 +9,0 @@

lib/main.js

 'use strict';
 
+if ( global.__electron_panel__ ) {
+  console.warn(`A different version of electron-panel already running in the process: ${global.__electron_panel__.id}, redirect to it. Please make sure your dependencies use the same version of electron-panel.`);
+  module.exports = global.__electron_panel__;
+
+  return;
+}
+
 const {app, ipcMain, BrowserWindow} = require('electron');
@@ -16,2 +23,3 @@ const ipcPlus = require('electron-ipc-plus');
 module.exports = panel;
+global.__electron_panel__ = panel;
 
@@ -102,3 +110,3 @@ /**
   if ( !opts ) {
-    args = ['ipc-plus:main2panel', panelID, message, ...args];
+    args = [`${ipcPlus.id}:main2panel`, panelID, message, ...args];
     if ( win.webContents.send.apply(win.webContents, args) === false ) {
@@ -113,3 +121,3 @@ console.error(`Failed to send message "${message}" to panel "${panelID}", no response received.`);
   //
-  args = ['ipc-plus:main2panel', panelID, message, ...args, ipcPlus.option({
+  args = [`${ipcPlus.id}:main2panel`, panelID, message, ...args, ipcPlus.option({
     sessionId: sessionId,
@@ -145,3 +153,3 @@ waitForReply: true,
       });
-      replyArgs = [`ipc-plus:reply`, ...replyArgs, replyOpts];
+      replyArgs = [`${ipcPlus.id}:reply`, ...replyArgs, replyOpts];
       return sender.send.apply( sender, replyArgs );
@@ -180,7 +188,7 @@ }, opts.timeout);
 
-ipcMain.on('ipc-plus:renderer2panel', (event, panelID, message, ...args) => {
+ipcMain.on(`${ipcPlus.id}:renderer2panel`, (event, panelID, message, ...args) => {
   _renderer2panelOpts(event, panelID, message, ...args);
 });
 
-ipcMain.on('panel:add', (event, panelID) => {
+ipcMain.on('electron-panel:add', (event, panelID) => {
   let browserWin = panel.findWindow(panelID);
@@ -205,3 +213,3 @@ if ( browserWin !== null ) {
 
-ipcMain.on('panel:remove', (event, panelID) => {
+ipcMain.on('electron-panel:remove', (event, panelID) => {
   let browserWin = BrowserWindow.fromWebContents( event.sender );
@@ -227,3 +235,3 @@ let winID = browserWin.id;
 
-ipcMain.on('panel:clear', (event) => {
+ipcMain.on('electron-panel:clear', (event) => {
   let browserWin = BrowserWindow.fromWebContents( event.sender );
@@ -230,0 +238,0 @@ let winID = browserWin.id;

lib/renderer/index.js

 'use strict';
 
+if ( window.__electron_panel__ ) {
+  console.warn(`A different version of electron-panel already running in the process: ${window.__electron_panel__.id}, redirect to it. Please make sure your dependencies use the same version of electron-panel.`);
+  module.exports = window.__electron_panel__;
+
+  return;
+}
+
 const {ipcRenderer} = require('electron');
@@ -9,2 +16,3 @@ const ipcPlus = require('electron-ipc-plus');
 module.exports = panel;
+window.__electron_panel__ = panel;
 
@@ -31,3 +39,3 @@ // ========================================
 
-  ipcRenderer.send('panel:clear');
+  ipcRenderer.send('electron-panel:clear');
 });
@@ -49,3 +57,3 @@
 
-ipcRenderer.on('ipc-plus:main2panel', (event, panelID, message, ...args) => {
+ipcRenderer.on(`${ipcPlus.id}:main2panel`, (event, panelID, message, ...args) => {
   // process waitForReply option
@@ -66,3 +74,3 @@ let opts = ipcPlus.internal._popOptions(args);
       });
-      replyArgs = [`ipc-plus:reply`, ...replyArgs, replyOpts];
+      replyArgs = [`${ipcPlus.id}:reply`, ...replyArgs, replyOpts];
       return sender.send.apply( sender, replyArgs );
@@ -69,0 +77,0 @@ };

lib/renderer/panel.js

@@ -28,3 +28,3 @@ 'use strict';
   if ( !opts ) {
-    args = ['ipc-plus:renderer2panel', panelID, message, ...args];
+    args = [`${ipcPlus.id}:renderer2panel`, panelID, message, ...args];
     ipcRenderer.send.apply( ipcRenderer, args );
@@ -37,3 +37,3 @@
 
-  args = ['ipc-plus:renderer2panel', panelID, message, ...args, ipcPlus.option({
+  args = [`${ipcPlus.id}:renderer2panel`, panelID, message, ...args, ipcPlus.option({
     sessionId: sessionId,
@@ -114,3 +114,3 @@ waitForReply: true,
 
-  ipcRenderer.send('panel:add', panelID);
+  ipcRenderer.send('electron-panel:add', panelID);
 };
@@ -125,3 +125,3 @@
 
-  ipcRenderer.send('panel:remove', panelID);
+  ipcRenderer.send('electron-panel:remove', panelID);
 };
@@ -128,0 +128,0 @@

package.json

 {
   "name": "electron-panel",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Manipulate panels in window for Electron",
@@ -25,7 +25,7 @@ "main": "index.js",
   "dependencies": {
-    "clean-css": "^4.0.5",
+    "clean-css": "^4.0.7",
     "electron-ipc-listener": "^1.0.0",
-    "electron-ipc-plus": "^1.2.3",
+    "electron-ipc-plus": "^1.3.3",
     "electron-platform": "^1.2.0",
-    "electron-protocols": "^1.0.0",
+    "electron-protocols": "^1.0.2",
     "less": "^2.7.2",
@@ -32,0 +32,0 @@ "mousetrap": "^1.6.0"

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

55441

increased by1.64%

Lines of code

1553

increased by0.78%

Dependency changes

• Updatedclean-css@^4.0.7

• Updatedelectron-ipc-plus@^1.3.3

• Updatedelectron-protocols@^1.0.2