Skip to content

Commit

Permalink
updated electron dependencies. #280
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Fenner committed Jan 2, 2020
1 parent 26cd263 commit 8101ce5
Show file tree
Hide file tree
Showing 5 changed files with 1,698 additions and 170 deletions.
5 changes: 5 additions & 0 deletions ember-electron/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
env: {
node: true
}
};
15 changes: 14 additions & 1 deletion ember-electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,20 @@ const protocolServe = require('electron-protocol-serve');
let mainWindow = null;

// Registering a protocol & schema to serve our Ember application
protocol.registerStandardSchemes([ 'serve' ], { secure: true });
if (typeof protocol.registerSchemesAsPrivileged === 'function') {
// Available in Electron >= 5
protocol.registerSchemesAsPrivileged([{
scheme: 'serve',
privileges: {
secure: true,
standard: true
}
}]);
}
else {
// For compatibility with Electron < 5
protocol.registerStandardSchemes(['serve'], { secure: true });
}
protocolServe({
cwd: join(__dirname || resolve(dirname('')), '..', 'ember'),
app,
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
"electron-squirrel-startup": "^1.0.0",
"ember-cli-version-checker": "^3.1.3",
"ember-decorators": "^6.1.1",
"ember-electron": "^2.10.2",
"ember-file-upload": "^2.7.1",
"ember-responsive": "^3.0.5",
"fastboot-app-server": "^2.0.0",
Expand Down Expand Up @@ -112,6 +111,7 @@
"devtron": "^1.4.0",
"dynamic-link": "^0.2.5",
"electron-forge": "^5.2.4",
"electron-prebuilt-compile": "4.0.0",
"ember-auto-import": "1.5.3",
"ember-auto-import-typescript": "^0.1.0",
"ember-bootstrap": "^3.1.0",
Expand Down Expand Up @@ -152,6 +152,7 @@
"ember-data": "~3.12.4",
"ember-data-factory-guy": "^3.9.5",
"ember-data-model-fragments": "^4.0.0",
"ember-electron": "^2.10.2",
"ember-export-application-global": "^2.0.1",
"ember-feature-flags": "^6.0.0",
"ember-fetch": "^7.0.0",
Expand Down
5 changes: 5 additions & 0 deletions tests/ember-electron/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
env: {
node: true,
},
};
Loading

0 comments on commit 8101ce5

Please sign in to comment.