-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adjust project bootstrap scripts to be windows-friendly (#1870)
* Adjust project bootstrap scripts to be windows-friendly * Add readme note on running dev desktop on windows
- Loading branch information
Showing
11 changed files
with
37,201 additions
and
37,085 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# Set the default behavior, in case people don't have core.autocrlf set. | ||
* text=auto | ||
|
||
# Declare files that will always have CRLF line endings on checkout. | ||
electron-fetch-git.patch text eol=crlf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
diff --git a/packages/backend/node_modules/electron-fetch/lib/index.js b/packages/backend/node_modules/electron-fetch/lib/index.js | ||
index c9ea590d9..74c0757a8 100644 | ||
--- a/packages/backend/node_modules/electron-fetch/lib/index.js | ||
+++ b/packages/backend/node_modules/electron-fetch/lib/index.js | ||
@@ -1283,12 +1283,7 @@ function getNodeRequestOptions(request) { | ||
|
||
let electron; // istanbul ignore else | ||
|
||
-if (process.versions.electron) { | ||
- electron = require('electron'); | ||
-} | ||
- | ||
-const isReady = electron && electron.app && !electron.app.isReady() ? new Promise(resolve => electron.app.once('ready', resolve)) : Promise.resolve(); | ||
- | ||
+const isReady = Promise.resolve(); | ||
/** | ||
* Fetch function | ||
* |
Oops, something went wrong.