Fix require on network share path #12282
Merged
Conversation
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
alexeykuzmin
suggested changes
Mar 15, 2018
lib/renderer/init.js
Outdated
| pathname = `//${loc.host}/${pathname}` | ||
| } | ||
| } else { | ||
| pathname = loc.pathname |
There was a problem hiding this comment.
Can you please initialise let pathname with window.location.pathname and do all Windows specific stuff below it? Like this:
const location = window.location
let pathname = location.pathname
if (process.platform === 'win32') {
// Oh crap
...
}
lib/renderer/init.js
Outdated
| pathname = loc.pathname.substr(1) | ||
| } | ||
|
|
||
| if (loc.hostname.length > 0 && globalPaths[0].startsWith('\\')) { |
There was a problem hiding this comment.
It would be great to have a comment describing (or a link to) an issue this addresses.
Or a simple variable could help too:
const isWindowsNetworkSharePath = location.hostname.length > 0 && globalPaths[0].startsWith('\\')
if (isWindowsNetworkSharePath) {
...
}
alexeykuzmin
approved these changes
Mar 15, 2018
MarshallOfSound
approved these changes
Mar 15, 2018
|
We have automatically backported this PR to "1-8-x", please check out #12286 |
|
We have automatically backported this PR to "2-0-x", please check out #12287 |
sethlu
pushed a commit
to sethlu/electron
that referenced
this pull request
May 3, 2018
* first pass at server/network require fix * refactor for clarity
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #12268.
Closes #3043.
This PR fixes an issue such that when an Electron executable is run through a server/network share path formatted as
\\SERVERNAME\appdir\appname.exe,requireruns intoerrors.
/cc @ckerr