Skip to content

Commit 2da9cac

Browse files
joelgallantjoelgallant
authored
Merge branch 'master' into master
2 parents eb60b34 + ec4f2ca commit 2da9cac

File tree

38 files changed

+2192
-2039
lines changed

38 files changed

+2192
-2039
lines changed

‎.github/workflows/cypress.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: cypress
22

33
on:
44
pull_request:
5+
branches: '**'
56
push:
67
branches: '**'
78

‎.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: main
22

33
on:
44
pull_request:
5+
branches: '**'
56
push:
67
branches: '**'
78

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<img alt="npm" src="https://img.shields.io/npm/v/@app-config/main.svg?style=flat-square"/>
1111
</a>
1212
<a href="https://github.com/launchcodedev/app-config/actions">
13-
<img alt="Build Status" src="https://img.shields.io/github/workflow/status/launchcodedev/app-config/main?style=flat-square"/>
13+
<img alt="Build Status" src="https://img.shields.io/github/actions/workflow/status/launchcodedev/app-config/main.yml?style=flat-square"/>
1414
</a>
1515
<a href="https://dashboard.cypress.io/projects/fm6zcy/runs">
1616
<img alt="Cypress.io Status" src="https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/fm6zcy/master&style=flat-square&logo=cypress"/>

‎app-config-cli/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@app-config/cli",
33
"description": "CLI for @app-config",
4-
"version": "2.8.6",
4+
"version": "2.8.7",
55
"license": "MPL-2.0",
66
"author": {
77
"name": "Launchcode",
@@ -35,14 +35,14 @@
3535
"prepublishOnly": "yarn clean && yarn build && yarn build:es"
3636
},
3737
"dependencies": {
38-
"@app-config/config": "^2.8.6",
39-
"@app-config/core": "^2.8.6",
40-
"@app-config/encryption": "^2.8.6",
41-
"@app-config/generate": "^2.8.6",
42-
"@app-config/logging": "^2.8.6",
43-
"@app-config/node": "^2.8.6",
44-
"@app-config/schema": "^2.8.6",
45-
"@app-config/utils": "^2.8.6",
38+
"@app-config/config": "^2.8.7",
39+
"@app-config/core": "^2.8.7",
40+
"@app-config/encryption": "^2.8.7",
41+
"@app-config/generate": "^2.8.7",
42+
"@app-config/logging": "^2.8.7",
43+
"@app-config/node": "^2.8.7",
44+
"@app-config/schema": "^2.8.7",
45+
"@app-config/utils": "^2.8.7",
4646
"ajv": "7",
4747
"clipboardy": "2",
4848
"common-tags": "1",
@@ -52,7 +52,7 @@
5252
"yargs": "16"
5353
},
5454
"devDependencies": {
55-
"@app-config/test-utils": "^2.8.6",
55+
"@app-config/test-utils": "^2.8.7",
5656
"@types/common-tags": "1",
5757
"@types/fs-extra": "9"
5858
},

‎app-config-config/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@app-config/config",
33
"description": "The config in @app-config",
4-
"version": "2.8.6",
4+
"version": "2.8.7",
55
"license": "MPL-2.0",
66
"author": {
77
"name": "Launchcode",
@@ -30,17 +30,17 @@
3030
"prepublishOnly": "yarn clean && yarn build && yarn build:es"
3131
},
3232
"dependencies": {
33-
"@app-config/core": "^2.8.6",
34-
"@app-config/default-extensions": "^2.8.6",
35-
"@app-config/extensions": "^2.8.6",
36-
"@app-config/logging": "^2.8.6",
37-
"@app-config/meta": "^2.8.6",
38-
"@app-config/node": "^2.8.6",
39-
"@app-config/schema": "^2.8.6",
40-
"@app-config/utils": "^2.8.6"
33+
"@app-config/core": "^2.8.7",
34+
"@app-config/default-extensions": "^2.8.7",
35+
"@app-config/extensions": "^2.8.7",
36+
"@app-config/logging": "^2.8.7",
37+
"@app-config/meta": "^2.8.7",
38+
"@app-config/node": "^2.8.7",
39+
"@app-config/schema": "^2.8.7",
40+
"@app-config/utils": "^2.8.7"
4141
},
4242
"devDependencies": {
43-
"@app-config/test-utils": "^2.8.6"
43+
"@app-config/test-utils": "^2.8.7"
4444
},
4545
"prettier": "@lcdev/prettier",
4646
"jest": {

‎app-config-core/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@app-config/core",
33
"description": "Core logic for App Config",
4-
"version": "2.8.6",
4+
"version": "2.8.7",
55
"license": "MPL-2.0",
66
"author": {
77
"name": "Launchcode",
@@ -30,15 +30,15 @@
3030
"prepublishOnly": "yarn clean && yarn build && yarn build:es"
3131
},
3232
"dependencies": {
33-
"@app-config/logging": "^2.8.6",
34-
"@app-config/utils": "^2.8.6",
33+
"@app-config/logging": "^2.8.7",
34+
"@app-config/utils": "^2.8.7",
3535
"@iarna/toml": "3",
3636
"js-yaml": "^3.13.1",
3737
"json5": "2",
3838
"lodash.merge": "^4.6.2"
3939
},
4040
"devDependencies": {
41-
"@app-config/test-utils": "^2.8.6",
41+
"@app-config/test-utils": "^2.8.7",
4242
"@types/js-yaml": "3",
4343
"@types/lodash.merge": "4"
4444
},

‎app-config-cypress/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@app-config/cypress",
33
"description": "Cypress testing plugin for @app-config",
4-
"version": "2.8.6",
4+
"version": "2.8.7",
55
"license": "MPL-2.0",
66
"author": {
77
"name": "Launchcode",
@@ -31,11 +31,11 @@
3131
},
3232
"dependencies": {},
3333
"peerDependencies": {
34-
"@app-config/main": "^2.8.6",
34+
"@app-config/main": "^2.8.7",
3535
"cypress": "6"
3636
},
3737
"devDependencies": {
38-
"@app-config/main": "^2.8.6",
38+
"@app-config/main": "^2.8.7",
3939
"cypress": "6"
4040
},
4141
"prettier": "@lcdev/prettier",

‎app-config-default-extensions/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@app-config/default-extensions",
33
"description": "Default parsing extensions for @app-config",
4-
"version": "2.8.6",
4+
"version": "2.8.7",
55
"license": "MPL-2.0",
66
"author": {
77
"name": "Launchcode",
@@ -22,10 +22,10 @@
2222
"test": "jest"
2323
},
2424
"dependencies": {
25-
"@app-config/core": "^2.8.6",
26-
"@app-config/encryption": "^2.8.6",
27-
"@app-config/extensions": "^2.8.6",
28-
"@app-config/git": "^2.8.6",
25+
"@app-config/core": "^2.8.7",
26+
"@app-config/encryption": "^2.8.7",
27+
"@app-config/extensions": "^2.8.7",
28+
"@app-config/git": "^2.8.7",
2929
"@app-config/v1-compat": "^2.1.4"
3030
},
3131
"devDependencies": {},

‎app-config-electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@app-config/electron",
33
"description": "Exposes app-config values to Electron render processes",
4-
"version": "2.8.6",
4+
"version": "2.8.7",
55
"license": "MPL-2.0",
66
"author": {
77
"name": "Launchcode",

‎app-config-encryption/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@app-config/encryption",
33
"description": "Secret value encryption for @app-config",
4-
"version": "2.8.6",
4+
"version": "2.8.7",
55
"license": "MPL-2.0",
66
"author": {
77
"name": "Launchcode",
@@ -30,24 +30,24 @@
3030
"prepublishOnly": "yarn clean && yarn build && yarn build:es"
3131
},
3232
"dependencies": {
33-
"@app-config/core": "^2.8.6",
34-
"@app-config/extension-utils": "^2.8.6",
35-
"@app-config/logging": "^2.8.6",
36-
"@app-config/meta": "^2.8.6",
37-
"@app-config/node": "^2.8.6",
38-
"@app-config/settings": "^2.8.6",
39-
"@app-config/utils": "^2.8.6",
33+
"@app-config/core": "^2.8.7",
34+
"@app-config/extension-utils": "^2.8.7",
35+
"@app-config/logging": "^2.8.7",
36+
"@app-config/meta": "^2.8.7",
37+
"@app-config/node": "^2.8.7",
38+
"@app-config/settings": "^2.8.7",
39+
"@app-config/utils": "^2.8.7",
4040
"@lcdev/ws-rpc": "0.4",
4141
"@types/openpgp": "4",
4242
"common-tags": "1",
4343
"fs-extra": "7",
4444
"openpgp": "^4.3.0",
45-
"selfsigned": "1",
45+
"selfsigned": "2",
4646
"text-encoding-utf-8": "1",
4747
"ws": "^7.4.6"
4848
},
4949
"devDependencies": {
50-
"@app-config/test-utils": "^2.8.6",
50+
"@app-config/test-utils": "^2.8.7",
5151
"get-port": "5"
5252
},
5353
"prettier": "@lcdev/prettier",

0 commit comments

Comments
 (0)