Skip to content

Commit 79b43fd

Browse files
authored
Merge branch 'master' into patch-1
2 parents 917428f + 4bcfa7f commit 79b43fd

File tree

5 files changed

+23
-27
lines changed

5 files changed

+23
-27
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ os:
77
- windows
88

99
node_js:
10-
- "8"
1110
- "10"
1211
- "12"
1312

appveyor.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Test against these versions of Node.js.
44
environment:
55
matrix:
6-
- nodejs_version: "8"
76
- nodejs_version: "10"
87
- nodejs_version: "12"
98

tests/test-config-cli.js

+22-12
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,34 @@ t.plan(3)
2727

2828
// dotenv/config enables preloading
2929
t.equal(
30-
spawn([
31-
'-r',
32-
'./config',
33-
'-e',
34-
'console.log(process.env.BASIC)',
35-
'dotenv_config_encoding=utf8',
36-
'dotenv_config_path=./tests/.env'
37-
]),
30+
spawn(
31+
[
32+
'-r',
33+
'./config',
34+
'-e',
35+
'console.log(process.env.BASIC)',
36+
'dotenv_config_encoding=utf8',
37+
'dotenv_config_path=./tests/.env'
38+
]
39+
),
3840
'basic\n'
3941
)
4042

4143
// dotenv/config supports configuration via environment variables
4244
t.equal(
43-
spawn(['-r', './config', '-e', 'console.log(process.env.BASIC)'], {
44-
env: {
45-
DOTENV_CONFIG_PATH: './tests/.env'
45+
spawn(
46+
[
47+
'-r',
48+
'./config',
49+
'-e',
50+
'console.log(process.env.BASIC)'
51+
],
52+
{
53+
env: {
54+
DOTENV_CONFIG_PATH: './tests/.env'
55+
}
4656
}
47-
}),
57+
),
4858
'basic\n'
4959
)
5060

types/index.d.ts

-7
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,5 @@ export interface DotenvConfigOutput {
5555
*
5656
*/
5757
export function config(options?: DotenvConfigOptions): DotenvConfigOutput;
58-
59-
/** dotenv library interface */
60-
export interface DotEnv {
61-
config: typeof config;
62-
parse: typeof parse;
63-
}
64-
6558
/** @deprecated since v7.0.0 Use config instead. */
6659
export const load: typeof config;

types/test.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
import * as dotenv from "dotenv";
2-
3-
const { config, parse }: dotenv.DotEnv = {
4-
config: dotenv.config,
5-
parse: dotenv.parse
6-
};
1+
import { config, parse } from "dotenv";
72

83
const env = config();
94
const dbUrl: string | null =

0 commit comments

Comments
 (0)