Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-reisdorf committed Jan 13, 2022
2 parents cc0f136 + bb8ee10 commit 7012a05
Show file tree
Hide file tree
Showing 7 changed files with 10,379 additions and 49 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -7,9 +7,9 @@ os:
- windows

node_js:
- "10"
- "12"
- "14"
- 12
- 14
- 16

cache: npm

Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Expand Up @@ -2,12 +2,19 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [Unreleased, to be released as 11.0.0]
## [Unreleased](https://github.com/motdotla/dotenv/compare/v11.0.0...master)

### Added

- Support inline comments

## [11.0.0](https://github.com/motdotla/dotenv/compare/v10.0.0...v11.0.0) (2022-01-11)

### Changed

- _Breaking:_ drop support for Node v10 ([#558](https://github.com/motdotla/dotenv/pull/558))
- Patch debug option ([#550](https://github.com/motdotla/dotenv/pull/550))

## [10.0.0](https://github.com/motdotla/dotenv/compare/v9.0.2...v10.0.0) (2021-05-20)

### Added
Expand Down
6 changes: 1 addition & 5 deletions README.md
@@ -1,9 +1,5 @@
<p align="center">
<strong>Announcement 📣</strong><br/>From the makers that brought you Dotenv, introducing <a href="https://sync.dotenv.org">Dotenv Sync</a>.<br/>Sync your .env files between machines, environments, and team members.<br/><a href="https://sync.dotenv.org">Join the early access list. 🕶</a>
</p>

<p align="center">
Also, we'd love to hear from you. <a href="https://join.slack.com/t/dotenv-org/shared_invite/zt-qsgpi6lu-qMsyASflKWQpa0Q651ceeg">Join the community on slack</a>, hang out with other cool devs, and talk tech.
<strong>Announcement 📣</strong><br/>From the makers that brought you Dotenv, introducing <a href="https://sync.dotenv.org">Dotenv Sync</a>.<br/>Sync your .env files between machines, environments, and team members.<br/><a href="https://sync.dotenv.org">Join the early access list.💛</a>
</p>

# dotenv
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Expand Up @@ -3,9 +3,9 @@
# Test against these versions of Node.js.
environment:
matrix:
- nodejs_version: "10"
- nodejs_version: "12"
- nodejs_version: "14"
- nodejs_version: 12
- nodejs_version: 14
- nodejs_version: 16

# Install scripts. (runs after repo cloning)
install:
Expand Down
5 changes: 1 addition & 4 deletions lib/main.js
Expand Up @@ -82,7 +82,7 @@ function resolveHome (envPath) {
function config (options /*: ?DotenvConfigOptions */) /*: DotenvConfigOutput */ {
let dotenvPath = path.resolve(process.cwd(), '.env')
let encoding /*: string */ = 'utf8'
let debug = false
const debug = Boolean(options && options.debug)

if (options) {
if (options.path != null) {
Expand All @@ -91,9 +91,6 @@ function config (options /*: ?DotenvConfigOptions */) /*: DotenvConfigOutput */
if (options.encoding != null) {
encoding = options.encoding
}
if (options.debug != null) {
debug = true
}
}

try {
Expand Down

0 comments on commit 7012a05

Please sign in to comment.