Skip to content

Commit 6a0edcd

Browse files
toddbluhmtoddbluhm
committed
feat(upgrade): update for the latest env-cmd master
1 parent bc7f31d commit 6a0edcd

File tree

44 files changed

+219
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+219
-85
lines changed

‎.github/workflows/linux-tests.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ jobs:
77

88
runs-on: ubuntu-latest
99

10+
env:
11+
HUSKY: 0
12+
1013
strategy:
1114
matrix:
12-
node-version: [8.x, 10.x, 12.x]
15+
node-version: [18.x, 20.x, 22.x]
1316

1417
steps:
1518
- name: Checkout Project
16-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
1720
with:
1821
fetch-depth: 0
1922

@@ -23,7 +26,7 @@ jobs:
2326
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2427

2528
- name: Use Node.js ${{ matrix.node-version }}
26-
uses: actions/setup-node@v1
29+
uses: actions/setup-node@v4
2730
with:
2831
node-version: ${{ matrix.node-version }}
2932

‎.github/workflows/windows-tests.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,23 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7-
87
runs-on: windows-latest
98

9+
env:
10+
HUSKY: 0
11+
1012
strategy:
1113
matrix:
12-
node-version: [8.x, 10.x, 12.x]
14+
node-version: [18.x, 20.x, 22.x]
1315

1416
steps:
1517
- name: Checkout Project
16-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1719
with:
1820
fetch-depth: 0
1921

2022
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v1
23+
uses: actions/setup-node@v4
2224
with:
2325
node-version: ${{ matrix.node-version }}
2426

‎.husky/commit-msg copy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npx commitlint --edit

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018 Todd Bluhm
3+
Copyright (c) Todd Bluhm
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎examples/env-file-async-cjs/async-env.cjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = Promise.resolve({
2+
TEST_NAME: 'Async File Test',
3+
NODE_ENV: 'env-file',
4+
ENVVAR: 'exists',
5+
ENV_PATH: './async-env.js'
6+
})

‎examples/env-file-async-cjs/index.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
3+
4+
console.log(process.argv)
5+
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
6+
console.log(`Environment: ${process.env.NODE_ENV}`)
7+
console.log(`ENVVAR: ${process.env.ENVVAR}`)
8+
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
9+
10+
assert(process.env.NODE_ENV === 'env-file')
11+
assert(process.env.ENVVAR === 'exists')
12+
assert(process.env.ENV_PATH === './async-env.js')
13+
14+
console.log(chalk.green('Asserts Pass!'))

‎examples/env-file-async-cjs/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "env-file-async-cjs",
3+
"version": "10.1.0",
4+
"description": "env-cmd async env file example",
5+
"type": "module",
6+
"scripts": {
7+
"test": "env-cmd --verbose -f async-env.cjs -- node index.js"
8+
}
9+
}

‎examples/env-file-async-mjs/async-env.mjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export default Promise.resolve({
2+
TEST_NAME: 'Async File Test',
3+
NODE_ENV: 'env-file',
4+
ENVVAR: 'exists',
5+
ENV_PATH: './async-env.js'
6+
})

‎examples/env-file-async-mjs/index.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
3+
4+
console.log(process.argv)
5+
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
6+
console.log(`Environment: ${process.env.NODE_ENV}`)
7+
console.log(`ENVVAR: ${process.env.ENVVAR}`)
8+
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
9+
10+
assert(process.env.NODE_ENV === 'env-file')
11+
assert(process.env.ENVVAR === 'exists')
12+
assert(process.env.ENV_PATH === './async-env.js')
13+
14+
console.log(chalk.green('Asserts Pass!'))

‎examples/env-file-async-mjs/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "env-file-async-mjs",
3+
"version": "10.1.0",
4+
"description": "env-cmd async env file example",
5+
"type": "module",
6+
"scripts": {
7+
"test": "env-cmd --verbose -f async-env.mjs -- node index.js"
8+
}
9+
}

‎examples/env-file-async/async-env.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = Promise.resolve({
1+
export default Promise.resolve({
22
TEST_NAME: 'Async File Test',
33
NODE_ENV: 'env-file',
44
ENVVAR: 'exists',

‎examples/env-file-async/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const assert = require('assert')
2-
const chalk = require('chalk')
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
33

44
console.log(process.argv)
55
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
6-
console.log(`Environment ${process.env.NODE_ENV}`)
6+
console.log(`Environment: ${process.env.NODE_ENV}`)
77
console.log(`ENVVAR: ${process.env.ENVVAR}`)
88
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
99

‎examples/env-file-async/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "env-file-async",
33
"version": "10.1.0",
44
"description": "env-cmd async env file example",
5+
"type": "module",
56
"scripts": {
6-
"test": "env-cmd --verbose -f async-env.js node index.js"
7+
"test": "env-cmd --verbose -f async-env.js -- node index.js"
78
}
89
}

‎examples/env-file-custom-path/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const assert = require('assert')
2-
const chalk = require('chalk')
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
33

44
console.log(process.argv)
55
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
6-
console.log(`Environment ${process.env.NODE_ENV}`)
6+
console.log(`Environment: ${process.env.NODE_ENV}`)
77
console.log(`ENVVAR: ${process.env.ENVVAR}`)
88
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
99

‎examples/env-file-custom-path/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "env-file-custom-path",
33
"version": "10.1.0",
44
"description": "env-cmd custom env file path",
5+
"type": "module",
56
"scripts": {
6-
"test": "env-cmd --verbose -f .env-file node index.js"
7+
"test": "env-cmd --verbose -f .env-file -- node index.js"
78
}
89
}

‎examples/env-file-env-expansion/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const assert = require('assert')
2-
const chalk = require('chalk')
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
33

44
console.log(process.argv)
55
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
6-
console.log(`Environment ${process.env.NODE_ENV}`)
6+
console.log(`Environment: ${process.env.NODE_ENV}`)
77
console.log(`ENVVAR: ${process.env.ENVVAR}`)
88
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
99

‎examples/env-file-env-expansion/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "env-file-env-expansion",
33
"version": "10.1.0",
44
"description": "env-cmd env expansion example",
5+
"type": "module",
56
"scripts": {
6-
"test": "env-cmd --verbose -x node index.js --path=\\$ENV_PATH --pathWin32=$ENV_PATH"
7+
"test": "env-cmd --verbose -x -- node index.js --path=\\$ENV_PATH --pathWin32=$ENV_PATH"
78
}
89
}

‎examples/env-file-fallback/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const assert = require('assert')
2-
const chalk = require('chalk')
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
33

44
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
5-
console.log(`Environment ${process.env.NODE_ENV}`)
5+
console.log(`Environment: ${process.env.NODE_ENV}`)
66
console.log(`ENVVAR: ${process.env.ENVVAR}`)
77

88
assert(process.env.NODE_ENV === 'fallback-file')

‎examples/env-file-fallback/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "env-file-fallback",
33
"version": "10.1.0",
44
"description": "env-cmd fallback file example",
5+
"type": "module",
56
"scripts": {
6-
"test": "env-cmd --verbose --fallback -f ./non-existant-file node index.js"
7+
"test": "env-cmd --verbose --fallback -f ./non-existant-file -- node index.js"
78
}
89
}

‎examples/env-file-silent/.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
TEST_NAME=Default File Path Test
2-
NODE_ENV=env-file
2+
NODE_ENV=env-file-silent
33
ENVVAR=exists
4-
ENV_PATH=./.env
4+
ENV_PATH=./.env

‎examples/env-file-silent/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const assert = require('assert')
2-
const chalk = require('chalk')
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
33

44
console.log(process.argv)
55
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
6-
console.log(`Environment ${process.env.NODE_ENV}`)
6+
console.log(`Environment: ${process.env.NODE_ENV}`)
77
console.log(`ENVVAR: ${process.env.ENVVAR}`)
88
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
99

‎examples/env-file-silent/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "env-file-silent",
33
"version": "10.1.0",
44
"description": "env-cmd silent flag example",
5+
"type": "module",
56
"scripts": {
6-
"test": "cross-env ENV_PATH=./non-existent env-cmd --verbose --silent -f ./non-existent node index.js"
7+
"test": "cross-env ENV_PATH=./non-existent env-cmd --verbose --silent -f ./non-existent -- node index.js"
78
}
89
}

‎examples/env-file-use-shell/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const assert = require('assert')
2-
const chalk = require('chalk')
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
33

44
console.log(process.argv)
55
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
6-
console.log(`Environment ${process.env.NODE_ENV}`)
6+
console.log(`Environment: ${process.env.NODE_ENV}`)
77
console.log(`ENVVAR: ${process.env.ENVVAR}`)
88
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
99

‎examples/env-file-use-shell/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "env-file-use-shell",
33
"version": "10.1.0",
44
"description": "env-cmd use shell flag example",
5+
"type": "module",
56
"scripts": {
6-
"test": "env-cmd --verbose -f use-shell.env --use-shell \"node index.js --path=\\$ENV_PATH --pathWin32=%ENV_PATH%\""
7+
"test": "env-cmd --verbose -f use-shell.env --use-shell -- \"node index.js --path=\\$ENV_PATH --pathWin32=%ENV_PATH%\""
78
}
89
}

‎examples/env-file/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const assert = require('assert')
2-
const chalk = require('chalk')
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
33

44
console.log(process.argv)
55
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
6-
console.log(`Environment ${process.env.NODE_ENV}`)
6+
console.log(`Environment: ${process.env.NODE_ENV}`)
77
console.log(`ENVVAR: ${process.env.ENVVAR}`)
88
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
99

‎examples/env-file/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "env-file",
33
"version": "10.1.0",
44
"description": "env-cmd basic env file example",
5+
"type": "module",
56
"scripts": {
6-
"test": "env-cmd --verbose node index.js"
7+
"test": "env-cmd --verbose -- node index.js"
78
}
89
}

‎examples/rc-file-async-cjs/async-rc.cjs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
module.exports = Promise.resolve({
2+
prod: {
3+
TEST_NAME: 'Async RC File Test',
4+
NODE_ENV: 'production',
5+
ENVVAR: 'exists',
6+
ENV_PATH: './async-rc.js'
7+
},
8+
test: {
9+
TEST_NAME: 'Async RC File Test',
10+
NODE_ENV: 'test',
11+
ENVVAR: 'exists',
12+
ENV_PATH: './async-rc.js'
13+
}
14+
})

‎examples/rc-file-async-cjs/index.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
3+
4+
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
5+
console.log(`Environment: ${process.env.NODE_ENV}`)
6+
console.log(`ENVVAR: ${process.env.ENVVAR}`)
7+
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
8+
9+
assert(process.env.NODE_ENV === 'test')
10+
assert(process.env.ENVVAR === 'exists')
11+
assert(process.env.ENV_PATH === './async-rc.js')
12+
13+
console.log(chalk.green('Asserts Pass!'))

‎examples/rc-file-async-cjs/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "rc-file-async-cjs",
3+
"version": "10.1.0",
4+
"description": "env-cmd async rc file",
5+
"type": "module",
6+
"scripts": {
7+
"test": "env-cmd --verbose -e test -r async-rc.cjs -- node index.js"
8+
}
9+
}

‎examples/rc-file-async-mjs/async-rc.mjs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export default Promise.resolve({
2+
prod: {
3+
TEST_NAME: 'Async RC File Test',
4+
NODE_ENV: 'production',
5+
ENVVAR: 'exists',
6+
ENV_PATH: './async-rc.js'
7+
},
8+
test: {
9+
TEST_NAME: 'Async RC File Test',
10+
NODE_ENV: 'test',
11+
ENVVAR: 'exists',
12+
ENV_PATH: './async-rc.js'
13+
}
14+
})

‎examples/rc-file-async-mjs/index.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
3+
4+
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
5+
console.log(`Environment: ${process.env.NODE_ENV}`)
6+
console.log(`ENVVAR: ${process.env.ENVVAR}`)
7+
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
8+
9+
assert(process.env.NODE_ENV === 'test')
10+
assert(process.env.ENVVAR === 'exists')
11+
assert(process.env.ENV_PATH === './async-rc.js')
12+
13+
console.log(chalk.green('Asserts Pass!'))

‎examples/rc-file-async-mjs/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "rc-file-async-mjs",
3+
"version": "10.1.0",
4+
"description": "env-cmd async rc file",
5+
"type": "module",
6+
"scripts": {
7+
"test": "env-cmd --verbose -e test -r async-rc.mjs -- node index.js"
8+
}
9+
}

‎examples/rc-file-async/async-rc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = Promise.resolve({
1+
export default Promise.resolve({
22
prod: {
33
TEST_NAME: 'Async RC File Test',
44
NODE_ENV: 'production',

‎examples/rc-file-async/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const assert = require('assert')
2-
const chalk = require('chalk')
1+
import assert from 'node:assert'
2+
import chalk from 'chalk'
33

44
console.log(chalk.cyan(`Test Name: ${process.env.TEST_NAME}`))
5-
console.log(`Environment ${process.env.NODE_ENV}`)
5+
console.log(`Environment: ${process.env.NODE_ENV}`)
66
console.log(`ENVVAR: ${process.env.ENVVAR}`)
77
console.log(`ENV_PATH: ${process.env.ENV_PATH}`)
88

0 commit comments

Comments
 (0)