Skip to content

Commit

Permalink
Upgrade dependencies (#416)
Browse files Browse the repository at this point in the history
* chore: upgrade dependencies

* chore: enable Node 12 on AppVeyor

* chore: trust windows on travis
  • Loading branch information
maxbeatty committed Aug 18, 2019
1 parent 52fe318 commit e4aa64d
Show file tree
Hide file tree
Showing 7 changed files with 4,790 additions and 4,962 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
Expand Up @@ -20,4 +20,4 @@ untyped-import
untyped-type-import

[version]
^0.92.1
^0.105.2
3 changes: 0 additions & 3 deletions .travis.yml
Expand Up @@ -9,14 +9,11 @@ os:
node_js:
- "8"
- "10"
- "11"
- "12"

cache: npm

matrix:
fast_finish: true
allow_failures:
- os: windows

after_success: if [[ "$TRAVIS_OS_NAME" != 'windows' ]]; then npm run flow; fi
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -200,7 +200,7 @@ If you want to override `process.env` you can do something like this:
const fs = require('fs')
const dotenv = require('dotenv')
const envConfig = dotenv.parse(fs.readFileSync('.env.override'))
for (let k in envConfig) {
for (const k in envConfig) {
process.env[k] = envConfig[k]
}
```
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Expand Up @@ -5,6 +5,7 @@ environment:
matrix:
- nodejs_version: "8"
- nodejs_version: "10"
- nodejs_version: "12"

# Install scripts. (runs after repo cloning)
install:
Expand Down
2 changes: 1 addition & 1 deletion lib/main.js
Expand Up @@ -96,7 +96,7 @@ function config (options /*: ?DotenvConfigOptions */) /*: DotenvConfigOutput */
const parsed = parse(fs.readFileSync(dotenvPath, { encoding }), { debug })

Object.keys(parsed).forEach(function (key) {
if (!process.env.hasOwnProperty(key)) {
if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
process.env[key] = parsed[key]
} else if (debug) {
log(`"${key}" is already defined in \`process.env\` and will not be overwritten`)
Expand Down

0 comments on commit e4aa64d

Please sign in to comment.