Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: electron main and renderer process detection #1879

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 14 additions & 17 deletions src/lib/is-browser.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
declare global {
namespace NodeJS {

Check failure on line 2 in src/lib/is-browser.ts

View workflow job for this annotation

GitHub Actions / build (20.x)

Replace `··` with `↹`

Check failure on line 2 in src/lib/is-browser.ts

View workflow job for this annotation

GitHub Actions / build (20.x)

ES2015 module syntax is preferred over namespaces
interface Process {

Check failure on line 3 in src/lib/is-browser.ts

View workflow job for this annotation

GitHub Actions / build (20.x)

Replace `····` with `↹↹`
readonly electron: string;

Check failure on line 4 in src/lib/is-browser.ts

View workflow job for this annotation

GitHub Actions / build (20.x)

Replace `··readonly·electron:·string;` with `↹readonly·electron:·string`
readonly type: ('browser' | 'renderer' | 'worker' | 'utility');

Check failure on line 5 in src/lib/is-browser.ts

View workflow job for this annotation

GitHub Actions / build (20.x)

Replace `··readonly·type:·('browser'·|·'renderer'·|·'worker'·|·'utility');` with `↹readonly·type:·'browser'·|·'renderer'·|·'worker'·|·'utility'`
}

Check failure on line 6 in src/lib/is-browser.ts

View workflow job for this annotation

GitHub Actions / build (20.x)

Replace `····` with `↹↹`
}

Check failure on line 7 in src/lib/is-browser.ts

View workflow job for this annotation

GitHub Actions / build (20.x)

Replace `··` with `↹`
}

const isStandardBrowserEnv = () => {
// window is only defined when it is a browser
if (typeof window !== 'undefined') {
// Is the process an electron application
// check if we are in electron `renderer`
const electronRenderCheck =
typeof navigator !== 'undefined' &&
navigator.userAgent?.toLowerCase().indexOf(' electron/') > -1
if (electronRenderCheck && process?.versions) {
const electronMainCheck = Object.prototype.hasOwnProperty.call(
process.versions,
'electron',
)
// Both electron checks are only true if the following webPreferences are set in the main electron BrowserWindow()
// webPreferences: {
// sandbox: false,
// nodeIntegration: true
// contextIsolation: false
// }
return !electronMainCheck
if (typeof process !== 'undefined') {
if (process.type === 'renderer') return true
else if (typeof process.electron !== 'undefined') return false

Check failure on line 15 in src/lib/is-browser.ts

View workflow job for this annotation

GitHub Actions / build (20.x)

Unnecessary 'else' after 'return'
}

return typeof window.document !== 'undefined'
}

// return false if nothing is detected
return false
}
Expand Down
Loading