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.

Sign up for GitHub

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

Jump to bottom

refactor: rewrite tests to use webpack compiler, drop node 8 #360

Merged
merged 25 commits into from
Mar 5, 2021
Merged

refactor: rewrite tests to use webpack compiler, drop node 8 #360

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6b7fa9d
fix: only stub `process.env` if not targeting node
beeequeue Mar 3, 2021
f57f1e2
fix: use better replacement
beeequeue Mar 3, 2021
d94ded6
only dont stub on main thread electron
beeequeue Mar 3, 2021
4bce481
add tests that use the compiler
beeequeue Mar 3, 2021
b058cd3
start converting old tests
beeequeue Mar 4, 2021
cc55ac5
move more tests
beeequeue Mar 4, 2021
81869a0
replace old tests
beeequeue Mar 4, 2021
1d11c9e
fix errors
beeequeue Mar 4, 2021
7535539
fix race condition
beeequeue Mar 4, 2021
3de6308
handle no dir error
beeequeue Mar 4, 2021
5378c4e
remove behavior changes
beeequeue Mar 4, 2021
9d9e6b5
drop node 8
beeequeue Mar 4, 2021
196171a
undo more fixes
beeequeue Mar 4, 2021
33ca22e
fix stubbing replacement, only stub on targets where we should
beeequeue Mar 4, 2021
0b5ee68
remove deprecated code
beeequeue Mar 4, 2021
297142a
drop support for webpack <4
beeequeue Mar 4, 2021
2f2b7de
merge stubIgnore PR
beeequeue Mar 4, 2021
05b119c
update readme
beeequeue Mar 4, 2021
53f1478
fix logic
beeequeue Mar 4, 2021
5c1d614
Update README.md
beeequeue Mar 4, 2021
1c71fb7
skip stubbing on webpack 4, do not stub if target includes `node`
beeequeue Mar 4, 2021
7e96c08
handle target array
beeequeue Mar 5, 2021
87c2e20
move version check
beeequeue Mar 5, 2021
1d0861e
fix logic
beeequeue Mar 5, 2021
acdd8af
replace usage of `rmdirSync(..., { recursive: true })`
beeequeue Mar 5, 2021
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
Prev Previous commit
Next Next commit
only dont stub on main thread electron
  • Loading branch information
@beeequeue
beeequeue committed Mar 4, 2021
commit d94ded6325fb348948da66d9ddf123d9e59bf5cc
5 changes: 4 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ const interpolate = (env, vars) => {
return env
}

const isMainThreadElectron = (target) =>
target.startsWith('electron') && target.endsWith('main')

class Dotenv {
/**
* The dotenv-webpack plugin.
Expand Down Expand Up @@ -154,7 +157,7 @@ class Dotenv {
// https://github.com/mrsteele/dotenv-webpack/issues/240#issuecomment-710231534
// However, if someone targets Node or Electron `process.env` still exists, and should therefore be kept
// https://webpack.js.org/configuration/target
if (!target.startsWith('node') && !target.startsWith('electron')) {
if (!target.startsWith('node') && !isMainThreadElectron(target)) {
// Results in `"MISSING_ENV_VAR".NAME` which is valid JS
formatted['process.env'] = '"MISSING_ENV_VAR"'
beeequeue marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Down