Skip to content

Commit

Permalink
fix: Add support for Electron 10 and 11 (#321)
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobbieTheWagner
RobbieTheWagner authored Feb 8, 2021
1 parent 211fc54 commit 4a89656
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"electron": "^9.0.0"
"electron": "^9.0.0 || ^10.0.0 || ^11.0.0"
}
}

5 comments on commit 4a89656

@franciscop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @rwwagner90 @maxogden , could you please npm publish with these changes? The latest npm version (from 1 month ago) doesn't seem to include these changes:

npm i menubar
npm ERR! code ERESOLVE
npm ERR! ERESOLVE unable to resolve dependency tree
npm ERR! 
npm ERR! While resolving: [email protected]
npm ERR! Found: [email protected]
npm ERR! node_modules/electron
npm ERR!   electron@"^11.3.0" from the root project
npm ERR! 
npm ERR! Could not resolve dependency:
npm ERR! peer electron@"^9.0.0" from [email protected]
npm ERR! node_modules/menubar
npm ERR!   menubar@"*" from the root project
npm ERR! 
npm ERR! Fix the upstream dependency conflict, or retry
npm ERR! this command with --force, or --legacy-peer-deps
npm ERR! to accept an incorrect (and potentially broken) dependency resolution.
npm ERR! 
npm ERR! See /Users/francisco/.npm/eresolve-report.txt for a full report.

npm ERR! A complete log of this run can be found in:
npm ERR!     /Users/francisco/.npm/_logs/2021-02-24T02_21_31_410Z-debug.log

@RobbieTheWagner
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @rwwagner90 @maxogden , could you please npm publish with these changes? The latest npm version (from 1 month ago) doesn't seem to include these changes:

npm i menubar
npm ERR! code ERESOLVE
npm ERR! ERESOLVE unable to resolve dependency tree
npm ERR! 
npm ERR! While resolving: [email protected]
npm ERR! Found: [email protected]
npm ERR! node_modules/electron
npm ERR!   electron@"^11.3.0" from the root project
npm ERR! 
npm ERR! Could not resolve dependency:
npm ERR! peer electron@"^9.0.0" from [email protected]
npm ERR! node_modules/menubar
npm ERR!   menubar@"*" from the root project
npm ERR! 
npm ERR! Fix the upstream dependency conflict, or retry
npm ERR! this command with --force, or --legacy-peer-deps
npm ERR! to accept an incorrect (and potentially broken) dependency resolution.
npm ERR! 
npm ERR! See /Users/francisco/.npm/eresolve-report.txt for a full report.

npm ERR! A complete log of this run can be found in:
npm ERR!     /Users/francisco/.npm/_logs/2021-02-24T02_21_31_410Z-debug.log

@franciscop no, I do not have permissions, and I think @AmauryM is the new maintainer of this repo.

@amaury1093
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, done in 9.0.3.

@RobbieTheWagner
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @AmauryM!

@franciscop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Please sign in to comment.