From bde97c114da26b3a7e44442c0e4fd4eef98e8f73 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 8 Apr 2021 18:59:45 -0600 Subject: [PATCH 01/39] feat(#106): removes some default parsing extensions --- app-config-default-extensions/index.js | 7 ------- app-config-default-extensions/package.json | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/app-config-default-extensions/index.js b/app-config-default-extensions/index.js index d6406526..7b296d72 100644 --- a/app-config-default-extensions/index.js +++ b/app-config-default-extensions/index.js @@ -28,26 +28,19 @@ module.exports = { substituteDirective, } = require('@app-config/extensions'); - const { default: encryptedDirective } = require('@app-config/encryption'); - const { default: v1Compat } = require('@app-config/v1-compat'); - const { default: gitRefDirectives } = require('@app-config/git'); - return [ unescape$Directives(), tryDirective(), ifDirective(), eqDirective(), hiddenDirective(), - v1Compat(), envDirective(aliases, environmentOverride, environmentSourceNames), envVarDirective(aliases, environmentOverride, environmentSourceNames), extendsDirective(), extendsSelfDirective(), overrideDirective(), - encryptedDirective(symmetricKey), timestampDirective(), substituteDirective(aliases, environmentOverride, environmentSourceNames), - gitRefDirectives(), ]; }, defaultEnvExtensions() { diff --git a/app-config-default-extensions/package.json b/app-config-default-extensions/package.json index 264c66d2..ed44f6b6 100644 --- a/app-config-default-extensions/package.json +++ b/app-config-default-extensions/package.json @@ -23,10 +23,7 @@ }, "dependencies": { "@app-config/core": "^2.4.5", - "@app-config/encryption": "^2.4.5", - "@app-config/extensions": "^2.4.5", - "@app-config/git": "^2.4.5", - "@app-config/v1-compat": "^2.1.4" + "@app-config/extensions": "^2.4.5" }, "devDependencies": {}, "prettier": "@lcdev/prettier", From 32ba6464b14526ce87c6cd03e85e7f8f401a6e96 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 8 Apr 2021 19:19:59 -0600 Subject: [PATCH 02/39] chore: removes v1 compat tests --- app-config-config/src/index.test.ts | 148 ---------------------------- 1 file changed, 148 deletions(-) diff --git a/app-config-config/src/index.test.ts b/app-config-config/src/index.test.ts index 48e96ca6..16208ed9 100644 --- a/app-config-config/src/index.test.ts +++ b/app-config-config/src/index.test.ts @@ -313,154 +313,6 @@ describe('CI Environment Variable Extension', () => { }); }); -describe('V1 Compatibility', () => { - it('retains nested properties called app-config', async () => { - await withTempFiles( - { - '.app-config.yml': ` - nested: - app-config: - extends: base-file.yml - `, - }, - async (inDir) => { - const { fullConfig } = await loadUnvalidatedConfig({ directory: inDir('.') }); - - // keeps config intact, since app-config isn't at the root - expect(fullConfig).toEqual({ nested: { 'app-config': { extends: 'base-file.yml' } } }); - }, - ); - }); - - it('uses special app-config property for $extends', async () => { - await withTempFiles( - { - '.app-config.yml': ` - app-config: { extends: "base-file.yml" } - foo: 88 - `, - 'base-file.yml': ` - foo: 42 - bar: foo - `, - }, - async (inDir) => { - const { fullConfig } = await loadUnvalidatedConfig({ directory: inDir('.') }); - - expect(fullConfig).toEqual({ foo: 88, bar: 'foo' }); - }, - ); - }); - - it('uses special app-config property for $extendsOptional', async () => { - await withTempFiles( - { - '.app-config.yml': ` - app-config: { extendsOptional: "base-file.yml" } - foo: 88 - `, - 'base-file.yml': ` - foo: 42 - bar: foo - `, - }, - async (inDir) => { - const { fullConfig } = await loadUnvalidatedConfig({ directory: inDir('.') }); - - expect(fullConfig).toEqual({ foo: 88, bar: 'foo' }); - }, - ); - - await withTempFiles( - { - '.app-config.yml': ` - app-config: { extendsOptional: "base-file.yml" } - foo: 88 - `, - }, - async (inDir) => { - const { fullConfig } = await loadUnvalidatedConfig({ directory: inDir('.') }); - - expect(fullConfig).toEqual({ foo: 88 }); - }, - ); - }); - - it('uses special app-config property for $override', async () => { - await withTempFiles( - { - '.app-config.yml': ` - app-config: { override: "base-file.yml" } - foo: 88 - `, - 'base-file.yml': ` - foo: 42 - bar: foo - `, - }, - async (inDir) => { - const { fullConfig } = await loadUnvalidatedConfig({ directory: inDir('.') }); - - expect(fullConfig).toEqual({ foo: 42, bar: 'foo' }); - }, - ); - }); - - it('uses special app-config property for $overrideOptional', async () => { - await withTempFiles( - { - '.app-config.yml': ` - app-config: { overrideOptional: "base-file.yml" } - foo: 88 - `, - 'base-file.yml': ` - foo: 42 - bar: foo - `, - }, - async (inDir) => { - const { fullConfig } = await loadUnvalidatedConfig({ directory: inDir('.') }); - - expect(fullConfig).toEqual({ foo: 42, bar: 'foo' }); - }, - ); - - await withTempFiles( - { - '.app-config.yml': ` - app-config: { overrideOptional: "base-file.yml" } - foo: 88 - `, - }, - async (inDir) => { - const { fullConfig } = await loadUnvalidatedConfig({ directory: inDir('.') }); - - expect(fullConfig).toEqual({ foo: 88 }); - }, - ); - }); - - it('uses an ambiguous path in special app-config property', async () => { - await withTempFiles( - { - '.app-config.yml': ` - app-config: { extends: "base-file" } - foo: 88 - `, - 'base-file.yml': ` - foo: 42 - bar: foo - `, - }, - async (inDir) => { - const { fullConfig } = await loadUnvalidatedConfig({ directory: inDir('.') }); - - expect(fullConfig).toEqual({ foo: 88, bar: 'foo' }); - }, - ); - }); -}); - describe('Special values', () => { it('fails to loadUnvalidatedConfig when a $ prefixed key is seen', async () => { process.env.APP_CONFIG = JSON.stringify({ a: { b: { $c: true } } }); From 83eca7b6bfcdea1d0274c82d8e8a9afbff0db7be Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 8 Apr 2021 19:26:32 -0600 Subject: [PATCH 03/39] ci: publish as "next" --- .github/workflows/publishing.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 06a5a35d..d0e72b27 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -22,144 +22,168 @@ jobs: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-config/package.json + tag: next - name: app-config-core uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-core/package.json + tag: next - name: app-config-cypress uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-cypress/package.json + tag: next - name: app-config-default-extensions uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-default-extensions/package.json + tag: next - name: app-config-encryption uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-encryption/package.json + tag: next - name: app-config-exec uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-exec/package.json + tag: next - name: app-config-extension-utils uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-extension-utils/package.json + tag: next - name: app-config-extensions uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-extensions/package.json + tag: next - name: app-config-generate uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-generate/package.json + tag: next - name: app-config-git uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-git/package.json + tag: next - name: app-config-inject uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-inject/package.json + tag: next - name: app-config-js uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-js/package.json + tag: next - name: app-config-logging uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-logging/package.json + tag: next - name: app-config-meta uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-meta/package.json + tag: next - name: app-config-node uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-node/package.json + tag: next - name: app-config-react-native uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-react-native/package.json + tag: next - name: app-config-schema uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-schema/package.json + tag: next - name: app-config-settings uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-settings/package.json + tag: next - name: app-config-utils uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-utils/package.json + tag: next - name: app-config-v1-compat uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-v1-compat/package.json + tag: next - name: app-config-vault uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-vault/package.json + tag: next - name: app-config-webpack uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-webpack/package.json + tag: next - name: lcdev-app-config-inject uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./lcdev-app-config-inject/package.json + tag: next - name: lcdev-app-config-webpack-plugin uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./lcdev-app-config-webpack-plugin/package.json + tag: next - name: lcdev-react-native-app-config-transformer uses: JS-DevTools/npm-publish@v1 with: @@ -174,12 +198,14 @@ jobs: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-cli/package.json + tag: next - name: app-config-main uses: JS-DevTools/npm-publish@v1 with: token: ${{ secrets.NPM_TOKEN }} access: public package: ./app-config-main/package.json + tag: next - name: lcdev-app-config uses: JS-DevTools/npm-publish@v1 with: From 4425a4f606b99766a35cb244be58ca22112b7fa5 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 8 Apr 2021 19:27:03 -0600 Subject: [PATCH 04/39] chore: release v3.0.0-alpha.1 --- app-config-cli/package.json | 18 +- app-config-config/package.json | 20 +- app-config-core/package.json | 8 +- app-config-cypress/package.json | 6 +- app-config-default-extensions/package.json | 6 +- app-config-encryption/package.json | 16 +- app-config-exec/package.json | 12 +- app-config-extension-utils/package.json | 4 +- app-config-extensions/package.json | 14 +- app-config-generate/package.json | 10 +- app-config-git/package.json | 8 +- app-config-inject/package.json | 10 +- app-config-js/package.json | 10 +- app-config-logging/package.json | 4 +- app-config-main/package.json | 24 +- app-config-meta/package.json | 14 +- app-config-node/package.json | 8 +- app-config-react-native/package.json | 6 +- app-config-schema/package.json | 16 +- app-config-settings/package.json | 12 +- app-config-test-utils/package.json | 6 +- app-config-utils/package.json | 2 +- app-config-v1-compat/package.json | 14 +- app-config-vault/package.json | 8 +- app-config-webpack/package.json | 6 +- lcdev-app-config-inject/package.json | 4 +- lcdev-app-config-webpack-plugin/package.json | 4 +- lcdev-app-config/package.json | 6 +- .../package.json | 4 +- yarn.lock | 231 ++++++++++++++++++ 30 files changed, 371 insertions(+), 140 deletions(-) diff --git a/app-config-cli/package.json b/app-config-cli/package.json index 40fee29a..a2e1c567 100644 --- a/app-config-cli/package.json +++ b/app-config-cli/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cli", "description": "CLI for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -35,14 +35,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^2.4.5", - "@app-config/core": "^2.4.5", - "@app-config/encryption": "^2.4.5", - "@app-config/generate": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/schema": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/config": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/encryption": "^3.0.0-alpha.1", + "@app-config/generate": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/schema": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "ajv": "7", "clipboardy": "2", "common-tags": "1", diff --git a/app-config-config/package.json b/app-config-config/package.json index 6eb08ca3..f694772d 100644 --- a/app-config-config/package.json +++ b/app-config-config/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/config", "description": "The config in @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,17 +30,17 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/default-extensions": "^2.4.5", - "@app-config/extensions": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/meta": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/schema": "^2.4.5", - "@app-config/utils": "^2.4.5" + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/default-extensions": "^3.0.0-alpha.1", + "@app-config/extensions": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/meta": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/schema": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5" + "@app-config/test-utils": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-core/package.json b/app-config-core/package.json index 3a22f08f..95ff058d 100644 --- a/app-config-core/package.json +++ b/app-config-core/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/core", "description": "Core logic for App Config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "@iarna/toml": "3", "js-yaml": "^3.13.1", "json5": "2", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5", + "@app-config/test-utils": "^3.0.0-alpha.1", "@types/js-yaml": "3", "@types/lodash.merge": "4" }, diff --git a/app-config-cypress/package.json b/app-config-cypress/package.json index c62f5188..75daeeea 100644 --- a/app-config-cypress/package.json +++ b/app-config-cypress/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cypress", "description": "Cypress testing plugin for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -31,11 +31,11 @@ }, "dependencies": {}, "peerDependencies": { - "@app-config/main": "^2.4.5", + "@app-config/main": "^3.0.0-alpha.1", "cypress": "6" }, "devDependencies": { - "@app-config/main": "^2.4.5", + "@app-config/main": "^3.0.0-alpha.1", "cypress": "6" }, "prettier": "@lcdev/prettier", diff --git a/app-config-default-extensions/package.json b/app-config-default-extensions/package.json index ed44f6b6..6c5e6ac2 100644 --- a/app-config-default-extensions/package.json +++ b/app-config-default-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/default-extensions", "description": "Default parsing extensions for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -22,8 +22,8 @@ "test": "jest" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/extensions": "^2.4.5" + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/extensions": "^3.0.0-alpha.1" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-encryption/package.json b/app-config-encryption/package.json index a0b3ea28..bc50acd6 100644 --- a/app-config-encryption/package.json +++ b/app-config-encryption/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/encryption", "description": "Secret value encryption for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/meta": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/settings": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/meta": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/settings": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "@lcdev/ws-rpc": "0.4", "@types/openpgp": "4", "common-tags": "1", @@ -46,7 +46,7 @@ "ws": "7" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5", + "@app-config/test-utils": "^3.0.0-alpha.1", "get-port": "5" }, "prettier": "@lcdev/prettier", diff --git a/app-config-exec/package.json b/app-config-exec/package.json index 6dea912d..f91f0153 100644 --- a/app-config-exec/package.json +++ b/app-config-exec/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/exec", "description": "Generate config by running arbitrary programs", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/extension-utils": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/utils": "^2.4.5" + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/extension-utils": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1" }, "devDependencies": { - "@app-config/main": "^2.4.5" + "@app-config/main": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-extension-utils/package.json b/app-config-extension-utils/package.json index ea14d36f..a24b4290 100644 --- a/app-config-extension-utils/package.json +++ b/app-config-extension-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extension-utils", "description": "Utilities for writing @app-config parsing extensions", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", "@serafin/schema-builder": "0.14" }, "devDependencies": {}, diff --git a/app-config-extensions/package.json b/app-config-extensions/package.json index 9209e132..b5b8441b 100644 --- a/app-config-extensions/package.json +++ b/app-config-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extensions", "description": "Common parsing extensions for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/extension-utils": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/extension-utils": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "lodash.isequal": "4" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5", + "@app-config/test-utils": "^3.0.0-alpha.1", "@types/lodash.isequal": "4" }, "prettier": "@lcdev/prettier", diff --git a/app-config-generate/package.json b/app-config-generate/package.json index e422320f..5cb7fe93 100644 --- a/app-config-generate/package.json +++ b/app-config-generate/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/generate", "description": "Code generation for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,9 +30,9 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^2.4.5", - "@app-config/meta": "^2.4.5", - "@app-config/schema": "^2.4.5", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/meta": "^3.0.0-alpha.1", + "@app-config/schema": "^3.0.0-alpha.1", "@types/readable-stream": "2", "@types/urijs": "1", "common-tags": "1", @@ -41,7 +41,7 @@ "quicktype-core": "6.0.70" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5" + "@app-config/test-utils": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-git/package.json b/app-config-git/package.json index 837b12bf..42363e6b 100644 --- a/app-config-git/package.json +++ b/app-config-git/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/git", "description": "$git directive parsing extension for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/extension-utils": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/extension-utils": "^3.0.0-alpha.1", "simple-git": "2" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5" + "@app-config/test-utils": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-inject/package.json b/app-config-inject/package.json index f19ee0b8..bd64b094 100644 --- a/app-config-inject/package.json +++ b/app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/inject", "description": "Runtime injection of app-config into static HTML files", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,10 +34,10 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/schema": "^2.4.5", + "@app-config/config": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/schema": "^3.0.0-alpha.1", "@types/yargs": "16", "node-html-parser": "1", "yargs": "16" diff --git a/app-config-js/package.json b/app-config-js/package.json index a37f635a..f296112f 100644 --- a/app-config-js/package.json +++ b/app-config-js/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/js", "description": "Loads a JavaScript module to inject configuration", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.2.0", - "@app-config/extension-utils": "^2.2.0", - "@app-config/node": "^2.2.0" + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/extension-utils": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1" }, "devDependencies": { - "@app-config/test-utils": "^2.2.0" + "@app-config/test-utils": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-logging/package.json b/app-config-logging/package.json index 3f7b18f2..456f956f 100644 --- a/app-config-logging/package.json +++ b/app-config-logging/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/logging", "description": "Logging for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/utils": "^2.4.5" + "@app-config/utils": "^3.0.0-alpha.1" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-main/package.json b/app-config-main/package.json index d52df799..205fe612 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/main", "description": "Easy to use configuration loader with schema validation", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,17 +34,17 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^2.4.5", - "@app-config/config": "^2.4.5", - "@app-config/core": "^2.4.5", - "@app-config/default-extensions": "^2.4.5", - "@app-config/encryption": "^2.4.5", - "@app-config/extensions": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/meta": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/schema": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/cli": "^3.0.0-alpha.1", + "@app-config/config": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/default-extensions": "^3.0.0-alpha.1", + "@app-config/encryption": "^3.0.0-alpha.1", + "@app-config/extensions": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/meta": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/schema": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "ajv": "7" }, "devDependencies": {}, diff --git a/app-config-meta/package.json b/app-config-meta/package.json index b4719f61..cbe183c6 100644 --- a/app-config-meta/package.json +++ b/app-config-meta/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/meta", "description": "Meta file parsing for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/default-extensions": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/default-extensions": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5" + "@app-config/test-utils": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-node/package.json b/app-config-node/package.json index 6f1751a4..92faa15f 100644 --- a/app-config-node/package.json +++ b/app-config-node/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/node", "description": "Node.js API for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/logging": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", "@types/prompts": "2", "fs-extra": "9", "prompts": "2" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5", + "@app-config/test-utils": "^3.0.0-alpha.1", "@types/fs-extra": "9" }, "prettier": "@lcdev/prettier", diff --git a/app-config-react-native/package.json b/app-config-react-native/package.json index fc27df71..c835e8be 100644 --- a/app-config-react-native/package.json +++ b/app-config-react-native/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/react-native", "description": "React Native Metro transformer that loads your app-config values into bundles statically", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -33,11 +33,11 @@ "semver": "7" }, "peerDependencies": { - "@app-config/main": "^2.4.5", + "@app-config/main": "^3.0.0-alpha.1", "react-native": ">=0.45.0" }, "devDependencies": { - "@app-config/main": "^2.4.5", + "@app-config/main": "^3.0.0-alpha.1", "@types/semver": "7" }, "prettier": "@lcdev/prettier", diff --git a/app-config-schema/package.json b/app-config-schema/package.json index 2017afe9..65bcdfb7 100644 --- a/app-config-schema/package.json +++ b/app-config-schema/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/schema", "description": "Schema validation for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,19 +30,19 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "@types/json-schema": "7", "ajv": "7", "ajv-formats": "1", "json-schema-ref-parser": "9" }, "devDependencies": { - "@app-config/encryption": "^2.4.5", - "@app-config/extensions": "^2.4.5", - "@app-config/test-utils": "^2.4.5" + "@app-config/encryption": "^3.0.0-alpha.1", + "@app-config/extensions": "^3.0.0-alpha.1", + "@app-config/test-utils": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-settings/package.json b/app-config-settings/package.json index 9df80b66..6adf16a2 100644 --- a/app-config-settings/package.json +++ b/app-config-settings/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/settings", "description": "User settings for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "env-paths": "2", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^2.4.5" + "@app-config/test-utils": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-test-utils/package.json b/app-config-test-utils/package.json index ab92a72c..9ec4bcc6 100644 --- a/app-config-test-utils/package.json +++ b/app-config-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/test-utils", "description": "Internal test utilities", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,8 +30,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "@types/fs-extra": "9", "@types/tmp": "0.2", "fs-extra": "9", diff --git a/app-config-utils/package.json b/app-config-utils/package.json index f8c8c081..b3e0cc86 100644 --- a/app-config-utils/package.json +++ b/app-config-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/utils", "description": "Common utilities used in @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", diff --git a/app-config-v1-compat/package.json b/app-config-v1-compat/package.json index 46b4f98a..ff703616 100644 --- a/app-config-v1-compat/package.json +++ b/app-config-v1-compat/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/v1-compat", "description": "Version 1 compatibility layer for @app-config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^2.4.5", - "@app-config/logging": "^2.4.5", - "@app-config/node": "^2.4.5", - "@app-config/utils": "^2.4.5", + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/node": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "fs-extra": "7" }, "devDependencies": { - "@app-config/extensions": "^2.4.5", - "@app-config/test-utils": "^2.4.5" + "@app-config/extensions": "^3.0.0-alpha.1", + "@app-config/test-utils": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vault/package.json b/app-config-vault/package.json index 542c643f..542b547b 100644 --- a/app-config-vault/package.json +++ b/app-config-vault/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/vault", "description": "Hashicorp Vault support for App Config", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/extension-utils": "^2.4.5", + "@app-config/extension-utils": "^3.0.0-alpha.1", "@lcdev/fetch": "^0.1.10", "cross-fetch": "3", "node-vault": "0.9" }, "peerDependencies": { - "@app-config/main": "^2.4.5" + "@app-config/main": "^3.0.0-alpha.1" }, "devDependencies": { - "@app-config/main": "^2.4.5" + "@app-config/main": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-webpack/package.json b/app-config-webpack/package.json index c25198de..605a7c24 100644 --- a/app-config-webpack/package.json +++ b/app-config-webpack/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/webpack", "description": "Webpack plugin that loads your app-config values into bundles statically", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,12 +34,12 @@ "loader-utils": "2" }, "peerDependencies": { - "@app-config/main": "^2.4.5", + "@app-config/main": "^3.0.0-alpha.1", "html-webpack-plugin": "4 || 5", "webpack": "4 || 5" }, "devDependencies": { - "@app-config/main": "^2.4.5", + "@app-config/main": "^3.0.0-alpha.1", "@types/loader-utils": "1", "@webpack-cli/serve": "1", "html-webpack-plugin": "5", diff --git a/lcdev-app-config-inject/package.json b/lcdev-app-config-inject/package.json index 913174d3..3dab6d4e 100644 --- a/lcdev-app-config-inject/package.json +++ b/lcdev-app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config-inject", "description": "Alias for @app-config/inject", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,7 +34,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/inject": "^2.4.5" + "@app-config/inject": "^3.0.0-alpha.1" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-app-config-webpack-plugin/package.json b/lcdev-app-config-webpack-plugin/package.json index 59f16124..7e3e9a44 100644 --- a/lcdev-app-config-webpack-plugin/package.json +++ b/lcdev-app-config-webpack-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config-webpack-plugin", "description": "Alias for @app-config/webpack", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/webpack": "^2.4.5" + "@app-config/webpack": "^3.0.0-alpha.1" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-app-config/package.json b/lcdev-app-config/package.json index 0d7167ab..161a2b1c 100644 --- a/lcdev-app-config/package.json +++ b/lcdev-app-config/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config", "description": "Alias for @app-config/main", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -33,8 +33,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^2.4.5", - "@app-config/main": "^2.4.5" + "@app-config/cli": "^3.0.0-alpha.1", + "@app-config/main": "^3.0.0-alpha.1" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-react-native-app-config-transformer/package.json b/lcdev-react-native-app-config-transformer/package.json index 7ad30b7c..d2fa285e 100644 --- a/lcdev-react-native-app-config-transformer/package.json +++ b/lcdev-react-native-app-config-transformer/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/react-native-app-config-transformer", "description": "Alias for @app-config/react-native", - "version": "2.4.5", + "version": "3.0.0-alpha.1", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/react-native": "^2.4.5" + "@app-config/react-native": "^3.0.0-alpha.1" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/yarn.lock b/yarn.lock index 28510f3c..77223c56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,6 +11,237 @@ call-me-maybe "^1.0.1" js-yaml "^3.13.1" +"@app-config/cli@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/cli/-/cli-2.4.5.tgz#9ac2bcb0dfe40854462029d0e25a4ee751fa31fa" + integrity sha512-SQ5yPQ6oM7TE/aM9vZMMx3NU2co5pRPigt48aUXRuovVO0epcTVVftcbFl1BiBWKcXNLbFEUsGP8WpYah2UL9Q== + dependencies: + "@app-config/config" "^2.4.5" + "@app-config/core" "^2.4.5" + "@app-config/encryption" "^2.4.5" + "@app-config/generate" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/schema" "^2.4.5" + "@app-config/utils" "^2.4.5" + ajv "7" + clipboardy "2" + common-tags "1" + execa "5" + fs-extra "9" + json-schema-ref-parser "9" + yargs "16" + +"@app-config/config@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/config/-/config-2.4.5.tgz#e056b4df22e6e4707a5c7435474c4382b26ca36e" + integrity sha512-u/dULMqnIcvSAzc/3xhMo8grJCoY8sLnkO/C3xRjRJMpW3J6J8IYb0JhomxpxnT0ep9uYhR6MscMVQ+lIhYWcw== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/default-extensions" "^2.4.5" + "@app-config/extensions" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/meta" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/schema" "^2.4.5" + "@app-config/utils" "^2.4.5" + +"@app-config/core@2", "@app-config/core@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/core/-/core-2.4.5.tgz#cb9155c3c78fb362f946b6965270e21056caa113" + integrity sha512-5/8jwEt8suXl3RBBUM1OZSN/alPdxxsYxJ9kqhsLgq6WqpkB99faD/sEVDvdXLywPX8V2212zKV/Pg0CcVTNhA== + dependencies: + "@app-config/logging" "^2.4.5" + "@app-config/utils" "^2.4.5" + "@iarna/toml" "3" + js-yaml "^3.13.1" + json5 "2" + lodash.merge "^4.6.2" + +"@app-config/cypress@2": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/cypress/-/cypress-2.4.5.tgz#d9f2f63bee94249b7797eae40bba1c2f16ea0725" + integrity sha512-qsrEhw21we+qVvTnRLR1ShTEt1UGAnqoTpQChb4xCyLbNduzJu6nVxnEZVlV9oM3b0EolQFcSQPaWYC+L4cY4w== + +"@app-config/default-extensions@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/default-extensions/-/default-extensions-2.4.5.tgz#2d1992a352efbe81ff54f8b8dde2c93c2f15c177" + integrity sha512-2vENo7U7TtF8/i1OW3dpCUtjwk4wv8op3X/2TeGT0zw08rOJwhycB6Bd4hnQjFuTszmldHCyMgyEQGmsVMaL1A== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/encryption" "^2.4.5" + "@app-config/extensions" "^2.4.5" + "@app-config/git" "^2.4.5" + "@app-config/v1-compat" "^2.1.4" + +"@app-config/encryption@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/encryption/-/encryption-2.4.5.tgz#fafa45af41dba143661ae1d1fa7adc8c325de4c8" + integrity sha512-+XqoV3qrpv89qy7icikOGqWFB1hXJ+eEPp3k1/ntgSfs+EBqQa2lBvOH1rvt7oVW9dBqVRbHT/1jDJ1JxFhx1w== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/meta" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/settings" "^2.4.5" + "@app-config/utils" "^2.4.5" + "@lcdev/ws-rpc" "0.4" + "@types/openpgp" "4" + common-tags "1" + fs-extra "7" + openpgp "^4.3.0" + selfsigned "1" + text-encoding-utf-8 "1" + ws "7" + +"@app-config/extension-utils@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/extension-utils/-/extension-utils-2.4.5.tgz#42d3e464e61b9959e913c4bd19b86e8fc51f4745" + integrity sha512-KiL5arB7sDEFAwpvgIVeJGRluoX97rKqd6bsv0BH3jounf+adhQUKB+imWSZUx1boiOHIjgNIfZ62R78qnd79A== + dependencies: + "@app-config/core" "^2.4.5" + "@serafin/schema-builder" "0.14" + +"@app-config/extensions@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/extensions/-/extensions-2.4.5.tgz#7cbb172c04312b4384f717853117a15d36a5cefe" + integrity sha512-w1BxaiI912NUkjhIh1ECVcdVkJSdP7eYq/tLxey1VRrLwsouVItAI+Dh4312aBumxmlr0/iYaxBdA8ziNbSKwA== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/extension-utils" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/utils" "^2.4.5" + lodash.isequal "4" + +"@app-config/generate@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/generate/-/generate-2.4.5.tgz#563e3122a4764b1c3e1b993df6a3f5469167000f" + integrity sha512-dfBJ5NXNrz+pvviwvo4TK/OpPubbsWWgoUAy1x+dysZTPmd2cXA8deztAMeviXdzlPfYzHnG6uOvjrKO7a74gw== + dependencies: + "@app-config/logging" "^2.4.5" + "@app-config/meta" "^2.4.5" + "@app-config/schema" "^2.4.5" + "@types/readable-stream" "2" + "@types/urijs" "1" + common-tags "1" + fs-extra "7" + lodash "4" + quicktype-core "6.0.70" + +"@app-config/git@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/git/-/git-2.4.5.tgz#0535999fab7dfca39a4ea002f5208760dfaab903" + integrity sha512-ZiwCfV6gv6/9kHgoPlmwS/jvRzTmtKuJgwdMS3BX6HnoskQ9VlWDMKWTjLGS2kitTmCk/YvYJK1OBk5LpHgjGQ== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/extension-utils" "^2.4.5" + simple-git "2" + +"@app-config/logging@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/logging/-/logging-2.4.5.tgz#4a1ce9044bd3d38dc9aa228c55d252e1f6482c2f" + integrity sha512-nPI9dVfzfgvzIO/rLSS8rBl0BaNs4GA9Pmf55rdoVVyPKBGVjpIjWrtgvP2l9ZbbV7YrRJK2sFWZddUSzJA2Sw== + dependencies: + "@app-config/utils" "^2.4.5" + +"@app-config/main@2": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/main/-/main-2.4.5.tgz#bc1aa43ef387e68770431412bb550bce0414e29b" + integrity sha512-6IOVVEWi6+u4Mb8bVxDpvyIg7IfUlTRKUgbhoSyLldUFhAlcWaVYcb+Hdr6eRIJlG6O5Xu+lW28ROk1xaT8I3Q== + dependencies: + "@app-config/cli" "^2.4.5" + "@app-config/config" "^2.4.5" + "@app-config/core" "^2.4.5" + "@app-config/default-extensions" "^2.4.5" + "@app-config/encryption" "^2.4.5" + "@app-config/extensions" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/meta" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/schema" "^2.4.5" + "@app-config/utils" "^2.4.5" + ajv "7" + +"@app-config/meta@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/meta/-/meta-2.4.5.tgz#ef8fa050c6d8d11034acd80012022b6c3098b208" + integrity sha512-bnEIbIEk3xn0e4CEbO3PaHYVIw7eB0QJfZLxz8cBsftf867so5FNKsh6qLwU1Rs/bvveLBg2trr42DP58+zqQw== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/default-extensions" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/utils" "^2.4.5" + fs-extra "7" + +"@app-config/node@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/node/-/node-2.4.5.tgz#0657c0112d6c70d0d66d6e04c790647571745b9a" + integrity sha512-cglyAjmiKo5rRcN0lwLCfqmGRH21VGabAGt6Q2l33qixNcQDA+OSPzOWIvBPi7t5BzaJAUAqEn9wwreV7Q53Kw== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@types/prompts" "2" + fs-extra "9" + prompts "2" + +"@app-config/react-native@2": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/react-native/-/react-native-2.4.5.tgz#0888d53705eceb6cec4b13423befa42a0653c168" + integrity sha512-7WRkUuj80C7XaeCkA1wpH2guDL3uVcboiU6AqSkfIb4u34bin8VwL+rBLgNabC382k5hP+6uX7V4sdQR+N2Gyg== + dependencies: + semver "7" + +"@app-config/schema@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/schema/-/schema-2.4.5.tgz#b6d1eb03062de06e56eb3bf95286ebcc267d0fe8" + integrity sha512-JmFsdK0NhZhl9FixFj1BzLB3h1WpZtJJL3YfTSCxZFy/1Jq2fGBUE03gTwjq+xCyTlCyYOf2h9quKcJR/EmK+Q== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/utils" "^2.4.5" + "@types/json-schema" "7" + ajv "7" + ajv-formats "1" + json-schema-ref-parser "9" + +"@app-config/settings@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/settings/-/settings-2.4.5.tgz#4f28c9bacdfda78cc2672c6edf90c1a3e336df66" + integrity sha512-AwNlOPW8/fhPHKRB/vcu55K9mchY1hmAbgmZKrVCX4i/zDKHK5s/OURHFVCHaaeSE0fL+7tDWjj2XKJX4ApQMQ== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/utils" "^2.4.5" + env-paths "2" + fs-extra "7" + +"@app-config/utils@2", "@app-config/utils@^2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/utils/-/utils-2.4.5.tgz#38ec91b4a942f419d0aec81d580dbd994681630d" + integrity sha512-GqiMzMoz+EDOLcZzzkZQSaX/wcU+ivFcFssRxUoL8byk+MH2OlZDp6ho0bbwwD4Ntk5jC0Lr95G7FxYVoo/Szw== + +"@app-config/v1-compat@^2.1.4": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/v1-compat/-/v1-compat-2.4.5.tgz#d5ad54c1c8bb658bb98ad49bbb2fc912ec94748f" + integrity sha512-+iVoRwmBDm0OxZNJxfQ5cBg8DoOOtCGVZEvUELmD7MTMI8izkawtdGFE/i8G87Lu673GE9Fny27XUIWfzaTQ7g== + dependencies: + "@app-config/core" "^2.4.5" + "@app-config/logging" "^2.4.5" + "@app-config/node" "^2.4.5" + "@app-config/utils" "^2.4.5" + fs-extra "7" + +"@app-config/webpack@2": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@app-config/webpack/-/webpack-2.4.5.tgz#6746e84dbc79f3ab87cbab5c1d39aef0a0de6125" + integrity sha512-XEAOecnHmvN71+XBtE7Yklrsyb+XqjTyll1Ag8oRlJIzlIrTETQqsSR7oxqEV4bwITDaxHIbWajmO+1ZaA7kMA== + dependencies: + loader-utils "2" + "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" From 44085dc48c246b43ecfb5cc58ce4672073deab83 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 8 Apr 2021 19:33:25 -0600 Subject: [PATCH 05/39] fix: tag --- .github/workflows/publishing.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index d0e72b27..5bcf7a1b 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -190,6 +190,7 @@ jobs: token: ${{ secrets.NPM_TOKEN }} access: public package: ./lcdev-react-native-app-config-transformer/package.json + tag: next # Do these last, since they're most commonly used by consumers - name: app-config-cli @@ -212,3 +213,4 @@ jobs: token: ${{ secrets.NPM_TOKEN }} access: public package: ./lcdev-app-config/package.json + tag: next From 26fb69f2d0cfff6e76876b578bc1ebf22cccf10e Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 8 Apr 2021 19:48:22 -0600 Subject: [PATCH 06/39] fix: versions of examples --- examples/cli-project/package.json | 2 +- .../frontend-webpack-project/package.json | 4 +- examples/nodejs-server/package.json | 2 +- examples/react-native-project/package.json | 6 +- tests/standalone-project/package.json | 2 +- .../app-config-core-in-browser/package.json | 4 +- .../cypress-plugin/package.json | 6 +- .../extending-other-files/package.json | 4 +- .../query-parameter-overrides/package.json | 4 +- .../two-app-config-sources/package.json | 4 +- tests/webpack-projects/webpack5/package.json | 6 +- yarn.lock | 231 ------------------ 12 files changed, 22 insertions(+), 253 deletions(-) diff --git a/examples/cli-project/package.json b/examples/cli-project/package.json index d4ba6a16..6b153c7c 100644 --- a/examples/cli-project/package.json +++ b/examples/cli-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "2" + "@app-config/main": "3.0.0-alpha.1" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/examples/frontend-webpack-project/package.json b/examples/frontend-webpack-project/package.json index 590b0112..bd2b620d 100644 --- a/examples/frontend-webpack-project/package.json +++ b/examples/frontend-webpack-project/package.json @@ -10,10 +10,10 @@ "test": "jest" }, "dependencies": { - "@app-config/main": "2" + "@app-config/main": "3.0.0-alpha.1" }, "devDependencies": { - "@app-config/webpack": "2", + "@app-config/webpack": "3.0.0-alpha.1", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/examples/nodejs-server/package.json b/examples/nodejs-server/package.json index b472dcc9..a402572a 100644 --- a/examples/nodejs-server/package.json +++ b/examples/nodejs-server/package.json @@ -13,7 +13,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "2", + "@app-config/main": "3.0.0-alpha.1", "fastify": "3" }, "devDependencies": { diff --git a/examples/react-native-project/package.json b/examples/react-native-project/package.json index 77e50a07..c455066d 100644 --- a/examples/react-native-project/package.json +++ b/examples/react-native-project/package.json @@ -12,7 +12,7 @@ "eject": "expo eject" }, "dependencies": { - "@app-config/main": "2", + "@app-config/main": "3.0.0-alpha.1", "expo": "39", "expo-status-bar": "1", "expo-yarn-workspaces": "1", @@ -22,8 +22,8 @@ }, "devDependencies": { "@babel/core": "7", - "@app-config/main": "2", - "@app-config/react-native": "2", + "@app-config/main": "3.0.0-alpha.1", + "@app-config/react-native": "3.0.0-alpha.1", "@lcdev/tsconfig": "0.1", "@types/react": "16", "@types/react-native": "0.63", diff --git a/tests/standalone-project/package.json b/tests/standalone-project/package.json index d620aec8..3f31e303 100644 --- a/tests/standalone-project/package.json +++ b/tests/standalone-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "2" + "@app-config/main": "3.0.0-alpha.1" }, "devDependencies": { "typescript": "*" diff --git a/tests/webpack-projects/app-config-core-in-browser/package.json b/tests/webpack-projects/app-config-core-in-browser/package.json index 4b717faf..c27f1525 100644 --- a/tests/webpack-projects/app-config-core-in-browser/package.json +++ b/tests/webpack-projects/app-config-core-in-browser/package.json @@ -10,8 +10,8 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/core": "2", - "@app-config/utils": "2" + "@app-config/core": "3.0.0-alpha.1", + "@app-config/utils": "3.0.0-alpha.1" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/tests/webpack-projects/cypress-plugin/package.json b/tests/webpack-projects/cypress-plugin/package.json index ca11c729..e72c70b9 100644 --- a/tests/webpack-projects/cypress-plugin/package.json +++ b/tests/webpack-projects/cypress-plugin/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "2", - "@app-config/cypress": "2" + "@app-config/main": "3.0.0-alpha.1", + "@app-config/cypress": "3.0.0-alpha.1" }, "devDependencies": { - "@app-config/webpack": "2", + "@app-config/webpack": "3.0.0-alpha.1", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", diff --git a/tests/webpack-projects/extending-other-files/package.json b/tests/webpack-projects/extending-other-files/package.json index 9ff25e95..b6c97ea2 100644 --- a/tests/webpack-projects/extending-other-files/package.json +++ b/tests/webpack-projects/extending-other-files/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "2" + "@app-config/main": "3.0.0-alpha.1" }, "devDependencies": { - "@app-config/webpack": "2", + "@app-config/webpack": "3.0.0-alpha.1", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/query-parameter-overrides/package.json b/tests/webpack-projects/query-parameter-overrides/package.json index 9a7e2067..bc0b35d4 100644 --- a/tests/webpack-projects/query-parameter-overrides/package.json +++ b/tests/webpack-projects/query-parameter-overrides/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "2", + "@app-config/main": "3.0.0-alpha.1", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/webpack": "2", + "@app-config/webpack": "3.0.0-alpha.1", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/two-app-config-sources/package.json b/tests/webpack-projects/two-app-config-sources/package.json index 3ee7a28b..751461d0 100644 --- a/tests/webpack-projects/two-app-config-sources/package.json +++ b/tests/webpack-projects/two-app-config-sources/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "2" + "@app-config/main": "3.0.0-alpha.1" }, "devDependencies": { - "@app-config/webpack": "2", + "@app-config/webpack": "3.0.0-alpha.1", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/webpack5/package.json b/tests/webpack-projects/webpack5/package.json index a0951b9c..9ccc6b95 100644 --- a/tests/webpack-projects/webpack5/package.json +++ b/tests/webpack-projects/webpack5/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "2", - "@app-config/cypress": "2" + "@app-config/main": "3.0.0-alpha.1", + "@app-config/cypress": "3.0.0-alpha.1" }, "devDependencies": { - "@app-config/webpack": "2", + "@app-config/webpack": "3.0.0-alpha.1", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", diff --git a/yarn.lock b/yarn.lock index 77223c56..28510f3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,237 +11,6 @@ call-me-maybe "^1.0.1" js-yaml "^3.13.1" -"@app-config/cli@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/cli/-/cli-2.4.5.tgz#9ac2bcb0dfe40854462029d0e25a4ee751fa31fa" - integrity sha512-SQ5yPQ6oM7TE/aM9vZMMx3NU2co5pRPigt48aUXRuovVO0epcTVVftcbFl1BiBWKcXNLbFEUsGP8WpYah2UL9Q== - dependencies: - "@app-config/config" "^2.4.5" - "@app-config/core" "^2.4.5" - "@app-config/encryption" "^2.4.5" - "@app-config/generate" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/schema" "^2.4.5" - "@app-config/utils" "^2.4.5" - ajv "7" - clipboardy "2" - common-tags "1" - execa "5" - fs-extra "9" - json-schema-ref-parser "9" - yargs "16" - -"@app-config/config@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/config/-/config-2.4.5.tgz#e056b4df22e6e4707a5c7435474c4382b26ca36e" - integrity sha512-u/dULMqnIcvSAzc/3xhMo8grJCoY8sLnkO/C3xRjRJMpW3J6J8IYb0JhomxpxnT0ep9uYhR6MscMVQ+lIhYWcw== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/default-extensions" "^2.4.5" - "@app-config/extensions" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/meta" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/schema" "^2.4.5" - "@app-config/utils" "^2.4.5" - -"@app-config/core@2", "@app-config/core@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/core/-/core-2.4.5.tgz#cb9155c3c78fb362f946b6965270e21056caa113" - integrity sha512-5/8jwEt8suXl3RBBUM1OZSN/alPdxxsYxJ9kqhsLgq6WqpkB99faD/sEVDvdXLywPX8V2212zKV/Pg0CcVTNhA== - dependencies: - "@app-config/logging" "^2.4.5" - "@app-config/utils" "^2.4.5" - "@iarna/toml" "3" - js-yaml "^3.13.1" - json5 "2" - lodash.merge "^4.6.2" - -"@app-config/cypress@2": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/cypress/-/cypress-2.4.5.tgz#d9f2f63bee94249b7797eae40bba1c2f16ea0725" - integrity sha512-qsrEhw21we+qVvTnRLR1ShTEt1UGAnqoTpQChb4xCyLbNduzJu6nVxnEZVlV9oM3b0EolQFcSQPaWYC+L4cY4w== - -"@app-config/default-extensions@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/default-extensions/-/default-extensions-2.4.5.tgz#2d1992a352efbe81ff54f8b8dde2c93c2f15c177" - integrity sha512-2vENo7U7TtF8/i1OW3dpCUtjwk4wv8op3X/2TeGT0zw08rOJwhycB6Bd4hnQjFuTszmldHCyMgyEQGmsVMaL1A== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/encryption" "^2.4.5" - "@app-config/extensions" "^2.4.5" - "@app-config/git" "^2.4.5" - "@app-config/v1-compat" "^2.1.4" - -"@app-config/encryption@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/encryption/-/encryption-2.4.5.tgz#fafa45af41dba143661ae1d1fa7adc8c325de4c8" - integrity sha512-+XqoV3qrpv89qy7icikOGqWFB1hXJ+eEPp3k1/ntgSfs+EBqQa2lBvOH1rvt7oVW9dBqVRbHT/1jDJ1JxFhx1w== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/meta" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/settings" "^2.4.5" - "@app-config/utils" "^2.4.5" - "@lcdev/ws-rpc" "0.4" - "@types/openpgp" "4" - common-tags "1" - fs-extra "7" - openpgp "^4.3.0" - selfsigned "1" - text-encoding-utf-8 "1" - ws "7" - -"@app-config/extension-utils@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/extension-utils/-/extension-utils-2.4.5.tgz#42d3e464e61b9959e913c4bd19b86e8fc51f4745" - integrity sha512-KiL5arB7sDEFAwpvgIVeJGRluoX97rKqd6bsv0BH3jounf+adhQUKB+imWSZUx1boiOHIjgNIfZ62R78qnd79A== - dependencies: - "@app-config/core" "^2.4.5" - "@serafin/schema-builder" "0.14" - -"@app-config/extensions@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/extensions/-/extensions-2.4.5.tgz#7cbb172c04312b4384f717853117a15d36a5cefe" - integrity sha512-w1BxaiI912NUkjhIh1ECVcdVkJSdP7eYq/tLxey1VRrLwsouVItAI+Dh4312aBumxmlr0/iYaxBdA8ziNbSKwA== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/extension-utils" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/utils" "^2.4.5" - lodash.isequal "4" - -"@app-config/generate@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/generate/-/generate-2.4.5.tgz#563e3122a4764b1c3e1b993df6a3f5469167000f" - integrity sha512-dfBJ5NXNrz+pvviwvo4TK/OpPubbsWWgoUAy1x+dysZTPmd2cXA8deztAMeviXdzlPfYzHnG6uOvjrKO7a74gw== - dependencies: - "@app-config/logging" "^2.4.5" - "@app-config/meta" "^2.4.5" - "@app-config/schema" "^2.4.5" - "@types/readable-stream" "2" - "@types/urijs" "1" - common-tags "1" - fs-extra "7" - lodash "4" - quicktype-core "6.0.70" - -"@app-config/git@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/git/-/git-2.4.5.tgz#0535999fab7dfca39a4ea002f5208760dfaab903" - integrity sha512-ZiwCfV6gv6/9kHgoPlmwS/jvRzTmtKuJgwdMS3BX6HnoskQ9VlWDMKWTjLGS2kitTmCk/YvYJK1OBk5LpHgjGQ== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/extension-utils" "^2.4.5" - simple-git "2" - -"@app-config/logging@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/logging/-/logging-2.4.5.tgz#4a1ce9044bd3d38dc9aa228c55d252e1f6482c2f" - integrity sha512-nPI9dVfzfgvzIO/rLSS8rBl0BaNs4GA9Pmf55rdoVVyPKBGVjpIjWrtgvP2l9ZbbV7YrRJK2sFWZddUSzJA2Sw== - dependencies: - "@app-config/utils" "^2.4.5" - -"@app-config/main@2": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/main/-/main-2.4.5.tgz#bc1aa43ef387e68770431412bb550bce0414e29b" - integrity sha512-6IOVVEWi6+u4Mb8bVxDpvyIg7IfUlTRKUgbhoSyLldUFhAlcWaVYcb+Hdr6eRIJlG6O5Xu+lW28ROk1xaT8I3Q== - dependencies: - "@app-config/cli" "^2.4.5" - "@app-config/config" "^2.4.5" - "@app-config/core" "^2.4.5" - "@app-config/default-extensions" "^2.4.5" - "@app-config/encryption" "^2.4.5" - "@app-config/extensions" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/meta" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/schema" "^2.4.5" - "@app-config/utils" "^2.4.5" - ajv "7" - -"@app-config/meta@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/meta/-/meta-2.4.5.tgz#ef8fa050c6d8d11034acd80012022b6c3098b208" - integrity sha512-bnEIbIEk3xn0e4CEbO3PaHYVIw7eB0QJfZLxz8cBsftf867so5FNKsh6qLwU1Rs/bvveLBg2trr42DP58+zqQw== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/default-extensions" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/utils" "^2.4.5" - fs-extra "7" - -"@app-config/node@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/node/-/node-2.4.5.tgz#0657c0112d6c70d0d66d6e04c790647571745b9a" - integrity sha512-cglyAjmiKo5rRcN0lwLCfqmGRH21VGabAGt6Q2l33qixNcQDA+OSPzOWIvBPi7t5BzaJAUAqEn9wwreV7Q53Kw== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@types/prompts" "2" - fs-extra "9" - prompts "2" - -"@app-config/react-native@2": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/react-native/-/react-native-2.4.5.tgz#0888d53705eceb6cec4b13423befa42a0653c168" - integrity sha512-7WRkUuj80C7XaeCkA1wpH2guDL3uVcboiU6AqSkfIb4u34bin8VwL+rBLgNabC382k5hP+6uX7V4sdQR+N2Gyg== - dependencies: - semver "7" - -"@app-config/schema@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/schema/-/schema-2.4.5.tgz#b6d1eb03062de06e56eb3bf95286ebcc267d0fe8" - integrity sha512-JmFsdK0NhZhl9FixFj1BzLB3h1WpZtJJL3YfTSCxZFy/1Jq2fGBUE03gTwjq+xCyTlCyYOf2h9quKcJR/EmK+Q== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/utils" "^2.4.5" - "@types/json-schema" "7" - ajv "7" - ajv-formats "1" - json-schema-ref-parser "9" - -"@app-config/settings@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/settings/-/settings-2.4.5.tgz#4f28c9bacdfda78cc2672c6edf90c1a3e336df66" - integrity sha512-AwNlOPW8/fhPHKRB/vcu55K9mchY1hmAbgmZKrVCX4i/zDKHK5s/OURHFVCHaaeSE0fL+7tDWjj2XKJX4ApQMQ== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/utils" "^2.4.5" - env-paths "2" - fs-extra "7" - -"@app-config/utils@2", "@app-config/utils@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/utils/-/utils-2.4.5.tgz#38ec91b4a942f419d0aec81d580dbd994681630d" - integrity sha512-GqiMzMoz+EDOLcZzzkZQSaX/wcU+ivFcFssRxUoL8byk+MH2OlZDp6ho0bbwwD4Ntk5jC0Lr95G7FxYVoo/Szw== - -"@app-config/v1-compat@^2.1.4": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/v1-compat/-/v1-compat-2.4.5.tgz#d5ad54c1c8bb658bb98ad49bbb2fc912ec94748f" - integrity sha512-+iVoRwmBDm0OxZNJxfQ5cBg8DoOOtCGVZEvUELmD7MTMI8izkawtdGFE/i8G87Lu673GE9Fny27XUIWfzaTQ7g== - dependencies: - "@app-config/core" "^2.4.5" - "@app-config/logging" "^2.4.5" - "@app-config/node" "^2.4.5" - "@app-config/utils" "^2.4.5" - fs-extra "7" - -"@app-config/webpack@2": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@app-config/webpack/-/webpack-2.4.5.tgz#6746e84dbc79f3ab87cbab5c1d39aef0a0de6125" - integrity sha512-XEAOecnHmvN71+XBtE7Yklrsyb+XqjTyll1Ag8oRlJIzlIrTETQqsSR7oxqEV4bwITDaxHIbWajmO+1ZaA7kMA== - dependencies: - loader-utils "2" - "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" From 6c9acbdd85acc5a10af92b7938c4514966c4620f Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 8 Apr 2021 20:19:07 -0600 Subject: [PATCH 07/39] chore: removes `$` prefixed options in $substitute --- app-config-extensions/src/index.test.ts | 168 +----------------------- app-config-extensions/src/index.ts | 20 +-- 2 files changed, 12 insertions(+), 176 deletions(-) diff --git a/app-config-extensions/src/index.test.ts b/app-config-extensions/src/index.test.ts index ee4f40f7..6056e7a1 100644 --- a/app-config-extensions/src/index.test.ts +++ b/app-config-extensions/src/index.test.ts @@ -995,162 +995,6 @@ describe('$substitute directive', () => { expect(parsed.toJSON()).toEqual({ foo: 'qa' }); }); - it('reads object with $name', async () => { - process.env.FOO = 'foo'; - - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO' } }, - }); - - const parsed = await source.read([substituteDirective()]); - - expect(parsed.toJSON()).toEqual({ foo: 'foo' }); - }); - - it('fails with $name when not defined', async () => { - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO' } }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('uses $name when $fallback is defined', async () => { - process.env.FOO = 'foo'; - - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: 'bar' } }, - }); - - const parsed = await source.read([substituteDirective()]); - - expect(parsed.toJSON()).toEqual({ foo: 'foo' }); - }); - - it('uses $fallback when $name was not found', async () => { - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: 'bar' } }, - }); - - const parsed = await source.read([substituteDirective()]); - - expect(parsed.toJSON()).toEqual({ foo: 'bar' }); - }); - - it('allows null value when $allowNull', async () => { - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: null, $allowNull: true } }, - }); - - const parsed = await source.read([substituteDirective()]); - - expect(parsed.toJSON()).toEqual({ foo: null }); - }); - - it('does not allow number even when $allowNull', async () => { - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: 42, $allowNull: true } }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('parses ints', async () => { - process.env.FOO = '11'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseInt: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(11); - }); - - it('fails when int is invalid', async () => { - process.env.FOO = 'not a number'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseInt: true }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('parses float', async () => { - process.env.FOO = '11.2'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseFloat: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(11.2); - }); - - it('fails when float is invalid', async () => { - process.env.FOO = 'not a number'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseFloat: true }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('parses boolean = true', async () => { - process.env.FOO = 'true'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(true); - }); - - it('parses boolean = 1', async () => { - process.env.FOO = '1'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(true); - }); - - it('parses boolean = 0', async () => { - process.env.FOO = '0'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(false); - }); - - it('parses boolean = false', async () => { - process.env.FOO = 'false'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(false); - }); - - it('doesnt visit fallback if name is defined', async () => { - const failDirective = forKey('$fail', () => () => { - throw new Error(); - }); - - process.env.FOO = 'foo'; - - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: { $fail: true } } }, - }); - - const parsed = await source.read([substituteDirective(), failDirective]); - - expect(parsed.toJSON()).toEqual({ foo: 'foo' }); - }); - it('reads object with name', async () => { process.env.FOO = 'foo'; @@ -1328,7 +1172,7 @@ describe('$envVar directive', () => { expect(parsed.toJSON()).toEqual({ foo: 'foo', bar: 'bar' }); }); - it('reads object with $name', async () => { + it('reads object with name', async () => { process.env.FOO = 'foo'; const source = new LiteralSource({ @@ -1340,7 +1184,7 @@ describe('$envVar directive', () => { expect(parsed.toJSON()).toEqual({ foo: 'foo' }); }); - it('fails with $name when not defined', async () => { + it('fails with name when not defined', async () => { const source = new LiteralSource({ foo: { $envVar: { name: 'FOO' } }, }); @@ -1348,7 +1192,7 @@ describe('$envVar directive', () => { await expect(source.read([envVarDirective()])).rejects.toThrow(); }); - it('uses $name when $fallback is defined', async () => { + it('uses name when fallback is defined', async () => { process.env.FOO = 'foo'; const source = new LiteralSource({ @@ -1360,7 +1204,7 @@ describe('$envVar directive', () => { expect(parsed.toJSON()).toEqual({ foo: 'foo' }); }); - it('uses $fallback when $name was not found', async () => { + it('uses fallback when name was not found', async () => { const source = new LiteralSource({ foo: { $envVar: { name: 'FOO', fallback: 'bar' } }, }); @@ -1370,7 +1214,7 @@ describe('$envVar directive', () => { expect(parsed.toJSON()).toEqual({ foo: 'bar' }); }); - it('allows null value when $allowNull', async () => { + it('allows null value when allowNull', async () => { const source = new LiteralSource({ foo: { $envVar: { name: 'FOO', fallback: null, allowNull: true } }, }); @@ -1380,7 +1224,7 @@ describe('$envVar directive', () => { expect(parsed.toJSON()).toEqual({ foo: null }); }); - it('does not allow number even when $allowNull', async () => { + it('does not allow number even when allowNull', async () => { const source = new LiteralSource({ foo: { $envVar: { name: 'FOO', fallback: 42, allowNull: true } }, }); diff --git a/app-config-extensions/src/index.ts b/app-config-extensions/src/index.ts index 2f32fff6..427aa1db 100644 --- a/app-config-extensions/src/index.ts +++ b/app-config-extensions/src/index.ts @@ -345,7 +345,7 @@ export function substituteDirective( validateObject(value, [...ctx, key]); if (Array.isArray(value)) throw new AppConfigError('$substitute was given an array'); - const name = (await parse(selectDefined(value.name, value.$name))).toJSON(); + const name = (await parse(value.name)).toJSON(); validateString(name, [...ctx, key, [InObject, 'name']]); @@ -356,7 +356,7 @@ export function substituteDirective( } if (resolvedValue) { - const parseInt = (await parse(selectDefined(value.parseInt, value.$parseInt))).toJSON(); + const parseInt = (await parse(value.parseInt)).toJSON(); if (parseInt) { const parsed = Number.parseInt(resolvedValue, 10); @@ -368,7 +368,7 @@ export function substituteDirective( return parse(parsed, { shouldFlatten: true }); } - const parseFloat = (await parse(selectDefined(value.parseFloat, value.$parseFloat))).toJSON(); + const parseFloat = (await parse(value.parseFloat)).toJSON(); if (parseFloat) { const parsed = Number.parseFloat(resolvedValue); @@ -380,7 +380,7 @@ export function substituteDirective( return parse(parsed, { shouldFlatten: true }); } - const parseBool = (await parse(selectDefined(value.parseBool, value.$parseBool))).toJSON(); + const parseBool = (await parse(value.parseBool)).toJSON(); if (parseBool) { const parsed = resolvedValue.toLowerCase() !== 'false' && resolvedValue !== '0'; @@ -392,8 +392,8 @@ export function substituteDirective( } if (value.fallback !== undefined || value.$fallback !== undefined) { - const fallback = (await parse(selectDefined(value.fallback, value.$fallback))).toJSON(); - const allowNull = (await parse(selectDefined(value.allowNull, value.$allowNull))).toJSON(); + const fallback = (await parse(value.fallback)).toJSON(); + const allowNull = (await parse(value.allowNull)).toJSON(); if (allowNull) { validateStringOrNull(fallback, [...ctx, key, [InObject, 'fallback']]); @@ -533,14 +533,6 @@ function performAllSubstitutions(text: string, envType?: string): string { return output; } -function selectDefined(...args: (T | null | undefined)[]): T | null { - for (const a of args) { - if (a !== undefined) return a; - } - - return (undefined as any) as T; -} - const validateObject: ValidationFunction< Record > = validationFunction(({ emptySchema }) => emptySchema().addAdditionalProperties()); From cafaa98cbb7d376b004008c4d09bc5d38e2bad0e Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Fri, 9 Apr 2021 12:47:01 -0600 Subject: [PATCH 08/39] chore: removes some exports from @app-config/main --- app-config-main/package.json | 2 -- app-config-main/src/index.ts | 27 --------------------------- app-config-vault/package.json | 6 ++---- app-config-vault/src/index.ts | 3 ++- 4 files changed, 4 insertions(+), 34 deletions(-) diff --git a/app-config-main/package.json b/app-config-main/package.json index 205fe612..95a0712e 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -38,8 +38,6 @@ "@app-config/config": "^3.0.0-alpha.1", "@app-config/core": "^3.0.0-alpha.1", "@app-config/default-extensions": "^3.0.0-alpha.1", - "@app-config/encryption": "^3.0.0-alpha.1", - "@app-config/extensions": "^3.0.0-alpha.1", "@app-config/logging": "^3.0.0-alpha.1", "@app-config/meta": "^3.0.0-alpha.1", "@app-config/node": "^3.0.0-alpha.1", diff --git a/app-config-main/src/index.ts b/app-config-main/src/index.ts index 0fcef219..b0021ba4 100644 --- a/app-config-main/src/index.ts +++ b/app-config-main/src/index.ts @@ -85,23 +85,6 @@ export default config; */ export const validateConfig: ValidateFunction = null as any; // eslint-disable-line -export { Json } from '@app-config/utils'; - -export { - ParsedValue, - ParsedValueMetadata, - ParsingExtension, - ParsingExtensionTransform, - ConfigSource, - LiteralSource, - CombinedSource, - FallbackSource, - FileType, - stringify, - filePathAssumedType, - parseRawString, -} from '@app-config/core'; - export { setLogLevel, LogLevel } from '@app-config/logging'; export { @@ -122,16 +105,6 @@ export { EnvironmentSource, } from '@app-config/node'; -export { - environmentVariableSubstitution, - envDirective, - extendsDirective, - extendsSelfDirective, - overrideDirective, -} from '@app-config/extensions'; - -export { default as encryptedDirective } from '@app-config/encryption'; - export { defaultExtensions, defaultEnvExtensions, diff --git a/app-config-vault/package.json b/app-config-vault/package.json index 542b547b..74bb643b 100644 --- a/app-config-vault/package.json +++ b/app-config-vault/package.json @@ -30,16 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { + "@app-config/core": "^3.0.0-alpha.1", + "@app-config/utils": "^3.0.0-alpha.1", "@app-config/extension-utils": "^3.0.0-alpha.1", "@lcdev/fetch": "^0.1.10", "cross-fetch": "3", "node-vault": "0.9" }, - "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.1" - }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.1" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vault/src/index.ts b/app-config-vault/src/index.ts index 292b514e..cdf3c85e 100644 --- a/app-config-vault/src/index.ts +++ b/app-config-vault/src/index.ts @@ -1,7 +1,8 @@ import fetch from 'cross-fetch'; import { api, buildPath, setGlobalFetch } from '@lcdev/fetch'; import type { JsonObject } from '@lcdev/ts'; -import type { ParsingExtension, Json } from '@app-config/main'; +import type { Json } from '@app-config/utils'; +import type { ParsingExtension } from '@app-config/core'; import { forKey, validateOptions } from '@app-config/extension-utils'; setGlobalFetch(fetch); From 6304de17ae70ecf1bfa01bb7f089c0d338462d83 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Fri, 9 Apr 2021 17:38:01 -0600 Subject: [PATCH 09/39] refactor(#129): changes parsing extensions to pass through some hierarchical context --- app-config-core/src/config-source.test.ts | 2 +- app-config-core/src/parsed-value.test.ts | 8 ++-- app-config-core/src/parsed-value.ts | 44 ++++++++++++--------- app-config-default-extensions/tsconfig.json | 4 +- app-config-extension-utils/src/index.ts | 32 ++++++--------- app-config-extensions/src/index.ts | 26 ++++++------ app-config-v1-compat/src/index.ts | 2 +- 7 files changed, 58 insertions(+), 60 deletions(-) diff --git a/app-config-core/src/config-source.test.ts b/app-config-core/src/config-source.test.ts index d4e170e7..ddc46171 100644 --- a/app-config-core/src/config-source.test.ts +++ b/app-config-core/src/config-source.test.ts @@ -15,7 +15,7 @@ class FailingSource extends ConfigSource { } } -const flattenExtension: ParsingExtension = (value, [_, key]) => { +const flattenExtension: ParsingExtension = (value, [[_, key]]) => { if (key === '$flatten') { return (parse) => parse(value, { shouldFlatten: true }); } diff --git a/app-config-core/src/parsed-value.test.ts b/app-config-core/src/parsed-value.test.ts index 724ed2d4..0c28a8c2 100644 --- a/app-config-core/src/parsed-value.test.ts +++ b/app-config-core/src/parsed-value.test.ts @@ -42,7 +42,7 @@ describe('parseValue', () => { return (parse) => parse(value, { marked: true }); }; - const markKeyExtension: ParsingExtension = (value, [keyType, key]) => { + const markKeyExtension: ParsingExtension = (value, [[keyType, key]]) => { if (keyType === InObject && key === '$mark') { return (parse) => parse(value, { shouldFlatten: true, marked: true }); } @@ -60,7 +60,7 @@ describe('parseValue', () => { return false; }; - const secretExtension: ParsingExtension = (_, [keyType, key]) => { + const secretExtension: ParsingExtension = (_, [[keyType, key]]) => { if (keyType === InObject && key === '$secret') { return (parse) => parse('revealed!', { shouldFlatten: true }); } @@ -68,7 +68,7 @@ describe('parseValue', () => { return false; }; - const mergeExtension: ParsingExtension = (value, [keyType, key]) => { + const mergeExtension: ParsingExtension = (value, [[keyType, key]]) => { if (keyType === InObject && key === '$merge') { return (parse) => parse(value, { shouldMerge: true }); } @@ -76,7 +76,7 @@ describe('parseValue', () => { return false; }; - const overrideExtension: ParsingExtension = (value, [keyType, key]) => { + const overrideExtension: ParsingExtension = (value, [[keyType, key]]) => { if (keyType === InObject && key === '$override') { return (parse) => parse(value, { shouldOverride: true }); } diff --git a/app-config-core/src/parsed-value.ts b/app-config-core/src/parsed-value.ts index 45261bad..087315f0 100644 --- a/app-config-core/src/parsed-value.ts +++ b/app-config-core/src/parsed-value.ts @@ -17,16 +17,19 @@ export type ParsingExtensionKey = | [typeof InArray, number] | [typeof Root]; -export type ParsingExtension = ( - value: Json, - key: ParsingExtensionKey, - context: ParsingExtensionKey[], -) => false | ParsingExtensionTransform; +export type ParsingContext = Record; + +export type ParsingExtension = ( + value: T, + parentKeys: ParsingExtensionKey[], + context: ParsingContext, +) => ParsingExtensionTransform | false; export type ParsingExtensionTransform = ( parse: ( value: Json, metadata?: ParsedValueMetadata, + context?: ParsingContext, source?: ConfigSource, extensions?: ParsingExtension[], ) => Promise, @@ -339,8 +342,9 @@ export async function parseValue( source: ConfigSource, extensions: ParsingExtension[] = [], metadata: ParsedValueMetadata = {}, + context: ParsingContext = {}, ): Promise { - return parseValueInner(value, source, extensions, metadata, [[Root]], value); + return parseValueInner(value, source, extensions, metadata, context, [[Root]], value); } async function parseValueInner( @@ -348,14 +352,12 @@ async function parseValueInner( source: ConfigSource, extensions: ParsingExtension[], metadata: ParsedValueMetadata = {}, - context: ParsingExtensionKey[], + context: ParsingContext = {}, + parentKeys: ParsingExtensionKey[], root: Json, parent?: JsonObject | Json[], visitedExtensions: ParsingExtension[] = [], ): Promise { - const [currentKey] = context.slice(-1); - const contextualKeys = context.slice(0, context.length - 1); - let applicableExtension: ParsingExtensionTransform | undefined; // before anything else, we check for parsing extensions that should be applied @@ -369,7 +371,7 @@ async function parseValueInner( // we track visitedExtensions so that calling `parse` in an extension doesn't hit that same extension with the same value if (visitedExtensions.includes(extension)) continue; - const applicable = extension(value, currentKey, contextualKeys); + const applicable = extension(value, parentKeys, context); if (applicable && !applicableExtension) { applicableExtension = applicable; @@ -378,18 +380,20 @@ async function parseValueInner( } if (applicableExtension) { - const parse = ( - inner: Json, - metadataOverride?: ParsedValueMetadata, - sourceOverride?: ConfigSource, - extensionsOverride?: ParsingExtension[], + const parse: Parameters[0] = ( + inner, + metadataOverride, + contextOverride, + sourceOverride, + extensionsOverride, ) => parseValueInner( inner, sourceOverride ?? source, extensionsOverride ?? extensions, { ...metadata, ...metadataOverride }, - context, + { ...context, ...contextOverride }, + parentKeys, root, parent, visitedExtensions, @@ -407,7 +411,8 @@ async function parseValueInner( source, extensions, undefined, - context.concat([[InArray, index]]), + context, + [[InArray, index], ...parentKeys], root, value, ); @@ -432,7 +437,8 @@ async function parseValueInner( source, extensions, undefined, - context.concat([[InObject, key]]), + context, + [[InObject, key], ...parentKeys], root, value, ); diff --git a/app-config-default-extensions/tsconfig.json b/app-config-default-extensions/tsconfig.json index 0bf0d055..157c3e1c 100644 --- a/app-config-default-extensions/tsconfig.json +++ b/app-config-default-extensions/tsconfig.json @@ -6,8 +6,6 @@ "include": ["src"], "exclude": ["node_modules"], "references": [ - { "path": "../app-config-core" }, - { "path": "../app-config-v1-compat" }, - { "path": "../app-config-git" } + { "path": "../app-config-core" } ] } diff --git a/app-config-extension-utils/src/index.ts b/app-config-extension-utils/src/index.ts index a1943755..95d8db65 100644 --- a/app-config-extension-utils/src/index.ts +++ b/app-config-extension-utils/src/index.ts @@ -1,13 +1,10 @@ -import type { - ParsingExtension, - ParsingExtensionKey, - ParsingExtensionTransform, -} from '@app-config/core'; +import type { ParsingExtension, ParsingExtensionKey } from '@app-config/core'; import { parseValue, Root, AppConfigError } from '@app-config/core'; +import { Json } from '@app-config/utils'; import { SchemaBuilder } from '@serafin/schema-builder'; export function composeExtensions(extensions: ParsingExtension[]): ParsingExtension { - return (value, [k]) => { + return (value, [[k]]) => { if (k !== Root) return false; return (_, __, source) => parseValue(value, source, extensions, { shouldFlatten: true }); @@ -28,9 +25,9 @@ export function forKey( return key === k; }; - return (value, ctxKey, ctx) => { - if (shouldApply(ctxKey)) { - return parsingExtension(value, ctxKey, ctx); + return (value, parentKeys, context) => { + if (shouldApply(parentKeys[0])) { + return parsingExtension(value, parentKeys, context); } return false; @@ -39,18 +36,14 @@ export function forKey( export class ParsingExtensionInvalidOptions extends AppConfigError {} -export function validateOptions( +export function validateOptions( builder: (builder: typeof SchemaBuilder) => SchemaBuilder, - extension: ( - value: T, - key: ParsingExtensionKey, - context: ParsingExtensionKey[], - ) => ParsingExtensionTransform | false, + extension: ParsingExtension, { lazy = false }: { lazy?: boolean } = {}, ): ParsingExtension { const validate: ValidationFunction = validationFunction(builder); - return (value, ctxKey, ctx) => { + return (value, parentKeys, context) => { return async (parse, ...args) => { let valid: unknown; @@ -60,9 +53,9 @@ export function validateOptions( valid = (await parse(value)).toJSON(); } - validate(valid, [...ctx, ctxKey]); + validate(valid, parentKeys); - const call = extension(valid, ctxKey, ctx); + const call = extension(valid, parentKeys, context); if (call) { return call(parse, ...args); @@ -91,7 +84,8 @@ export function validationFunction( const message = error instanceof Error ? error.message : 'unknown'; const parents = - ctx + [...ctx] + .reverse() .map(([, k]) => k) .filter((v) => !!v) .join('.') || 'root'; diff --git a/app-config-extensions/src/index.ts b/app-config-extensions/src/index.ts index 427aa1db..48d10102 100644 --- a/app-config-extensions/src/index.ts +++ b/app-config-extensions/src/index.ts @@ -31,7 +31,7 @@ export function markAllValuesAsSecret(): ParsingExtension { /** When a key $$foo is seen, change it to be $foo and mark with meta property fromEscapedDirective */ export function unescape$Directives(): ParsingExtension { - return (value, [_, key]) => { + return (value, [[_, key]]) => { if (typeof key === 'string' && key.startsWith('$$')) { return async (parse) => { return parse(value, { rewriteKey: key.slice(1), fromEscapedDirective: true }); @@ -141,9 +141,9 @@ export function extendsSelfDirective(): ParsingExtension { stringSchema(), ); - return forKey('$extendsSelf', (input, key, ctx) => async (parse, _, __, ___, root) => { + return forKey('$extendsSelf', (input, parentKeys) => async (parse, _, __, ___, root) => { const value = (await parse(input)).toJSON(); - validate(value, [...ctx, key]); + validate(value, parentKeys); // we temporarily use a ParsedValue literal so that we get the same property lookup semantics const selected = ParsedValue.literal(root).property(value.split('.')); @@ -255,7 +255,7 @@ export function envVarDirective( ): ParsingExtension { const envType = environmentOverride ?? currentEnvironment(aliases, environmentSourceNames); - return forKey('$envVar', (value, key, ctx) => async (parse) => { + return forKey('$envVar', (value, parentKeys) => async (parse) => { let name: string; let parseInt = false; let parseFloat = false; @@ -264,11 +264,11 @@ export function envVarDirective( if (typeof value === 'string') { name = value; } else { - validateObject(value, [...ctx, key]); + validateObject(value, parentKeys); if (Array.isArray(value)) throw new AppConfigError('$envVar was given an array'); const resolved = (await parse(value.name)).toJSON(); - validateString(resolved, [...ctx, key, [InObject, 'name']]); + validateString(resolved, [[InObject, 'name'], ...parentKeys]); parseInt = !!(await parse(value.parseInt)).toJSON(); parseFloat = !!(await parse(value.parseFloat)).toJSON(); @@ -317,9 +317,9 @@ export function envVarDirective( const allowNull = (await parse(value.allowNull)).toJSON(); if (allowNull) { - validateStringOrNull(fallback, [...ctx, key, [InObject, 'fallback']]); + validateStringOrNull(fallback, [[InObject, 'fallback'], ...parentKeys]); } else { - validateString(fallback, [...ctx, key, [InObject, 'fallback']]); + validateString(fallback, [[InObject, 'fallback'], ...parentKeys]); } return parse(fallback, { shouldFlatten: true }); @@ -337,17 +337,17 @@ export function substituteDirective( ): ParsingExtension { const envType = environmentOverride ?? currentEnvironment(aliases, environmentSourceNames); - return forKey(['$substitute', '$subs'], (value, key, ctx) => async (parse) => { + return forKey(['$substitute', '$subs'], (value, parentKeys) => async (parse) => { if (typeof value === 'string') { return parse(performAllSubstitutions(value, envType), { shouldFlatten: true }); } - validateObject(value, [...ctx, key]); + validateObject(value, parentKeys); if (Array.isArray(value)) throw new AppConfigError('$substitute was given an array'); const name = (await parse(value.name)).toJSON(); - validateString(name, [...ctx, key, [InObject, 'name']]); + validateString(name, [[InObject, 'name'], ...parentKeys]); let resolvedValue = process.env[name]; @@ -396,9 +396,9 @@ export function substituteDirective( const allowNull = (await parse(value.allowNull)).toJSON(); if (allowNull) { - validateStringOrNull(fallback, [...ctx, key, [InObject, 'fallback']]); + validateStringOrNull(fallback, [[InObject, 'fallback'], ...parentKeys]); } else { - validateString(fallback, [...ctx, key, [InObject, 'fallback']]); + validateString(fallback, [[InObject, 'fallback'], ...parentKeys]); } return parse(fallback, { shouldFlatten: true }); diff --git a/app-config-v1-compat/src/index.ts b/app-config-v1-compat/src/index.ts index 4fedc84a..8112cde7 100644 --- a/app-config-v1-compat/src/index.ts +++ b/app-config-v1-compat/src/index.ts @@ -7,7 +7,7 @@ import { logger } from '@app-config/logging'; /** V1 app-config compatibility */ export default function v1Compat(): ParsingExtension { - return (value, [_, key], context) => { + return (value, [[_, key], ...context]) => { // only apply in top-level app-config property if (context[context.length - 1]?.[0] !== Root) { return false; From 1e7836c601be0cf358e01ead41e4a809e181d223 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Fri, 9 Apr 2021 17:56:29 -0600 Subject: [PATCH 10/39] feat: reads env from parsing context --- app-config-core/src/parsed-value.ts | 2 +- app-config-default-extensions/index.js | 13 ++---- app-config-extensions/src/index.ts | 61 ++++++++++++++------------ app-config-v1-compat/src/index.ts | 4 +- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/app-config-core/src/parsed-value.ts b/app-config-core/src/parsed-value.ts index 087315f0..2dbfd848 100644 --- a/app-config-core/src/parsed-value.ts +++ b/app-config-core/src/parsed-value.ts @@ -17,7 +17,7 @@ export type ParsingExtensionKey = | [typeof InArray, number] | [typeof Root]; -export type ParsingContext = Record; +export type ParsingContext = Record>; export type ParsingExtension = ( value: T, diff --git a/app-config-default-extensions/index.js b/app-config-default-extensions/index.js index 7b296d72..39881ad4 100644 --- a/app-config-default-extensions/index.js +++ b/app-config-default-extensions/index.js @@ -7,12 +7,7 @@ const { defaultAliases } = require('@app-config/node'); module.exports = { - defaultExtensions( - aliases = defaultAliases, - environmentOverride, - symmetricKey, - environmentSourceNames, - ) { + defaultExtensions() { const { unescape$Directives, tryDirective, @@ -34,13 +29,13 @@ module.exports = { ifDirective(), eqDirective(), hiddenDirective(), - envDirective(aliases, environmentOverride, environmentSourceNames), - envVarDirective(aliases, environmentOverride, environmentSourceNames), + envDirective(), + envVarDirective(), extendsDirective(), extendsSelfDirective(), overrideDirective(), timestampDirective(), - substituteDirective(aliases, environmentOverride, environmentSourceNames), + substituteDirective(), ]; }, defaultEnvExtensions() { diff --git a/app-config-extensions/src/index.ts b/app-config-extensions/src/index.ts index 48d10102..15f63053 100644 --- a/app-config-extensions/src/index.ts +++ b/app-config-extensions/src/index.ts @@ -14,13 +14,14 @@ import { FailedToSelectSubObject, Fallbackable, InObject, + ParsingContext, } from '@app-config/core'; import { currentEnvironment, - defaultAliases, resolveFilepath, - EnvironmentAliases, FileSource, + defaultAliases, + EnvironmentAliases, } from '@app-config/node'; import { logger } from '@app-config/logging'; @@ -161,19 +162,16 @@ export function extendsSelfDirective(): ParsingExtension { } /** Looks up an environment-specific value ($env) */ -export function envDirective( - aliases: EnvironmentAliases = defaultAliases, - environmentOverride?: string, - environmentSourceNames?: string[] | string, -): ParsingExtension { - const environment = environmentOverride ?? currentEnvironment(aliases, environmentSourceNames); +export function envDirective(): ParsingExtension { const metadata = { shouldOverride: true }; return forKey( '$env', validateOptions( (SchemaBuilder) => SchemaBuilder.emptySchema().addAdditionalProperties(), - (value) => (parse) => { + (value, _, context) => (parse) => { + const environment = getEnv(context); + if (!environment) { if ('none' in value) { return parse(value.none, metadata); @@ -188,6 +186,8 @@ export function envDirective( ); } + const aliases = getAliases(context); + for (const [envName, envValue] of Object.entries(value)) { if (envName === environment || aliases[envName] === environment) { return parse(envValue, metadata); @@ -248,14 +248,8 @@ export function timestampDirective(dateSource: () => Date = () => new Date()): P } /** Substitues environment variables */ -export function envVarDirective( - aliases: EnvironmentAliases = defaultAliases, - environmentOverride?: string, - environmentSourceNames?: string[] | string, -): ParsingExtension { - const envType = environmentOverride ?? currentEnvironment(aliases, environmentSourceNames); - - return forKey('$envVar', (value, parentKeys) => async (parse) => { +export function envVarDirective(): ParsingExtension { + return forKey('$envVar', (value, parentKeys, context) => async (parse) => { let name: string; let parseInt = false; let parseFloat = false; @@ -279,7 +273,7 @@ export function envVarDirective( let resolvedValue = process.env[name]; if (!resolvedValue && name === 'APP_CONFIG_ENV') { - resolvedValue = envType; + resolvedValue = getEnv(context); } if (resolvedValue) { @@ -330,16 +324,12 @@ export function envVarDirective( } /** Substitues environment variables found in strings (similar to bash variable substitution) */ -export function substituteDirective( - aliases: EnvironmentAliases = defaultAliases, - environmentOverride?: string, - environmentSourceNames?: string[] | string, -): ParsingExtension { - const envType = environmentOverride ?? currentEnvironment(aliases, environmentSourceNames); - - return forKey(['$substitute', '$subs'], (value, parentKeys) => async (parse) => { +export function substituteDirective(): ParsingExtension { + return forKey(['$substitute', '$subs'], (value, parentKeys, context) => async (parse) => { + const environment = getEnv(context); + if (typeof value === 'string') { - return parse(performAllSubstitutions(value, envType), { shouldFlatten: true }); + return parse(performAllSubstitutions(value, environment), { shouldFlatten: true }); } validateObject(value, parentKeys); @@ -352,7 +342,7 @@ export function substituteDirective( let resolvedValue = process.env[name]; if (!resolvedValue && name === 'APP_CONFIG_ENV') { - resolvedValue = envType; + resolvedValue = environment; } if (resolvedValue) { @@ -533,6 +523,21 @@ function performAllSubstitutions(text: string, envType?: string): string { return output; } +function getAliases(context: ParsingContext) { + const { environmentAliases } = context; + + return (environmentAliases as EnvironmentAliases) ?? defaultAliases; +} + +function getEnv(context: ParsingContext) { + const { environmentOverride, environmentSourceNames } = context; + + return ( + (environmentOverride as string) ?? + currentEnvironment(getAliases(context), environmentSourceNames as string) + ); +} + const validateObject: ValidationFunction< Record > = validationFunction(({ emptySchema }) => emptySchema().addAdditionalProperties()); diff --git a/app-config-v1-compat/src/index.ts b/app-config-v1-compat/src/index.ts index 8112cde7..4f50dc41 100644 --- a/app-config-v1-compat/src/index.ts +++ b/app-config-v1-compat/src/index.ts @@ -7,9 +7,9 @@ import { logger } from '@app-config/logging'; /** V1 app-config compatibility */ export default function v1Compat(): ParsingExtension { - return (value, [[_, key], ...context]) => { + return (value, [[_, key], ...parents]) => { // only apply in top-level app-config property - if (context[context.length - 1]?.[0] !== Root) { + if (parents[parents.length - 1]?.[0] !== Root) { return false; } From 6285b3d7bf0b0e67e064f1cececea36765798093 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Fri, 9 Apr 2021 19:35:27 -0600 Subject: [PATCH 11/39] refactor:environment via parsing extension context --- app-config-config/src/index.ts | 7 ++----- app-config-core/src/config-source.ts | 20 ++++++++++--------- app-config-core/src/parsed-value.ts | 7 +++++-- app-config-default-extensions/index.js | 1 - app-config-extensions/src/index.ts | 2 +- app-config-node/src/file-source.ts | 12 ++++++++--- app-config-schema/src/index.ts | 6 ++++-- tests/parsing-extensions/eval-package/main.js | 2 +- .../parsing-extensions/random-package/main.js | 2 +- 9 files changed, 34 insertions(+), 25 deletions(-) diff --git a/app-config-config/src/index.ts b/app-config-config/src/index.ts index ac3520c8..010581de 100644 --- a/app-config-config/src/index.ts +++ b/app-config-config/src/index.ts @@ -90,9 +90,7 @@ export async function loadUnvalidatedConfig({ const environmentAliases = environmentAliasesArg ?? meta.value.environmentAliases ?? defaultAliases; - const parsingExtensions = - parsingExtensionsArg ?? - defaultExtensions(environmentAliases, environmentOverride, undefined, environmentSourceNames); + const parsingExtensions = parsingExtensionsArg ?? defaultExtensions(); const secretsFileExtensions = secretsFileExtensionsArg ?? parsingExtensions.concat(markAllValuesAsSecret()); @@ -112,7 +110,6 @@ export async function loadUnvalidatedConfig({ join(directory, fileNameBase), environmentOverride, environmentAliases, - undefined, environmentSourceNames, ).read(parsingExtensions), @@ -120,7 +117,6 @@ export async function loadUnvalidatedConfig({ join(directory, secretsFileNameBase), environmentOverride, environmentAliases, - undefined, environmentSourceNames, ) .read(secretsFileExtensions) @@ -210,6 +206,7 @@ export async function loadValidatedConfig( : undefined, environmentOverride: options?.environmentOverride, environmentAliases: options?.environmentAliases, + environmentSourceNames: options?.environmentSourceNames, ...schemaOptions, }), loadUnvalidatedConfig(options), diff --git a/app-config-core/src/config-source.ts b/app-config-core/src/config-source.ts index ea29f06d..3ce4f1c7 100644 --- a/app-config-core/src/config-source.ts +++ b/app-config-core/src/config-source.ts @@ -4,7 +4,7 @@ import { safeLoad as parseYAML, safeDump as stringifyYAML } from 'js-yaml'; import { parse as parseJSON5, stringify as stringifyJSON5 } from 'json5'; import { Json, JsonObject } from '@app-config/utils'; import { logger } from '@app-config/logging'; -import { ParsedValue, ParsingExtension } from './parsed-value'; +import { ParsedValue, ParsingContext, ParsingExtension } from './parsed-value'; import { AppConfigError, NotFoundError, ParsingError, BadFileType } from './errors'; export enum FileType { @@ -30,15 +30,15 @@ export abstract class ConfigSource { } /** Reads the contents of the source into a full ParsedValue (not the raw JSON, like readValue) */ - async read(extensions?: ParsingExtension[]): Promise { + async read(extensions?: ParsingExtension[], context?: ParsingContext): Promise { const rawValue = await this.readValue(); - return ParsedValue.parse(rawValue, this, extensions); + return ParsedValue.parse(rawValue, this, extensions, undefined, context); } /** Ergonomic helper for chaining `source.read(extensions).then(v => v.toJSON())` */ - async readToJSON(extensions?: ParsingExtension[]): Promise { - const parsed = await this.read(extensions); + async readToJSON(extensions?: ParsingExtension[], context?: ParsingContext): Promise { + const parsed = await this.read(extensions, context); return parsed.toJSON(); } @@ -82,8 +82,10 @@ export class CombinedSource extends ConfigSource { } // override so that ParsedValue is directly from the originating ConfigSource - async read(extensions?: ParsingExtension[]): Promise { - const values = await Promise.all(this.sources.map((source) => source.read(extensions))); + async read(extensions?: ParsingExtension[], context?: ParsingContext): Promise { + const values = await Promise.all( + this.sources.map((source) => source.read(extensions, context)), + ); const merged = values.reduce((acc, parsed) => { if (!acc) return parsed; @@ -137,11 +139,11 @@ export class FallbackSource extends ConfigSource { } // override so that ParsedValue is directly from the originating ConfigSource - async read(extensions?: ParsingExtension[]): Promise { + async read(extensions?: ParsingExtension[], context?: ParsingContext): Promise { // take the first value that comes back without an error for (const source of this.sources) { try { - const value = await source.read(extensions); + const value = await source.read(extensions, context); logger.verbose(`FallbackSource found successful source`); return value; diff --git a/app-config-core/src/parsed-value.ts b/app-config-core/src/parsed-value.ts index 2dbfd848..0d40b051 100644 --- a/app-config-core/src/parsed-value.ts +++ b/app-config-core/src/parsed-value.ts @@ -17,7 +17,9 @@ export type ParsingExtensionKey = | [typeof InArray, number] | [typeof Root]; -export type ParsingContext = Record>; +export interface ParsingContext { + [k: string]: string | Record | string[] | undefined; +} export type ParsingExtension = ( value: T, @@ -69,8 +71,9 @@ export class ParsedValue { source: ConfigSource, extensions?: ParsingExtension[], metadata?: ParsedValueMetadata, + context?: ParsingContext, ): Promise { - return parseValue(raw, source, extensions, metadata); + return parseValue(raw, source, extensions, metadata, context); } /** Parses (with extensions) from a plain JSON object */ diff --git a/app-config-default-extensions/index.js b/app-config-default-extensions/index.js index 39881ad4..06007547 100644 --- a/app-config-default-extensions/index.js +++ b/app-config-default-extensions/index.js @@ -4,7 +4,6 @@ // NOTE: Also, we don't require modules up-front - lazy load them instead. // This avoids circular dependency chains. -const { defaultAliases } = require('@app-config/node'); module.exports = { defaultExtensions() { diff --git a/app-config-extensions/src/index.ts b/app-config-extensions/src/index.ts index 15f63053..bb39b662 100644 --- a/app-config-extensions/src/index.ts +++ b/app-config-extensions/src/index.ts @@ -534,7 +534,7 @@ function getEnv(context: ParsingContext) { return ( (environmentOverride as string) ?? - currentEnvironment(getAliases(context), environmentSourceNames as string) + currentEnvironment(getAliases(context), environmentSourceNames as string | string[]) ); } diff --git a/app-config-node/src/file-source.ts b/app-config-node/src/file-source.ts index a57cd168..ee07fdda 100644 --- a/app-config-node/src/file-source.ts +++ b/app-config-node/src/file-source.ts @@ -8,6 +8,7 @@ import { ParsingExtension, AppConfigError, NotFoundError, + ParsingContext, } from '@app-config/core'; import { logger } from '@app-config/logging'; import { currentEnvironment, defaultAliases, EnvironmentAliases } from './environment'; @@ -46,8 +47,8 @@ export class FlexibleFileSource extends ConfigSource { private readonly filePath: string, private readonly environmentOverride?: string, private readonly environmentAliases: EnvironmentAliases = defaultAliases, - private readonly fileExtensions: string[] = ['yml', 'yaml', 'toml', 'json', 'json5'], private readonly environmentSourceNames?: string[] | string, + private readonly fileExtensions: string[] = ['yml', 'yaml', 'toml', 'json', 'json5'], ) { super(); } @@ -90,10 +91,15 @@ export class FlexibleFileSource extends ConfigSource { return this.resolveSource().then((source) => source.readContents()); } - async read(extensions?: ParsingExtension[]): Promise { + async read(extensions?: ParsingExtension[], context?: ParsingContext): Promise { const source = await this.resolveSource(); - return source.read(extensions); + return source.read(extensions, { + environmentOverride: this.environmentOverride, + environmentAliases: this.environmentAliases, + environmentSourceNames: this.environmentSourceNames, + ...context, + }); } } diff --git a/app-config-schema/src/index.ts b/app-config-schema/src/index.ts index c15a89bb..770bfc29 100644 --- a/app-config-schema/src/index.ts +++ b/app-config-schema/src/index.ts @@ -15,7 +15,6 @@ import { } from '@app-config/core'; import { logger } from '@app-config/logging'; import { - defaultAliases, EnvironmentAliases, EnvironmentSource, FileSource, @@ -30,6 +29,7 @@ export interface SchemaLoadingOptions { environmentVariableName?: string; environmentOverride?: string; environmentAliases?: EnvironmentAliases; + environmentSourceNames?: string[] | string; parsingExtensions?: ParsingExtension[]; } @@ -48,7 +48,8 @@ export async function loadSchema({ fileNameBase = '.app-config.schema', environmentVariableName = 'APP_CONFIG_SCHEMA', environmentOverride, - environmentAliases = defaultAliases, + environmentAliases, + environmentSourceNames, parsingExtensions = [], }: SchemaLoadingOptions = {}): Promise { const env = new EnvironmentSource(environmentVariableName); @@ -72,6 +73,7 @@ export async function loadSchema({ join(directory, fileNameBase), environmentOverride, environmentAliases, + environmentSourceNames, ); parsed = await source.read(parsingExtensions); diff --git a/tests/parsing-extensions/eval-package/main.js b/tests/parsing-extensions/eval-package/main.js index 32ae1e0f..6349d0f3 100644 --- a/tests/parsing-extensions/eval-package/main.js +++ b/tests/parsing-extensions/eval-package/main.js @@ -1,4 +1,4 @@ -module.exports = (options) => (value, [, key]) => { +module.exports = (options) => (value, [[, key]]) => { if (key === '$eval') { if (typeof value === 'string') { return (parse) => parse(eval(value), { shouldFlatten: true }); diff --git a/tests/parsing-extensions/random-package/main.js b/tests/parsing-extensions/random-package/main.js index bafd5cc0..71a6847f 100644 --- a/tests/parsing-extensions/random-package/main.js +++ b/tests/parsing-extensions/random-package/main.js @@ -1,4 +1,4 @@ -module.exports = (options) => (value, [, key]) => { +module.exports = (options) => (value, [[, key]]) => { const rng = require('seedrandom')(options.seed); if (key === '$random') { From 7caed5c0787b957f45da377c66e95a671ba1c1b5 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Fri, 9 Apr 2021 19:54:39 -0600 Subject: [PATCH 12/39] feat(#131): starts test for $extends with env --- app-config-cli/src/validation.ts | 2 +- app-config-extensions/src/index.test.ts | 25 ++++++++++++++++ app-config-extensions/src/index.ts | 39 ++++++++++++++++--------- 3 files changed, 51 insertions(+), 15 deletions(-) diff --git a/app-config-cli/src/validation.ts b/app-config-cli/src/validation.ts index 0e7fd405..b278167f 100644 --- a/app-config-cli/src/validation.ts +++ b/app-config-cli/src/validation.ts @@ -35,7 +35,7 @@ export async function validateAllConfigVariants({ await Promise.all( appConfigFiles.map(async (filename) => { - const parsed = await new FileSource(filename).read(); + const parsed = await new FileSource(filename).read(undefined, { environmentAliases }); parsed.visitAll((value) => { const obj = value.asObject(); diff --git a/app-config-extensions/src/index.test.ts b/app-config-extensions/src/index.test.ts index 6056e7a1..7ce02677 100644 --- a/app-config-extensions/src/index.test.ts +++ b/app-config-extensions/src/index.test.ts @@ -843,6 +843,31 @@ describe('$env directive', () => { const parsed2 = await source.read([envDirective()]); expect(parsed2.toJSON()).toEqual({ sibling: true, testing: false }); }); + + it('overrides env', async () => { + await withTempFiles( + { + 'test-file.yml': ` + foo: + $env: + default: 44 + dev: 88 + `, + }, + async (inDir) => { + const source = new LiteralSource({ + $extends: { + path: inDir('test-file.yml'), + env: 'development', + }, + }); + + const parsed = await source.read([envDirective(), extendsDirective()]); + + expect(parsed.toJSON()).toEqual({ foo: 88 }); + }, + ); + }); }); /* eslint-disable no-template-curly-in-string */ diff --git a/app-config-extensions/src/index.ts b/app-config-extensions/src/index.ts index bb39b662..4c14c0f0 100644 --- a/app-config-extensions/src/index.ts +++ b/app-config-extensions/src/index.ts @@ -411,26 +411,37 @@ function fileReferenceDirective(keyName: string, meta: ParsedValueMetadata): Par SchemaBuilder.emptySchema() .addString('path') .addBoolean('optional', {}, false) - .addString('select', {}, false), + .addString('select', {}, false) + .addString('env', {}, false), ); return SchemaBuilder.oneOf(reference, SchemaBuilder.arraySchema(reference)); }, - (value) => async (_, __, context, extensions) => { - const retrieveFile = async (filepath: string, subselector?: string, isOptional = false) => { - const resolvedPath = resolveFilepath(context, filepath); + (value, _, context) => async (_, __, originalSource, extensions) => { + const retrieveFile = async ( + filepath: string, + subselector?: string, + isOptional = false, + env?: string, + ) => { + const resolvedPath = resolveFilepath(originalSource, filepath); logger.verbose(`Loading file for ${keyName}: ${resolvedPath}`); const source = new FileSource(resolvedPath); - const parsed = await source.read(extensions).catch((error) => { - if (error instanceof NotFoundError && isOptional) { - return ParsedValue.literal({}); - } + const parsed = await source + .read(extensions, { + ...context, + environmentOverride: env ?? context.environmentOverride, + }) + .catch((error) => { + if (error instanceof NotFoundError && isOptional) { + return ParsedValue.literal({}); + } - throw error; - }); + throw error; + }); if (subselector) { const found = parsed.property(subselector.split('.')); @@ -458,15 +469,15 @@ function fileReferenceDirective(keyName: string, meta: ParsedValueMetadata): Par if (typeof ext === 'string') { parsed = ParsedValue.merge(parsed, await retrieveFile(ext)); } else { - const { path, optional, select } = ext; + const { path, optional, select, env } = ext; - parsed = ParsedValue.merge(parsed, await retrieveFile(path, select, optional)); + parsed = ParsedValue.merge(parsed, await retrieveFile(path, select, optional, env)); } } } else { - const { path, optional, select } = value; + const { path, optional, select, env } = value; - parsed = await retrieveFile(path, select, optional); + parsed = await retrieveFile(path, select, optional, env); } return parsed.assignMeta(meta); From f46c99084912f123c3c3d0c6a7a2d297dba05c3b Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Fri, 9 Apr 2021 20:17:15 -0600 Subject: [PATCH 13/39] chore: 3.0.0-alpha.2 --- app-config-cli/package.json | 18 ++++++++--------- app-config-config/package.json | 20 +++++++++---------- app-config-core/package.json | 8 ++++---- app-config-cypress/package.json | 6 +++--- app-config-default-extensions/package.json | 6 +++--- app-config-encryption/package.json | 16 +++++++-------- app-config-exec/package.json | 12 +++++------ app-config-extension-utils/package.json | 4 ++-- app-config-extensions/package.json | 14 ++++++------- app-config-generate/package.json | 10 +++++----- app-config-git/package.json | 8 ++++---- app-config-inject/package.json | 10 +++++----- app-config-js/package.json | 10 +++++----- app-config-logging/package.json | 4 ++-- app-config-main/package.json | 20 +++++++++---------- app-config-meta/package.json | 14 ++++++------- app-config-node/package.json | 8 ++++---- app-config-react-native/package.json | 6 +++--- app-config-schema/package.json | 16 +++++++-------- app-config-settings/package.json | 12 +++++------ app-config-test-utils/package.json | 6 +++--- app-config-utils/package.json | 2 +- app-config-v1-compat/package.json | 14 ++++++------- app-config-vault/package.json | 8 ++++---- app-config-webpack/package.json | 6 +++--- examples/cli-project/package.json | 2 +- .../frontend-webpack-project/package.json | 4 ++-- examples/nodejs-server/package.json | 2 +- examples/react-native-project/package.json | 6 +++--- lcdev-app-config-inject/package.json | 4 ++-- lcdev-app-config-webpack-plugin/package.json | 4 ++-- lcdev-app-config/package.json | 6 +++--- .../package.json | 4 ++-- tests/standalone-project/package.json | 2 +- .../app-config-core-in-browser/package.json | 4 ++-- .../cypress-plugin/package.json | 6 +++--- .../extending-other-files/package.json | 4 ++-- .../query-parameter-overrides/package.json | 4 ++-- .../two-app-config-sources/package.json | 4 ++-- tests/webpack-projects/webpack5/package.json | 6 +++--- 40 files changed, 160 insertions(+), 160 deletions(-) diff --git a/app-config-cli/package.json b/app-config-cli/package.json index a2e1c567..c1d01c16 100644 --- a/app-config-cli/package.json +++ b/app-config-cli/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cli", "description": "CLI for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -35,14 +35,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.1", - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/encryption": "^3.0.0-alpha.1", - "@app-config/generate": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/schema": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/config": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/encryption": "^3.0.0-alpha.2", + "@app-config/generate": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/schema": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "ajv": "7", "clipboardy": "2", "common-tags": "1", diff --git a/app-config-config/package.json b/app-config-config/package.json index f694772d..7ce04598 100644 --- a/app-config-config/package.json +++ b/app-config-config/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/config", "description": "The config in @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,17 +30,17 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/default-extensions": "^3.0.0-alpha.1", - "@app-config/extensions": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/meta": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/schema": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1" + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/default-extensions": "^3.0.0-alpha.2", + "@app-config/extensions": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/meta": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/schema": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1" + "@app-config/test-utils": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-core/package.json b/app-config-core/package.json index 95ff058d..8c199a07 100644 --- a/app-config-core/package.json +++ b/app-config-core/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/core", "description": "Core logic for App Config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "@iarna/toml": "3", "js-yaml": "^3.13.1", "json5": "2", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1", + "@app-config/test-utils": "^3.0.0-alpha.2", "@types/js-yaml": "3", "@types/lodash.merge": "4" }, diff --git a/app-config-cypress/package.json b/app-config-cypress/package.json index 75daeeea..097fce27 100644 --- a/app-config-cypress/package.json +++ b/app-config-cypress/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cypress", "description": "Cypress testing plugin for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -31,11 +31,11 @@ }, "dependencies": {}, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.1", + "@app-config/main": "^3.0.0-alpha.2", "cypress": "6" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.1", + "@app-config/main": "^3.0.0-alpha.2", "cypress": "6" }, "prettier": "@lcdev/prettier", diff --git a/app-config-default-extensions/package.json b/app-config-default-extensions/package.json index 6c5e6ac2..0c44286b 100644 --- a/app-config-default-extensions/package.json +++ b/app-config-default-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/default-extensions", "description": "Default parsing extensions for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -22,8 +22,8 @@ "test": "jest" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/extensions": "^3.0.0-alpha.1" + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/extensions": "^3.0.0-alpha.2" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-encryption/package.json b/app-config-encryption/package.json index bc50acd6..efa6469b 100644 --- a/app-config-encryption/package.json +++ b/app-config-encryption/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/encryption", "description": "Secret value encryption for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/meta": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/settings": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/meta": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/settings": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "@lcdev/ws-rpc": "0.4", "@types/openpgp": "4", "common-tags": "1", @@ -46,7 +46,7 @@ "ws": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1", + "@app-config/test-utils": "^3.0.0-alpha.2", "get-port": "5" }, "prettier": "@lcdev/prettier", diff --git a/app-config-exec/package.json b/app-config-exec/package.json index f91f0153..f4e0dbb9 100644 --- a/app-config-exec/package.json +++ b/app-config-exec/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/exec", "description": "Generate config by running arbitrary programs", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/extension-utils": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1" + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/extension-utils": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.1" + "@app-config/main": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-extension-utils/package.json b/app-config-extension-utils/package.json index a24b4290..881936fe 100644 --- a/app-config-extension-utils/package.json +++ b/app-config-extension-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extension-utils", "description": "Utilities for writing @app-config parsing extensions", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", "@serafin/schema-builder": "0.14" }, "devDependencies": {}, diff --git a/app-config-extensions/package.json b/app-config-extensions/package.json index b5b8441b..044661af 100644 --- a/app-config-extensions/package.json +++ b/app-config-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extensions", "description": "Common parsing extensions for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/extension-utils": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/extension-utils": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "lodash.isequal": "4" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1", + "@app-config/test-utils": "^3.0.0-alpha.2", "@types/lodash.isequal": "4" }, "prettier": "@lcdev/prettier", diff --git a/app-config-generate/package.json b/app-config-generate/package.json index 5cb7fe93..cfdfd96a 100644 --- a/app-config-generate/package.json +++ b/app-config-generate/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/generate", "description": "Code generation for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,9 +30,9 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/meta": "^3.0.0-alpha.1", - "@app-config/schema": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/meta": "^3.0.0-alpha.2", + "@app-config/schema": "^3.0.0-alpha.2", "@types/readable-stream": "2", "@types/urijs": "1", "common-tags": "1", @@ -41,7 +41,7 @@ "quicktype-core": "6.0.70" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1" + "@app-config/test-utils": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-git/package.json b/app-config-git/package.json index 42363e6b..465263cf 100644 --- a/app-config-git/package.json +++ b/app-config-git/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/git", "description": "$git directive parsing extension for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/extension-utils": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/extension-utils": "^3.0.0-alpha.2", "simple-git": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1" + "@app-config/test-utils": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-inject/package.json b/app-config-inject/package.json index bd64b094..d87d7713 100644 --- a/app-config-inject/package.json +++ b/app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/inject", "description": "Runtime injection of app-config into static HTML files", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,10 +34,10 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/schema": "^3.0.0-alpha.1", + "@app-config/config": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/schema": "^3.0.0-alpha.2", "@types/yargs": "16", "node-html-parser": "1", "yargs": "16" diff --git a/app-config-js/package.json b/app-config-js/package.json index f296112f..60cd201e 100644 --- a/app-config-js/package.json +++ b/app-config-js/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/js", "description": "Loads a JavaScript module to inject configuration", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/extension-utils": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1" + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/extension-utils": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1" + "@app-config/test-utils": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-logging/package.json b/app-config-logging/package.json index 456f956f..ae0b3f5e 100644 --- a/app-config-logging/package.json +++ b/app-config-logging/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/logging", "description": "Logging for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/utils": "^3.0.0-alpha.1" + "@app-config/utils": "^3.0.0-alpha.2" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-main/package.json b/app-config-main/package.json index 95a0712e..89a52224 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/main", "description": "Easy to use configuration loader with schema validation", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,15 +34,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^3.0.0-alpha.1", - "@app-config/config": "^3.0.0-alpha.1", - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/default-extensions": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/meta": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/schema": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/cli": "^3.0.0-alpha.2", + "@app-config/config": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/default-extensions": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/meta": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/schema": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "ajv": "7" }, "devDependencies": {}, diff --git a/app-config-meta/package.json b/app-config-meta/package.json index cbe183c6..ede87a78 100644 --- a/app-config-meta/package.json +++ b/app-config-meta/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/meta", "description": "Meta file parsing for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/default-extensions": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/default-extensions": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1" + "@app-config/test-utils": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-node/package.json b/app-config-node/package.json index 92faa15f..6f0f403c 100644 --- a/app-config-node/package.json +++ b/app-config-node/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/node", "description": "Node.js API for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", "@types/prompts": "2", "fs-extra": "9", "prompts": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1", + "@app-config/test-utils": "^3.0.0-alpha.2", "@types/fs-extra": "9" }, "prettier": "@lcdev/prettier", diff --git a/app-config-react-native/package.json b/app-config-react-native/package.json index c835e8be..be56c834 100644 --- a/app-config-react-native/package.json +++ b/app-config-react-native/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/react-native", "description": "React Native Metro transformer that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -33,11 +33,11 @@ "semver": "7" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.1", + "@app-config/main": "^3.0.0-alpha.2", "react-native": ">=0.45.0" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.1", + "@app-config/main": "^3.0.0-alpha.2", "@types/semver": "7" }, "prettier": "@lcdev/prettier", diff --git a/app-config-schema/package.json b/app-config-schema/package.json index 65bcdfb7..3be206c2 100644 --- a/app-config-schema/package.json +++ b/app-config-schema/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/schema", "description": "Schema validation for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,19 +30,19 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "@types/json-schema": "7", "ajv": "7", "ajv-formats": "1", "json-schema-ref-parser": "9" }, "devDependencies": { - "@app-config/encryption": "^3.0.0-alpha.1", - "@app-config/extensions": "^3.0.0-alpha.1", - "@app-config/test-utils": "^3.0.0-alpha.1" + "@app-config/encryption": "^3.0.0-alpha.2", + "@app-config/extensions": "^3.0.0-alpha.2", + "@app-config/test-utils": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-settings/package.json b/app-config-settings/package.json index 6adf16a2..cff80081 100644 --- a/app-config-settings/package.json +++ b/app-config-settings/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/settings", "description": "User settings for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "env-paths": "2", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.1" + "@app-config/test-utils": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-test-utils/package.json b/app-config-test-utils/package.json index 9ec4bcc6..299587fc 100644 --- a/app-config-test-utils/package.json +++ b/app-config-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/test-utils", "description": "Internal test utilities", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,8 +30,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "@types/fs-extra": "9", "@types/tmp": "0.2", "fs-extra": "9", diff --git a/app-config-utils/package.json b/app-config-utils/package.json index b3e0cc86..8d666e23 100644 --- a/app-config-utils/package.json +++ b/app-config-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/utils", "description": "Common utilities used in @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", diff --git a/app-config-v1-compat/package.json b/app-config-v1-compat/package.json index ff703616..73a2f311 100644 --- a/app-config-v1-compat/package.json +++ b/app-config-v1-compat/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/v1-compat", "description": "Version 1 compatibility layer for @app-config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/logging": "^3.0.0-alpha.1", - "@app-config/node": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/node": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", "fs-extra": "7" }, "devDependencies": { - "@app-config/extensions": "^3.0.0-alpha.1", - "@app-config/test-utils": "^3.0.0-alpha.1" + "@app-config/extensions": "^3.0.0-alpha.2", + "@app-config/test-utils": "^3.0.0-alpha.2" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vault/package.json b/app-config-vault/package.json index 74bb643b..f66cbcd6 100644 --- a/app-config-vault/package.json +++ b/app-config-vault/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/vault", "description": "Hashicorp Vault support for App Config", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,9 +30,9 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.1", - "@app-config/utils": "^3.0.0-alpha.1", - "@app-config/extension-utils": "^3.0.0-alpha.1", + "@app-config/core": "^3.0.0-alpha.2", + "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/extension-utils": "^3.0.0-alpha.2", "@lcdev/fetch": "^0.1.10", "cross-fetch": "3", "node-vault": "0.9" diff --git a/app-config-webpack/package.json b/app-config-webpack/package.json index 605a7c24..7158e514 100644 --- a/app-config-webpack/package.json +++ b/app-config-webpack/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/webpack", "description": "Webpack plugin that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,12 +34,12 @@ "loader-utils": "2" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.1", + "@app-config/main": "^3.0.0-alpha.2", "html-webpack-plugin": "4 || 5", "webpack": "4 || 5" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.1", + "@app-config/main": "^3.0.0-alpha.2", "@types/loader-utils": "1", "@webpack-cli/serve": "1", "html-webpack-plugin": "5", diff --git a/examples/cli-project/package.json b/examples/cli-project/package.json index 6b153c7c..1b8b22f6 100644 --- a/examples/cli-project/package.json +++ b/examples/cli-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1" + "@app-config/main": "3.0.0-alpha.2" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/examples/frontend-webpack-project/package.json b/examples/frontend-webpack-project/package.json index bd2b620d..e10c4b33 100644 --- a/examples/frontend-webpack-project/package.json +++ b/examples/frontend-webpack-project/package.json @@ -10,10 +10,10 @@ "test": "jest" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1" + "@app-config/main": "3.0.0-alpha.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.1", + "@app-config/webpack": "3.0.0-alpha.2", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/examples/nodejs-server/package.json b/examples/nodejs-server/package.json index a402572a..3ed7e2df 100644 --- a/examples/nodejs-server/package.json +++ b/examples/nodejs-server/package.json @@ -13,7 +13,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1", + "@app-config/main": "3.0.0-alpha.2", "fastify": "3" }, "devDependencies": { diff --git a/examples/react-native-project/package.json b/examples/react-native-project/package.json index c455066d..25fd05ed 100644 --- a/examples/react-native-project/package.json +++ b/examples/react-native-project/package.json @@ -12,7 +12,7 @@ "eject": "expo eject" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1", + "@app-config/main": "3.0.0-alpha.2", "expo": "39", "expo-status-bar": "1", "expo-yarn-workspaces": "1", @@ -22,8 +22,8 @@ }, "devDependencies": { "@babel/core": "7", - "@app-config/main": "3.0.0-alpha.1", - "@app-config/react-native": "3.0.0-alpha.1", + "@app-config/main": "3.0.0-alpha.2", + "@app-config/react-native": "3.0.0-alpha.2", "@lcdev/tsconfig": "0.1", "@types/react": "16", "@types/react-native": "0.63", diff --git a/lcdev-app-config-inject/package.json b/lcdev-app-config-inject/package.json index 3dab6d4e..cf72113f 100644 --- a/lcdev-app-config-inject/package.json +++ b/lcdev-app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config-inject", "description": "Alias for @app-config/inject", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,7 +34,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/inject": "^3.0.0-alpha.1" + "@app-config/inject": "^3.0.0-alpha.2" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-app-config-webpack-plugin/package.json b/lcdev-app-config-webpack-plugin/package.json index 7e3e9a44..0d884691 100644 --- a/lcdev-app-config-webpack-plugin/package.json +++ b/lcdev-app-config-webpack-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config-webpack-plugin", "description": "Alias for @app-config/webpack", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/webpack": "^3.0.0-alpha.1" + "@app-config/webpack": "^3.0.0-alpha.2" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-app-config/package.json b/lcdev-app-config/package.json index 161a2b1c..23f029d9 100644 --- a/lcdev-app-config/package.json +++ b/lcdev-app-config/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config", "description": "Alias for @app-config/main", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -33,8 +33,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^3.0.0-alpha.1", - "@app-config/main": "^3.0.0-alpha.1" + "@app-config/cli": "^3.0.0-alpha.2", + "@app-config/main": "^3.0.0-alpha.2" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-react-native-app-config-transformer/package.json b/lcdev-react-native-app-config-transformer/package.json index d2fa285e..9320c178 100644 --- a/lcdev-react-native-app-config-transformer/package.json +++ b/lcdev-react-native-app-config-transformer/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/react-native-app-config-transformer", "description": "Alias for @app-config/react-native", - "version": "3.0.0-alpha.1", + "version": "3.0.0-alpha.2", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/react-native": "^3.0.0-alpha.1" + "@app-config/react-native": "^3.0.0-alpha.2" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/tests/standalone-project/package.json b/tests/standalone-project/package.json index 3f31e303..60aa3365 100644 --- a/tests/standalone-project/package.json +++ b/tests/standalone-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1" + "@app-config/main": "3.0.0-alpha.2" }, "devDependencies": { "typescript": "*" diff --git a/tests/webpack-projects/app-config-core-in-browser/package.json b/tests/webpack-projects/app-config-core-in-browser/package.json index c27f1525..b6f57dfc 100644 --- a/tests/webpack-projects/app-config-core-in-browser/package.json +++ b/tests/webpack-projects/app-config-core-in-browser/package.json @@ -10,8 +10,8 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/core": "3.0.0-alpha.1", - "@app-config/utils": "3.0.0-alpha.1" + "@app-config/core": "3.0.0-alpha.2", + "@app-config/utils": "3.0.0-alpha.2" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/tests/webpack-projects/cypress-plugin/package.json b/tests/webpack-projects/cypress-plugin/package.json index e72c70b9..6551c7da 100644 --- a/tests/webpack-projects/cypress-plugin/package.json +++ b/tests/webpack-projects/cypress-plugin/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1", - "@app-config/cypress": "3.0.0-alpha.1" + "@app-config/main": "3.0.0-alpha.2", + "@app-config/cypress": "3.0.0-alpha.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.1", + "@app-config/webpack": "3.0.0-alpha.2", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", diff --git a/tests/webpack-projects/extending-other-files/package.json b/tests/webpack-projects/extending-other-files/package.json index b6c97ea2..5e37184c 100644 --- a/tests/webpack-projects/extending-other-files/package.json +++ b/tests/webpack-projects/extending-other-files/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1" + "@app-config/main": "3.0.0-alpha.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.1", + "@app-config/webpack": "3.0.0-alpha.2", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/query-parameter-overrides/package.json b/tests/webpack-projects/query-parameter-overrides/package.json index bc0b35d4..6a2bb1f6 100644 --- a/tests/webpack-projects/query-parameter-overrides/package.json +++ b/tests/webpack-projects/query-parameter-overrides/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1", + "@app-config/main": "3.0.0-alpha.2", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.1", + "@app-config/webpack": "3.0.0-alpha.2", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/two-app-config-sources/package.json b/tests/webpack-projects/two-app-config-sources/package.json index 751461d0..64331593 100644 --- a/tests/webpack-projects/two-app-config-sources/package.json +++ b/tests/webpack-projects/two-app-config-sources/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1" + "@app-config/main": "3.0.0-alpha.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.1", + "@app-config/webpack": "3.0.0-alpha.2", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/webpack5/package.json b/tests/webpack-projects/webpack5/package.json index 9ccc6b95..b79235ac 100644 --- a/tests/webpack-projects/webpack5/package.json +++ b/tests/webpack-projects/webpack5/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.1", - "@app-config/cypress": "3.0.0-alpha.1" + "@app-config/main": "3.0.0-alpha.2", + "@app-config/cypress": "3.0.0-alpha.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.1", + "@app-config/webpack": "3.0.0-alpha.2", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", From 2a5c9566e02c208d7a8a42ed6430a4a975d9e71a Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Fri, 9 Apr 2021 22:44:57 -0600 Subject: [PATCH 14/39] feat: upgrade to ajv v8 --- app-config-cli/package.json | 2 +- app-config-main/package.json | 2 +- app-config-schema/package.json | 4 ++-- .../src/__snapshots__/index.test.ts.snap | 4 ++-- app-config-schema/src/index.ts | 6 +++--- app-config-webpack/src/index.test.ts | 2 +- yarn.lock | 18 ++++++++++-------- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app-config-cli/package.json b/app-config-cli/package.json index c1d01c16..7bd7a6fb 100644 --- a/app-config-cli/package.json +++ b/app-config-cli/package.json @@ -43,7 +43,7 @@ "@app-config/node": "^3.0.0-alpha.2", "@app-config/schema": "^3.0.0-alpha.2", "@app-config/utils": "^3.0.0-alpha.2", - "ajv": "7", + "ajv": "8", "clipboardy": "2", "common-tags": "1", "execa": "5", diff --git a/app-config-main/package.json b/app-config-main/package.json index 89a52224..aefa6e50 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -43,7 +43,7 @@ "@app-config/node": "^3.0.0-alpha.2", "@app-config/schema": "^3.0.0-alpha.2", "@app-config/utils": "^3.0.0-alpha.2", - "ajv": "7" + "ajv": "8" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-schema/package.json b/app-config-schema/package.json index 3be206c2..f2f0a644 100644 --- a/app-config-schema/package.json +++ b/app-config-schema/package.json @@ -35,8 +35,8 @@ "@app-config/node": "^3.0.0-alpha.2", "@app-config/utils": "^3.0.0-alpha.2", "@types/json-schema": "7", - "ajv": "7", - "ajv-formats": "1", + "ajv": "8", + "ajv-formats": "2", "json-schema-ref-parser": "9" }, "devDependencies": { diff --git a/app-config-schema/src/__snapshots__/index.test.ts.snap b/app-config-schema/src/__snapshots__/index.test.ts.snap index 04da5b58..151014c7 100644 --- a/app-config-schema/src/__snapshots__/index.test.ts.snap +++ b/app-config-schema/src/__snapshots__/index.test.ts.snap @@ -3,9 +3,9 @@ exports[`Code Generation validates using the generated code 1`] = ` Array [ Object { - "dataPath": "", + "instancePath": "", "keyword": "required", - "message": "should have required property 'foo'", + "message": "must have required property 'foo'", "params": Object { "missingProperty": "foo", }, diff --git a/app-config-schema/src/index.ts b/app-config-schema/src/index.ts index 770bfc29..8b7a995a 100644 --- a/app-config-schema/src/index.ts +++ b/app-config-schema/src/index.ts @@ -120,11 +120,11 @@ export async function loadSchema({ message: 'should not be present in non-secret files (and not encrypted)', }, validate(value: boolean, _data, _parentSchema, ctx): boolean { - const { dataPath } = ctx ?? {}; + const { instancePath } = ctx ?? {}; - if (!dataPath || !value) return true; + if (!instancePath || !value) return true; - const [, ...key] = dataPath.split('/'); + const [, ...key] = instancePath.split('/'); // check that any properties marked as secret were from secrets file const found = currentlyParsing?.property(key); diff --git a/app-config-webpack/src/index.test.ts b/app-config-webpack/src/index.test.ts index eb3715c9..3cab1d9d 100644 --- a/app-config-webpack/src/index.test.ts +++ b/app-config-webpack/src/index.test.ts @@ -131,7 +131,7 @@ describe('frontend-webpack-project example', () => { done(); }); }), - ).rejects.toMatch('config/externalApiUrl should match format "uri"'); + ).rejects.toMatch('config/externalApiUrl must match format "uri"'); }); it('uses custom loading options to read a specific environment variable', async () => { diff --git a/yarn.lock b/yarn.lock index 28510f3c..6e595155 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3867,10 +3867,12 @@ ajv-errors@^1.0.0: resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== -ajv-formats@1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-1.6.0.tgz#605304a6b4c10613904b55ab2cda0669d233d127" - integrity sha512-iio2lsjYkuTq49avg+/coyM5D3qdjyW1dkiy+I79XG3DAQFAOcGltC6eXsw6dX10OtH2S9Kyez7OkFtY0bJBBA== +ajv-formats@2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.0.2.tgz#69875cb99d76c74be46e9c7a4444bc232354eba0" + integrity sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw== + dependencies: + ajv "^8.0.0" ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" @@ -3887,10 +3889,10 @@ ajv@6.5.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@7: - version "7.2.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.2.4.tgz#8e239d4d56cf884bccca8cca362f508446dc160f" - integrity sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A== +ajv@8, ajv@^8.0.0: + version "8.0.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.5.tgz#f07d6fdeffcdbb80485570ce3f1bc845fcc812b9" + integrity sha512-RkiLa/AeJx7+9OvniQ/qeWu0w74A8DiPPBclQ6ji3ZQkv5KamO+QGpqmi7O4JIw3rHGUXZ6CoP9tsAkn3gyazg== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" From ed5df0e4fb52c970dd5587eb93b5792bc8afb717 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Fri, 9 Apr 2021 22:49:09 -0600 Subject: [PATCH 15/39] chore: dependencies --- yarn.lock | 499 ++++++++++++++++++++++++++---------------------------- 1 file changed, 236 insertions(+), 263 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6e595155..674a6aaf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,24 +25,24 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.12", "@babel/compat-data@^7.13.8": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1" - integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.12", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4" + integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA== "@babel/core@7", "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.11.0", "@babel/core@^7.7.5", "@babel/core@^7.8.4": - version "7.13.14" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.14.tgz#8e46ebbaca460a63497c797e574038ab04ae6d06" - integrity sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA== + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0" + integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ== dependencies: "@babel/code-frame" "^7.12.13" "@babel/generator" "^7.13.9" "@babel/helper-compilation-targets" "^7.13.13" "@babel/helper-module-transforms" "^7.13.14" "@babel/helpers" "^7.13.10" - "@babel/parser" "^7.13.13" + "@babel/parser" "^7.13.15" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.13" + "@babel/traverse" "^7.13.15" "@babel/types" "^7.13.14" convert-source-map "^1.7.0" debug "^4.1.0" @@ -75,7 +75,7 @@ "@babel/helper-explode-assignable-expression" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.9.6": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.9.6": version "7.13.13" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5" integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ== @@ -85,7 +85,7 @@ browserslist "^4.14.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.13.0": +"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.13.11": version "7.13.11" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6" integrity sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw== @@ -104,10 +104,10 @@ "@babel/helper-annotate-as-pure" "^7.12.13" regexpu-core "^4.7.1" -"@babel/helper-define-polyfill-provider@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e" - integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg== +"@babel/helper-define-polyfill-provider@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1" + integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw== dependencies: "@babel/helper-compilation-targets" "^7.13.0" "@babel/helper-module-imports" "^7.12.13" @@ -267,10 +267,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.13", "@babel/parser@^7.7.0": - version "7.13.13" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" - integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.15", "@babel/parser@^7.7.0": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8" + integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": version "7.13.12" @@ -288,10 +288,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-proposal-async-generator-functions@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1" - integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA== +"@babel/plugin-proposal-async-generator-functions@^7.13.15": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b" + integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-remap-async-to-generator" "^7.13.0" @@ -306,11 +306,11 @@ "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-proposal-decorators@^7.6.0", "@babel/plugin-proposal-decorators@^7.8.3": - version "7.13.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.5.tgz#d28071457a5ba8ee1394b23e38d5dcf32ea20ef7" - integrity sha512-i0GDfVNuoapwiheevUOuSW67mInqJ8qw7uWfpjNVeHMn143kXblEy/bmL9AdZ/0yf/4BMQeWXezK0tQIvNPqag== + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz#e91ccfef2dc24dd5bd5dcc9fc9e2557c684ecfb8" + integrity sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" + "@babel/helper-create-class-features-plugin" "^7.13.11" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-decorators" "^7.12.13" @@ -777,10 +777,10 @@ "@babel/plugin-syntax-jsx" "^7.12.13" "@babel/types" "^7.13.12" -"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" - integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== +"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.13.15": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39" + integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ== dependencies: regenerator-transform "^0.14.2" @@ -792,15 +792,15 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-runtime@^7.0.0", "@babel/plugin-transform-runtime@^7.11.0": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.10.tgz#a1e40d22e2bf570c591c9c7e5ab42d6bf1e419e1" - integrity sha512-Y5k8ipgfvz5d/76tx7JYbKQTcgFSU6VgJ3kKQv4zGTKr+a9T/KBvfRvGtSFgKDQGt/DBykQixV0vNWKIdzWErA== + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7" + integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA== dependencies: - "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-module-imports" "^7.13.12" "@babel/helper-plugin-utils" "^7.13.0" - babel-plugin-polyfill-corejs2 "^0.1.4" - babel-plugin-polyfill-corejs3 "^0.1.3" - babel-plugin-polyfill-regenerator "^0.1.2" + babel-plugin-polyfill-corejs2 "^0.2.0" + babel-plugin-polyfill-corejs3 "^0.2.0" + babel-plugin-polyfill-regenerator "^0.2.0" semver "^6.3.0" "@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.12.13": @@ -864,16 +864,16 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/preset-env@7", "@babel/preset-env@^7.11.0", "@babel/preset-env@^7.6.3": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.12.tgz#6dff470478290582ac282fb77780eadf32480237" - integrity sha512-JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA== + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.15.tgz#c8a6eb584f96ecba183d3d414a83553a599f478f" + integrity sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA== dependencies: - "@babel/compat-data" "^7.13.12" - "@babel/helper-compilation-targets" "^7.13.10" + "@babel/compat-data" "^7.13.15" + "@babel/helper-compilation-targets" "^7.13.13" "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-validator-option" "^7.12.17" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" - "@babel/plugin-proposal-async-generator-functions" "^7.13.8" + "@babel/plugin-proposal-async-generator-functions" "^7.13.15" "@babel/plugin-proposal-class-properties" "^7.13.0" "@babel/plugin-proposal-dynamic-import" "^7.13.8" "@babel/plugin-proposal-export-namespace-from" "^7.12.13" @@ -921,7 +921,7 @@ "@babel/plugin-transform-object-super" "^7.12.13" "@babel/plugin-transform-parameters" "^7.13.0" "@babel/plugin-transform-property-literals" "^7.12.13" - "@babel/plugin-transform-regenerator" "^7.12.13" + "@babel/plugin-transform-regenerator" "^7.13.15" "@babel/plugin-transform-reserved-words" "^7.12.13" "@babel/plugin-transform-shorthand-properties" "^7.12.13" "@babel/plugin-transform-spread" "^7.13.0" @@ -931,10 +931,10 @@ "@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.13.12" - babel-plugin-polyfill-corejs2 "^0.1.4" - babel-plugin-polyfill-corejs3 "^0.1.3" - babel-plugin-polyfill-regenerator "^0.1.2" + "@babel/types" "^7.13.14" + babel-plugin-polyfill-corejs2 "^0.2.0" + babel-plugin-polyfill-corejs3 "^0.2.0" + babel-plugin-polyfill-regenerator "^0.2.0" core-js-compat "^3.9.0" semver "^6.3.0" @@ -984,21 +984,21 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.7.0": - version "7.13.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d" - integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg== +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.7.0": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7" + integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ== dependencies: "@babel/code-frame" "^7.12.13" "@babel/generator" "^7.13.9" "@babel/helper-function-name" "^7.12.13" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.13" - "@babel/types" "^7.13.13" + "@babel/parser" "^7.13.15" + "@babel/types" "^7.13.14" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": version "7.13.14" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d" integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ== @@ -1198,9 +1198,9 @@ uuid "^3.3.2" "@cypress/webpack-preprocessor@5": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.6.0.tgz#9648ae22d2e52f17a604e2a493af27a9c96568bd" - integrity sha512-kSelTDe6gs3Skp4vPP2vfTvAl+Ua+9rR/AMTir7bgJihDvzFESqnjWtF6N1TrPo+vCFVGx0VUA6JUvDkhvpwhA== + version "5.7.0" + resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.7.0.tgz#653c92662fe885260f176f5a1bd630dfd2cee8ca" + integrity sha512-E60lsdMoIJFR36t7J2yjcAH3vrxF1WecoTIz4PL7Km/LrIEx1/qafEeyGuHTBynr/RBd4kCaS2XLJW75hOeLSw== dependencies: bluebird "^3.7.1" debug "4.3.2" @@ -2496,17 +2496,15 @@ once "^1.4.0" "@octokit/request@^5.2.0": - version "5.4.14" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.14.tgz#ec5f96f78333bb2af390afa5ff66f114b063bc96" - integrity sha512-VkmtacOIQp9daSnBmDI92xNIeLuSRDOIuplp/CJomkvzt7M18NXgG044Cx/LFKLgjKt9T2tZR6AtJayba9GTSA== + version "5.4.15" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.15.tgz#829da413dc7dd3aa5e2cdbb1c7d0ebe1f146a128" + integrity sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag== dependencies: "@octokit/endpoint" "^6.0.1" "@octokit/request-error" "^2.0.0" "@octokit/types" "^6.7.1" - deprecation "^2.0.0" is-plain-object "^5.0.0" node-fetch "^2.6.1" - once "^1.4.0" universal-user-agent "^6.0.0" "@octokit/rest@^16.28.4": @@ -2686,9 +2684,9 @@ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sinonjs/commons@^1.7.0": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" - integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" @@ -2777,9 +2775,9 @@ integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag== "@types/eslint@*": - version "7.2.8" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.8.tgz#45cd802380fcc352e5680e1781d43c50916f12ee" - integrity sha512-RTKvBsfz0T8CKOGZMfuluDNyMFHnu5lvNr4hWEsQeHXH6FcmIDIozOyWMh36nLGMwVd5UFNXC2xztA8lln22MQ== + version "7.2.9" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.9.tgz#5d26eadbb6d04a225967176399a18eff622da982" + integrity sha512-SdAAXZNvWfhtf3X3y1cbbCZhP3xyPh7mfTvzV6CgfWc/ZhiHpyr9bVroe2/RCHIf7gczaNcprhaBLsx0CCJHQA== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -2795,9 +2793,9 @@ integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== "@types/fs-extra@9": - version "9.0.9" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.9.tgz#11ed43b3f3c6b3490f1ef9bd17f58da896e2d861" - integrity sha512-5TqDycCl0oMzwzd1cIjSJWMKMvLCDVErle4ZTjU4EmHDURR/+yZghe6GDHMCpHtcVfq0x0gMoOM546/5TbYHrg== + version "9.0.10" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.10.tgz#8023a72e3d06cf54929ea47ec7634e47f33f4046" + integrity sha512-O9T2LLkRDiTlalOBdjEkcnT0MRdT2+wglCl7pJUJ3mkWkR8hX4K+5bg2raQNJcLv4V8zGuTXe7Ud3wSqkTyuyQ== dependencies: "@types/node" "*" @@ -3079,9 +3077,9 @@ source-map "^0.6.0" "@types/ws@7": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.0.tgz#499690ea08736e05a8186113dac37769ab251a0e" - integrity sha512-Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw== + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.1.tgz#49eacb15a0534663d53a36fbf5b4d98f5ae9a73a" + integrity sha512-ISCK1iFnR+jYv7+jLNX0wDqesZ/5RAeY3wUx6QaphmocphU61h+b+PHjS18TF4WIPTu/MMzxIq2PHr32o2TS5Q== dependencies: "@types/node" "*" @@ -3889,7 +3887,7 @@ ajv@6.5.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@8, ajv@^8.0.0: +ajv@8, ajv@^8.0.0, ajv@^8.0.1: version "8.0.5" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.5.tgz#f07d6fdeffcdbb80485570ce3f1bc845fcc812b9" integrity sha512-RkiLa/AeJx7+9OvniQ/qeWu0w74A8DiPPBclQ6ji3ZQkv5KamO+QGpqmi7O4JIw3rHGUXZ6CoP9tsAkn3gyazg== @@ -3909,16 +3907,6 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0, ajv@^6.12.2, ajv@^6.12.3, ajv json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.2.tgz#1396e27f208ed56dd5638ab5a251edeb1c91d402" - integrity sha512-V0HGxJd0PiDF0ecHYIesTOqfd1gJguwQUOYfMfAWnRsWQEXfc5ifbUFhD3Wjc+O+y7VAqL+g07prq9gHQ/JOZQ== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - algoliasearch@^3.24.5: version "3.35.1" resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-3.35.1.tgz#297d15f534a3507cab2f5dfb996019cac7568f0c" @@ -4091,9 +4079,9 @@ anymatch@^2.0.0: normalize-path "^2.1.1" anymatch@^3.0.3, anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -4436,9 +4424,9 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axe-core@^4.0.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.3.tgz#64a4c85509e0991f5168340edc4bedd1ceea6966" - integrity sha512-vwPpH4Aj4122EW38mxO/fxhGKtwWTMLDIJfZ1He0Edbtjcfna/R3YB67yVhezUMzqc3Jr3+Ii50KRntlENL4xQ== + version "4.1.4" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.4.tgz#f19cd99a84ee32a318b9c5b5bb8ed373ad94f143" + integrity sha512-Pdgfv6iP0gNx9ejRGa3zE7Xgkj/iclXqLfe7BnatdZz0QnLZ3jrRHUVH8wNSdN68w05Sk3ShGTb3ydktMTooig== axobject-query@^2.2.0: version "2.2.0" @@ -4520,29 +4508,29 @@ babel-plugin-module-resolver@^3.2.0: reselect "^3.0.1" resolve "^1.4.0" -babel-plugin-polyfill-corejs2@^0.1.4: - version "0.1.10" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz#a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1" - integrity sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA== +babel-plugin-polyfill-corejs2@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4" + integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg== dependencies: - "@babel/compat-data" "^7.13.0" - "@babel/helper-define-polyfill-provider" "^0.1.5" + "@babel/compat-data" "^7.13.11" + "@babel/helper-define-polyfill-provider" "^0.2.0" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.1.3: - version "0.1.7" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0" - integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw== +babel-plugin-polyfill-corejs3@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2" + integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.1.5" - core-js-compat "^3.8.1" + "@babel/helper-define-polyfill-provider" "^0.2.0" + core-js-compat "^3.9.1" -babel-plugin-polyfill-regenerator@^0.1.2: - version "0.1.6" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz#0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f" - integrity sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg== +babel-plugin-polyfill-regenerator@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8" + integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.1.5" + "@babel/helper-define-polyfill-provider" "^0.2.0" babel-plugin-react-native-web@~0.13.6: version "0.13.18" @@ -4630,9 +4618,9 @@ badgin@^1.1.2: integrity sha512-XtoSjNhy2D09qGiLhFWBJmBwBlmleQuwyYyjddWNCJ3gqGRBOBR25VGcd8CAOSghpEUmghB3LD4NpHrUG89zCg== balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" @@ -4665,9 +4653,9 @@ bcrypt-pbkdf@^1.0.0: tweetnacl "^0.14.3" before-after-hook@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.0.tgz#09c40d92e936c64777aa385c4e9b904f8147eaf0" - integrity sha512-jH6rKQIfroBbhEXVmI7XmXe3ix5S/PgJqpzdDPnR8JGLHWNYLsYZ6tK5iWOF/Ra3oqEX0NobXGlzbiylIzVphQ== + version "2.2.1" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.1.tgz#73540563558687586b52ed217dad6a802ab1549c" + integrity sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw== big-integer@^1.6.44: version "1.6.48" @@ -4943,9 +4931,9 @@ bser@2.1.1: node-int64 "^0.4.0" bson@4: - version "4.2.3" - resolved "https://registry.yarnpkg.com/bson/-/bson-4.2.3.tgz#be2f8d16c5c7c143aad4eadd2847bb1df5faf00d" - integrity sha512-3ztgjpKp0itFxGqzrLMHWqyZH5oMOIRWsjeY61yNVzrDGB/KxtgD6djFlz9n3vx7lLr2r6bkHagBCgyk1ZjETA== + version "4.3.0" + resolved "https://registry.yarnpkg.com/bson/-/bson-4.3.0.tgz#b466abeb6555f9b621dc6681b175a634e14356d4" + integrity sha512-LkKKeFJx5D6RRCRvLE+fDs40M2ZQNuk7W7tFXmKd7OOcQQ+BHdzCgRdL4XEGjc1UEGtiYuMvIVk91Bv8qsI50A== dependencies: buffer "^5.6.0" @@ -5230,9 +5218,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181: - version "1.0.30001205" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz#d79bf6a6fb13196b4bb46e5143a22ca0242e0ef8" - integrity sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og== + version "1.0.30001208" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz#a999014a35cebd4f98c405930a057a0d75352eb9" + integrity sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA== capture-exit@^2.0.0: version "2.0.0" @@ -5351,11 +5339,9 @@ chownr@^1.1.1, chownr@^1.1.2: integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^2.0.0: version "2.0.0" @@ -5994,18 +5980,18 @@ copy-webpack-plugin@^5.0.2: serialize-javascript "^4.0.0" webpack-log "^2.0.0" -core-js-compat@^3.6.5, core-js-compat@^3.8.1, core-js-compat@^3.9.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.0.tgz#3600dc72869673c110215ee7a005a8609dea0fe1" - integrity sha512-9yVewub2MXNYyGvuLnMHcN1k9RkvB7/ofktpeKTIaASyB88YYqGzUnu0ywMMhJrDHOMiTjSHWGzR+i7Wb9Z1kQ== +core-js-compat@^3.6.5, core-js-compat@^3.9.0, core-js-compat@^3.9.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.1.tgz#62183a3a77ceeffcc420d907a3e6fc67d9b27f1c" + integrity sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg== dependencies: browserslist "^4.16.3" semver "7.0.0" core-js-pure@^3.0.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.10.0.tgz#dab9d6b141779b622b40567e7a536d2276646c15" - integrity sha512-CC582enhrFZStO4F8lGI7QL3SYx7/AIRc+IdSi3btrQGrVsTawo5K/crmKbRrQ+MOMhNX4v+PATn0k2NN6wI7A== + version "3.10.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.10.1.tgz#28642697dfcf02e0fd9f4d9891bd03a22df28ecf" + integrity sha512-PeyJH2SE0KuxY5eCGNWA+W+CeDpB6M1PN3S7Am7jSv/Ttuxz2SnWbIiVQOn/TDaGaGtxo8CRWHkXwJscbUHtVw== core-js@^1.0.0: version "1.2.7" @@ -6018,9 +6004,9 @@ core-js@^2.4.1: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.6.1, core-js@^3.6.4, core-js@^3.6.5: - version "3.10.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.0.tgz#9a020547c8b6879f929306949e31496bbe2ae9b3" - integrity sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ== + version "3.10.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.1.tgz#e683963978b6806dcc6c0a4a8bd4ab0bdaf3f21a" + integrity sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -6258,10 +6244,10 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76" - integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA== +cssnano-preset-default@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz#920622b1fc1e95a34e8838203f1397a504f2d3ff" + integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ== dependencies: css-declaration-sorter "^4.0.1" cssnano-util-raw-cache "^4.0.1" @@ -6291,7 +6277,7 @@ cssnano-preset-default@^4.0.7: postcss-ordered-values "^4.1.2" postcss-reduce-initial "^4.0.3" postcss-reduce-transforms "^4.0.2" - postcss-svgo "^4.0.2" + postcss-svgo "^4.0.3" postcss-unique-selectors "^4.0.1" cssnano-util-get-arguments@^4.0.0: @@ -6317,12 +6303,12 @@ cssnano-util-same-parent@^4.0.0: integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== cssnano@^4.1.10: - version "4.1.10" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2" - integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ== + version "4.1.11" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz#c7b5f5b81da269cb1fd982cb960c1200910c9a99" + integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g== dependencies: cosmiconfig "^5.0.0" - cssnano-preset-default "^4.0.7" + cssnano-preset-default "^4.0.8" is-resolvable "^1.0.0" postcss "^7.0.0" @@ -6368,9 +6354,9 @@ cyclist@^1.0.1: integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= cypress@6: - version "6.8.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.8.0.tgz#8338f39212a8f71e91ff8c017a1b6e22d823d8c1" - integrity sha512-W2e9Oqi7DmF48QtOD0LfsOLVq6ef2hcXZvJXI/E3PgFNmZXEVwBefhAxVCW9yTPortjYA2XkM20KyC4HRkOm9w== + version "6.9.1" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.9.1.tgz#ce1106bfdc47f8d76381dba63f943447883f864c" + integrity sha512-/RVx6sOhsyTR9sd9v0BHI4tnDZAhsH9rNat7CIKCUEr5VPWxyfGH0EzK4IHhAqAH8vjFcD4U14tPiJXshoUrmQ== dependencies: "@cypress/listr-verbose-renderer" "^0.4.1" "@cypress/request" "^2.88.5" @@ -7125,9 +7111,9 @@ domelementtype@1, domelementtype@^1.3.1: integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== domelementtype@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" - integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== domexception@^2.0.1: version "2.0.1" @@ -7221,9 +7207,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.649: - version "1.3.703" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.703.tgz#6d9b9a75c42a40775f5930329e642b22b227317f" - integrity sha512-SVBVhNB+4zPL+rvtWLw7PZQkw/Eqj1HQZs22xtcqW36+xoifzEOEEDEpkxSMfB6RFeSIOcG00w6z5mSqLr1Y6w== + version "1.3.712" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.712.tgz#ae467ffe5f95961c6d41ceefe858fc36eb53b38f" + integrity sha512-3kRVibBeCM4vsgoHHGKHmPocLqtFAGTrebXxxtgKs87hNUzXrX2NuS3jnBys7IozCnw7viQlozxKkmty2KNfrw== elegant-spinner@^1.0.1: version "1.0.1" @@ -7347,9 +7333,9 @@ envify@^4.0.0: through "~2.3.4" envinfo@^7.2.0, envinfo@^7.3.1, envinfo@^7.7.2, envinfo@^7.7.3: - version "7.7.4" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320" - integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ== + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== err-code@^1.0.0: version "1.1.2" @@ -7603,9 +7589,9 @@ eslint-plugin-react-hooks@4: integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== eslint-plugin-react@7: - version "7.23.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.1.tgz#f1a2e844c0d1967c822388204a8bc4dee8415b11" - integrity sha512-MvFGhZjI8Z4HusajmSw0ougGrq3Gs4vT/0WgwksZgf5RrLrRa2oYAw56okU4tZJl8+j7IYNuTM+2RnFEuTSdRQ== + version "7.23.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz#2d2291b0f95c03728b55869f01102290e792d494" + integrity sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw== dependencies: array-includes "^3.1.3" array.prototype.flatmap "^1.2.4" @@ -7654,9 +7640,9 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@7: - version "7.23.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.23.0.tgz#8d029d252f6e8cf45894b4bee08f5493f8e94325" - integrity sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q== + version "7.24.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a" + integrity sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.0" @@ -8282,9 +8268,9 @@ fastify-warning@^0.2.0: integrity sha512-s1EQguBw/9qtc1p/WTY4eq9WMRIACkj+HTcOIK1in4MV5aFaQC9ZCIt0dJ7pr5bIf4lPpHvAtP2ywpTNgs7hqw== fastify@3: - version "3.14.1" - resolved "https://registry.yarnpkg.com/fastify/-/fastify-3.14.1.tgz#f57e12701a4671b1a4d38c72259b346a66d121e9" - integrity sha512-9hoK1vvopsUJnUJpge90t8PZIqNQhGM54yDrd2veCZLkxh8eipnaHrXe2+f7tIt6UScUZ92JZQavxFGB4HX7xA== + version "3.14.2" + resolved "https://registry.yarnpkg.com/fastify/-/fastify-3.14.2.tgz#136c80ab5a811e2f44ef361c1e1986c8a31d6e83" + integrity sha512-/PY//7gJnGxLQORaRHCEW148vpFKFpBIQNz1Yo/DxbHuk5EQqK2comzyE2ug8FSEldDX8nleapTshl0m78Px2w== dependencies: "@fastify/proxy-addr" "^3.0.0" abstract-logging "^2.0.0" @@ -9032,9 +9018,9 @@ globals@^12.1.0: type-fest "^0.8.1" globals@^13.6.0: - version "13.7.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795" - integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA== + version "13.8.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" + integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== dependencies: type-fest "^0.20.2" @@ -9305,9 +9291,9 @@ homedir-polyfill@^1.0.1: parse-passwd "^1.0.0" hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== hosted-git-info@^4.0.1: version "4.0.2" @@ -9336,11 +9322,6 @@ hsla-regex@^1.0.0: resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= -html-comment-regex@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" - integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== - html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" @@ -10023,9 +10004,9 @@ is-directory@^0.3.1: integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -10184,9 +10165,9 @@ is-plain-object@^5.0.0: integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== is-potential-custom-element-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-promise@^2.1.0: version "2.2.2" @@ -10233,13 +10214,6 @@ is-string@^1.0.5: resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== -is-svg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" - integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ== - dependencies: - html-comment-regex "^1.1.0" - is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" @@ -11550,9 +11524,9 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4 js-tokens "^3.0.0 || ^4.0.0" lottie-web@^5.1.9: - version "5.7.7" - resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.7.7.tgz#077c705d5c82b33a421618c529fccebd69a111fd" - integrity sha512-dAUrMX5BRxP7dr+qDWzablhGY6SqXztCS46sW11wjuzExQKZl5GLX2yMGGqg4AkdjgfjetndcU+VR1xoLhlkpA== + version "5.7.8" + resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.7.8.tgz#c7a2e42983bcb42093590a03ccdde8741d3f960e" + integrity sha512-VxKCZk33GwZac6mVHvT3grUFR/zrMsW85M7vxQPrgpJOP2IhcnjMbuD0h7muBkXgw84K9KmGulmcyzvhpzSMAg== loud-rejection@^1.0.0: version "1.6.0" @@ -11685,9 +11659,9 @@ map-obj@^2.0.0: integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk= map-obj@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.0.tgz#0e8bc823e2aaca8a0942567d12ed14f389eec153" - integrity sha512-NAq0fCmZYGz9UFEQyndp7sisrow4GroyGeKluyKC/chuITZsPyOyC1UJZPJlVFImhXdROIP5xqouRLThT3BbpQ== + version "4.2.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7" + integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ== map-visit@^1.0.0: version "1.0.0" @@ -12130,12 +12104,12 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.0, micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + version "4.0.3" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.3.tgz#fdad8352bf0cbeb89b391b5d244bc22ff3dd4ec8" + integrity sha512-ueuSaP4i67F/FAUac9zzZ0Dz/5KeKDkITYIS/k4fps+9qeh1SkeH6gbljcqz97mNBOsaWZ+iv2UobMKK/yD+aw== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.1" miller-rabin@^4.0.0: version "4.0.1" @@ -12145,10 +12119,10 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.46.0, "mime-db@>= 1.43.0 < 2": - version "1.46.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" - integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== +mime-db@1.47.0, "mime-db@>= 1.43.0 < 2": + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== mime-db@~1.23.0: version "1.23.0" @@ -12175,11 +12149,11 @@ mime-types@2.1.18: mime-db "~1.33.0" mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.29" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" - integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== dependencies: - mime-db "1.46.0" + mime-db "1.47.0" mime@1.6.0: version "1.6.0" @@ -12624,9 +12598,9 @@ node-releases@^1.1.70: integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== node-stream-zip@^1.9.1: - version "1.13.2" - resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.13.2.tgz#2fce9d001fa7fda943a906eff239eb83fda124ba" - integrity sha512-159NUO3quDIRVSVOQiQ/0VG8NFrGvVyUa+MUUleiOys3NLtrGtNkodqYYTRHU/kiXu/ygHZcNy/tZ4NUCcDUmQ== + version "1.13.3" + resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.13.3.tgz#63235337abebcef408b244b4e28f28961e6e86f0" + integrity sha512-Vv95ug+8Jfug4AxcqNV7TeGEk2antNidj+YBOyP8SS8LTHJmjsE3d9h6L831eJtO8p7jesJ3CDtgkwmLO/wcSw== node-vault@0.9: version "0.9.21" @@ -13466,9 +13440,9 @@ path-type@^4.0.0: integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pbkdf2@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" - integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -13486,7 +13460,7 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: +picomatch@^2.0.4, picomatch@^2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== @@ -13932,12 +13906,11 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: uniq "^1.0.1" util-deprecate "^1.0.2" -postcss-svgo@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258" - integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw== +postcss-svgo@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" + integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw== dependencies: - is-svg "^3.0.0" postcss "^7.0.0" postcss-value-parser "^3.0.0" svgo "^1.0.0" @@ -14118,9 +14091,9 @@ promise@^8.0.3: asap "~2.0.6" prompts@2, prompts@^2.0.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" - integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" + integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== dependencies: kleur "^3.0.3" sisteransi "^1.0.5" @@ -14394,9 +14367,9 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.8: strip-json-comments "~2.0.1" react-devtools-core@^4.6.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.10.1.tgz#6d57db291aeac9cc45ef9fb4636dd2ab97490daf" - integrity sha512-sXbBjGAWcf9HAblTP/zMtFhGHqxAfIR+GPxONZsSGN9FHnF4635dx1s2LdQWG9rJ+Ehr3nWg+BUAB6P78my5PA== + version "4.11.0" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.11.0.tgz#38e92bcfebd7fa6f89f9a29439e30688ef4781b4" + integrity sha512-QBbyZv3rodvWvhh2NjXuEk5AehCDNh/3elTi1vL03/Bo8UbeX3bmR3NDlx1YIcZ7hsDjxhT6a1GSuO5PVOR8Ag== dependencies: shell-quote "^1.6.1" ws "^7" @@ -14809,9 +14782,9 @@ renderkid@^2.0.4: strip-ansi "^3.0.0" repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== repeat-string@^1.6.1: version "1.6.1" @@ -15237,9 +15210,9 @@ section-matter@^1.0.0: kind-of "^6.0.0" secure-json-parse@^2.0.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.3.2.tgz#0284c9525c6f24d38774f13727addff80634c2e9" - integrity sha512-4oUSFU0w2d8/XQb7NO9dbMYyp/hxIwZPcZcGAlAAEziMRHs+NbUcx2Z5dda/z8o+avyQ8gpuYnTMlGh8SVwg9g== + version "2.4.0" + resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.4.0.tgz#5aaeaaef85c7a417f76271a4f5b0cc3315ddca85" + integrity sha512-Q5Z/97nbON5t/L/sH6mY2EacfjVGwrCcSi5D3btRO2GZ8pf1K1UN7Z9H5J57hjVU2Qzxr1xO+FmBhOvEkzCMmg== seedrandom@3: version "3.0.5" @@ -15673,9 +15646,9 @@ socks@~2.3.2: smart-buffer "^4.1.0" sonic-boom@^1.0.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.4.0.tgz#d6d35196c32609b46193145afc1174a8c692d21e" - integrity sha512-1xUAszhQBOrjk7uisbStQZYkZxD3vkYlCUw5qzOblWQ1ILN5v0dVPAs+QPgszzoPmbdWx6jyT9XiLJ95JdlLiQ== + version "1.4.1" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.4.1.tgz#d35d6a74076624f12e6f917ade7b9d75e918f53e" + integrity sha512-LRHh/A8tpW7ru89lrlkU4AszXt1dbwSjVWguGrmlxE7tawVmDBlI1PILMkXAxJTwqhgsEeTHzj36D5CmHgQmNg== dependencies: atomic-sleep "^1.0.0" flatstr "^1.0.12" @@ -15839,9 +15812,9 @@ sshpk@^1.7.0: tweetnacl "~0.14.0" ssri@^6.0.0, ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: figgy-pudding "^3.5.1" @@ -15851,9 +15824,9 @@ stable@^0.1.8: integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== stack-utils@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8" - integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w== + version "1.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz#a19b0b01947e0029c8e451d5d61a498f5bb1471b" + integrity sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ== dependencies: escape-string-regexp "^2.0.0" @@ -16240,9 +16213,9 @@ supports-color@^7.0.0, supports-color@^7.1.0, supports-color@^7.2.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -16781,9 +16754,9 @@ tslib@^1.8.1, tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + version "2.2.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" + integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== tsutils@^3.17.1: version "3.21.0" @@ -16894,14 +16867,14 @@ typescript@3: integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w== typescript@4: - version "4.2.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3" - integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== + version "4.2.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" + integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== ua-parser-js@^0.7.18: - version "0.7.26" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.26.tgz#b3731860e241419abd5b542b1a0881070d92e0ce" - integrity sha512-VwIvGlFNmpKbjzRt51jpbbFTrKIEgGHxIwA8Y69K1Bqc6bTIV7TaGGABOkghSFQWsLmcRB4drGvpfv9z2szqoQ== + version "0.7.27" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.27.tgz#b54f8ce9eb6c7abf3584edeaf9a3d8b3bd92edba" + integrity sha512-eXMaRYK2skomGocoX0x9sBXzx5A1ZVQgXfrW4mTc8dT0zS7olEcyfudAzRC5tIIRgLxQ69B6jut3DI+n5hslPA== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" @@ -17724,9 +17697,9 @@ webpack@4, webpack@^4.8.1: webpack-sources "^1.4.1" webpack@5: - version "5.28.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.28.0.tgz#0de8bcd706186b26da09d4d1e8cbd3e4025a7c2f" - integrity sha512-1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg== + version "5.31.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.31.2.tgz#40d9b9d15b7d76af73d3f1cae895b82613a544d6" + integrity sha512-0bCQe4ybo7T5Z0SC5axnIAH+1WuIdV4FwLYkaAlLtvfBhIx8bPS48WHTfiRZS1VM+pSiYt7e/rgLs3gLrH82lQ== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.46" @@ -18114,14 +18087,14 @@ xtend@^4.0.0, xtend@~4.0.1: integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" - integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^2.1.2: version "2.1.2" From b4e94636b4e844b862d97cca2fa7bd4f84cd39e2 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sat, 10 Apr 2021 08:54:31 -0600 Subject: [PATCH 16/39] fix: error message from ajv --- .../cypress/integration/main.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/webpack-projects/query-parameter-overrides/cypress/integration/main.spec.ts b/tests/webpack-projects/query-parameter-overrides/cypress/integration/main.spec.ts index cd7ff597..aa322bef 100644 --- a/tests/webpack-projects/query-parameter-overrides/cypress/integration/main.spec.ts +++ b/tests/webpack-projects/query-parameter-overrides/cypress/integration/main.spec.ts @@ -22,12 +22,12 @@ describe('Config Loading', () => { it('should not accept invalid query parameter override', () => { cy.visit(`/?config=${JSON.stringify({ urlProperty: 'not a url' })}`); - cy.get('body').should('contain', `Config Error: should match format "uri"`); + cy.get('body').should('contain', `Config Error: must match format "uri"`); }); it('should not accept invalid longStringProperty', () => { cy.visit(`/?config=${JSON.stringify({ longStringProperty: 'short' })}`); - cy.get('body').should('contain', `Config Error: should NOT have fewer than 10 characters`); + cy.get('body').should('contain', `Config Error: must NOT have fewer than 10 characters`); }); }); From 25b363394eb5349cfb4bf430e537ff0a3de6bfb2 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sat, 10 Apr 2021 09:05:29 -0600 Subject: [PATCH 17/39] fix: more ajv error messages --- .../cypress-plugin/cypress/integration/main.spec.ts | 2 +- .../webpack-projects/webpack5/cypress/integration/main.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/webpack-projects/cypress-plugin/cypress/integration/main.spec.ts b/tests/webpack-projects/cypress-plugin/cypress/integration/main.spec.ts index 8ff9fdb4..a084d8cd 100644 --- a/tests/webpack-projects/cypress-plugin/cypress/integration/main.spec.ts +++ b/tests/webpack-projects/cypress-plugin/cypress/integration/main.spec.ts @@ -32,7 +32,7 @@ describe('Config Loading', () => { cy.visit('/'); - cy.get('body').should('contain', `Config Error: should NOT have fewer than 10 characters`); + cy.get('body').should('contain', `Config Error: must NOT have fewer than 10 characters`); }); it('uses config from webpack preprocessor', () => { diff --git a/tests/webpack-projects/webpack5/cypress/integration/main.spec.ts b/tests/webpack-projects/webpack5/cypress/integration/main.spec.ts index 8ff9fdb4..a084d8cd 100644 --- a/tests/webpack-projects/webpack5/cypress/integration/main.spec.ts +++ b/tests/webpack-projects/webpack5/cypress/integration/main.spec.ts @@ -32,7 +32,7 @@ describe('Config Loading', () => { cy.visit('/'); - cy.get('body').should('contain', `Config Error: should NOT have fewer than 10 characters`); + cy.get('body').should('contain', `Config Error: must NOT have fewer than 10 characters`); }); it('uses config from webpack preprocessor', () => { From 9155ebb41349224d5d7e932332fde5a37f3799d0 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sat, 10 Apr 2021 09:07:32 -0600 Subject: [PATCH 18/39] chore: v3.0.0-alpha.3 --- app-config-cli/package.json | 18 ++++++++--------- app-config-config/package.json | 20 +++++++++---------- app-config-core/package.json | 8 ++++---- app-config-cypress/package.json | 6 +++--- app-config-default-extensions/package.json | 6 +++--- app-config-encryption/package.json | 16 +++++++-------- app-config-exec/package.json | 12 +++++------ app-config-extension-utils/package.json | 4 ++-- app-config-extensions/package.json | 14 ++++++------- app-config-generate/package.json | 10 +++++----- app-config-git/package.json | 8 ++++---- app-config-inject/package.json | 10 +++++----- app-config-js/package.json | 10 +++++----- app-config-logging/package.json | 4 ++-- app-config-main/package.json | 20 +++++++++---------- app-config-meta/package.json | 14 ++++++------- app-config-node/package.json | 8 ++++---- app-config-react-native/package.json | 6 +++--- app-config-schema/package.json | 16 +++++++-------- app-config-settings/package.json | 12 +++++------ app-config-test-utils/package.json | 6 +++--- app-config-utils/package.json | 2 +- app-config-v1-compat/package.json | 14 ++++++------- app-config-vault/package.json | 8 ++++---- app-config-webpack/package.json | 6 +++--- examples/cli-project/package.json | 2 +- .../frontend-webpack-project/package.json | 4 ++-- examples/nodejs-server/package.json | 2 +- examples/react-native-project/package.json | 6 +++--- lcdev-app-config-inject/package.json | 4 ++-- lcdev-app-config-webpack-plugin/package.json | 4 ++-- lcdev-app-config/package.json | 6 +++--- .../package.json | 4 ++-- tests/standalone-project/package.json | 2 +- .../app-config-core-in-browser/package.json | 4 ++-- .../cypress-plugin/package.json | 6 +++--- .../extending-other-files/package.json | 4 ++-- .../query-parameter-overrides/package.json | 4 ++-- .../two-app-config-sources/package.json | 4 ++-- tests/webpack-projects/webpack5/package.json | 6 +++--- 40 files changed, 160 insertions(+), 160 deletions(-) diff --git a/app-config-cli/package.json b/app-config-cli/package.json index 7bd7a6fb..67a4f816 100644 --- a/app-config-cli/package.json +++ b/app-config-cli/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cli", "description": "CLI for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -35,14 +35,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.2", - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/encryption": "^3.0.0-alpha.2", - "@app-config/generate": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/schema": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/config": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/encryption": "^3.0.0-alpha.3", + "@app-config/generate": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/schema": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "ajv": "8", "clipboardy": "2", "common-tags": "1", diff --git a/app-config-config/package.json b/app-config-config/package.json index 7ce04598..32e8d158 100644 --- a/app-config-config/package.json +++ b/app-config-config/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/config", "description": "The config in @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,17 +30,17 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/default-extensions": "^3.0.0-alpha.2", - "@app-config/extensions": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/meta": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/schema": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2" + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/default-extensions": "^3.0.0-alpha.3", + "@app-config/extensions": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/meta": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/schema": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2" + "@app-config/test-utils": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-core/package.json b/app-config-core/package.json index 8c199a07..ecb5b658 100644 --- a/app-config-core/package.json +++ b/app-config-core/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/core", "description": "Core logic for App Config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "@iarna/toml": "3", "js-yaml": "^3.13.1", "json5": "2", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2", + "@app-config/test-utils": "^3.0.0-alpha.3", "@types/js-yaml": "3", "@types/lodash.merge": "4" }, diff --git a/app-config-cypress/package.json b/app-config-cypress/package.json index 097fce27..a023a6cc 100644 --- a/app-config-cypress/package.json +++ b/app-config-cypress/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cypress", "description": "Cypress testing plugin for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -31,11 +31,11 @@ }, "dependencies": {}, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.2", + "@app-config/main": "^3.0.0-alpha.3", "cypress": "6" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.2", + "@app-config/main": "^3.0.0-alpha.3", "cypress": "6" }, "prettier": "@lcdev/prettier", diff --git a/app-config-default-extensions/package.json b/app-config-default-extensions/package.json index 0c44286b..f2ccc876 100644 --- a/app-config-default-extensions/package.json +++ b/app-config-default-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/default-extensions", "description": "Default parsing extensions for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -22,8 +22,8 @@ "test": "jest" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/extensions": "^3.0.0-alpha.2" + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/extensions": "^3.0.0-alpha.3" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-encryption/package.json b/app-config-encryption/package.json index efa6469b..dd3c4a3e 100644 --- a/app-config-encryption/package.json +++ b/app-config-encryption/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/encryption", "description": "Secret value encryption for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/meta": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/settings": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/meta": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/settings": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "@lcdev/ws-rpc": "0.4", "@types/openpgp": "4", "common-tags": "1", @@ -46,7 +46,7 @@ "ws": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2", + "@app-config/test-utils": "^3.0.0-alpha.3", "get-port": "5" }, "prettier": "@lcdev/prettier", diff --git a/app-config-exec/package.json b/app-config-exec/package.json index f4e0dbb9..7d25700e 100644 --- a/app-config-exec/package.json +++ b/app-config-exec/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/exec", "description": "Generate config by running arbitrary programs", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/extension-utils": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2" + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/extension-utils": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.2" + "@app-config/main": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-extension-utils/package.json b/app-config-extension-utils/package.json index 881936fe..b5dbf2dc 100644 --- a/app-config-extension-utils/package.json +++ b/app-config-extension-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extension-utils", "description": "Utilities for writing @app-config parsing extensions", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", "@serafin/schema-builder": "0.14" }, "devDependencies": {}, diff --git a/app-config-extensions/package.json b/app-config-extensions/package.json index 044661af..a6a76491 100644 --- a/app-config-extensions/package.json +++ b/app-config-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extensions", "description": "Common parsing extensions for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/extension-utils": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/extension-utils": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "lodash.isequal": "4" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2", + "@app-config/test-utils": "^3.0.0-alpha.3", "@types/lodash.isequal": "4" }, "prettier": "@lcdev/prettier", diff --git a/app-config-generate/package.json b/app-config-generate/package.json index cfdfd96a..e171df1e 100644 --- a/app-config-generate/package.json +++ b/app-config-generate/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/generate", "description": "Code generation for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,9 +30,9 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/meta": "^3.0.0-alpha.2", - "@app-config/schema": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/meta": "^3.0.0-alpha.3", + "@app-config/schema": "^3.0.0-alpha.3", "@types/readable-stream": "2", "@types/urijs": "1", "common-tags": "1", @@ -41,7 +41,7 @@ "quicktype-core": "6.0.70" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2" + "@app-config/test-utils": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-git/package.json b/app-config-git/package.json index 465263cf..3ab144d5 100644 --- a/app-config-git/package.json +++ b/app-config-git/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/git", "description": "$git directive parsing extension for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/extension-utils": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/extension-utils": "^3.0.0-alpha.3", "simple-git": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2" + "@app-config/test-utils": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-inject/package.json b/app-config-inject/package.json index d87d7713..af6de05d 100644 --- a/app-config-inject/package.json +++ b/app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/inject", "description": "Runtime injection of app-config into static HTML files", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,10 +34,10 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/schema": "^3.0.0-alpha.2", + "@app-config/config": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/schema": "^3.0.0-alpha.3", "@types/yargs": "16", "node-html-parser": "1", "yargs": "16" diff --git a/app-config-js/package.json b/app-config-js/package.json index 60cd201e..27de44ad 100644 --- a/app-config-js/package.json +++ b/app-config-js/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/js", "description": "Loads a JavaScript module to inject configuration", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/extension-utils": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2" + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/extension-utils": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2" + "@app-config/test-utils": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-logging/package.json b/app-config-logging/package.json index ae0b3f5e..34436eac 100644 --- a/app-config-logging/package.json +++ b/app-config-logging/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/logging", "description": "Logging for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/utils": "^3.0.0-alpha.2" + "@app-config/utils": "^3.0.0-alpha.3" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-main/package.json b/app-config-main/package.json index aefa6e50..3aa51dd9 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/main", "description": "Easy to use configuration loader with schema validation", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,15 +34,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^3.0.0-alpha.2", - "@app-config/config": "^3.0.0-alpha.2", - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/default-extensions": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/meta": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/schema": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/cli": "^3.0.0-alpha.3", + "@app-config/config": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/default-extensions": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/meta": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/schema": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "ajv": "8" }, "devDependencies": {}, diff --git a/app-config-meta/package.json b/app-config-meta/package.json index ede87a78..9c5a0068 100644 --- a/app-config-meta/package.json +++ b/app-config-meta/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/meta", "description": "Meta file parsing for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/default-extensions": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/default-extensions": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2" + "@app-config/test-utils": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-node/package.json b/app-config-node/package.json index 6f0f403c..60119c81 100644 --- a/app-config-node/package.json +++ b/app-config-node/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/node", "description": "Node.js API for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", "@types/prompts": "2", "fs-extra": "9", "prompts": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2", + "@app-config/test-utils": "^3.0.0-alpha.3", "@types/fs-extra": "9" }, "prettier": "@lcdev/prettier", diff --git a/app-config-react-native/package.json b/app-config-react-native/package.json index be56c834..2705aa1f 100644 --- a/app-config-react-native/package.json +++ b/app-config-react-native/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/react-native", "description": "React Native Metro transformer that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -33,11 +33,11 @@ "semver": "7" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.2", + "@app-config/main": "^3.0.0-alpha.3", "react-native": ">=0.45.0" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.2", + "@app-config/main": "^3.0.0-alpha.3", "@types/semver": "7" }, "prettier": "@lcdev/prettier", diff --git a/app-config-schema/package.json b/app-config-schema/package.json index f2f0a644..87591bcb 100644 --- a/app-config-schema/package.json +++ b/app-config-schema/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/schema", "description": "Schema validation for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,19 +30,19 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "@types/json-schema": "7", "ajv": "8", "ajv-formats": "2", "json-schema-ref-parser": "9" }, "devDependencies": { - "@app-config/encryption": "^3.0.0-alpha.2", - "@app-config/extensions": "^3.0.0-alpha.2", - "@app-config/test-utils": "^3.0.0-alpha.2" + "@app-config/encryption": "^3.0.0-alpha.3", + "@app-config/extensions": "^3.0.0-alpha.3", + "@app-config/test-utils": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-settings/package.json b/app-config-settings/package.json index cff80081..1c665dd8 100644 --- a/app-config-settings/package.json +++ b/app-config-settings/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/settings", "description": "User settings for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "env-paths": "2", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.2" + "@app-config/test-utils": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-test-utils/package.json b/app-config-test-utils/package.json index 299587fc..25896d90 100644 --- a/app-config-test-utils/package.json +++ b/app-config-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/test-utils", "description": "Internal test utilities", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,8 +30,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "@types/fs-extra": "9", "@types/tmp": "0.2", "fs-extra": "9", diff --git a/app-config-utils/package.json b/app-config-utils/package.json index 8d666e23..49e331e6 100644 --- a/app-config-utils/package.json +++ b/app-config-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/utils", "description": "Common utilities used in @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", diff --git a/app-config-v1-compat/package.json b/app-config-v1-compat/package.json index 73a2f311..6e35f656 100644 --- a/app-config-v1-compat/package.json +++ b/app-config-v1-compat/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/v1-compat", "description": "Version 1 compatibility layer for @app-config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/logging": "^3.0.0-alpha.2", - "@app-config/node": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/node": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", "fs-extra": "7" }, "devDependencies": { - "@app-config/extensions": "^3.0.0-alpha.2", - "@app-config/test-utils": "^3.0.0-alpha.2" + "@app-config/extensions": "^3.0.0-alpha.3", + "@app-config/test-utils": "^3.0.0-alpha.3" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vault/package.json b/app-config-vault/package.json index f66cbcd6..20893eb0 100644 --- a/app-config-vault/package.json +++ b/app-config-vault/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/vault", "description": "Hashicorp Vault support for App Config", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,9 +30,9 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.2", - "@app-config/utils": "^3.0.0-alpha.2", - "@app-config/extension-utils": "^3.0.0-alpha.2", + "@app-config/core": "^3.0.0-alpha.3", + "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/extension-utils": "^3.0.0-alpha.3", "@lcdev/fetch": "^0.1.10", "cross-fetch": "3", "node-vault": "0.9" diff --git a/app-config-webpack/package.json b/app-config-webpack/package.json index 7158e514..ae9c16cd 100644 --- a/app-config-webpack/package.json +++ b/app-config-webpack/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/webpack", "description": "Webpack plugin that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,12 +34,12 @@ "loader-utils": "2" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.2", + "@app-config/main": "^3.0.0-alpha.3", "html-webpack-plugin": "4 || 5", "webpack": "4 || 5" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.2", + "@app-config/main": "^3.0.0-alpha.3", "@types/loader-utils": "1", "@webpack-cli/serve": "1", "html-webpack-plugin": "5", diff --git a/examples/cli-project/package.json b/examples/cli-project/package.json index 1b8b22f6..d698b811 100644 --- a/examples/cli-project/package.json +++ b/examples/cli-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2" + "@app-config/main": "3.0.0-alpha.3" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/examples/frontend-webpack-project/package.json b/examples/frontend-webpack-project/package.json index e10c4b33..3df8a2e8 100644 --- a/examples/frontend-webpack-project/package.json +++ b/examples/frontend-webpack-project/package.json @@ -10,10 +10,10 @@ "test": "jest" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2" + "@app-config/main": "3.0.0-alpha.3" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.2", + "@app-config/webpack": "3.0.0-alpha.3", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/examples/nodejs-server/package.json b/examples/nodejs-server/package.json index 3ed7e2df..c8e597bd 100644 --- a/examples/nodejs-server/package.json +++ b/examples/nodejs-server/package.json @@ -13,7 +13,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2", + "@app-config/main": "3.0.0-alpha.3", "fastify": "3" }, "devDependencies": { diff --git a/examples/react-native-project/package.json b/examples/react-native-project/package.json index 25fd05ed..4329790c 100644 --- a/examples/react-native-project/package.json +++ b/examples/react-native-project/package.json @@ -12,7 +12,7 @@ "eject": "expo eject" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2", + "@app-config/main": "3.0.0-alpha.3", "expo": "39", "expo-status-bar": "1", "expo-yarn-workspaces": "1", @@ -22,8 +22,8 @@ }, "devDependencies": { "@babel/core": "7", - "@app-config/main": "3.0.0-alpha.2", - "@app-config/react-native": "3.0.0-alpha.2", + "@app-config/main": "3.0.0-alpha.3", + "@app-config/react-native": "3.0.0-alpha.3", "@lcdev/tsconfig": "0.1", "@types/react": "16", "@types/react-native": "0.63", diff --git a/lcdev-app-config-inject/package.json b/lcdev-app-config-inject/package.json index cf72113f..70cbed3e 100644 --- a/lcdev-app-config-inject/package.json +++ b/lcdev-app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config-inject", "description": "Alias for @app-config/inject", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,7 +34,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/inject": "^3.0.0-alpha.2" + "@app-config/inject": "^3.0.0-alpha.3" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-app-config-webpack-plugin/package.json b/lcdev-app-config-webpack-plugin/package.json index 0d884691..951cd662 100644 --- a/lcdev-app-config-webpack-plugin/package.json +++ b/lcdev-app-config-webpack-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config-webpack-plugin", "description": "Alias for @app-config/webpack", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/webpack": "^3.0.0-alpha.2" + "@app-config/webpack": "^3.0.0-alpha.3" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-app-config/package.json b/lcdev-app-config/package.json index 23f029d9..3d47bf69 100644 --- a/lcdev-app-config/package.json +++ b/lcdev-app-config/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config", "description": "Alias for @app-config/main", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -33,8 +33,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^3.0.0-alpha.2", - "@app-config/main": "^3.0.0-alpha.2" + "@app-config/cli": "^3.0.0-alpha.3", + "@app-config/main": "^3.0.0-alpha.3" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-react-native-app-config-transformer/package.json b/lcdev-react-native-app-config-transformer/package.json index 9320c178..a82288b2 100644 --- a/lcdev-react-native-app-config-transformer/package.json +++ b/lcdev-react-native-app-config-transformer/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/react-native-app-config-transformer", "description": "Alias for @app-config/react-native", - "version": "3.0.0-alpha.2", + "version": "3.0.0-alpha.3", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/react-native": "^3.0.0-alpha.2" + "@app-config/react-native": "^3.0.0-alpha.3" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/tests/standalone-project/package.json b/tests/standalone-project/package.json index 60aa3365..8feef4db 100644 --- a/tests/standalone-project/package.json +++ b/tests/standalone-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2" + "@app-config/main": "3.0.0-alpha.3" }, "devDependencies": { "typescript": "*" diff --git a/tests/webpack-projects/app-config-core-in-browser/package.json b/tests/webpack-projects/app-config-core-in-browser/package.json index b6f57dfc..9937d250 100644 --- a/tests/webpack-projects/app-config-core-in-browser/package.json +++ b/tests/webpack-projects/app-config-core-in-browser/package.json @@ -10,8 +10,8 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/core": "3.0.0-alpha.2", - "@app-config/utils": "3.0.0-alpha.2" + "@app-config/core": "3.0.0-alpha.3", + "@app-config/utils": "3.0.0-alpha.3" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/tests/webpack-projects/cypress-plugin/package.json b/tests/webpack-projects/cypress-plugin/package.json index 6551c7da..fedb8496 100644 --- a/tests/webpack-projects/cypress-plugin/package.json +++ b/tests/webpack-projects/cypress-plugin/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2", - "@app-config/cypress": "3.0.0-alpha.2" + "@app-config/main": "3.0.0-alpha.3", + "@app-config/cypress": "3.0.0-alpha.3" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.2", + "@app-config/webpack": "3.0.0-alpha.3", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", diff --git a/tests/webpack-projects/extending-other-files/package.json b/tests/webpack-projects/extending-other-files/package.json index 5e37184c..09cffaed 100644 --- a/tests/webpack-projects/extending-other-files/package.json +++ b/tests/webpack-projects/extending-other-files/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2" + "@app-config/main": "3.0.0-alpha.3" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.2", + "@app-config/webpack": "3.0.0-alpha.3", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/query-parameter-overrides/package.json b/tests/webpack-projects/query-parameter-overrides/package.json index 6a2bb1f6..c6186ebb 100644 --- a/tests/webpack-projects/query-parameter-overrides/package.json +++ b/tests/webpack-projects/query-parameter-overrides/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2", + "@app-config/main": "3.0.0-alpha.3", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.2", + "@app-config/webpack": "3.0.0-alpha.3", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/two-app-config-sources/package.json b/tests/webpack-projects/two-app-config-sources/package.json index 64331593..c6d04818 100644 --- a/tests/webpack-projects/two-app-config-sources/package.json +++ b/tests/webpack-projects/two-app-config-sources/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2" + "@app-config/main": "3.0.0-alpha.3" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.2", + "@app-config/webpack": "3.0.0-alpha.3", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/webpack5/package.json b/tests/webpack-projects/webpack5/package.json index b79235ac..ab47fe59 100644 --- a/tests/webpack-projects/webpack5/package.json +++ b/tests/webpack-projects/webpack5/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.2", - "@app-config/cypress": "3.0.0-alpha.2" + "@app-config/main": "3.0.0-alpha.3", + "@app-config/cypress": "3.0.0-alpha.3" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.2", + "@app-config/webpack": "3.0.0-alpha.3", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", From 0ba4bcfb9ab5e76e795fc05597e973ec40a4f1d5 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Wed, 5 May 2021 20:17:51 -0600 Subject: [PATCH 19/39] cleanup: removes deprecation warnings --- app-config-encryption/src/index.ts | 11 +---------- app-config-git/src/index.ts | 7 ------- app-config-v1-compat/src/index.ts | 26 +------------------------- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/app-config-encryption/src/index.ts b/app-config-encryption/src/index.ts index 7ad0fc17..459935aa 100644 --- a/app-config-encryption/src/index.ts +++ b/app-config-encryption/src/index.ts @@ -8,19 +8,10 @@ export * from './secret-agent'; export * from './secret-agent-tls'; /** Decrypts inline encrypted values */ -export default function encryptedDirective( - symmetricKey?: DecryptedSymmetricKey, - shouldShowDeprecationNotice?: true, -): ParsingExtension { +export default function encryptedDirective(symmetricKey?: DecryptedSymmetricKey): ParsingExtension { return named('encryption', (value) => { if (typeof value === 'string' && value.startsWith('enc:')) { return async (parse) => { - if (shouldShowDeprecationNotice) { - logger.warn( - 'Detected deprecated use of @app-config/encryption parsing extension. Please install @app-config/encryption and add it to your meta file "parsingExtensions".', - ); - } - const decrypted = await decryptValue(value, symmetricKey); return parse(decrypted, { fromSecrets: true, parsedFromEncryptedValue: true }); diff --git a/app-config-git/src/index.ts b/app-config-git/src/index.ts index c6be0649..e9342531 100644 --- a/app-config-git/src/index.ts +++ b/app-config-git/src/index.ts @@ -8,7 +8,6 @@ class GitError extends Fallbackable {} /** Access to the git branch and commit ref */ export default function gitRefDirectives( getStatus: typeof gitStatus = gitStatus, - shouldShowDeprecationNotice?: true, ): ParsingExtension { return named( '$git', @@ -17,12 +16,6 @@ export default function gitRefDirectives( validateOptions( (SchemaBuilder) => SchemaBuilder.stringSchema(), (value) => async (parse) => { - if (shouldShowDeprecationNotice) { - logger.warn( - 'Detected deprecated use of @app-config/git parsing extension. Please install @app-config/git and add it to your meta file "parsingExtensions".', - ); - } - switch (value) { case 'commit': return getStatus().then(({ commitRef }) => parse(commitRef, { shouldFlatten: true })); diff --git a/app-config-v1-compat/src/index.ts b/app-config-v1-compat/src/index.ts index 453824e8..ef71b097 100644 --- a/app-config-v1-compat/src/index.ts +++ b/app-config-v1-compat/src/index.ts @@ -7,7 +7,7 @@ import { FileSource } from '@app-config/node'; import { logger } from '@app-config/logging'; /** V1 app-config compatibility */ -export default function v1Compat(shouldShowDeprecationNotice?: true): ParsingExtension { +export default function v1Compat(): ParsingExtension { return named('v1-compat', (value, [_, key], parentKeys) => { // only apply in top-level app-config property if (parentKeys[parentKeys.length - 1]?.[0] !== Root) { @@ -46,12 +46,6 @@ export default function v1Compat(shouldShowDeprecationNotice?: true): ParsingExt // TODO: multiple properties defined if ('extends' in value) { - if (shouldShowDeprecationNotice) { - logger.warn( - 'Detected deprecated use of @app-config/v1-compat parsing extension. Please install @app-config/v1-compat and add it to your meta file "parsingExtensions".', - ); - } - return parse( { $extends: await resolveAmbiguousFilename(value.extends as string) }, { shouldMerge: true }, @@ -59,12 +53,6 @@ export default function v1Compat(shouldShowDeprecationNotice?: true): ParsingExt } if ('extendsOptional' in value) { - if (shouldShowDeprecationNotice) { - logger.warn( - 'Detected deprecated use of @app-config/v1-compat parsing extension. Please install @app-config/v1-compat and add it to your meta file "parsingExtensions".', - ); - } - return parse( { $extends: { @@ -77,12 +65,6 @@ export default function v1Compat(shouldShowDeprecationNotice?: true): ParsingExt } if ('override' in value) { - if (shouldShowDeprecationNotice) { - logger.warn( - 'Detected deprecated use of @app-config/v1-compat parsing extension. Please install @app-config/v1-compat and add it to your meta file "parsingExtensions".', - ); - } - return parse( { $override: await resolveAmbiguousFilename(value.override as string) }, { shouldOverride: true }, @@ -90,12 +72,6 @@ export default function v1Compat(shouldShowDeprecationNotice?: true): ParsingExt } if ('overrideOptional' in value) { - if (shouldShowDeprecationNotice) { - logger.warn( - 'Detected deprecated use of @app-config/v1-compat parsing extension. Please install @app-config/v1-compat and add it to your meta file "parsingExtensions".', - ); - } - return parse( { $override: { From ffe46a4a5ba4dbb723c72957c743539ab2aab860 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Wed, 5 May 2021 20:21:18 -0600 Subject: [PATCH 20/39] cleanup: removes deprecation options on envVar and substitute --- .../src/env-var-directive.ts | 51 ----------- .../src/substitute-directive.ts | 87 +------------------ 2 files changed, 4 insertions(+), 134 deletions(-) diff --git a/app-config-extensions/src/env-var-directive.ts b/app-config-extensions/src/env-var-directive.ts index 39f8d73c..bcbd7062 100644 --- a/app-config-extensions/src/env-var-directive.ts +++ b/app-config-extensions/src/env-var-directive.ts @@ -19,9 +19,6 @@ export function envVarDirective( '$envVar', forKey('$envVar', (value, key, parentKeys, context) => async (parse) => { let name: string; - let parseInt = false; - let parseFloat = false; - let parseBool = false; if (typeof value === 'string') { name = value; @@ -32,62 +29,14 @@ export function envVarDirective( const resolved = (await parse(value.name)).toJSON(); validateString(resolved, [...parentKeys, key, [InObject, 'name']]); - parseInt = !!(await parse(value.parseInt)).toJSON(); - parseFloat = !!(await parse(value.parseFloat)).toJSON(); - parseBool = !!(await parse(value.parseBool)).toJSON(); name = resolved; - - if (parseInt) { - logger.warn( - `Detected use of deprecated of 'parseInt' option in $envVar - use $parseInt directive instead`, - ); - } - - if (parseFloat) { - logger.warn( - `Detected use of deprecated of 'parseFloat' option in $envVar - use $parseFloat directive instead`, - ); - } - - if (parseBool) { - logger.warn( - `Detected use of deprecated of 'parseBool' option in $envVar - use $parseBool directive instead`, - ); - } } const parseValue = (strValue: string | null) => { - if (parseBool) { - const parsed = - strValue !== null && (strValue.toLowerCase() === 'true' || strValue === '1'); - - return parse(parsed, { shouldFlatten: true }); - } - if (strValue === null) { return parse(null, { shouldFlatten: true }); } - if (parseInt) { - const parsed = Number.parseInt(strValue, 10); - - if (Number.isNaN(parsed)) { - throw new AppConfigError(`Failed to parseInt(${strValue})`); - } - - return parse(parsed, { shouldFlatten: true }); - } - - if (parseFloat) { - const parsed = Number.parseFloat(strValue); - - if (Number.isNaN(parsed)) { - throw new AppConfigError(`Failed to parseFloat(${strValue})`); - } - - return parse(parsed, { shouldFlatten: true }); - } - return parse(strValue, { shouldFlatten: true }); }; diff --git a/app-config-extensions/src/substitute-directive.ts b/app-config-extensions/src/substitute-directive.ts index 8d14047e..ffe3ac03 100644 --- a/app-config-extensions/src/substitute-directive.ts +++ b/app-config-extensions/src/substitute-directive.ts @@ -29,74 +29,15 @@ export function substituteDirective( validateObject(value, [...parentKeys, key]); if (Array.isArray(value)) throw new AppConfigError('$substitute was given an array'); - if (value.$name) { - logger.warn( - `Detected deprecated use of $name in a $substitute directive. Use 'name' instead.`, - ); - } - - const name = (await parse(selectDefined(value.name, value.$name))).toJSON(); + const name = (await parse(value.name)).toJSON(); validateString(name, [...parentKeys, key, [InObject, 'name']]); const parseValue = async (strValue: string | null) => { - const parseBool = (await parse(selectDefined(value.parseBool, value.$parseBool))).toJSON(); - - if (value.$parseBool) { - logger.warn( - `Detected deprecated use of $parseBool in a $substitute directive - use $parseBool directive instead`, - ); - } - - if (parseBool) { - const parsed = - strValue !== null && (strValue.toLowerCase() === 'true' || strValue === '1'); - - return parse(parsed, { shouldFlatten: true }); - } - if (strValue === null) { return parse(null, { shouldFlatten: true }); } - const parseInt = (await parse(selectDefined(value.parseInt, value.$parseInt))).toJSON(); - - if (value.$parseInt) { - logger.warn( - `Detected deprecated use of $parseInt in a $substitute directive - use $parseInt directive instead`, - ); - } - - if (parseInt) { - const parsed = Number.parseInt(strValue, 10); - - if (Number.isNaN(parsed)) { - throw new AppConfigError(`Failed to parseInt(${strValue})`); - } - - return parse(parsed, { shouldFlatten: true }); - } - - if (value.$parseFloat) { - logger.warn( - `Detected deprecated use of $parseFloat in a $substitute directive - use $parseFloat directive instead`, - ); - } - - const parseFloat = ( - await parse(selectDefined(value.parseFloat, value.$parseFloat)) - ).toJSON(); - - if (parseFloat) { - const parsed = Number.parseFloat(strValue); - - if (Number.isNaN(parsed)) { - throw new AppConfigError(`Failed to parseFloat(${strValue})`); - } - - return parse(parsed, { shouldFlatten: true }); - } - return parse(strValue, { shouldFlatten: true }); }; @@ -110,21 +51,9 @@ export function substituteDirective( return parseValue(resolvedValue); } - if (value.fallback !== undefined || value.$fallback !== undefined) { - const fallback = (await parse(selectDefined(value.fallback, value.$fallback))).toJSON(); - const allowNull = (await parse(selectDefined(value.allowNull, value.$allowNull))).toJSON(); - - if (value.$fallback) { - logger.warn( - `Detected deprecated use of $fallback in a $substitute directive. Use 'fallback' instead.`, - ); - } - - if (value.$allowNull) { - logger.warn( - `Detected deprecated use of $allowNull in a $substitute directive. Use 'allowNull' instead.`, - ); - } + if (value.fallback !== undefined) { + const fallback = (await parse(value.fallback)).toJSON(); + const allowNull = (await parse(value.allowNull)).toJSON(); if (allowNull) { validateStringOrNull(fallback, [...parentKeys, key, [InObject, 'fallback']]); @@ -188,14 +117,6 @@ function performAllSubstitutions(text: string, envType?: string): string { return output; } -function selectDefined(...args: (T | null | undefined)[]): T | null { - for (const a of args) { - if (a !== undefined) return a; - } - - return (undefined as any) as T; -} - const validateObject: ValidationFunction< Record > = validationFunction(({ emptySchema }) => emptySchema().addAdditionalProperties()); From 1819e0587e29e70e59b3609344017ffca73686ce Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Wed, 5 May 2021 20:24:02 -0600 Subject: [PATCH 21/39] cleanup: removes deprecated FlexibleFileSource constructor --- app-config-node/src/file-source.ts | 44 ++---------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/app-config-node/src/file-source.ts b/app-config-node/src/file-source.ts index 4c48df70..a103af88 100644 --- a/app-config-node/src/file-source.ts +++ b/app-config-node/src/file-source.ts @@ -54,54 +54,16 @@ export class FlexibleFileSource extends ConfigSource { private readonly fileExtensions: string[]; private readonly environmentOptions: EnvironmentOptions; - constructor(filePath: string, fileExtensions?: string[], environmentOptions?: EnvironmentOptions); - - /** @deprecated use constructor with environmentOptions instead */ - constructor( - filePath: string, - environmentOverride?: string, - environmentAliases?: EnvironmentAliases, - fileExtensions?: string[], - environmentSourceNames?: string[] | string, - ); - constructor( filePath: string, - environmentOverrideOrFileExtensions?: string | string[], - environmentAliasesOrEnvironmentOptions?: EnvironmentAliases | EnvironmentOptions, fileExtensions?: string[], - environmentSourceNames?: string[] | string, + environmentOptions?: EnvironmentOptions, ) { super(); this.filePath = filePath; - const defaultFileExtensions = ['yml', 'yaml', 'toml', 'json', 'json5']; - - if ( - (Array.isArray(environmentOverrideOrFileExtensions) || - environmentOverrideOrFileExtensions === undefined) && - (environmentAliasesOrEnvironmentOptions - ? 'aliases' in environmentAliasesOrEnvironmentOptions || - 'envVarNames' in environmentAliasesOrEnvironmentOptions - : true) && - fileExtensions === undefined && - environmentSourceNames === undefined - ) { - this.fileExtensions = environmentOverrideOrFileExtensions ?? defaultFileExtensions; - this.environmentOptions = - (environmentAliasesOrEnvironmentOptions as EnvironmentOptions) ?? defaultEnvOptions; - } else { - logger.warn( - `Detected deprecated usage of FlexibleFileSource constructor loading ${filePath}`, - ); - - this.fileExtensions = fileExtensions ?? defaultFileExtensions; - this.environmentOptions = asEnvOptions( - environmentOverrideOrFileExtensions as string, - environmentAliasesOrEnvironmentOptions as EnvironmentAliases, - environmentSourceNames, - ); - } + this.fileExtensions = fileExtensions ?? ['yml', 'yaml', 'toml', 'json', 'json5']; + this.environmentOptions = environmentOptions ?? defaultEnvOptions; } // share 'resolveSource' so that read() returns a ParsedValue pointed to the FileSource, not FlexibleFileSource From e790ac6e95e90db6aec37a9fca12572f7d2d6605 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Wed, 5 May 2021 20:25:15 -0600 Subject: [PATCH 22/39] cleanup: removes deprecated use of currentEnvironment --- app-config-node/src/environment.test.ts | 29 +++++---------- app-config-node/src/environment.ts | 47 +++++-------------------- 2 files changed, 17 insertions(+), 59 deletions(-) diff --git a/app-config-node/src/environment.test.ts b/app-config-node/src/environment.test.ts index 9f0bbe5e..92dd5b4a 100644 --- a/app-config-node/src/environment.test.ts +++ b/app-config-node/src/environment.test.ts @@ -7,25 +7,6 @@ import { } from './environment'; describe('currentEnvironment', () => { - describe('deprecated currentEnvironment', () => { - it('uses environmentSourceNames', () => { - process.env.NODE_ENV = 'foo'; - process.env.FOO = 'bar'; - - expect(currentEnvironment(undefined, ['FOO', 'BAR'])).toBe('bar'); - expect(currentEnvironment(undefined, ['BAR'])).toBe(undefined); - }); - - it('uses environmentAliases', () => { - process.env.FOO = 'bar'; - process.env.NODE_ENV = 'bar'; - - expect(currentEnvironment({}, ['FOO'])).toBe('bar'); - expect(currentEnvironment({ bar: 'foo' })).toBe('foo'); - expect(currentEnvironment({ bar: 'foo' }, ['FOO'])).toBe('foo'); - }); - }); - it('uses envVarNames', () => { process.env.NODE_ENV = 'foo'; process.env.FOO = 'bar'; @@ -49,8 +30,14 @@ describe('currentEnvironment', () => { it('uses override', () => { process.env.NODE_ENV = 'foo'; - expect(currentEnvironment({})).toBe('foo'); - expect(currentEnvironment({ override: 'bar' })).toBe('bar'); + expect(currentEnvironment()).toBe('foo'); + expect( + currentEnvironment({ + override: 'bar', + aliases: defaultAliases, + envVarNames: defaultEnvVarNames, + }), + ).toBe('bar'); }); }); diff --git a/app-config-node/src/environment.ts b/app-config-node/src/environment.ts index f3c1a7d3..17c9ab93 100644 --- a/app-config-node/src/environment.ts +++ b/app-config-node/src/environment.ts @@ -48,50 +48,21 @@ export function asEnvOptions( } /** Retrieve what app-config thinks the current deployment environment is (ie QA, dev, staging, production) */ -export function currentEnvironment(options?: EnvironmentOptions): string | undefined; - -/** @deprecated use currentEnvironment(EnvironmentOptions) instead */ -export function currentEnvironment( - environmentAliases?: EnvironmentAliases, - environmentSourceNames?: string[] | string, -): string | undefined; - -export function currentEnvironment(...args: any[]): string | undefined { +export function currentEnvironment(options?: EnvironmentOptions): string | undefined { let environmentSourceNames: string[] = defaultEnvVarNames; let environmentAliases: EnvironmentAliases = defaultAliases; let environmentOverride: string | undefined; - if ( - args[0] && - typeof args[0] === 'object' && - ('override' in args[0] || 'aliases' in args[0] || 'envVarNames' in args[0]) - ) { - const options = args[0] as EnvironmentOptions; - - if (options.override) { - environmentOverride = options.override; - } - - if (options.aliases) { - environmentAliases = options.aliases; - } + if (options?.override) { + environmentOverride = options.override; + } - if (options.envVarNames) { - environmentSourceNames = options.envVarNames; - } - } else { - if (args[0]) { - environmentAliases = args[0] as EnvironmentAliases; - logger.warn('Detected deprecated usage of currentEnvironment'); - } + if (options?.aliases) { + environmentAliases = options.aliases; + } - if (Array.isArray(args[1])) { - environmentSourceNames = args[1] as string[]; - logger.warn('Detected deprecated usage of currentEnvironment'); - } else if (typeof args[1] === 'string') { - environmentSourceNames = [args[1]]; - logger.warn('Detected deprecated usage of currentEnvironment'); - } + if (options?.envVarNames) { + environmentSourceNames = options.envVarNames; } if (environmentOverride) { From 8a0d3a82fea6068732ba677764fb66d69aa1a102 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Wed, 5 May 2021 20:34:43 -0600 Subject: [PATCH 23/39] fix: lints --- app-config-encryption/src/index.ts | 1 - app-config-extensions/src/env-var-directive.ts | 1 - app-config-git/src/index.ts | 1 - app-config-node/src/environment.ts | 1 - app-config-node/src/file-source.ts | 2 -- app-config-v1-compat/src/index.ts | 1 - 6 files changed, 7 deletions(-) diff --git a/app-config-encryption/src/index.ts b/app-config-encryption/src/index.ts index 459935aa..faa3220a 100644 --- a/app-config-encryption/src/index.ts +++ b/app-config-encryption/src/index.ts @@ -1,6 +1,5 @@ import type { ParsingExtension } from '@app-config/core'; import { named } from '@app-config/extension-utils'; -import { logger } from '@app-config/logging'; import { DecryptedSymmetricKey, decryptValue } from './encryption'; export * from './encryption'; diff --git a/app-config-extensions/src/env-var-directive.ts b/app-config-extensions/src/env-var-directive.ts index bcbd7062..7479b442 100644 --- a/app-config-extensions/src/env-var-directive.ts +++ b/app-config-extensions/src/env-var-directive.ts @@ -7,7 +7,6 @@ import { defaultAliases, EnvironmentAliases, } from '@app-config/node'; -import { logger } from '@app-config/logging'; /** Substitutes environment variables */ export function envVarDirective( diff --git a/app-config-git/src/index.ts b/app-config-git/src/index.ts index e9342531..2cee7b46 100644 --- a/app-config-git/src/index.ts +++ b/app-config-git/src/index.ts @@ -1,7 +1,6 @@ import simpleGit from 'simple-git'; import { ParsingExtension, AppConfigError, Fallbackable } from '@app-config/core'; import { named, forKey, validateOptions } from '@app-config/extension-utils'; -import { logger } from '@app-config/logging'; class GitError extends Fallbackable {} diff --git a/app-config-node/src/environment.ts b/app-config-node/src/environment.ts index 17c9ab93..3a81bc08 100644 --- a/app-config-node/src/environment.ts +++ b/app-config-node/src/environment.ts @@ -1,5 +1,4 @@ import { ParsingContext } from '@app-config/core'; -import { logger } from '@app-config/logging'; /** A mapping for "alias" names of environments, like "dev" => "development" */ export interface EnvironmentAliases { diff --git a/app-config-node/src/file-source.ts b/app-config-node/src/file-source.ts index a103af88..82ee2847 100644 --- a/app-config-node/src/file-source.ts +++ b/app-config-node/src/file-source.ts @@ -13,10 +13,8 @@ import { import { logger } from '@app-config/logging'; import { aliasesFor, - asEnvOptions, currentEnvFromContext, defaultEnvOptions, - EnvironmentAliases, EnvironmentOptions, } from './environment'; diff --git a/app-config-v1-compat/src/index.ts b/app-config-v1-compat/src/index.ts index ef71b097..43941dfe 100644 --- a/app-config-v1-compat/src/index.ts +++ b/app-config-v1-compat/src/index.ts @@ -4,7 +4,6 @@ import { isObject } from '@app-config/utils'; import { named } from '@app-config/extension-utils'; import { ParsingExtension, Root } from '@app-config/core'; import { FileSource } from '@app-config/node'; -import { logger } from '@app-config/logging'; /** V1 app-config compatibility */ export default function v1Compat(): ParsingExtension { From cadfbc7d8e651f7ae4a0bc084388ec6017dec85b Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Wed, 5 May 2021 20:44:03 -0600 Subject: [PATCH 24/39] fix: old parentkeys --- app-config-core/src/parsed-value.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-config-core/src/parsed-value.test.ts b/app-config-core/src/parsed-value.test.ts index 7b61809c..a9e7afb9 100644 --- a/app-config-core/src/parsed-value.test.ts +++ b/app-config-core/src/parsed-value.test.ts @@ -42,7 +42,7 @@ describe('parseValue', () => { return (parse) => parse(value, { marked: true }); }; - const markKeyExtension: ParsingExtension = (value, [[keyType, key]]) => { + const markKeyExtension: ParsingExtension = (value, [keyType, key]) => { if (keyType === InObject && key === '$mark') { return (parse) => parse(value, { shouldFlatten: true, marked: true }); } @@ -84,7 +84,7 @@ describe('parseValue', () => { return false; }; - const mergeExtension: ParsingExtension = (value, [[keyType, key]]) => { + const mergeExtension: ParsingExtension = (value, [keyType, key]) => { if (keyType === InObject && key === '$merge') { return (parse) => parse(value, { shouldMerge: true }); } @@ -92,7 +92,7 @@ describe('parseValue', () => { return false; }; - const overrideExtension: ParsingExtension = (value, [[keyType, key]]) => { + const overrideExtension: ParsingExtension = (value, [keyType, key]) => { if (keyType === InObject && key === '$override') { return (parse) => parse(value, { shouldOverride: true }); } From 1d70bb6beb0ef413efca6a90035bf041f70efeba Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Wed, 5 May 2021 20:56:15 -0600 Subject: [PATCH 25/39] cleanup: old tests --- .../src/env-var-directive.test.ts | 88 ------- .../src/substitute-directive.test.ts | 236 ------------------ 2 files changed, 324 deletions(-) diff --git a/app-config-extensions/src/env-var-directive.test.ts b/app-config-extensions/src/env-var-directive.test.ts index a12a4704..0e79ea1a 100644 --- a/app-config-extensions/src/env-var-directive.test.ts +++ b/app-config-extensions/src/env-var-directive.test.ts @@ -95,86 +95,6 @@ describe('$envVar directive', () => { expect(parsed.toJSON()).toEqual({ foo: null, bar: 'foo' }); }); - it('parses ints', async () => { - process.env.FOO = '11'; - - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseInt: true }, - }); - - expect(await source.readToJSON([envVarDirective()])).toEqual(11); - }); - - it('fails when int is invalid', async () => { - process.env.FOO = 'not a number'; - - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseInt: true }, - }); - - await expect(source.read([envVarDirective()])).rejects.toThrow(); - }); - - it('parses float', async () => { - process.env.FOO = '11.2'; - - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseFloat: true }, - }); - - expect(await source.readToJSON([envVarDirective()])).toEqual(11.2); - }); - - it('fails when float is invalid', async () => { - process.env.FOO = 'not a number'; - - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseFloat: true }, - }); - - await expect(source.read([envVarDirective()])).rejects.toThrow(); - }); - - it('parses boolean = true', async () => { - process.env.FOO = 'true'; - - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseBool: true }, - }); - - expect(await source.readToJSON([envVarDirective()])).toEqual(true); - }); - - it('parses boolean = 1', async () => { - process.env.FOO = '1'; - - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseBool: true }, - }); - - expect(await source.readToJSON([envVarDirective()])).toEqual(true); - }); - - it('parses boolean = 0', async () => { - process.env.FOO = '0'; - - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseBool: true }, - }); - - expect(await source.readToJSON([envVarDirective()])).toEqual(false); - }); - - it('parses boolean = false', async () => { - process.env.FOO = 'false'; - - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseBool: true }, - }); - - expect(await source.readToJSON([envVarDirective()])).toEqual(false); - }); - it('doesnt visit fallback if name is defined', async () => { const failDirective = forKey('$fail', () => () => { throw new Error(); @@ -202,12 +122,4 @@ describe('$envVar directive', () => { expect(parsed.toJSON()).toEqual({ foo: 'qa' }); }); - - it('parses boolean from fallback', async () => { - const source = new LiteralSource({ - $envVar: { name: 'FOO', parseBool: true, fallback: 'true' }, - }); - - expect(await source.readToJSON([envVarDirective()])).toEqual(true); - }); }); diff --git a/app-config-extensions/src/substitute-directive.test.ts b/app-config-extensions/src/substitute-directive.test.ts index 13cc8f1d..c3bb8f8f 100644 --- a/app-config-extensions/src/substitute-directive.test.ts +++ b/app-config-extensions/src/substitute-directive.test.ts @@ -152,162 +152,6 @@ describe('$substitute directive', () => { expect(parsed.toJSON()).toEqual({ foo: 'qa' }); }); - it('reads object with $name', async () => { - process.env.FOO = 'foo'; - - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO' } }, - }); - - const parsed = await source.read([substituteDirective()]); - - expect(parsed.toJSON()).toEqual({ foo: 'foo' }); - }); - - it('fails with $name when not defined', async () => { - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO' } }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('uses $name when $fallback is defined', async () => { - process.env.FOO = 'foo'; - - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: 'bar' } }, - }); - - const parsed = await source.read([substituteDirective()]); - - expect(parsed.toJSON()).toEqual({ foo: 'foo' }); - }); - - it('uses $fallback when $name was not found', async () => { - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: 'bar' } }, - }); - - const parsed = await source.read([substituteDirective()]); - - expect(parsed.toJSON()).toEqual({ foo: 'bar' }); - }); - - it('allows null value when $allowNull', async () => { - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: null, $allowNull: true } }, - }); - - const parsed = await source.read([substituteDirective()]); - - expect(parsed.toJSON()).toEqual({ foo: null }); - }); - - it('does not allow number even when $allowNull', async () => { - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: 42, $allowNull: true } }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('parses ints', async () => { - process.env.FOO = '11'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseInt: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(11); - }); - - it('fails when int is invalid', async () => { - process.env.FOO = 'not a number'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseInt: true }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('parses float', async () => { - process.env.FOO = '11.2'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseFloat: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(11.2); - }); - - it('fails when float is invalid', async () => { - process.env.FOO = 'not a number'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseFloat: true }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('parses boolean = true', async () => { - process.env.FOO = 'true'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(true); - }); - - it('parses boolean = 1', async () => { - process.env.FOO = '1'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(true); - }); - - it('parses boolean = 0', async () => { - process.env.FOO = '0'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(false); - }); - - it('parses boolean = false', async () => { - process.env.FOO = 'false'; - - const source = new LiteralSource({ - $substitute: { $name: 'FOO', $parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(false); - }); - - it('doesnt visit fallback if name is defined', async () => { - const failDirective = forKey('$fail', () => () => { - throw new Error(); - }); - - process.env.FOO = 'foo'; - - const source = new LiteralSource({ - foo: { $substitute: { $name: 'FOO', $fallback: { $fail: true } } }, - }); - - const parsed = await source.read([substituteDirective(), failDirective]); - - expect(parsed.toJSON()).toEqual({ foo: 'foo' }); - }); - it('reads object with name', async () => { process.env.FOO = 'foo'; @@ -368,86 +212,6 @@ describe('$substitute directive', () => { await expect(source.read([substituteDirective()])).rejects.toThrow(); }); - it('parses ints', async () => { - process.env.FOO = '11'; - - const source = new LiteralSource({ - $substitute: { name: 'FOO', parseInt: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(11); - }); - - it('fails when int is invalid', async () => { - process.env.FOO = 'not a number'; - - const source = new LiteralSource({ - $substitute: { name: 'FOO', parseInt: true }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('parses float', async () => { - process.env.FOO = '11.2'; - - const source = new LiteralSource({ - $substitute: { name: 'FOO', parseFloat: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(11.2); - }); - - it('fails when float is invalid', async () => { - process.env.FOO = 'not a number'; - - const source = new LiteralSource({ - $substitute: { name: 'FOO', parseFloat: true }, - }); - - await expect(source.read([substituteDirective()])).rejects.toThrow(); - }); - - it('parses boolean = true', async () => { - process.env.FOO = 'true'; - - const source = new LiteralSource({ - $substitute: { name: 'FOO', parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(true); - }); - - it('parses boolean = 1', async () => { - process.env.FOO = '1'; - - const source = new LiteralSource({ - $substitute: { name: 'FOO', parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(true); - }); - - it('parses boolean = 0', async () => { - process.env.FOO = '0'; - - const source = new LiteralSource({ - $substitute: { name: 'FOO', parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(false); - }); - - it('parses boolean = false', async () => { - process.env.FOO = 'false'; - - const source = new LiteralSource({ - $substitute: { name: 'FOO', parseBool: true }, - }); - - expect(await source.readToJSON([substituteDirective()])).toEqual(false); - }); - it('doesnt visit fallback if name is defined', async () => { const failDirective = forKey('$fail', () => () => { throw new Error(); From 72132d74998f81e4a637431b8f89e075d5f8fa3e Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 6 May 2021 06:27:27 -0600 Subject: [PATCH 26/39] fix: random-package --- tests/parsing-extensions/random-package/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parsing-extensions/random-package/main.js b/tests/parsing-extensions/random-package/main.js index 71a6847f..bafd5cc0 100644 --- a/tests/parsing-extensions/random-package/main.js +++ b/tests/parsing-extensions/random-package/main.js @@ -1,4 +1,4 @@ -module.exports = (options) => (value, [[, key]]) => { +module.exports = (options) => (value, [, key]) => { const rng = require('seedrandom')(options.seed); if (key === '$random') { From de636dd22bfdfd1f7395b9777454d2c59d966aaa Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 6 May 2021 06:27:58 -0600 Subject: [PATCH 27/39] fix: eval-package --- tests/parsing-extensions/eval-package/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parsing-extensions/eval-package/main.js b/tests/parsing-extensions/eval-package/main.js index 6349d0f3..32ae1e0f 100644 --- a/tests/parsing-extensions/eval-package/main.js +++ b/tests/parsing-extensions/eval-package/main.js @@ -1,4 +1,4 @@ -module.exports = (options) => (value, [[, key]]) => { +module.exports = (options) => (value, [, key]) => { if (key === '$eval') { if (typeof value === 'string') { return (parse) => parse(eval(value), { shouldFlatten: true }); From 7d5af9ab7910eb5c8ece8066f2db732feb235b52 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 6 May 2021 06:54:14 -0600 Subject: [PATCH 28/39] cleanup: default-extensions type --- app-config-default-extensions/index.d.ts | 17 +-------- app-config-default-extensions/index.js | 46 ++++++++---------------- 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/app-config-default-extensions/index.d.ts b/app-config-default-extensions/index.d.ts index 090abc2f..a8f2517e 100644 --- a/app-config-default-extensions/index.d.ts +++ b/app-config-default-extensions/index.d.ts @@ -4,21 +4,6 @@ import type { ParsingExtension } from '@app-config/core'; -interface EnvironmentAliases { - [alias: string]: string; -} - -interface DecryptedSymmetricKey { - revision: number; - key: Uint8Array; -} - -export function defaultExtensions( - aliases?: EnvironmentAliases, - environmentOverride?: string, - symmetricKey?: DecryptedSymmetricKey, - environmentSourceNames?: string[] | string, -): ParsingExtension[]; - +export function defaultExtensions(): ParsingExtension[]; export function defaultEnvExtensions(): ParsingExtension[]; export function defaultMetaExtensions(): ParsingExtension[]; diff --git a/app-config-default-extensions/index.js b/app-config-default-extensions/index.js index 38e827e2..7634a123 100644 --- a/app-config-default-extensions/index.js +++ b/app-config-default-extensions/index.js @@ -2,27 +2,24 @@ // By not being a TypeScript project with project references, we can use this // tiny module as a glue between @app-config/node and @app-config/* extensions. -// NOTE: Also, we don't require modules up-front - lazy load them instead. -// This avoids circular dependency chains. +const { + unescape$Directives, + tryDirective, + ifDirective, + eqDirective, + parseDirective, + hiddenDirective, + envDirective, + envVarDirective, + extendsDirective, + extendsSelfDirective, + overrideDirective, + timestampDirective, + substituteDirective, +} = require('@app-config/extensions'); module.exports = { defaultExtensions() { - const { - unescape$Directives, - tryDirective, - ifDirective, - eqDirective, - parseDirective, - hiddenDirective, - envDirective, - envVarDirective, - extendsDirective, - extendsSelfDirective, - overrideDirective, - timestampDirective, - substituteDirective, - } = require('@app-config/extensions'); - return [ unescape$Directives(), tryDirective(), @@ -40,22 +37,9 @@ module.exports = { ]; }, defaultEnvExtensions() { - const { unescape$Directives, markAllValuesAsSecret } = require('@app-config/extensions'); - return [unescape$Directives(), markAllValuesAsSecret()]; }, defaultMetaExtensions() { - const { - unescape$Directives, - tryDirective, - ifDirective, - eqDirective, - hiddenDirective, - extendsDirective, - extendsSelfDirective, - overrideDirective, - } = require('@app-config/extensions'); - return [ unescape$Directives(), tryDirective(), From 7de7bf549b1b2163f638876084a3a4933692c11c Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 6 May 2021 07:03:14 -0600 Subject: [PATCH 29/39] feat: removes default-extensions --- .github/workflows/publishing.yml | 7 -- CONTRIBUTING.md | 1 - app-config-config/package.json | 1 - app-config-config/src/index.ts | 7 +- app-config-default-extensions/.eslintrc.js | 1 - app-config-default-extensions/README.md | 8 --- app-config-default-extensions/index.d.ts | 9 --- app-config-default-extensions/index.js | 54 ---------------- app-config-default-extensions/package.json | 33 ---------- app-config-default-extensions/tsconfig.json | 11 ---- app-config-extensions/src/index.ts | 72 +++++++++++++++++---- app-config-main/package.json | 2 +- app-config-main/src/index.ts | 2 +- app-config-meta/package.json | 2 +- app-config-meta/src/index.ts | 2 +- app-config-meta/tsconfig.json | 2 +- new-version.sh | 1 - 17 files changed, 70 insertions(+), 145 deletions(-) delete mode 100644 app-config-default-extensions/.eslintrc.js delete mode 100644 app-config-default-extensions/README.md delete mode 100644 app-config-default-extensions/index.d.ts delete mode 100644 app-config-default-extensions/index.js delete mode 100644 app-config-default-extensions/package.json delete mode 100644 app-config-default-extensions/tsconfig.json diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 5bcf7a1b..74b68715 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -37,13 +37,6 @@ jobs: access: public package: ./app-config-cypress/package.json tag: next - - name: app-config-default-extensions - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.NPM_TOKEN }} - access: public - package: ./app-config-default-extensions/package.json - tag: next - name: app-config-encryption uses: JS-DevTools/npm-publish@v1 with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a4b1ef1..1957f70b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,7 +43,6 @@ If you are adding anything new or changing behavior, please add applicable tests - `@app-config/git`: `$git` parsing extension - `@app-config/v1-compat`: v1 version compatibility extension - `@app-config/extensions`: common parsing extensions -- `@app-config/default-extensions`: all default parsing extensions - `@app-config/generate`: code generation - `@app-config/config`: config loading - `@app-config/meta`: meta file loading diff --git a/app-config-config/package.json b/app-config-config/package.json index 32e8d158..9bff12f1 100644 --- a/app-config-config/package.json +++ b/app-config-config/package.json @@ -31,7 +31,6 @@ }, "dependencies": { "@app-config/core": "^3.0.0-alpha.3", - "@app-config/default-extensions": "^3.0.0-alpha.3", "@app-config/extensions": "^3.0.0-alpha.3", "@app-config/logging": "^3.0.0-alpha.3", "@app-config/meta": "^3.0.0-alpha.3", diff --git a/app-config-config/src/index.ts b/app-config-config/src/index.ts index b69d2469..599024c4 100644 --- a/app-config-config/src/index.ts +++ b/app-config-config/src/index.ts @@ -17,8 +17,11 @@ import { EnvironmentSource, asEnvOptions, } from '@app-config/node'; -import { markAllValuesAsSecret } from '@app-config/extensions'; -import { defaultExtensions, defaultEnvExtensions } from '@app-config/default-extensions'; +import { + defaultExtensions, + defaultEnvExtensions, + markAllValuesAsSecret, +} from '@app-config/extensions'; import { loadSchema, JSONSchema, SchemaLoadingOptions } from '@app-config/schema'; import { loadMetaConfig, loadExtraParsingExtensions } from '@app-config/meta'; diff --git a/app-config-default-extensions/.eslintrc.js b/app-config-default-extensions/.eslintrc.js deleted file mode 100644 index 10bb3e63..00000000 --- a/app-config-default-extensions/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lcdev/eslint-config/cwd')(__dirname); diff --git a/app-config-default-extensions/README.md b/app-config-default-extensions/README.md deleted file mode 100644 index bbaef4e9..00000000 --- a/app-config-default-extensions/README.md +++ /dev/null @@ -1,8 +0,0 @@ -## App Config Default Extensions - -This is a package for combining all parsing extensions that are used by default in [App Config](https://app-config.dev). - -The API of this module is documented via TypeScript definitions. - -Read the [Introduction](https://app-config.dev/guide/intro/) or -[Quick Start](https://app-config.dev/guide/intro/quick-start/) guides on our website. diff --git a/app-config-default-extensions/index.d.ts b/app-config-default-extensions/index.d.ts deleted file mode 100644 index a8f2517e..00000000 --- a/app-config-default-extensions/index.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -// NOTE: This module "breaks" the circular dependency between different packages. -// By not being a TypeScript project with project references, we can use this -// tiny module as a glue between @app-config/node and @app-config/* extensions. - -import type { ParsingExtension } from '@app-config/core'; - -export function defaultExtensions(): ParsingExtension[]; -export function defaultEnvExtensions(): ParsingExtension[]; -export function defaultMetaExtensions(): ParsingExtension[]; diff --git a/app-config-default-extensions/index.js b/app-config-default-extensions/index.js deleted file mode 100644 index 7634a123..00000000 --- a/app-config-default-extensions/index.js +++ /dev/null @@ -1,54 +0,0 @@ -// NOTE: This module "breaks" the circular dependency between different packages. -// By not being a TypeScript project with project references, we can use this -// tiny module as a glue between @app-config/node and @app-config/* extensions. - -const { - unescape$Directives, - tryDirective, - ifDirective, - eqDirective, - parseDirective, - hiddenDirective, - envDirective, - envVarDirective, - extendsDirective, - extendsSelfDirective, - overrideDirective, - timestampDirective, - substituteDirective, -} = require('@app-config/extensions'); - -module.exports = { - defaultExtensions() { - return [ - unescape$Directives(), - tryDirective(), - ifDirective(), - eqDirective(), - parseDirective(), - hiddenDirective(), - envDirective(), - envVarDirective(), - extendsDirective(), - extendsSelfDirective(), - overrideDirective(), - timestampDirective(), - substituteDirective(), - ]; - }, - defaultEnvExtensions() { - return [unescape$Directives(), markAllValuesAsSecret()]; - }, - defaultMetaExtensions() { - return [ - unescape$Directives(), - tryDirective(), - ifDirective(), - eqDirective(), - hiddenDirective(), - extendsDirective(), - extendsSelfDirective(), - overrideDirective(), - ]; - }, -}; diff --git a/app-config-default-extensions/package.json b/app-config-default-extensions/package.json deleted file mode 100644 index f2ccc876..00000000 --- a/app-config-default-extensions/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "@app-config/default-extensions", - "description": "Default parsing extensions for @app-config", - "version": "3.0.0-alpha.3", - "license": "MPL-2.0", - "author": { - "name": "Launchcode", - "email": "admin@lc.dev", - "url": "https://lc.dev" - }, - "repository": { - "type": "git", - "url": "https://github.com/launchcodedev/app-config.git" - }, - "main": "index.js", - "types": "index.d.ts", - "files": [ - "index.js", - "index.d.ts" - ], - "scripts": { - "test": "jest" - }, - "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extensions": "^3.0.0-alpha.3" - }, - "devDependencies": {}, - "prettier": "@lcdev/prettier", - "jest": { - "preset": "@lcdev/jest" - } -} diff --git a/app-config-default-extensions/tsconfig.json b/app-config-default-extensions/tsconfig.json deleted file mode 100644 index 157c3e1c..00000000 --- a/app-config-default-extensions/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "@lcdev/tsconfig", - "compilerOptions": { - "rootDir": "." - }, - "include": ["src"], - "exclude": ["node_modules"], - "references": [ - { "path": "../app-config-core" } - ] -} diff --git a/app-config-extensions/src/index.ts b/app-config-extensions/src/index.ts index b976684a..0415ca0c 100644 --- a/app-config-extensions/src/index.ts +++ b/app-config-extensions/src/index.ts @@ -1,18 +1,31 @@ import { named } from '@app-config/extension-utils'; import { ParsingExtension } from '@app-config/core'; -export { tryDirective } from './try-directive'; -export { ifDirective } from './if-directive'; -export { eqDirective } from './eq-directive'; -export { hiddenDirective } from './hidden-directive'; -export { envDirective } from './env-directive'; -export { extendsDirective, extendsSelfDirective, overrideDirective } from './extends-directive'; -export { timestampDirective } from './timestamp-directive'; - -export { envVarDirective } from './env-var-directive'; -export { substituteDirective } from './substitute-directive'; -export { substituteDirective as environmentVariableSubstitution } from './substitute-directive'; -export { parseDirective } from './parse-directive'; +import { tryDirective } from './try-directive'; +import { ifDirective } from './if-directive'; +import { eqDirective } from './eq-directive'; +import { hiddenDirective } from './hidden-directive'; +import { envDirective } from './env-directive'; +import { extendsDirective, extendsSelfDirective, overrideDirective } from './extends-directive'; +import { timestampDirective } from './timestamp-directive'; +import { envVarDirective } from './env-var-directive'; +import { substituteDirective } from './substitute-directive'; +import { parseDirective } from './parse-directive'; + +export { + tryDirective, + ifDirective, + eqDirective, + hiddenDirective, + envDirective, + extendsDirective, + extendsSelfDirective, + overrideDirective, + timestampDirective, + envVarDirective, + substituteDirective, + parseDirective, +}; /** Marks all values recursively as fromSecrets, so they do not trigger schema errors */ export function markAllValuesAsSecret(): ParsingExtension { @@ -31,3 +44,38 @@ export function unescape$Directives(): ParsingExtension { return false; }); } + +export function defaultExtensions() { + return [ + unescape$Directives(), + tryDirective(), + ifDirective(), + eqDirective(), + parseDirective(), + hiddenDirective(), + envDirective(), + envVarDirective(), + extendsDirective(), + extendsSelfDirective(), + overrideDirective(), + timestampDirective(), + substituteDirective(), + ]; +} + +export function defaultEnvExtensions() { + return [unescape$Directives(), markAllValuesAsSecret()]; +} + +export function defaultMetaExtensions() { + return [ + unescape$Directives(), + tryDirective(), + ifDirective(), + eqDirective(), + hiddenDirective(), + extendsDirective(), + extendsSelfDirective(), + overrideDirective(), + ]; +} diff --git a/app-config-main/package.json b/app-config-main/package.json index 3aa51dd9..fc667232 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -37,7 +37,7 @@ "@app-config/cli": "^3.0.0-alpha.3", "@app-config/config": "^3.0.0-alpha.3", "@app-config/core": "^3.0.0-alpha.3", - "@app-config/default-extensions": "^3.0.0-alpha.3", + "@app-config/extensions": "^3.0.0-alpha.3", "@app-config/logging": "^3.0.0-alpha.3", "@app-config/meta": "^3.0.0-alpha.3", "@app-config/node": "^3.0.0-alpha.3", diff --git a/app-config-main/src/index.ts b/app-config-main/src/index.ts index d0e69798..312b4077 100644 --- a/app-config-main/src/index.ts +++ b/app-config-main/src/index.ts @@ -118,7 +118,7 @@ export { defaultExtensions, defaultEnvExtensions, defaultMetaExtensions, -} from '@app-config/default-extensions'; +} from '@app-config/extensions'; /** @hidden Please don't rely on this. */ export function resetConfigInternal() { diff --git a/app-config-meta/package.json b/app-config-meta/package.json index 9c5a0068..b4a87bf5 100644 --- a/app-config-meta/package.json +++ b/app-config-meta/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@app-config/core": "^3.0.0-alpha.3", - "@app-config/default-extensions": "^3.0.0-alpha.3", + "@app-config/extensions": "^3.0.0-alpha.3", "@app-config/logging": "^3.0.0-alpha.3", "@app-config/node": "^3.0.0-alpha.3", "@app-config/utils": "^3.0.0-alpha.3", diff --git a/app-config-meta/src/index.ts b/app-config-meta/src/index.ts index 523391be..5bbb053e 100644 --- a/app-config-meta/src/index.ts +++ b/app-config-meta/src/index.ts @@ -12,7 +12,7 @@ import { import { logger } from '@app-config/logging'; import { FlexibleFileSource, FileSource } from '@app-config/node'; -import { defaultMetaExtensions } from '@app-config/default-extensions'; +import { defaultMetaExtensions } from '@app-config/extensions'; export interface MetaLoadingOptions { directory?: string; diff --git a/app-config-meta/tsconfig.json b/app-config-meta/tsconfig.json index 0807f8cf..f21b84ac 100644 --- a/app-config-meta/tsconfig.json +++ b/app-config-meta/tsconfig.json @@ -9,6 +9,6 @@ "references": [ { "path": "../app-config-test-utils" }, { "path": "../app-config-node" }, - { "path": "../app-config-default-extensions" } + { "path": "../app-config-extensions" } ] } diff --git a/new-version.sh b/new-version.sh index 699a8d35..89c06255 100755 --- a/new-version.sh +++ b/new-version.sh @@ -41,7 +41,6 @@ new_version app-config-cli new_version app-config-config new_version app-config-core new_version app-config-cypress -new_version app-config-default-extensions new_version app-config-encryption new_version app-config-exec new_version app-config-extension-utils From 41ed7c000da9f75af909e0b2fa7171c1521b4943 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 6 May 2021 07:16:44 -0600 Subject: [PATCH 30/39] chore: release v3.0.0-alpha.4 --- app-config-cli/package.json | 18 ++++++++--------- app-config-config/package.json | 18 ++++++++--------- app-config-core/package.json | 8 ++++---- app-config-cypress/package.json | 6 +++--- app-config-encryption/package.json | 18 ++++++++--------- app-config-exec/package.json | 12 +++++------ app-config-extension-utils/package.json | 4 ++-- app-config-extensions/package.json | 14 ++++++------- app-config-generate/package.json | 10 +++++----- app-config-git/package.json | 8 ++++---- app-config-inject/package.json | 10 +++++----- app-config-js/package.json | 10 +++++----- app-config-logging/package.json | 4 ++-- app-config-main/package.json | 20 +++++++++---------- app-config-meta/package.json | 14 ++++++------- app-config-node/package.json | 8 ++++---- app-config-react-native/package.json | 6 +++--- app-config-schema/package.json | 16 +++++++-------- app-config-settings/package.json | 12 +++++------ app-config-test-utils/package.json | 6 +++--- app-config-utils/package.json | 2 +- app-config-v1-compat/package.json | 16 +++++++-------- app-config-vault/package.json | 11 +++++----- app-config-webpack/package.json | 6 +++--- lcdev-app-config-inject/package.json | 4 ++-- lcdev-app-config-webpack-plugin/package.json | 4 ++-- lcdev-app-config/package.json | 6 +++--- .../package.json | 4 ++-- 28 files changed, 137 insertions(+), 138 deletions(-) diff --git a/app-config-cli/package.json b/app-config-cli/package.json index 67a4f816..6f2f9139 100644 --- a/app-config-cli/package.json +++ b/app-config-cli/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cli", "description": "CLI for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -35,14 +35,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.3", - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/encryption": "^3.0.0-alpha.3", - "@app-config/generate": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/schema": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/config": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/encryption": "^3.0.0-alpha.4", + "@app-config/generate": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/schema": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "ajv": "8", "clipboardy": "2", "common-tags": "1", diff --git a/app-config-config/package.json b/app-config-config/package.json index 9bff12f1..4ca6fedb 100644 --- a/app-config-config/package.json +++ b/app-config-config/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/config", "description": "The config in @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extensions": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/meta": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/schema": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3" + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extensions": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/meta": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/schema": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3" + "@app-config/test-utils": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-core/package.json b/app-config-core/package.json index ecb5b658..e9c66c69 100644 --- a/app-config-core/package.json +++ b/app-config-core/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/core", "description": "Core logic for App Config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "@iarna/toml": "3", "js-yaml": "^3.13.1", "json5": "2", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3", + "@app-config/test-utils": "^3.0.0-alpha.4", "@types/js-yaml": "3", "@types/lodash.merge": "4" }, diff --git a/app-config-cypress/package.json b/app-config-cypress/package.json index a023a6cc..514d896c 100644 --- a/app-config-cypress/package.json +++ b/app-config-cypress/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cypress", "description": "Cypress testing plugin for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -31,11 +31,11 @@ }, "dependencies": {}, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.3", + "@app-config/main": "^3.0.0-alpha.4", "cypress": "6" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.3", + "@app-config/main": "^3.0.0-alpha.4", "cypress": "6" }, "prettier": "@lcdev/prettier", diff --git a/app-config-encryption/package.json b/app-config-encryption/package.json index 8c5c0d3e..621afcca 100644 --- a/app-config-encryption/package.json +++ b/app-config-encryption/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/encryption", "description": "Secret value encryption for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extension-utils": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/meta": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/settings": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extension-utils": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/meta": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/settings": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "@lcdev/ws-rpc": "0.4", "@types/openpgp": "4", "common-tags": "1", @@ -47,7 +47,7 @@ "ws": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3", + "@app-config/test-utils": "^3.0.0-alpha.4", "get-port": "5" }, "prettier": "@lcdev/prettier", diff --git a/app-config-exec/package.json b/app-config-exec/package.json index 7d25700e..182d2e2f 100644 --- a/app-config-exec/package.json +++ b/app-config-exec/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/exec", "description": "Generate config by running arbitrary programs", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extension-utils": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3" + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extension-utils": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.3" + "@app-config/main": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-extension-utils/package.json b/app-config-extension-utils/package.json index b5dbf2dc..0e7bfbd6 100644 --- a/app-config-extension-utils/package.json +++ b/app-config-extension-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extension-utils", "description": "Utilities for writing @app-config parsing extensions", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", "@serafin/schema-builder": "0.14" }, "devDependencies": {}, diff --git a/app-config-extensions/package.json b/app-config-extensions/package.json index a6a76491..904ab17d 100644 --- a/app-config-extensions/package.json +++ b/app-config-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extensions", "description": "Common parsing extensions for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extension-utils": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extension-utils": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "lodash.isequal": "4" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3", + "@app-config/test-utils": "^3.0.0-alpha.4", "@types/lodash.isequal": "4" }, "prettier": "@lcdev/prettier", diff --git a/app-config-generate/package.json b/app-config-generate/package.json index e171df1e..b79835c8 100644 --- a/app-config-generate/package.json +++ b/app-config-generate/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/generate", "description": "Code generation for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,9 +30,9 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/meta": "^3.0.0-alpha.3", - "@app-config/schema": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/meta": "^3.0.0-alpha.4", + "@app-config/schema": "^3.0.0-alpha.4", "@types/readable-stream": "2", "@types/urijs": "1", "common-tags": "1", @@ -41,7 +41,7 @@ "quicktype-core": "6.0.70" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3" + "@app-config/test-utils": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-git/package.json b/app-config-git/package.json index 3ab144d5..b3b455b7 100644 --- a/app-config-git/package.json +++ b/app-config-git/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/git", "description": "$git directive parsing extension for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extension-utils": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extension-utils": "^3.0.0-alpha.4", "simple-git": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3" + "@app-config/test-utils": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-inject/package.json b/app-config-inject/package.json index af6de05d..903a1d97 100644 --- a/app-config-inject/package.json +++ b/app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/inject", "description": "Runtime injection of app-config into static HTML files", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,10 +34,10 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/schema": "^3.0.0-alpha.3", + "@app-config/config": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/schema": "^3.0.0-alpha.4", "@types/yargs": "16", "node-html-parser": "1", "yargs": "16" diff --git a/app-config-js/package.json b/app-config-js/package.json index 27de44ad..92ffef25 100644 --- a/app-config-js/package.json +++ b/app-config-js/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/js", "description": "Loads a JavaScript module to inject configuration", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extension-utils": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3" + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extension-utils": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3" + "@app-config/test-utils": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-logging/package.json b/app-config-logging/package.json index 34436eac..c97f8e70 100644 --- a/app-config-logging/package.json +++ b/app-config-logging/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/logging", "description": "Logging for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/utils": "^3.0.0-alpha.3" + "@app-config/utils": "^3.0.0-alpha.4" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-main/package.json b/app-config-main/package.json index fc667232..565a1183 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/main", "description": "Easy to use configuration loader with schema validation", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,15 +34,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^3.0.0-alpha.3", - "@app-config/config": "^3.0.0-alpha.3", - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extensions": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/meta": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/schema": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/cli": "^3.0.0-alpha.4", + "@app-config/config": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extensions": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/meta": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/schema": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "ajv": "8" }, "devDependencies": {}, diff --git a/app-config-meta/package.json b/app-config-meta/package.json index b4a87bf5..4b4463e3 100644 --- a/app-config-meta/package.json +++ b/app-config-meta/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/meta", "description": "Meta file parsing for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extensions": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extensions": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3" + "@app-config/test-utils": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-node/package.json b/app-config-node/package.json index 60119c81..0da40c65 100644 --- a/app-config-node/package.json +++ b/app-config-node/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/node", "description": "Node.js API for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", "@types/prompts": "2", "fs-extra": "9", "prompts": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3", + "@app-config/test-utils": "^3.0.0-alpha.4", "@types/fs-extra": "9" }, "prettier": "@lcdev/prettier", diff --git a/app-config-react-native/package.json b/app-config-react-native/package.json index 2705aa1f..249152a9 100644 --- a/app-config-react-native/package.json +++ b/app-config-react-native/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/react-native", "description": "React Native Metro transformer that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -33,11 +33,11 @@ "semver": "7" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.3", + "@app-config/main": "^3.0.0-alpha.4", "react-native": ">=0.45.0" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.3", + "@app-config/main": "^3.0.0-alpha.4", "@types/semver": "7" }, "prettier": "@lcdev/prettier", diff --git a/app-config-schema/package.json b/app-config-schema/package.json index 87591bcb..1d4bf2de 100644 --- a/app-config-schema/package.json +++ b/app-config-schema/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/schema", "description": "Schema validation for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,19 +30,19 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "@types/json-schema": "7", "ajv": "8", "ajv-formats": "2", "json-schema-ref-parser": "9" }, "devDependencies": { - "@app-config/encryption": "^3.0.0-alpha.3", - "@app-config/extensions": "^3.0.0-alpha.3", - "@app-config/test-utils": "^3.0.0-alpha.3" + "@app-config/encryption": "^3.0.0-alpha.4", + "@app-config/extensions": "^3.0.0-alpha.4", + "@app-config/test-utils": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-settings/package.json b/app-config-settings/package.json index 1c665dd8..074e3d5b 100644 --- a/app-config-settings/package.json +++ b/app-config-settings/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/settings", "description": "User settings for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "env-paths": "2", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.3" + "@app-config/test-utils": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-test-utils/package.json b/app-config-test-utils/package.json index 25896d90..a4b10098 100644 --- a/app-config-test-utils/package.json +++ b/app-config-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/test-utils", "description": "Internal test utilities", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,8 +30,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "@types/fs-extra": "9", "@types/tmp": "0.2", "fs-extra": "9", diff --git a/app-config-utils/package.json b/app-config-utils/package.json index 49e331e6..b45916c8 100644 --- a/app-config-utils/package.json +++ b/app-config-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/utils", "description": "Common utilities used in @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", diff --git a/app-config-v1-compat/package.json b/app-config-v1-compat/package.json index 9d6c2ca9..5583baea 100644 --- a/app-config-v1-compat/package.json +++ b/app-config-v1-compat/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/v1-compat", "description": "Version 1 compatibility layer for @app-config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/extension-utils": "^3.0.0-alpha.3", - "@app-config/logging": "^3.0.0-alpha.3", - "@app-config/node": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extension-utils": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "fs-extra": "7" }, "devDependencies": { - "@app-config/extensions": "^3.0.0-alpha.3", - "@app-config/test-utils": "^3.0.0-alpha.3" + "@app-config/extensions": "^3.0.0-alpha.4", + "@app-config/test-utils": "^3.0.0-alpha.4" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vault/package.json b/app-config-vault/package.json index 20893eb0..1e90d1b8 100644 --- a/app-config-vault/package.json +++ b/app-config-vault/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/vault", "description": "Hashicorp Vault support for App Config", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.3", - "@app-config/utils": "^3.0.0-alpha.3", - "@app-config/extension-utils": "^3.0.0-alpha.3", + "@app-config/core": "^3.0.0-alpha.4", + "@app-config/extension-utils": "^3.0.0-alpha.4", + "@app-config/utils": "^3.0.0-alpha.4", "@lcdev/fetch": "^0.1.10", "cross-fetch": "3", "node-vault": "0.9" }, - "devDependencies": { - }, + "devDependencies": {}, "prettier": "@lcdev/prettier", "jest": { "preset": "@lcdev/jest" diff --git a/app-config-webpack/package.json b/app-config-webpack/package.json index ae9c16cd..c180e1ba 100644 --- a/app-config-webpack/package.json +++ b/app-config-webpack/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/webpack", "description": "Webpack plugin that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,12 +34,12 @@ "loader-utils": "2" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.3", + "@app-config/main": "^3.0.0-alpha.4", "html-webpack-plugin": "4 || 5", "webpack": "4 || 5" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.3", + "@app-config/main": "^3.0.0-alpha.4", "@types/loader-utils": "1", "@webpack-cli/serve": "1", "html-webpack-plugin": "5", diff --git a/lcdev-app-config-inject/package.json b/lcdev-app-config-inject/package.json index 70cbed3e..0d2ac412 100644 --- a/lcdev-app-config-inject/package.json +++ b/lcdev-app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config-inject", "description": "Alias for @app-config/inject", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,7 +34,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/inject": "^3.0.0-alpha.3" + "@app-config/inject": "^3.0.0-alpha.4" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-app-config-webpack-plugin/package.json b/lcdev-app-config-webpack-plugin/package.json index 951cd662..a08c92c4 100644 --- a/lcdev-app-config-webpack-plugin/package.json +++ b/lcdev-app-config-webpack-plugin/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config-webpack-plugin", "description": "Alias for @app-config/webpack", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/webpack": "^3.0.0-alpha.3" + "@app-config/webpack": "^3.0.0-alpha.4" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-app-config/package.json b/lcdev-app-config/package.json index 3d47bf69..1012c00b 100644 --- a/lcdev-app-config/package.json +++ b/lcdev-app-config/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/app-config", "description": "Alias for @app-config/main", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -33,8 +33,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^3.0.0-alpha.3", - "@app-config/main": "^3.0.0-alpha.3" + "@app-config/cli": "^3.0.0-alpha.4", + "@app-config/main": "^3.0.0-alpha.4" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/lcdev-react-native-app-config-transformer/package.json b/lcdev-react-native-app-config-transformer/package.json index a82288b2..6b121423 100644 --- a/lcdev-react-native-app-config-transformer/package.json +++ b/lcdev-react-native-app-config-transformer/package.json @@ -1,7 +1,7 @@ { "name": "@lcdev/react-native-app-config-transformer", "description": "Alias for @app-config/react-native", - "version": "3.0.0-alpha.3", + "version": "3.0.0-alpha.4", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/react-native": "^3.0.0-alpha.3" + "@app-config/react-native": "^3.0.0-alpha.4" }, "devDependencies": {}, "prettier": "@lcdev/prettier", From 852c35df7c33c11c60111cbe07994d12c0a718a3 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 6 May 2021 17:14:56 -0600 Subject: [PATCH 31/39] fix: examples versions --- examples/cli-project/package.json | 2 +- examples/frontend-webpack-project/package.json | 4 ++-- examples/nodejs-server/package.json | 2 +- examples/react-native-project/package.json | 6 +++--- tests/standalone-project/package.json | 2 +- .../app-config-core-in-browser/package.json | 4 ++-- tests/webpack-projects/cypress-plugin/package.json | 6 +++--- tests/webpack-projects/extending-other-files/package.json | 4 ++-- .../webpack-projects/query-parameter-overrides/package.json | 4 ++-- tests/webpack-projects/two-app-config-sources/package.json | 4 ++-- tests/webpack-projects/webpack5/package.json | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/cli-project/package.json b/examples/cli-project/package.json index d698b811..fe17a2c5 100644 --- a/examples/cli-project/package.json +++ b/examples/cli-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3" + "@app-config/main": "3.0.0-alpha.4" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/examples/frontend-webpack-project/package.json b/examples/frontend-webpack-project/package.json index 3df8a2e8..c570c32b 100644 --- a/examples/frontend-webpack-project/package.json +++ b/examples/frontend-webpack-project/package.json @@ -10,10 +10,10 @@ "test": "jest" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3" + "@app-config/main": "3.0.0-alpha.4" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.3", + "@app-config/webpack": "3.0.0-alpha.4", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/examples/nodejs-server/package.json b/examples/nodejs-server/package.json index c8e597bd..5ef60b4a 100644 --- a/examples/nodejs-server/package.json +++ b/examples/nodejs-server/package.json @@ -13,7 +13,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3", + "@app-config/main": "3.0.0-alpha.4", "fastify": "3" }, "devDependencies": { diff --git a/examples/react-native-project/package.json b/examples/react-native-project/package.json index 4329790c..d636ec5e 100644 --- a/examples/react-native-project/package.json +++ b/examples/react-native-project/package.json @@ -12,7 +12,7 @@ "eject": "expo eject" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3", + "@app-config/main": "3.0.0-alpha.4", "expo": "39", "expo-status-bar": "1", "expo-yarn-workspaces": "1", @@ -22,8 +22,8 @@ }, "devDependencies": { "@babel/core": "7", - "@app-config/main": "3.0.0-alpha.3", - "@app-config/react-native": "3.0.0-alpha.3", + "@app-config/main": "3.0.0-alpha.4", + "@app-config/react-native": "3.0.0-alpha.4", "@lcdev/tsconfig": "0.1", "@types/react": "16", "@types/react-native": "0.63", diff --git a/tests/standalone-project/package.json b/tests/standalone-project/package.json index 8feef4db..7eba4565 100644 --- a/tests/standalone-project/package.json +++ b/tests/standalone-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3" + "@app-config/main": "3.0.0-alpha.4" }, "devDependencies": { "typescript": "*" diff --git a/tests/webpack-projects/app-config-core-in-browser/package.json b/tests/webpack-projects/app-config-core-in-browser/package.json index 9937d250..e7c61201 100644 --- a/tests/webpack-projects/app-config-core-in-browser/package.json +++ b/tests/webpack-projects/app-config-core-in-browser/package.json @@ -10,8 +10,8 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/core": "3.0.0-alpha.3", - "@app-config/utils": "3.0.0-alpha.3" + "@app-config/core": "3.0.0-alpha.4", + "@app-config/utils": "3.0.0-alpha.4" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/tests/webpack-projects/cypress-plugin/package.json b/tests/webpack-projects/cypress-plugin/package.json index fedb8496..fb73f8fa 100644 --- a/tests/webpack-projects/cypress-plugin/package.json +++ b/tests/webpack-projects/cypress-plugin/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3", - "@app-config/cypress": "3.0.0-alpha.3" + "@app-config/main": "3.0.0-alpha.4", + "@app-config/cypress": "3.0.0-alpha.4" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.3", + "@app-config/webpack": "3.0.0-alpha.4", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", diff --git a/tests/webpack-projects/extending-other-files/package.json b/tests/webpack-projects/extending-other-files/package.json index 09cffaed..eedef444 100644 --- a/tests/webpack-projects/extending-other-files/package.json +++ b/tests/webpack-projects/extending-other-files/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3" + "@app-config/main": "3.0.0-alpha.4" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.3", + "@app-config/webpack": "3.0.0-alpha.4", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/query-parameter-overrides/package.json b/tests/webpack-projects/query-parameter-overrides/package.json index c6186ebb..f87e6de9 100644 --- a/tests/webpack-projects/query-parameter-overrides/package.json +++ b/tests/webpack-projects/query-parameter-overrides/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3", + "@app-config/main": "3.0.0-alpha.4", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.3", + "@app-config/webpack": "3.0.0-alpha.4", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/two-app-config-sources/package.json b/tests/webpack-projects/two-app-config-sources/package.json index c6d04818..d340ec85 100644 --- a/tests/webpack-projects/two-app-config-sources/package.json +++ b/tests/webpack-projects/two-app-config-sources/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3" + "@app-config/main": "3.0.0-alpha.4" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.3", + "@app-config/webpack": "3.0.0-alpha.4", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/webpack5/package.json b/tests/webpack-projects/webpack5/package.json index ab47fe59..7786c5b2 100644 --- a/tests/webpack-projects/webpack5/package.json +++ b/tests/webpack-projects/webpack5/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.3", - "@app-config/cypress": "3.0.0-alpha.3" + "@app-config/main": "3.0.0-alpha.4", + "@app-config/cypress": "3.0.0-alpha.4" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.3", + "@app-config/webpack": "3.0.0-alpha.4", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", From 11943d12bc80714e570d0c93272ab99631690cc1 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Tue, 29 Jun 2021 18:39:30 -0600 Subject: [PATCH 32/39] chore: removes @lcdev packages --- lcdev-app-config-inject/.eslintrc.js | 1 - lcdev-app-config-inject/README.md | 3 -- lcdev-app-config-inject/package.json | 44 ------------------ lcdev-app-config-inject/src/cli.ts | 5 --- lcdev-app-config-inject/src/index.ts | 2 - lcdev-app-config-inject/tsconfig.es.json | 8 ---- lcdev-app-config-inject/tsconfig.json | 14 ------ lcdev-app-config-webpack-plugin/.eslintrc.js | 1 - lcdev-app-config-webpack-plugin/README.md | 3 -- lcdev-app-config-webpack-plugin/package.json | 40 ----------------- lcdev-app-config-webpack-plugin/src/index.ts | 2 - .../tsconfig.es.json | 8 ---- lcdev-app-config-webpack-plugin/tsconfig.json | 14 ------ lcdev-app-config/.eslintrc.js | 1 - lcdev-app-config/README.md | 3 -- lcdev-app-config/package.json | 45 ------------------- lcdev-app-config/src/cli.ts | 5 --- lcdev-app-config/src/index.ts | 2 - lcdev-app-config/tsconfig.es.json | 8 ---- lcdev-app-config/tsconfig.json | 14 ------ .../.eslintrc.js | 1 - .../README.md | 4 -- .../package.json | 40 ----------------- .../src/index.ts | 1 - .../tsconfig.es.json | 8 ---- .../tsconfig.json | 13 ------ lerna.json | 1 - new-version.sh | 4 -- package.json | 1 - tsconfig.es.json | 6 +-- tsconfig.json | 6 +-- 31 files changed, 2 insertions(+), 306 deletions(-) delete mode 100644 lcdev-app-config-inject/.eslintrc.js delete mode 100644 lcdev-app-config-inject/README.md delete mode 100644 lcdev-app-config-inject/package.json delete mode 100644 lcdev-app-config-inject/src/cli.ts delete mode 100644 lcdev-app-config-inject/src/index.ts delete mode 100644 lcdev-app-config-inject/tsconfig.es.json delete mode 100644 lcdev-app-config-inject/tsconfig.json delete mode 100644 lcdev-app-config-webpack-plugin/.eslintrc.js delete mode 100644 lcdev-app-config-webpack-plugin/README.md delete mode 100644 lcdev-app-config-webpack-plugin/package.json delete mode 100644 lcdev-app-config-webpack-plugin/src/index.ts delete mode 100644 lcdev-app-config-webpack-plugin/tsconfig.es.json delete mode 100644 lcdev-app-config-webpack-plugin/tsconfig.json delete mode 100644 lcdev-app-config/.eslintrc.js delete mode 100644 lcdev-app-config/README.md delete mode 100644 lcdev-app-config/package.json delete mode 100644 lcdev-app-config/src/cli.ts delete mode 100644 lcdev-app-config/src/index.ts delete mode 100644 lcdev-app-config/tsconfig.es.json delete mode 100644 lcdev-app-config/tsconfig.json delete mode 100644 lcdev-react-native-app-config-transformer/.eslintrc.js delete mode 100644 lcdev-react-native-app-config-transformer/README.md delete mode 100644 lcdev-react-native-app-config-transformer/package.json delete mode 100644 lcdev-react-native-app-config-transformer/src/index.ts delete mode 100644 lcdev-react-native-app-config-transformer/tsconfig.es.json delete mode 100644 lcdev-react-native-app-config-transformer/tsconfig.json diff --git a/lcdev-app-config-inject/.eslintrc.js b/lcdev-app-config-inject/.eslintrc.js deleted file mode 100644 index 10bb3e63..00000000 --- a/lcdev-app-config-inject/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lcdev/eslint-config/cwd')(__dirname); diff --git a/lcdev-app-config-inject/README.md b/lcdev-app-config-inject/README.md deleted file mode 100644 index a0f44833..00000000 --- a/lcdev-app-config-inject/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## App Config Inject - -This is a package that re-exports `@app-config/inject`, maintained for backwards compatibility. diff --git a/lcdev-app-config-inject/package.json b/lcdev-app-config-inject/package.json deleted file mode 100644 index 0d2ac412..00000000 --- a/lcdev-app-config-inject/package.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "@lcdev/app-config-inject", - "description": "Alias for @app-config/inject", - "version": "3.0.0-alpha.4", - "license": "MPL-2.0", - "author": { - "name": "Launchcode", - "email": "admin@lc.dev", - "url": "https://lc.dev" - }, - "repository": { - "type": "git", - "url": "https://github.com/launchcodedev/app-config.git" - }, - "main": "dist/index.js", - "module": "dist/es/index.js", - "types": "dist/index.d.ts", - "files": [ - "/dist", - "!**/*.tsbuildinfo", - "!**/*.test.*" - ], - "bin": { - "app-config-inject": "dist/cli.js" - }, - "scripts": { - "start": "node ./dist/cli.js", - "build": "tsc -b", - "build:es": "tsc -b tsconfig.es.json", - "clean": "rm -rf dist *.tsbuildinfo", - "lint": "eslint src", - "fix": "eslint --fix src", - "test": "jest", - "prepublishOnly": "yarn clean && yarn build && yarn build:es" - }, - "dependencies": { - "@app-config/inject": "^3.0.0-alpha.4" - }, - "devDependencies": {}, - "prettier": "@lcdev/prettier", - "jest": { - "preset": "@lcdev/jest" - } -} diff --git a/lcdev-app-config-inject/src/cli.ts b/lcdev-app-config-inject/src/cli.ts deleted file mode 100644 index d2e65d19..00000000 --- a/lcdev-app-config-inject/src/cli.ts +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env node - -import { cli } from '@app-config/inject'; - -cli.parse(); diff --git a/lcdev-app-config-inject/src/index.ts b/lcdev-app-config-inject/src/index.ts deleted file mode 100644 index c7c79dd2..00000000 --- a/lcdev-app-config-inject/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from '@app-config/inject'; -export { default } from '@app-config/inject'; diff --git a/lcdev-app-config-inject/tsconfig.es.json b/lcdev-app-config-inject/tsconfig.es.json deleted file mode 100644 index 774628e3..00000000 --- a/lcdev-app-config-inject/tsconfig.es.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es2019", - "module": "es2020", - "outDir": "./dist/es" - } -} diff --git a/lcdev-app-config-inject/tsconfig.json b/lcdev-app-config-inject/tsconfig.json deleted file mode 100644 index 4c79d7d9..00000000 --- a/lcdev-app-config-inject/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ - -{ - "extends": "@lcdev/tsconfig", - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist" - }, - "include": ["src"], - "exclude": ["node_modules"], - "references": [ - { "path": "../app-config-inject" } - ] -} - diff --git a/lcdev-app-config-webpack-plugin/.eslintrc.js b/lcdev-app-config-webpack-plugin/.eslintrc.js deleted file mode 100644 index 10bb3e63..00000000 --- a/lcdev-app-config-webpack-plugin/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lcdev/eslint-config/cwd')(__dirname); diff --git a/lcdev-app-config-webpack-plugin/README.md b/lcdev-app-config-webpack-plugin/README.md deleted file mode 100644 index 6b057d2f..00000000 --- a/lcdev-app-config-webpack-plugin/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## App Config Webpack Plugin - -This is a package that re-exports `@app-config/webpack`, maintained for backwards compatibility. diff --git a/lcdev-app-config-webpack-plugin/package.json b/lcdev-app-config-webpack-plugin/package.json deleted file mode 100644 index a08c92c4..00000000 --- a/lcdev-app-config-webpack-plugin/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@lcdev/app-config-webpack-plugin", - "description": "Alias for @app-config/webpack", - "version": "3.0.0-alpha.4", - "license": "MPL-2.0", - "author": { - "name": "Launchcode", - "email": "admin@lc.dev", - "url": "https://lc.dev" - }, - "repository": { - "type": "git", - "url": "https://github.com/launchcodedev/app-config.git" - }, - "main": "dist/index.js", - "module": "dist/es/index.js", - "types": "dist/index.d.ts", - "files": [ - "/dist", - "!**/*.tsbuildinfo", - "!**/*.test.*" - ], - "scripts": { - "build": "tsc -b", - "build:es": "tsc -b tsconfig.es.json", - "clean": "rm -rf dist *.tsbuildinfo", - "lint": "eslint src", - "fix": "eslint --fix src", - "test": "jest", - "prepublishOnly": "yarn clean && yarn build && yarn build:es" - }, - "dependencies": { - "@app-config/webpack": "^3.0.0-alpha.4" - }, - "devDependencies": {}, - "prettier": "@lcdev/prettier", - "jest": { - "preset": "@lcdev/jest" - } -} diff --git a/lcdev-app-config-webpack-plugin/src/index.ts b/lcdev-app-config-webpack-plugin/src/index.ts deleted file mode 100644 index 5c1167b8..00000000 --- a/lcdev-app-config-webpack-plugin/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from '@app-config/webpack'; -export { default } from '@app-config/webpack'; diff --git a/lcdev-app-config-webpack-plugin/tsconfig.es.json b/lcdev-app-config-webpack-plugin/tsconfig.es.json deleted file mode 100644 index 774628e3..00000000 --- a/lcdev-app-config-webpack-plugin/tsconfig.es.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es2019", - "module": "es2020", - "outDir": "./dist/es" - } -} diff --git a/lcdev-app-config-webpack-plugin/tsconfig.json b/lcdev-app-config-webpack-plugin/tsconfig.json deleted file mode 100644 index 931dacc4..00000000 --- a/lcdev-app-config-webpack-plugin/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ - -{ - "extends": "@lcdev/tsconfig", - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist" - }, - "include": ["src"], - "exclude": ["node_modules"], - "references": [ - { "path": "../app-config-webpack" } - ] -} - diff --git a/lcdev-app-config/.eslintrc.js b/lcdev-app-config/.eslintrc.js deleted file mode 100644 index 10bb3e63..00000000 --- a/lcdev-app-config/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lcdev/eslint-config/cwd')(__dirname); diff --git a/lcdev-app-config/README.md b/lcdev-app-config/README.md deleted file mode 100644 index 103df61b..00000000 --- a/lcdev-app-config/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## App Config - -This is a package that re-exports `@app-config/main`, maintained for backwards compatibility. diff --git a/lcdev-app-config/package.json b/lcdev-app-config/package.json deleted file mode 100644 index 23c7fec8..00000000 --- a/lcdev-app-config/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "@lcdev/app-config", - "description": "Alias for @app-config/main", - "version": "3.0.0-alpha.4", - "license": "MPL-2.0", - "author": { - "name": "Launchcode", - "email": "admin@lc.dev", - "url": "https://lc.dev" - }, - "repository": { - "type": "git", - "url": "https://github.com/launchcodedev/app-config.git" - }, - "main": "dist/index.js", - "module": "dist/es/index.js", - "types": "dist/index.d.ts", - "files": [ - "/dist", - "!**/*.tsbuildinfo", - "!**/*.test.*" - ], - "bin": { - "ac": "dist/cli.js", - "app-config": "dist/cli.js" - }, - "scripts": { - "build": "tsc -b", - "build:es": "tsc -b tsconfig.es.json", - "clean": "rm -rf dist *.tsbuildinfo", - "lint": "eslint src", - "fix": "eslint --fix src", - "test": "jest", - "prepublishOnly": "yarn clean && yarn build && yarn build:es" - }, - "dependencies": { - "@app-config/cli": "^3.0.0-alpha.4", - "@app-config/main": "^3.0.0-alpha.4" - }, - "devDependencies": {}, - "prettier": "@lcdev/prettier", - "jest": { - "preset": "@lcdev/jest" - } -} diff --git a/lcdev-app-config/src/cli.ts b/lcdev-app-config/src/cli.ts deleted file mode 100644 index 3f38628b..00000000 --- a/lcdev-app-config/src/cli.ts +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env node - -import { cli } from '@app-config/cli'; - -cli.parse(); diff --git a/lcdev-app-config/src/index.ts b/lcdev-app-config/src/index.ts deleted file mode 100644 index 6b4115fa..00000000 --- a/lcdev-app-config/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from '@app-config/main'; -export { default } from '@app-config/main'; diff --git a/lcdev-app-config/tsconfig.es.json b/lcdev-app-config/tsconfig.es.json deleted file mode 100644 index 774628e3..00000000 --- a/lcdev-app-config/tsconfig.es.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es2019", - "module": "es2020", - "outDir": "./dist/es" - } -} diff --git a/lcdev-app-config/tsconfig.json b/lcdev-app-config/tsconfig.json deleted file mode 100644 index 9d6f06dd..00000000 --- a/lcdev-app-config/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ - -{ - "extends": "@lcdev/tsconfig", - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist" - }, - "include": ["src"], - "exclude": ["node_modules"], - "references": [ - { "path": "../app-config-test-utils" } - ] -} - diff --git a/lcdev-react-native-app-config-transformer/.eslintrc.js b/lcdev-react-native-app-config-transformer/.eslintrc.js deleted file mode 100644 index 10bb3e63..00000000 --- a/lcdev-react-native-app-config-transformer/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lcdev/eslint-config/cwd')(__dirname); diff --git a/lcdev-react-native-app-config-transformer/README.md b/lcdev-react-native-app-config-transformer/README.md deleted file mode 100644 index c6f7bc80..00000000 --- a/lcdev-react-native-app-config-transformer/README.md +++ /dev/null @@ -1,4 +0,0 @@ -## App Config React Native - -This is a package that re-exports `@app-config/react-native`, maintained for backwards compatibility. - diff --git a/lcdev-react-native-app-config-transformer/package.json b/lcdev-react-native-app-config-transformer/package.json deleted file mode 100644 index 6b121423..00000000 --- a/lcdev-react-native-app-config-transformer/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@lcdev/react-native-app-config-transformer", - "description": "Alias for @app-config/react-native", - "version": "3.0.0-alpha.4", - "license": "MPL-2.0", - "author": { - "name": "Launchcode", - "email": "admin@lc.dev", - "url": "https://lc.dev" - }, - "repository": { - "type": "git", - "url": "https://github.com/launchcodedev/app-config.git" - }, - "main": "dist/index.js", - "module": "dist/es/index.js", - "types": "dist/index.d.ts", - "files": [ - "/dist", - "!**/*.tsbuildinfo", - "!**/*.test.*" - ], - "scripts": { - "build": "tsc -b", - "build:es": "tsc -b tsconfig.es.json", - "clean": "rm -rf dist *.tsbuildinfo", - "lint": "eslint src", - "fix": "eslint --fix src", - "test": "jest", - "prepublishOnly": "yarn clean && yarn build && yarn build:es" - }, - "dependencies": { - "@app-config/react-native": "^3.0.0-alpha.4" - }, - "devDependencies": {}, - "prettier": "@lcdev/prettier", - "jest": { - "preset": "@lcdev/jest" - } -} diff --git a/lcdev-react-native-app-config-transformer/src/index.ts b/lcdev-react-native-app-config-transformer/src/index.ts deleted file mode 100644 index 6a7c79d4..00000000 --- a/lcdev-react-native-app-config-transformer/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@app-config/react-native'; diff --git a/lcdev-react-native-app-config-transformer/tsconfig.es.json b/lcdev-react-native-app-config-transformer/tsconfig.es.json deleted file mode 100644 index 774628e3..00000000 --- a/lcdev-react-native-app-config-transformer/tsconfig.es.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es2019", - "module": "es2020", - "outDir": "./dist/es" - } -} diff --git a/lcdev-react-native-app-config-transformer/tsconfig.json b/lcdev-react-native-app-config-transformer/tsconfig.json deleted file mode 100644 index 58436a8a..00000000 --- a/lcdev-react-native-app-config-transformer/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "@lcdev/tsconfig", - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist" - }, - "include": ["src"], - "exclude": ["node_modules"], - "references": [ - { "path": "../app-config-test-utils" }, - { "path": "../app-config-react-native" } - ] -} diff --git a/lerna.json b/lerna.json index 219e7b82..c000b574 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,6 @@ { "packages": [ "app-config-*", - "lcdev-*", "tests/parsing-extensions/*", "tests/webpack-projects/*", "examples/*", diff --git a/new-version.sh b/new-version.sh index 0f1acbb2..60e84ca3 100755 --- a/new-version.sh +++ b/new-version.sh @@ -63,10 +63,6 @@ new_version app-config-vault new_version app-config-webpack new_version app-config-rollup new_version app-config-vite -new_version lcdev-app-config -new_version lcdev-app-config-inject -new_version lcdev-app-config-webpack-plugin -new_version lcdev-react-native-app-config-transformer git commit -m "chore: release v$VERSION" git tag v$VERSION diff --git a/package.json b/package.json index 037b3b02..12db7959 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "workspaces": { "packages": [ "app-config-*", - "lcdev-*", "tests/parsing-extensions/*", "tests/webpack-projects/*", "examples/*", diff --git a/tsconfig.es.json b/tsconfig.es.json index 55377504..360e05cf 100644 --- a/tsconfig.es.json +++ b/tsconfig.es.json @@ -30,10 +30,6 @@ { "path": "app-config-v1-compat/tsconfig.es.json" }, { "path": "app-config-vault/tsconfig.es.json" }, { "path": "app-config-vite/tsconfig.es.json" }, - { "path": "app-config-webpack/tsconfig.es.json" }, - { "path": "lcdev-app-config/tsconfig.es.json" }, - { "path": "lcdev-app-config-inject/tsconfig.es.json" }, - { "path": "lcdev-app-config-webpack-plugin/tsconfig.es.json" }, - { "path": "lcdev-react-native-app-config-transformer/tsconfig.es.json" } + { "path": "app-config-webpack/tsconfig.es.json" } ] } diff --git a/tsconfig.json b/tsconfig.json index 13eb9bb5..b465b057 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -29,10 +29,6 @@ { "path": "app-config-v1-compat/tsconfig.json" }, { "path": "app-config-vault/tsconfig.json" }, { "path": "app-config-vite/tsconfig.json" }, - { "path": "app-config-webpack/tsconfig.json" }, - { "path": "lcdev-app-config/tsconfig.json" }, - { "path": "lcdev-app-config-inject/tsconfig.json" }, - { "path": "lcdev-app-config-webpack-plugin/tsconfig.json" }, - { "path": "lcdev-react-native-app-config-transformer/tsconfig.json" } + { "path": "app-config-webpack/tsconfig.json" } ] } From d887cc439a598fb80b6f67a7d1ef186cbd08ae83 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Tue, 29 Jun 2021 18:46:43 -0600 Subject: [PATCH 33/39] fix: types --- app-config-webpack/package.json | 1 + yarn.lock | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app-config-webpack/package.json b/app-config-webpack/package.json index 7019b823..9d56769b 100644 --- a/app-config-webpack/package.json +++ b/app-config-webpack/package.json @@ -42,6 +42,7 @@ }, "devDependencies": { "@app-config/main": "^3.0.0-alpha.4", + "@types/loader-utils": "2", "@webpack-cli/serve": "1", "html-webpack-plugin": "5", "webpack": "5" diff --git a/yarn.lock b/yarn.lock index 68b99f83..d9a1ff31 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3681,6 +3681,14 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/loader-utils@2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-2.0.2.tgz#2999dc2a3330b3ac0b2eaa9e01328b3484ef1112" + integrity sha512-y3UaQ1rIkp2Nzv67Wa/MS7GJM958CDyWkMmnFneTRcWKlaSPreESrwruQ2WhEapQHCV6HJ2Pj62k0BB7mtQNHw== + dependencies: + "@types/node" "*" + "@types/webpack" "^4" + "@types/lodash.isequal@4": version "4.5.5" resolved "https://registry.yarnpkg.com/@types/lodash.isequal/-/lodash.isequal-4.5.5.tgz#4fed1b1b00bef79e305de0352d797e9bb816c8ff" @@ -3868,7 +3876,7 @@ "@types/source-list-map" "*" source-map "^0.7.3" -"@types/webpack@^4.4.31", "@types/webpack@^4.41.8": +"@types/webpack@^4", "@types/webpack@^4.4.31", "@types/webpack@^4.41.8": version "4.41.29" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.29.tgz#2e66c1de8223c440366469415c50a47d97625773" integrity sha512-6pLaORaVNZxiB3FSHbyBiWM7QdazAWda1zvAq4SbZObZqHSDbWLi62iFdblVea6SK9eyBIVp5yHhKt/yNQdR7Q== From 1a824844de4b0a90f88fee54d6c3febe422573a7 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sun, 26 Sep 2021 17:24:05 -0600 Subject: [PATCH 34/39] chore: release v3.0.0-alpha.5 --- app-config-cli/package.json | 20 ++++++++++---------- app-config-config/package.json | 18 +++++++++--------- app-config-core/package.json | 8 ++++---- app-config-cypress/package.json | 6 +++--- app-config-electron/package.json | 2 +- app-config-encryption/package.json | 18 +++++++++--------- app-config-esbuild/package.json | 8 ++++---- app-config-exec/package.json | 14 +++++++------- app-config-extension-utils/package.json | 4 ++-- app-config-extensions/package.json | 14 +++++++------- app-config-generate/package.json | 10 +++++----- app-config-git/package.json | 10 +++++----- app-config-inject/package.json | 10 +++++----- app-config-js/package.json | 10 +++++----- app-config-logging/package.json | 4 ++-- app-config-main/package.json | 24 ++++++++++++------------ app-config-meta/package.json | 12 ++++++------ app-config-node/package.json | 8 ++++---- app-config-react-native/package.json | 8 ++++---- app-config-rollup/package.json | 6 +++--- app-config-schema/package.json | 16 ++++++++-------- app-config-settings/package.json | 12 ++++++------ app-config-test-utils/package.json | 6 +++--- app-config-utils/package.json | 2 +- app-config-v1-compat/package.json | 16 ++++++++-------- app-config-vault/package.json | 8 ++++---- app-config-vite/package.json | 4 ++-- app-config-webpack/package.json | 10 +++++----- 28 files changed, 144 insertions(+), 144 deletions(-) diff --git a/app-config-cli/package.json b/app-config-cli/package.json index 0bbb93e0..216c5184 100644 --- a/app-config-cli/package.json +++ b/app-config-cli/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cli", "description": "CLI for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -36,14 +36,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.4", - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/encryption": "^3.0.0-alpha.4", - "@app-config/generate": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/schema": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/config": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/encryption": "^3.0.0-alpha.5", + "@app-config/generate": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/schema": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "ajv": "8", "clipboardy": "2", "common-tags": "1", @@ -53,7 +53,7 @@ "yargs": "16" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4", + "@app-config/test-utils": "^3.0.0-alpha.5", "@types/common-tags": "1", "@types/fs-extra": "9" }, diff --git a/app-config-config/package.json b/app-config-config/package.json index 4ca6fedb..b5a8ad17 100644 --- a/app-config-config/package.json +++ b/app-config-config/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/config", "description": "The config in @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/extensions": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/meta": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/schema": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4" + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/extensions": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/meta": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/schema": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-core/package.json b/app-config-core/package.json index e9c66c69..b6b88462 100644 --- a/app-config-core/package.json +++ b/app-config-core/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/core", "description": "Core logic for App Config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "@iarna/toml": "3", "js-yaml": "^3.13.1", "json5": "2", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4", + "@app-config/test-utils": "^3.0.0-alpha.5", "@types/js-yaml": "3", "@types/lodash.merge": "4" }, diff --git a/app-config-cypress/package.json b/app-config-cypress/package.json index 514d896c..2886f9c0 100644 --- a/app-config-cypress/package.json +++ b/app-config-cypress/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cypress", "description": "Cypress testing plugin for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -31,11 +31,11 @@ }, "dependencies": {}, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.4", + "@app-config/main": "^3.0.0-alpha.5", "cypress": "6" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.4", + "@app-config/main": "^3.0.0-alpha.5", "cypress": "6" }, "prettier": "@lcdev/prettier", diff --git a/app-config-electron/package.json b/app-config-electron/package.json index 540d74a2..5150079a 100644 --- a/app-config-electron/package.json +++ b/app-config-electron/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/electron", "description": "Exposes app-config values to Electron render processes", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", diff --git a/app-config-encryption/package.json b/app-config-encryption/package.json index 621afcca..bcf71351 100644 --- a/app-config-encryption/package.json +++ b/app-config-encryption/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/encryption", "description": "Secret value encryption for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/extension-utils": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/meta": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/settings": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/extension-utils": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/meta": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/settings": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "@lcdev/ws-rpc": "0.4", "@types/openpgp": "4", "common-tags": "1", @@ -47,7 +47,7 @@ "ws": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4", + "@app-config/test-utils": "^3.0.0-alpha.5", "get-port": "5" }, "prettier": "@lcdev/prettier", diff --git a/app-config-esbuild/package.json b/app-config-esbuild/package.json index 7a972dd5..7ef493c7 100644 --- a/app-config-esbuild/package.json +++ b/app-config-esbuild/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/esbuild", "description": "esbuild module resolution support for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,11 +30,11 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4" + "@app-config/config": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4", + "@app-config/test-utils": "^3.0.0-alpha.5", "esbuild": "0.13" }, "prettier": "@lcdev/prettier", diff --git a/app-config-exec/package.json b/app-config-exec/package.json index 60d52d16..16178c08 100644 --- a/app-config-exec/package.json +++ b/app-config-exec/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/exec", "description": "Generate config by running arbitrary programs", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/extension-utils": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4" + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/extension-utils": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.4", - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/main": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-extension-utils/package.json b/app-config-extension-utils/package.json index 0e7bfbd6..b0d09da5 100644 --- a/app-config-extension-utils/package.json +++ b/app-config-extension-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extension-utils", "description": "Utilities for writing @app-config parsing extensions", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", "@serafin/schema-builder": "0.14" }, "devDependencies": {}, diff --git a/app-config-extensions/package.json b/app-config-extensions/package.json index 904ab17d..f3502cda 100644 --- a/app-config-extensions/package.json +++ b/app-config-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extensions", "description": "Common parsing extensions for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/extension-utils": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/extension-utils": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "lodash.isequal": "4" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4", + "@app-config/test-utils": "^3.0.0-alpha.5", "@types/lodash.isequal": "4" }, "prettier": "@lcdev/prettier", diff --git a/app-config-generate/package.json b/app-config-generate/package.json index b79835c8..70d445e1 100644 --- a/app-config-generate/package.json +++ b/app-config-generate/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/generate", "description": "Code generation for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,9 +30,9 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/meta": "^3.0.0-alpha.4", - "@app-config/schema": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/meta": "^3.0.0-alpha.5", + "@app-config/schema": "^3.0.0-alpha.5", "@types/readable-stream": "2", "@types/urijs": "1", "common-tags": "1", @@ -41,7 +41,7 @@ "quicktype-core": "6.0.70" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-git/package.json b/app-config-git/package.json index 7a756839..4d9f4623 100644 --- a/app-config-git/package.json +++ b/app-config-git/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/git", "description": "$git directive parsing extension for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/extension-utils": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/extension-utils": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", "simple-git": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-inject/package.json b/app-config-inject/package.json index 903a1d97..3483a1e9 100644 --- a/app-config-inject/package.json +++ b/app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/inject", "description": "Runtime injection of app-config into static HTML files", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,10 +34,10 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/schema": "^3.0.0-alpha.4", + "@app-config/config": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/schema": "^3.0.0-alpha.5", "@types/yargs": "16", "node-html-parser": "1", "yargs": "16" diff --git a/app-config-js/package.json b/app-config-js/package.json index 92ffef25..1c1686c2 100644 --- a/app-config-js/package.json +++ b/app-config-js/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/js", "description": "Loads a JavaScript module to inject configuration", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/extension-utils": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4" + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/extension-utils": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-logging/package.json b/app-config-logging/package.json index c97f8e70..41aa7cc2 100644 --- a/app-config-logging/package.json +++ b/app-config-logging/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/logging", "description": "Logging for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/utils": "^3.0.0-alpha.4" + "@app-config/utils": "^3.0.0-alpha.5" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-main/package.json b/app-config-main/package.json index 4d27c32a..042b2446 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/main", "description": "Easy to use configuration loader with schema validation", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -35,20 +35,20 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^3.0.0-alpha.4", - "@app-config/config": "^3.0.0-alpha.4", - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/encryption": "^3.0.0-alpha.4", - "@app-config/extensions": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/meta": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/schema": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/cli": "^3.0.0-alpha.5", + "@app-config/config": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/encryption": "^3.0.0-alpha.5", + "@app-config/extensions": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/meta": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/schema": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "ajv": "8" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-meta/package.json b/app-config-meta/package.json index 5f1bfa98..9503b220 100644 --- a/app-config-meta/package.json +++ b/app-config-meta/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/meta", "description": "Meta file parsing for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-node/package.json b/app-config-node/package.json index 0da40c65..0b07c4d4 100644 --- a/app-config-node/package.json +++ b/app-config-node/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/node", "description": "Node.js API for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", "@types/prompts": "2", "fs-extra": "9", "prompts": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4", + "@app-config/test-utils": "^3.0.0-alpha.5", "@types/fs-extra": "9" }, "prettier": "@lcdev/prettier", diff --git a/app-config-react-native/package.json b/app-config-react-native/package.json index 0450c19b..5a1b25d8 100644 --- a/app-config-react-native/package.json +++ b/app-config-react-native/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/react-native", "description": "React Native Metro transformer that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/node": "^3.0.0-alpha.4", + "@app-config/node": "^3.0.0-alpha.5", "semver": "7" }, "peerDependencies": { - "@app-config/config": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/config": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "react-native": ">=0.45.0" }, "devDependencies": { diff --git a/app-config-rollup/package.json b/app-config-rollup/package.json index 448807f1..5a2e74bd 100644 --- a/app-config-rollup/package.json +++ b/app-config-rollup/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/rollup", "description": "Rollup plugin that resolves @app-config for you", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,8 +34,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4" + "@app-config/config": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5" }, "peerDependencies": {}, "devDependencies": { diff --git a/app-config-schema/package.json b/app-config-schema/package.json index 1d4bf2de..9770b120 100644 --- a/app-config-schema/package.json +++ b/app-config-schema/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/schema", "description": "Schema validation for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,19 +30,19 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "@types/json-schema": "7", "ajv": "8", "ajv-formats": "2", "json-schema-ref-parser": "9" }, "devDependencies": { - "@app-config/encryption": "^3.0.0-alpha.4", - "@app-config/extensions": "^3.0.0-alpha.4", - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/encryption": "^3.0.0-alpha.5", + "@app-config/extensions": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-settings/package.json b/app-config-settings/package.json index 074e3d5b..458b87ff 100644 --- a/app-config-settings/package.json +++ b/app-config-settings/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/settings", "description": "User settings for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "env-paths": "2", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-test-utils/package.json b/app-config-test-utils/package.json index a4b10098..947ca546 100644 --- a/app-config-test-utils/package.json +++ b/app-config-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/test-utils", "description": "Internal test utilities", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,8 +30,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "@types/fs-extra": "9", "@types/tmp": "0.2", "fs-extra": "9", diff --git a/app-config-utils/package.json b/app-config-utils/package.json index b45916c8..8b3dade1 100644 --- a/app-config-utils/package.json +++ b/app-config-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/utils", "description": "Common utilities used in @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", diff --git a/app-config-v1-compat/package.json b/app-config-v1-compat/package.json index 5583baea..31e52341 100644 --- a/app-config-v1-compat/package.json +++ b/app-config-v1-compat/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/v1-compat", "description": "Version 1 compatibility layer for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.4", - "@app-config/extension-utils": "^3.0.0-alpha.4", - "@app-config/logging": "^3.0.0-alpha.4", - "@app-config/node": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/core": "^3.0.0-alpha.5", + "@app-config/extension-utils": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "fs-extra": "7" }, "devDependencies": { - "@app-config/extensions": "^3.0.0-alpha.4", - "@app-config/test-utils": "^3.0.0-alpha.4" + "@app-config/extensions": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vault/package.json b/app-config-vault/package.json index 9758025d..219f2023 100644 --- a/app-config-vault/package.json +++ b/app-config-vault/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/vault", "description": "Hashicorp Vault support for App Config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/extension-utils": "^3.0.0-alpha.4", + "@app-config/extension-utils": "^3.0.0-alpha.5", "@lcdev/fetch": "^0.1.10", "cross-fetch": "3", "node-vault": "0.9" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.4" + "@app-config/main": "^3.0.0-alpha.5" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.4" + "@app-config/main": "^3.0.0-alpha.5" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vite/package.json b/app-config-vite/package.json index a3318331..ab9c831f 100644 --- a/app-config-vite/package.json +++ b/app-config-vite/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/vite", "description": "Vite plugin for @app-config", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,7 +34,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/rollup": "^3.0.0-alpha.4" + "@app-config/rollup": "^3.0.0-alpha.5" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-webpack/package.json b/app-config-webpack/package.json index 30155b7a..ff7f7bfb 100644 --- a/app-config-webpack/package.json +++ b/app-config-webpack/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/webpack", "description": "Webpack plugin that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.4", + "version": "3.0.0-alpha.5", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -31,17 +31,17 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.4", - "@app-config/utils": "^3.0.0-alpha.4", + "@app-config/config": "^3.0.0-alpha.5", + "@app-config/utils": "^3.0.0-alpha.5", "loader-utils": "2" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.4", + "@app-config/main": "^3.0.0-alpha.5", "html-webpack-plugin": "4 || 5", "webpack": "4 || 5" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.4", + "@app-config/main": "^3.0.0-alpha.5", "@types/loader-utils": "1", "@webpack-cli/serve": "1", "html-webpack-plugin": "5", From b9f68aff4b2fa7216e04f4670f7e6261091fb706 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sun, 26 Sep 2021 17:32:04 -0600 Subject: [PATCH 35/39] fix: test snapshots --- app-config-esbuild/src/__snapshots__/index.test.ts.snap | 4 ++-- app-config-esbuild/src/index.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-config-esbuild/src/__snapshots__/index.test.ts.snap b/app-config-esbuild/src/__snapshots__/index.test.ts.snap index 6db03de8..2a5d957b 100644 --- a/app-config-esbuild/src/__snapshots__/index.test.ts.snap +++ b/app-config-esbuild/src/__snapshots__/index.test.ts.snap @@ -6,11 +6,11 @@ exports[`loads config correctly 1`] = ` `; exports[`loads currentEnvironment 1`] = ` -"(()=>{var t={foo:\\"bar\\"},e=(typeof window==\\"undefined\\"?globalThis:window)||{},r=e._appConfig||t;(typeof e._appConfig==\\"undefined\\"||!Object.isFrozen(e._appConfig))&&(e._appConfig=r);function o(){return\\"test\\"}console.log(o());})(); +"(()=>{var o={foo:\\"bar\\"},e=(typeof window==\\"undefined\\"?globalThis:window)||{},r=e._appConfig||o;(typeof e._appConfig==\\"undefined\\"||!Object.isFrozen(e._appConfig))&&(e._appConfig=r);function t(){return\\"test\\"}console.log(t());})(); " `; exports[`loads validation function 1`] = ` -"(()=>{var v={foo:\\"bar\\"},n=(typeof window==\\"undefined\\"?globalThis:window)||{},m=n._appConfig||v;(typeof n._appConfig==\\"undefined\\"||!Object.isFrozen(n._appConfig))&&(n._appConfig=m);function P(){let s={};return function(p){\\"use strict\\";p.exports=i,p.exports.default=i;var b={type:\\"object\\",additionalProperties:!1,properties:{foo:{type:\\"string\\"}},$schema:\\"http://json-schema.org/draft-07/schema#\\"};function i(o,t){\\"use strict\\";if(t)var a=t.dataPath,g=t.parentData,h=t.parentDataProperty,y=t.rootData;else var a=\\"\\",g=void 0,h=void 0,y=o;var e=null,r=0;if(o&&typeof o==\\"object\\"&&!Array.isArray(o)){for(var f in o)if(f!==\\"foo\\"){var d={keyword:\\"additionalProperties\\",dataPath:a,schemaPath:\\"#/additionalProperties\\",params:{additionalProperty:f},message:\\"should NOT have additional properties\\"};e===null?e=[d]:e.push(d),r++}if(o.foo!==void 0&&typeof o.foo!=\\"string\\"){var l={keyword:\\"type\\",dataPath:a+\\"/foo\\",schemaPath:\\"#/properties/foo/type\\",params:{type:\\"string\\"},message:\\"should be string\\"};e===null?e=[l]:e.push(l),r++}}else{var c={keyword:\\"type\\",dataPath:a,schemaPath:\\"#/type\\",params:{type:\\"object\\"},message:\\"should be object\\"};e===null?e=[c]:e.push(c),r++}return i.errors=e,r===0}}(s),s.exports}var u=P();u({foo:12});})(); +"(()=>{var h={foo:\\"bar\\"},n=(typeof window==\\"undefined\\"?globalThis:window)||{},v=n._appConfig||h;(typeof n._appConfig==\\"undefined\\"||!Object.isFrozen(n._appConfig))&&(n._appConfig=v);function P(){let s={};return function(p){\\"use strict\\";p.exports=i,p.exports.default=i;var b={type:\\"object\\",additionalProperties:!1,properties:{foo:{type:\\"string\\"}},$schema:\\"http://json-schema.org/draft-07/schema#\\"};function i(t,o){\\"use strict\\";if(o)var a=o.instancePath,g=o.parentData,m=o.parentDataProperty,y=o.rootData;else var a=\\"\\",g=void 0,m=void 0,y=t;var e=null,r=0;if(t&&typeof t==\\"object\\"&&!Array.isArray(t)){for(var f in t)if(f!==\\"foo\\"){var c={instancePath:a,schemaPath:\\"#/additionalProperties\\",keyword:\\"additionalProperties\\",params:{additionalProperty:f},message:\\"must NOT have additional properties\\"};e===null?e=[c]:e.push(c),r++}if(t.foo!==void 0&&typeof t.foo!=\\"string\\"){var u={instancePath:a+\\"/foo\\",schemaPath:\\"#/properties/foo/type\\",keyword:\\"type\\",params:{type:\\"string\\"},message:\\"must be string\\"};e===null?e=[u]:e.push(u),r++}}else{var d={instancePath:a,schemaPath:\\"#/type\\",keyword:\\"type\\",params:{type:\\"object\\"},message:\\"must be object\\"};e===null?e=[d]:e.push(d),r++}return i.errors=e,r===0}}(s),s.exports}var l=P();l({foo:12});})(); " `; diff --git a/app-config-esbuild/src/index.test.ts b/app-config-esbuild/src/index.test.ts index 8aef53df..5af986a3 100644 --- a/app-config-esbuild/src/index.test.ts +++ b/app-config-esbuild/src/index.test.ts @@ -55,7 +55,7 @@ it('fails when config is incorrect', () => write: false, }), ).rejects.toThrow( - 'error: [plugin: @app-config/esbuild] Config is invalid: config should NOT have additional properties', + 'error: [plugin: @app-config/esbuild] Config is invalid: config must NOT have additional properties', ); }, )); From 272996c58c819a35529630c1f4859588c2119899 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sun, 26 Sep 2021 17:48:36 -0600 Subject: [PATCH 36/39] fix: remove default-extensions entirely --- .github/workflows/main.yml | 1 - .github/workflows/publishing.yml | 7 ------- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1db79d71..fb67423a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,6 @@ jobs: ./app-config-config/coverage/coverage-final.json, ./app-config-core/coverage/coverage-final.json, ./app-config-cypress/coverage/coverage-final.json, - ./app-config-default-extensions/coverage/coverage-final.json, ./app-config-encryption/coverage/coverage-final.json, ./app-config-exec/coverage/coverage-final.json, ./app-config-extension-utils/coverage/coverage-final.json, diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 29979fed..25e20f31 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -44,13 +44,6 @@ jobs: access: public package: ./app-config-electron/package.json tag: next - - name: app-config-default-extensions - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.NPM_TOKEN }} - access: public - package: ./app-config-default-extensions/package.json - tag: next - name: app-config-encryption uses: JS-DevTools/npm-publish@v1 with: From 467c1e1271bddfbc5c2e2d6bbdfd84b4b22defea Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sun, 26 Sep 2021 18:11:14 -0600 Subject: [PATCH 37/39] chore: lockfile bumps --- yarn.lock | 772 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 473 insertions(+), 299 deletions(-) diff --git a/yarn.lock b/yarn.lock index 50fe58ad..b3b3779c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -33,20 +33,6 @@ json-schema-ref-parser "9" yargs "16" -"@app-config/config@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/config/-/config-2.6.1.tgz#8b0150b830a61d530b7d4e3c93fab5af8d1753de" - integrity sha512-qRugJYSEHRWFFpuBk5qRqLd3MX0Re7xRDzWFJOVNwHqgjQDL4+NFa3hMQf3Fa4NX1bXa5Bxicwd1D24HQXYqUA== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/default-extensions" "^2.6.1" - "@app-config/extensions" "^2.6.1" - "@app-config/logging" "^2.6.1" - "@app-config/meta" "^2.6.1" - "@app-config/node" "^2.6.1" - "@app-config/schema" "^2.6.1" - "@app-config/utils" "^2.6.1" - "@app-config/config@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/config/-/config-2.8.0.tgz#05b530b16572d53b93375a2166e38482d7582318" @@ -61,13 +47,13 @@ "@app-config/schema" "^2.8.0" "@app-config/utils" "^2.8.0" -"@app-config/core@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/core/-/core-2.6.1.tgz#f828c03acf32c51dc53b777b38523b1e1235d038" - integrity sha512-6/osd+V2dvTPGuojJj9fl1l6nYt6YmTApaoAhmxVCUjgQaUBmn1CYJmXkQ+R3T2zVASwQTTm/5DmQ9FxuxODTA== +"@app-config/core@3.0.0-alpha.4": + version "3.0.0-alpha.4" + resolved "https://registry.yarnpkg.com/@app-config/core/-/core-3.0.0-alpha.4.tgz#c823a48a7d3cb2bea0ad5b69d6cc37d36b0fa9ce" + integrity sha512-ZB+ywDpLU9iXl8quMu9w3Z0mpT/CujhhdlgyegvrBO3WHX73zhwc3DJ/PDLyzJzLcNCo8085/KDfwWemopIg9A== dependencies: - "@app-config/logging" "^2.6.1" - "@app-config/utils" "^2.6.1" + "@app-config/logging" "^3.0.0-alpha.4" + "@app-config/utils" "^3.0.0-alpha.4" "@iarna/toml" "3" js-yaml "^3.13.1" json5 "2" @@ -86,20 +72,14 @@ lodash.merge "^4.6.2" "@app-config/cypress@2": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/cypress/-/cypress-2.6.1.tgz#1075f0821bf94e359db044e09ae5bea1913f6443" - integrity sha512-7Ez3nm0fDkj17yv0+qh9BNKytPxnPes4TksSmQ9t3BnIWhLXLvlZL3gxZnwIjZJ1B5/fxCp/28RTpDcesqXn3Q== + version "2.8.0" + resolved "https://registry.yarnpkg.com/@app-config/cypress/-/cypress-2.8.0.tgz#c015ed70147dde5a085e2f92dbf1394b22f10ee2" + integrity sha512-T1IXFgoQ3cS0n6X8Xy/jscX0Hyh3c1jShxgi6JPoIdiJ3z3tpS4gGXFF5nRjOYDsmQ4bixG6Pz+ikEXfgYQYCw== -"@app-config/default-extensions@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/default-extensions/-/default-extensions-2.6.1.tgz#6af02088969ba95ef7c57c87433214b949698e4c" - integrity sha512-mX/v2fg5IgWG9ARwE6Z8wQuVmbL7ABl27Zna3qz04BjANR2t13h8IKn48Aeijr7nCZ2Cvtz3pLcAlrQc5h1fcA== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/encryption" "^2.6.1" - "@app-config/extensions" "^2.6.1" - "@app-config/git" "^2.6.1" - "@app-config/v1-compat" "^2.1.4" +"@app-config/cypress@3.0.0-alpha.4": + version "3.0.0-alpha.4" + resolved "https://registry.yarnpkg.com/@app-config/cypress/-/cypress-3.0.0-alpha.4.tgz#9558866c16b57ecd9b8138b462ef2a416c02cc27" + integrity sha512-342XaFBZxHTuIquyrEodWsX9iozQuLOYkgHgB6mbNN2ng6bxDoJrUAEomY7aD/n5vb2U1Gv16dWYLvUc75eDDg== "@app-config/default-extensions@^2.8.0": version "2.8.0" @@ -120,27 +100,6 @@ "@app-config/logging" "^2.6.0" "@app-config/main" "^2.6.0" -"@app-config/encryption@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/encryption/-/encryption-2.6.1.tgz#d022b4742b23a21b79cfb8a0030b7c1c34162775" - integrity sha512-zdBAqG/9VxDco4bMQqJgbDyiNspQ/oXhob3hUy+f8D71x5P5rAIFjHoRU/DstPeuQkWipHoLmVL11NHpJIlbKw== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/extension-utils" "^2.6.1" - "@app-config/logging" "^2.6.1" - "@app-config/meta" "^2.6.1" - "@app-config/node" "^2.6.1" - "@app-config/settings" "^2.6.1" - "@app-config/utils" "^2.6.1" - "@lcdev/ws-rpc" "0.4" - "@types/openpgp" "4" - common-tags "1" - fs-extra "7" - openpgp "^4.3.0" - selfsigned "1" - text-encoding-utf-8 "1" - ws "7" - "@app-config/encryption@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/encryption/-/encryption-2.8.0.tgz#1b840c3c70b1f7b1580e5b3baad0f28db02f5ff1" @@ -170,14 +129,6 @@ "@app-config/config" "^2.8.0" "@app-config/utils" "^2.8.0" -"@app-config/extension-utils@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/extension-utils/-/extension-utils-2.6.1.tgz#7fa9b1a68cca887095c319bfd8ea15d26d4bb4ce" - integrity sha512-jQxjbGSehV52stec0ekwQCxB2FKl5PUTJKbJlrY/4+5JeiDCdnGsDiDUwKgOKlvJAUk0l7dNm6qw91tKZqXZBw== - dependencies: - "@app-config/core" "^2.6.1" - "@serafin/schema-builder" "0.14" - "@app-config/extension-utils@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/extension-utils/-/extension-utils-2.8.0.tgz#73c80d0a6aac6059353977697541f13e190e5320" @@ -186,18 +137,6 @@ "@app-config/core" "^2.8.0" "@serafin/schema-builder" "0.14" -"@app-config/extensions@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/extensions/-/extensions-2.6.1.tgz#3b5808c8f1aa6b72b6c15e4ee67eab4b32feff77" - integrity sha512-QuR8JAfW1yEyQdZkXaoAXptOFGMytxMeeAUDDGXhspiSTYr4fbZ18FNU7a1P/j603gLNu7zw5Tt/QiRJOiMXLA== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/extension-utils" "^2.6.1" - "@app-config/logging" "^2.6.1" - "@app-config/node" "^2.6.1" - "@app-config/utils" "^2.6.1" - lodash.isequal "4" - "@app-config/extensions@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/extensions/-/extensions-2.8.0.tgz#19bae110527515928e3391c0b010d975cda98eb2" @@ -225,16 +164,6 @@ lodash "4" quicktype-core "6.0.70" -"@app-config/git@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/git/-/git-2.6.1.tgz#05229f0f8fe7e4669b6b7f01041066b9126463ed" - integrity sha512-kswiK1Qv9wrEmKGHmpnwZiJpsqMSbbBWimCfViiIHPfUc5o78DIN+vlsETQLLkdp10SUCLelLs5Gj9X/lTL2Sw== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/extension-utils" "^2.6.1" - "@app-config/logging" "^2.6.1" - simple-git "2" - "@app-config/git@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/git/-/git-2.8.0.tgz#b382e8dcd92a7765fcad59ea0e2b865c3ae214a1" @@ -245,20 +174,29 @@ "@app-config/logging" "^2.8.0" simple-git "2" -"@app-config/logging@2", "@app-config/logging@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/logging/-/logging-2.6.1.tgz#23ee80775336155bf8f3c994d9ea70b392796fcf" - integrity sha512-WpvzWq825vfZRhuA7/4UADCkYVuasVXCrZpApRPFyvcROEJ/iijG8iCHA1m9XtcdNQphYHYAf6sHj0hRSMkd7A== - dependencies: - "@app-config/utils" "^2.6.1" - -"@app-config/logging@^2.6.0", "@app-config/logging@^2.8.0": +"@app-config/logging@2", "@app-config/logging@^2.6.0", "@app-config/logging@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/logging/-/logging-2.8.0.tgz#16cd1e10f82f8310d06358adc5a5642987e4941b" integrity sha512-rtVznu+uOtaaD3djHmdEW7gcSS2aUCr0Sb1Og6KwoLtCleIQ4UNNhV6HlHySv1ty3jodSOKe9Nl1+mtBV0BFUw== dependencies: "@app-config/utils" "^2.8.0" +"@app-config/main@3.0.0-alpha.4": + version "3.0.0-alpha.4" + resolved "https://registry.yarnpkg.com/@app-config/main/-/main-3.0.0-alpha.4.tgz#b3dd4e68d683ea6ab2dcb74ce2bac338503f816d" + integrity sha512-9DAuj7uS9EPrCGe9zLcREFWow5pH+xhzblcgRbYHjkTdHUy4e/6edhne7BgcsaW9/+VRCi33NvX5b6VyciFtaw== + dependencies: + "@app-config/cli" "^3.0.0-alpha.4" + "@app-config/config" "^3.0.0-alpha.4" + "@app-config/core" "^3.0.0-alpha.4" + "@app-config/extensions" "^3.0.0-alpha.4" + "@app-config/logging" "^3.0.0-alpha.4" + "@app-config/meta" "^3.0.0-alpha.4" + "@app-config/node" "^3.0.0-alpha.4" + "@app-config/schema" "^3.0.0-alpha.4" + "@app-config/utils" "^3.0.0-alpha.4" + ajv "8" + "@app-config/main@^2.6.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/main/-/main-2.8.0.tgz#ce56cd165d8418a8fd0b747bfc71b7aee194f245" @@ -277,18 +215,6 @@ "@app-config/utils" "^2.8.0" ajv "7" -"@app-config/meta@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/meta/-/meta-2.6.1.tgz#184c52b18b827c5f2bc061f3c2983089cbafc2df" - integrity sha512-Ims32++ZdH+VzXJr2sTDbDku8DKmbkmzFe0w3alGmxtlHKIMs/E5AdlWS6bJZBnq445VfvG98FFcVgbcbXyeXA== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/default-extensions" "^2.6.1" - "@app-config/logging" "^2.6.1" - "@app-config/node" "^2.6.1" - "@app-config/utils" "^2.6.1" - fs-extra "7" - "@app-config/meta@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/meta/-/meta-2.8.0.tgz#cea3d209eb6df5870cacfec25f1a5961c226c36f" @@ -301,17 +227,6 @@ "@app-config/utils" "^2.8.0" fs-extra "7" -"@app-config/node@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/node/-/node-2.6.1.tgz#0cdbba003c6a0fd2f2df13ec0dd77f5c4a5b565a" - integrity sha512-6+N4lIzM2naEPjH9iaX6x/Eo1B6CXdfM/NnDdkn3zzmaNgBmdMeUSbRrEd90h6g7EIfc9Ou4s1LfAh77sCCl3g== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/logging" "^2.6.1" - "@types/prompts" "2" - fs-extra "9" - prompts "2" - "@app-config/node@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/node/-/node-2.8.0.tgz#096be7568b13cfc4faf93c987ea2815a161a3f9a" @@ -323,28 +238,20 @@ fs-extra "9" prompts "2" -"@app-config/rollup@2", "@app-config/rollup@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/rollup/-/rollup-2.6.1.tgz#51eb5cbfef852bc10c31083cd49b78ec9a32d873" - integrity sha512-neM8oLdMoXGcnIDCRKscmtiMNlRzimFtJex4dsVsMEBxJlihGBH740ScYaMlZNiT5889BBVorF2y/CyW1ca2Tw== +"@app-config/react-native@3.0.0-alpha.4": + version "3.0.0-alpha.4" + resolved "https://registry.yarnpkg.com/@app-config/react-native/-/react-native-3.0.0-alpha.4.tgz#af0550539dfce1d9c9358ea34170e7f89cbdb68f" + integrity sha512-+w6Hsy+pZGUL2uAjdBVzc4vnmqjDo3j/ItTtEFQ4X1MFXfMN5NIiY7Z6me2ZcRFO4nBszp8z2/CAKX40JznweA== dependencies: - "@app-config/config" "^2.6.1" - "@app-config/node" "^2.6.1" - "@app-config/utils" "^2.6.1" + semver "7" -"@app-config/schema@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/schema/-/schema-2.6.1.tgz#f7121043e61ca88011eca0eeb2ac7033c17fc0be" - integrity sha512-Uy7cNCR5WYQ3pFxzMgbLK5pt/cQ5W3H9Tw+lZ5YKFLjdEjNOIqj2gkaKmRs1/H7Odrq6TUoTGnnxd0q8IP/XJQ== +"@app-config/rollup@2", "@app-config/rollup@^2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@app-config/rollup/-/rollup-2.8.0.tgz#b363a9a5969a053d8d31d24a06af742f8dc99d36" + integrity sha512-tdd7YNYEbMW8n74RzrKZuEUtmXs8G5B1HclO2Nh7Qa04t9SARJenKeDiLrRqHsb0O3RrixT7I50JzMdToORQkg== dependencies: - "@app-config/core" "^2.6.1" - "@app-config/logging" "^2.6.1" - "@app-config/node" "^2.6.1" - "@app-config/utils" "^2.6.1" - "@types/json-schema" "7" - ajv "7" - ajv-formats "1" - json-schema-ref-parser "9" + "@app-config/config" "^2.8.0" + "@app-config/utils" "^2.8.0" "@app-config/schema@^2.8.0": version "2.8.0" @@ -360,18 +267,6 @@ ajv-formats "1" json-schema-ref-parser "9" -"@app-config/settings@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/settings/-/settings-2.6.1.tgz#5e49f5811a3387867c21b1a1bc27801755dc0980" - integrity sha512-UJUcdEEz0l6J/fwKreGFIXtm6FLU/nYB4UWU8M3I8ndrV7Lg8secmTD3BsjckaQ1Tc+OnfHPiwKjMHuHJL8KHQ== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/logging" "^2.6.1" - "@app-config/node" "^2.6.1" - "@app-config/utils" "^2.6.1" - env-paths "2" - fs-extra "7" - "@app-config/settings@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@app-config/settings/-/settings-2.8.0.tgz#b14f90332a0395ffa0b64ea2984d3e83420791d6" @@ -396,10 +291,10 @@ mock-stdin "1" tmp-promise "3" -"@app-config/utils@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/utils/-/utils-2.6.1.tgz#ca2295a0724a6df01bf2d117060fc7c49ea0e91a" - integrity sha512-RRvLJFl6G7f9d/i6H0R4b5qVMWXbkxCRXzWpCs1OHFbX2zkx/kL9gN+ezACWAdtHxOSHHNnaVtQ+eIYTP5gcuw== +"@app-config/utils@3.0.0-alpha.4": + version "3.0.0-alpha.4" + resolved "https://registry.yarnpkg.com/@app-config/utils/-/utils-3.0.0-alpha.4.tgz#36d8cc06fda8484b6174bb9a18d5fad57fa0df9e" + integrity sha512-WGRf80ho32EaFiXUDkJlZmFqTq3iARx2GFSZPNwE4httKhtwqG6+ll5RYmy5wzCdNM/5UAB1w4idXXgAjZKxiw== "@app-config/utils@^2.8.0": version "2.8.0" @@ -407,23 +302,30 @@ integrity sha512-CVVcaUACnVRW5uEcpluyLiMFNvzsDF/AowM0sGIgPDhr31cbBVR+ic5rNUKY/FXTBsCcYpv1N/TUaaQ8WQaEcw== "@app-config/v1-compat@^2.1.4": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/v1-compat/-/v1-compat-2.6.1.tgz#beeaf1f48cbe2c0a42e1e634f9d1184e5c10fa03" - integrity sha512-5zcpQKzNQtluqGWKTqx/SNGMa9RYY+/5sYgcclXuJl9tLR9qHKVIdCxB5urQIC2qYF4sY1pBvrGJJVHKSrqkPg== - dependencies: - "@app-config/core" "^2.6.1" - "@app-config/extension-utils" "^2.6.1" - "@app-config/logging" "^2.6.1" - "@app-config/node" "^2.6.1" - "@app-config/utils" "^2.6.1" + version "2.8.0" + resolved "https://registry.yarnpkg.com/@app-config/v1-compat/-/v1-compat-2.8.0.tgz#2a5029be81c14942eb622460cfd94d631eb38394" + integrity sha512-nrTzPLQ2SayN3/s8v/6htl4OjnPPuLvpmmUcmD/htdxPMddTP8P/WHMgNm/KCxK61aKJKwdvhU9aF0y+G9cjlw== + dependencies: + "@app-config/core" "^2.8.0" + "@app-config/extension-utils" "^2.8.0" + "@app-config/logging" "^2.8.0" + "@app-config/node" "^2.8.0" + "@app-config/utils" "^2.8.0" fs-extra "7" "@app-config/vite@2": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@app-config/vite/-/vite-2.6.1.tgz#af3e8397e48fbaf24eb17fe307c686fab66d5713" - integrity sha512-2maylhRBN3FsoI42XmD/n386tpXKMnEQWj/3G1x0c0MJ8rYXVJKLTGxxJ3bptH2tUHuRlG8jUTPYlcg2mrNYrA== + version "2.8.0" + resolved "https://registry.yarnpkg.com/@app-config/vite/-/vite-2.8.0.tgz#5a46f7b9f62126c4003a0aa25f2d0b64e15a7d86" + integrity sha512-Zfc2UaPifvzj0of+vYcaLX1j8umR3ewcImuIXmTxD3UAsCqFZNXUsSkPPk0nlA4zh5QIJM/1UiT7oXuoiXWVXQ== + dependencies: + "@app-config/rollup" "^2.8.0" + +"@app-config/webpack@3.0.0-alpha.4": + version "3.0.0-alpha.4" + resolved "https://registry.yarnpkg.com/@app-config/webpack/-/webpack-3.0.0-alpha.4.tgz#45e6dadc3592020b506baae808ec1427503c1a71" + integrity sha512-NiBWs9cZdyCA+OcRPNKDwoaEOkYnqmN0EdPX1DHiVXnN0itsxyWzG2yjYI6VozZCn0VvOOXC0xxi6YbTV/HSiw== dependencies: - "@app-config/rollup" "^2.6.1" + loader-utils "2" "@babel/code-frame@7.10.4", "@babel/code-frame@~7.10.4": version "7.10.4" @@ -3573,10 +3475,10 @@ is-plain-object "^5.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-10.3.0.tgz#c168e6904055bf637a43c79331ad280b142c7762" - integrity sha512-mThN3aLK9BXPKdVUNxmQLv6nCJMmp7mrfTNvw9NevzvXhM3ObGg6NWsAfCtP6t3fCcpNhkL1fwbbm4pF55DmXg== +"@octokit/openapi-types@^10.5.0": + version "10.6.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-10.6.0.tgz#13278af3cbe7bb141dc4ae02c24eaff209efadfb" + integrity sha512-/iQtZq+zuQJrwawFyjixh333xPu4/KJKk0bFM/Omm4kFlTGw0dWXfq6xCOe5DqONW0faW29Cc9r6p2mvl72aTQ== "@octokit/plugin-enterprise-rest@^6.0.1": version "6.0.1" @@ -3663,11 +3565,11 @@ "@types/node" ">= 8" "@octokit/types@^6.0.3", "@octokit/types@^6.16.1": - version "6.29.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.29.0.tgz#0261a7f0aea05d4b348845f8d763821e5c661072" - integrity sha512-+6DczLm2ryGbMmJspCA26gt0OGonhCwVrp9wqku486SCo6/SjbI2ipbJm8TSKWuQ6LJgftRC+Q236v6tVgaa1w== + version "6.31.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.31.0.tgz#b444852100090d1c5d0015614860c6131dc217e8" + integrity sha512-xobpvYmMYoFSxZB6jL1TPTMMZkxZIBlY145ZKibBJDKCczP1FrLLougtuVOZywGVZdcYs8oq2Bxb3aMjqIFeiw== dependencies: - "@octokit/openapi-types" "^10.3.0" + "@octokit/openapi-types" "^10.5.0" "@pmmmwh/react-refresh-webpack-plugin@^0.3.3": version "0.3.3" @@ -4025,9 +3927,9 @@ "@types/lodash" "*" "@types/lodash@*": - version "4.14.173" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.173.tgz#9d3b674c67a26cf673756f6aca7b429f237f91ed" - integrity sha512-vv0CAYoaEjCw/mLy96GBTnRoZrSxkGE0BKzKimdR8P3OzrNYNvBgtW7p055A+E8C31vXNUhWKoFCbhq7gbyhFg== + version "4.14.174" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.174.tgz#b4b06b6eced9850eed6b6a8f1abdd0f5192803c1" + integrity sha512-KMBLT6+g9qrGXpDt7ohjWPUD34WA/jasrtjTEHStF0NPdEwJ1N9SZ+4GaMVDeuk/y0+X5j9xFm6mNiXS7UoaLQ== "@types/minimatch@*": version "3.0.5" @@ -4040,9 +3942,9 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@*", "@types/node@>= 8": - version "16.9.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.6.tgz#040a64d7faf9e5d9e940357125f0963012e66f04" - integrity sha512-YHUZhBOMTM3mjFkXVcK+WwAcYmyhe1wL4lfqNtzI0b3qAy7yuSetnM7QJazgE5PFmgVTNGiLOgRFfJMqW7XpSQ== + version "16.10.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.1.tgz#f3647623199ca920960006b3dccf633ea905f243" + integrity sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w== "@types/node@12.12.50": version "12.12.50" @@ -4050,9 +3952,9 @@ integrity sha512-5ImO01Fb8YsEOYpV+aeyGYztcYcjGsBvN4D7G5r1ef2cuQOpymjWNQi5V0rKHE6PC2ru3HkoUr/Br2/8GUA84w== "@types/node@^14.6.2": - version "14.17.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.18.tgz#0198489a751005f71217744aa966cd1f29447c81" - integrity sha512-haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA== + version "14.17.19" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.19.tgz#7341e9ac1b5d748d7a3ddc04336ed536a6f91c31" + integrity sha512-jjYI6NkyfXykucU6ELEoT64QyKOdvaA6enOqKtP4xUsGY0X0ZUZz29fUmrTRo+7v7c6TgDu82q3GHHaCEkqZwA== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -4072,9 +3974,9 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.0.0": - version "2.3.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3" - integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog== + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.0.tgz#900b13362610ccd3570fb6eefb911a6732973d00" + integrity sha512-WHRsy5nMpjXfU9B0LqOqPT06EI2+8Xv5NERy0pLxJLbU98q7uhcGogQzfX+rXpU7S5mgHsLxHrLCufZcV/P8TQ== "@types/prompts@2": version "2.0.14" @@ -5223,7 +5125,7 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== -ansi-regex@^5.0.0: +ansi-regex@^5.0.0, ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -5586,13 +5488,13 @@ autocomplete.js@0.36.0: immediate "^3.2.3" autoprefixer@^9.5.1: - version "9.8.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" - integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== + version "9.8.7" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.7.tgz#e3c12de18a800af1a1a8155fbc01dc7de29ea184" + integrity sha512-7Hg99B1eTH5+LgmUBUSmov1Z3bsggQJS7v3IMGo6wcScnbRuvtMc871J9J+4bSbIqa9LSX/zypFXJ8sXHpMJeQ== dependencies: browserslist "^4.12.0" caniuse-lite "^1.0.30001109" - colorette "^1.2.1" + nanocolors "^0.2.8" normalize-range "^0.1.2" num2fraction "^1.2.2" postcss "^7.0.32" @@ -5736,12 +5638,12 @@ babel-plugin-polyfill-corejs2@^0.2.2: semver "^6.1.1" babel-plugin-polyfill-corejs3@^0.2.2: - version "0.2.4" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9" - integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ== + version "0.2.5" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92" + integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw== dependencies: "@babel/helper-define-polyfill-provider" "^0.2.2" - core-js-compat "^3.14.0" + core-js-compat "^3.16.2" babel-plugin-polyfill-regenerator@^0.2.2: version "0.2.2" @@ -5944,9 +5846,9 @@ bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5, bluebird@^3. integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== blueimp-md5@^2.10.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.18.0.tgz#1152be1335f0c6b3911ed9e36db54f3e6ac52935" - integrity sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q== + version "2.19.0" + resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0" + integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w== bmp-js@^0.1.0: version "0.1.0" @@ -6169,16 +6071,16 @@ browserslist@4.14.2: escalade "^3.0.2" node-releases "^1.1.61" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.0: - version "4.17.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c" - integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.1.tgz#a98d104f54af441290b7d592626dd541fa642eb9" + integrity sha512-aLD0ZMDSnF4lUt4ZDNgqi5BUn9BZ7YdQdI/cYlILrhdSSZJLU9aNZoD5/NBmM4SK34APB2e83MOsRt1EnkuyaQ== dependencies: - caniuse-lite "^1.0.30001254" - colorette "^1.3.0" - electron-to-chromium "^1.3.830" + caniuse-lite "^1.0.30001259" + electron-to-chromium "^1.3.846" escalade "^3.1.1" - node-releases "^1.1.75" + nanocolors "^0.1.5" + node-releases "^1.1.76" bs-logger@0.x: version "0.2.6" @@ -6505,10 +6407,12 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001254: - version "1.0.30001259" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001259.tgz#ae21691d3da9c4be6144403ac40f71d9f6efd790" - integrity sha512-V7mQTFhjITxuk9zBpI6nYsiTXhcPe05l+364nZjK7MFK/E7ibvYBSAXr4YcA6oPR8j3ZLM/LN+lUqUVAQEUZFg== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001259: + version "1.0.30001260" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001260.tgz#e3be3f34ddad735ca4a2736fa9e768ef34316270" + integrity sha512-Fhjc/k8725ItmrvW5QomzxLeojewxvqiYCKeFcfFEhut28IVLdpHU19dneOmltZQIE5HNbawj1HYD+1f2bM1Dg== + dependencies: + nanocolors "^0.1.0" capture-exit@^2.0.0: version "2.0.0" @@ -6896,7 +6800,7 @@ color@^3.0.0: color-convert "^1.9.3" color-string "^1.6.0" -colorette@^1.0.7, colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0: +colorette@^1.0.7, colorette@^1.2.1: version "1.4.0" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== @@ -6941,6 +6845,11 @@ commander@2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== +commander@7, commander@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + commander@^4.0.0, commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" @@ -6956,11 +6865,6 @@ commander@^6.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -commander@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - commander@~2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" @@ -7306,18 +7210,18 @@ copy-webpack-plugin@~6.0.3: serialize-javascript "^4.0.0" webpack-sources "^1.4.3" -core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.5, core-js-compat@^3.8.0: - version "3.18.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.0.tgz#fb360652201e8ac8da812718c008cd0482ed9b42" - integrity sha512-tRVjOJu4PxdXjRMEgbP7lqWy1TWJu9a01oBkn8d+dNrhgmBwdTkzhHZpVJnEmhISLdoJI1lX08rcBcHi3TZIWg== +core-js-compat@^3.16.0, core-js-compat@^3.16.2, core-js-compat@^3.6.5, core-js-compat@^3.8.0: + version "3.18.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.1.tgz#01942a0877caf9c6e5007c027183cf0bdae6a191" + integrity sha512-XJMYx58zo4W0kLPmIingVZA10+7TuKrMLPt83+EzDmxFJQUMcTVVmQ+n5JP4r6Z14qSzhQBRi3NSWoeVyKKXUg== dependencies: - browserslist "^4.17.0" + browserslist "^4.17.1" semver "7.0.0" core-js-pure@^3.16.0: - version "3.18.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.18.0.tgz#e5187347bae66448c9e2d67c01c34c4df3261dc5" - integrity sha512-ZnK+9vyuMhKulIGqT/7RHGRok8RtkHMEX/BGPHkHx+ouDkq+MUvf9mfIgdqhpmPDu8+V5UtRn/CbCRc9I4lX4w== + version "3.18.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.18.1.tgz#097d34d24484be45cea700a448d1e74622646c80" + integrity sha512-kmW/k8MaSuqpvA1xm2l3TVlBuvW+XBkcaOroFUpO3D4lsTGQWBTb/tBDCf/PNkkPLrwgrkQRIYNPB0CeqGJWGQ== core-js@^1.0.0: version "1.2.7" @@ -7330,9 +7234,9 @@ core-js@^2.4.0, core-js@^2.4.1: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.6.1, core-js@^3.6.4, core-js@^3.6.5: - version "3.18.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.0.tgz#9af3f4a6df9ba3428a3fb1b171f1503b3f40cc49" - integrity sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w== + version "3.18.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.1.tgz#289d4be2ce0085d40fc1244c0b1a54c00454622f" + integrity sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA== core-util-is@1.0.2: version "1.0.2" @@ -7770,11 +7674,23 @@ d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0: resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw== +"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.0.4.tgz#60550bcc9818be9ace88d269ccd97038fc399b55" + integrity sha512-ShFl90cxNqDaSynDF/Bik/kTzISqePqU3qo2fv6kSJEvF7y7tDCDpcU6WiT01rPO6zngZnrvJ/0j4q6Qg+5EQg== + dependencies: + internmap "1 - 2" + d3-axis@1: version "1.0.12" resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9" integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ== +d3-axis@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322" + integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw== + d3-brush@1: version "1.1.6" resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b" @@ -7786,6 +7702,17 @@ d3-brush@1: d3-selection "1" d3-transition "1" +d3-brush@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c" + integrity sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ== + dependencies: + d3-dispatch "1 - 3" + d3-drag "2 - 3" + d3-interpolate "1 - 3" + d3-selection "3" + d3-transition "3" + d3-chord@1: version "1.0.6" resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f" @@ -7794,6 +7721,13 @@ d3-chord@1: d3-array "1" d3-path "1" +d3-chord@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-3.0.1.tgz#d156d61f485fce8327e6abf339cb41d8cbba6966" + integrity sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g== + dependencies: + d3-path "1 - 3" + d3-collection@1: version "1.0.7" resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" @@ -7804,6 +7738,11 @@ d3-color@1: resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== +"d3-color@1 - 3", d3-color@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.0.1.tgz#03316e595955d1fcd39d9f3610ad41bb90194d0a" + integrity sha512-6/SlHkDOBLyQSJ1j1Ghs82OIUXpKWlR0hCsw0XrLSQhuUPuCSmLQ1QPH98vpnQxMUQM2/gfAkUEWsupVpd9JGw== + d3-contour@1: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3" @@ -7811,11 +7750,30 @@ d3-contour@1: dependencies: d3-array "^1.1.1" +d3-contour@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-3.0.1.tgz#2c64255d43059599cd0dba8fe4cc3d51ccdd9bbd" + integrity sha512-0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ== + dependencies: + d3-array "2 - 3" + +d3-delaunay@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/d3-delaunay/-/d3-delaunay-6.0.2.tgz#7fd3717ad0eade2fc9939f4260acfb503f984e92" + integrity sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ== + dependencies: + delaunator "5" + d3-dispatch@1: version "1.0.6" resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58" integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA== +"d3-dispatch@1 - 3", d3-dispatch@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e" + integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg== + d3-drag@1: version "1.2.5" resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70" @@ -7824,6 +7782,14 @@ d3-drag@1: d3-dispatch "1" d3-selection "1" +"d3-drag@2 - 3", d3-drag@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba" + integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg== + dependencies: + d3-dispatch "1 - 3" + d3-selection "3" + d3-dsv@1: version "1.2.0" resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c" @@ -7833,11 +7799,25 @@ d3-dsv@1: iconv-lite "0.4" rw "1" +"d3-dsv@1 - 3", d3-dsv@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-3.0.1.tgz#c63af978f4d6a0d084a52a673922be2160789b73" + integrity sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q== + dependencies: + commander "7" + iconv-lite "0.6" + rw "1" + d3-ease@1: version "1.0.7" resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2" integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ== +"d3-ease@1 - 3", d3-ease@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4" + integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w== + d3-fetch@1: version "1.2.0" resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7" @@ -7845,6 +7825,13 @@ d3-fetch@1: dependencies: d3-dsv "1" +d3-fetch@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-3.0.1.tgz#83141bff9856a0edb5e38de89cdcfe63d0a60a22" + integrity sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw== + dependencies: + d3-dsv "1 - 3" + d3-force@1: version "1.2.1" resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b" @@ -7855,11 +7842,25 @@ d3-force@1: d3-quadtree "1" d3-timer "1" +d3-force@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4" + integrity sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg== + dependencies: + d3-dispatch "1 - 3" + d3-quadtree "1 - 3" + d3-timer "1 - 3" + d3-format@1: version "1.4.5" resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4" integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ== +"d3-format@1 - 3", d3-format@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.0.1.tgz#e41b81b2ab79277141ec1404aa5d05001da64084" + integrity sha512-hdL7+HBIohpgfolhBxr1KX47VMD6+vVD/oEFrxk5yhmzV2prk99EkFKYpXuhVkFpTgHdJ6/4bYcjdLPPXV4tIA== + d3-geo@1: version "1.12.1" resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f" @@ -7867,11 +7868,23 @@ d3-geo@1: dependencies: d3-array "1" +d3-geo@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.0.1.tgz#4f92362fd8685d93e3b1fae0fd97dc8980b1ed7e" + integrity sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA== + dependencies: + d3-array "2.5.0 - 3" + d3-hierarchy@1: version "1.1.9" resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83" integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ== +d3-hierarchy@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.0.1.tgz#0365342d54972e38ca05e9143e0ab1c60846b3b5" + integrity sha512-RlLTaofEoOrMK1JoXYIGhKTkJFI/6rFrYPgxy6QlZo2BcVc4HGTqEU0rPpzuMq5T/5XcMtAzv1XiLA3zRTfygw== + d3-interpolate@1: version "1.4.0" resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" @@ -7879,26 +7892,53 @@ d3-interpolate@1: dependencies: d3-color "1" +"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d" + integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g== + dependencies: + d3-color "1 - 3" + d3-path@1: version "1.0.9" resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf" integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg== +"d3-path@1 - 3", d3-path@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.0.1.tgz#f09dec0aaffd770b7995f1a399152bf93052321e" + integrity sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w== + d3-polygon@1: version "1.0.6" resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e" integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ== +d3-polygon@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-3.0.1.tgz#0b45d3dd1c48a29c8e057e6135693ec80bf16398" + integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg== + d3-quadtree@1: version "1.0.7" resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135" integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA== +"d3-quadtree@1 - 3", d3-quadtree@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f" + integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw== + d3-random@1: version "1.1.2" resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291" integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ== +d3-random@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4" + integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ== + d3-scale-chromatic@1: version "1.5.0" resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98" @@ -7907,6 +7947,14 @@ d3-scale-chromatic@1: d3-color "1" d3-interpolate "1" +d3-scale-chromatic@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz#15b4ceb8ca2bb0dcb6d1a641ee03d59c3b62376a" + integrity sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g== + dependencies: + d3-color "1 - 3" + d3-interpolate "1 - 3" + d3-scale@2: version "2.2.2" resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f" @@ -7919,11 +7967,27 @@ d3-scale@2: d3-time "1" d3-time-format "2" +d3-scale@4: + version "4.0.2" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396" + integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ== + dependencies: + d3-array "2.10.0 - 3" + d3-format "1 - 3" + d3-interpolate "1.2.0 - 3" + d3-time "2.1.1 - 3" + d3-time-format "2 - 4" + d3-selection@1, d3-selection@^1.1.0: version "1.4.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c" integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg== +"d3-selection@2 - 3", d3-selection@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31" + integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ== + d3-shape@1: version "1.3.7" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7" @@ -7931,6 +7995,13 @@ d3-shape@1: dependencies: d3-path "1" +d3-shape@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.0.1.tgz#9ccdfb28fd9b0d12f2d8aec234cd5c4a9ea27931" + integrity sha512-HNZNEQoDhuCrDWEc/BMbF/hKtzMZVoe64TvisFLDp2Iyj0UShB/E6/lBsLlJTfBMbYgftHj90cXJ0SEitlE6Xw== + dependencies: + d3-path "1 - 3" + d3-time-format@2: version "2.3.0" resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850" @@ -7938,16 +8009,35 @@ d3-time-format@2: dependencies: d3-time "1" +"d3-time-format@2 - 4", d3-time-format@4: + version "4.0.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.0.0.tgz#930ded86a9de761702344760d8a25753467f28b7" + integrity sha512-nzaCwlj+ZVBIlFuVOT1RmU+6xb/7D5IcnhHzHQcBgS/aTa5K9fWZNN5LCXA27LgF5WxoSNJqKBbLcGMtM6Ca6A== + dependencies: + d3-time "1 - 3" + d3-time@1: version "1.1.0" resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1" integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA== +"d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.0.0.tgz#65972cb98ae2d4954ef5c932e8704061335d4975" + integrity sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ== + dependencies: + d3-array "2 - 3" + d3-timer@1: version "1.0.10" resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5" integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw== +"d3-timer@1 - 3", d3-timer@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0" + integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA== + d3-transition@1: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398" @@ -7960,6 +8050,17 @@ d3-transition@1: d3-selection "^1.1.0" d3-timer "1" +"d3-transition@2 - 3", d3-transition@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f" + integrity sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w== + dependencies: + d3-color "1 - 3" + d3-dispatch "1 - 3" + d3-ease "1 - 3" + d3-interpolate "1 - 3" + d3-timer "1 - 3" + d3-voronoi@1: version "1.1.4" resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297" @@ -7976,7 +8077,18 @@ d3-zoom@1: d3-selection "1" d3-transition "1" -d3@^5.14, d3@^5.16.0: +d3-zoom@3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3" + integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw== + dependencies: + d3-dispatch "1 - 3" + d3-drag "2 - 3" + d3-interpolate "1 - 3" + d3-selection "2 - 3" + d3-transition "2 - 3" + +d3@^5.14: version "5.16.0" resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877" integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw== @@ -8013,6 +8125,42 @@ d3@^5.14, d3@^5.16.0: d3-voronoi "1" d3-zoom "1" +d3@^7.0.0: + version "7.0.4" + resolved "https://registry.yarnpkg.com/d3/-/d3-7.0.4.tgz#37dfeb3b526f64a0de2ddb705ea61649325207bd" + integrity sha512-ruRiyPYZEGeJBOOjVS5pHliNUZM2HAllEY7HKB2ff+9ENxOti4N+S+WZqo9ggUMr8tSPMm+riqKpJd1oYEDN5Q== + dependencies: + d3-array "3" + d3-axis "3" + d3-brush "3" + d3-chord "3" + d3-color "3" + d3-contour "3" + d3-delaunay "6" + d3-dispatch "3" + d3-drag "3" + d3-dsv "3" + d3-ease "3" + d3-fetch "3" + d3-force "3" + d3-format "3" + d3-geo "3" + d3-hierarchy "3" + d3-interpolate "3" + d3-path "3" + d3-polygon "3" + d3-quadtree "3" + d3-random "3" + d3-scale "4" + d3-scale-chromatic "3" + d3-selection "3" + d3-shape "3" + d3-time "3" + d3-time-format "4" + d3-timer "3" + d3-transition "3" + d3-zoom "3" + dagre-d3@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/dagre-d3/-/dagre-d3-0.6.4.tgz#0728d5ce7f177ca2337df141ceb60fbe6eeb7b29" @@ -8098,14 +8246,7 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@4.3.2: +debug@4, debug@4.3.2, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -8294,6 +8435,13 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" +delaunator@5: + version "5.0.0" + resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b" + integrity sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw== + dependencies: + robust-predicates "^3.0.0" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -8604,10 +8752,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.830: - version "1.3.846" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.846.tgz#a55fd59613dbcaed609e965e3e88f42b08c401d3" - integrity sha512-2jtSwgyiRzybHRxrc2nKI+39wH3AwQgn+sogQ+q814gv8hIFwrcZbV07Ea9f8AmK0ufPVZUvvAG1uZJ+obV4Jw== +electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.846: + version "1.3.850" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.850.tgz#c56c72abfeab051b4b328beb894461c5912d0456" + integrity sha512-ZzkDcdzePeF4dhoGZQT77V2CyJOpwfTZEOg4h0x6R/jQhGt/rIRpbRyVreWLtD7B/WsVxo91URm2WxMKR9JQZA== electron@^13.1.4: version "13.4.0" @@ -8694,7 +8842,7 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1, enhan memory-fs "^0.5.0" tapable "^1.0.0" -enhanced-resolve@^5.8.0: +enhanced-resolve@^5.8.3: version "5.8.3" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA== @@ -8809,10 +8957,10 @@ es-get-iterator@^1.1.1: is-string "^1.0.5" isarray "^2.0.5" -es-module-lexer@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d" - integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw== +es-module-lexer@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.0.tgz#fe4c4621977bc668e285c5f1f70ca3b451095fda" + integrity sha512-qU2eN/XHsrl3E4y7mK1wdWnyy5c8gXtCbfP6Xcsemm7fPUR1PIV1JhZfP7ojcN0Fzp69CfrS3u76h2tusvfKiQ== es-to-primitive@^1.2.1: version "1.2.1" @@ -8943,9 +9091,9 @@ esbuild@0.13: esbuild-windows-arm64 "0.13.2" esbuild@^0.12.17: - version "0.12.28" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.28.tgz#84da0d2a0d0dee181281545271e0d65cf6fab1ef" - integrity sha512-pZ0FrWZXlvQOATlp14lRSk1N9GkeJ3vLIwOcUoo3ICQn9WNR4rWoNi81pbn6sC1iYUy7QPqNzI3+AEzokwyVcA== + version "0.12.29" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.29.tgz#be602db7c4dc78944a9dbde0d1ea19d36c1f882d" + integrity sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g== escalade@^3.0.2, escalade@^3.1.1: version "3.1.1" @@ -9835,9 +9983,9 @@ fastify-warning@^0.2.0: integrity sha512-s1EQguBw/9qtc1p/WTY4eq9WMRIACkj+HTcOIK1in4MV5aFaQC9ZCIt0dJ7pr5bIf4lPpHvAtP2ywpTNgs7hqw== fastify@3: - version "3.21.3" - resolved "https://registry.yarnpkg.com/fastify/-/fastify-3.21.3.tgz#2c32124d82489b7cf5ee7a546e5ab85f647cdf57" - integrity sha512-4PuuCCcGZpcD9ERc8x6H7GHElcHQxHVouyANAVw/Nd9h07X63QQJ2EpHeQtuiDCjcs0pf9wKb6KIul3qCYh+1g== + version "3.21.6" + resolved "https://registry.yarnpkg.com/fastify/-/fastify-3.21.6.tgz#a8235518147ea469a98ec3e5d4599f56eac3ff09" + integrity sha512-PextZFavEZaqn2ZYbVGBPAI0AiElnVdfqo9sN1wlOi0mhGtYuec4KT82MHe5npCf3Lz++6i7jLl7YKyYidPrMg== dependencies: "@fastify/ajv-compiler" "^1.0.0" abstract-logging "^2.0.0" @@ -10599,9 +10747,9 @@ glob@7.1.6: path-is-absolute "^1.0.0" glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -11333,7 +11481,7 @@ iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.2: +iconv-lite@0.6, iconv-lite@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -11592,6 +11740,11 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" +"internmap@1 - 2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009" + integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg== + interpret@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" @@ -11837,9 +11990,9 @@ is-glob@^3.1.0: is-extglob "^2.1.0" is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + version "4.0.2" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.2.tgz#859fc2e731e58c902f99fcabccb75a7dd07d29d8" + integrity sha512-ZZTOjRcDjuAAAv2cTBQP/lL59ZTArx77+7UzHdWW/XB1mrfp7DEaVpKmZ0XIzx+M7AxfhKcqV+nMetUQmFifwg== dependencies: is-extglob "^2.1.1" @@ -12137,9 +12290,9 @@ isstream@~0.1.2: integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.1.tgz#e8900b3ed6069759229cf30f7067388d148aeb5e" + integrity sha512-GvCYYTxaCPqwMjobtVcVKvSHtAGe48MNhGjpK8LtVF8K0ISX7hCKl85LgtuaSneWVyQmaGcW3iXVV3GaZSLpmQ== istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: version "4.0.3" @@ -12640,9 +12793,9 @@ jest-worker@^26.2.1, jest-worker@^26.6.2: supports-color "^7.0.0" jest-worker@^27.0.6: - version "27.2.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.0.tgz#11eef39f1c88f41384ca235c2f48fe50bc229bc0" - integrity sha512-laB0ZVIBz+voh/QQy9dmUuuDsadixeerrKqyVpgPz+CCWiOYjOBabUXHIXZhsdvkWbLqSHbgkAHWl5cg24Q6RA== + version "27.2.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.2.tgz#636deeae8068abbf2b34b4eb9505f8d4e5bd625c" + integrity sha512-aG1xq9KgWB2CPC8YdMIlI8uZgga2LFNcGbHJxO8ctfXAydSaThR4EewKQGg3tBOC+kS3vhPGgymsBdi9VINjPw== dependencies: "@types/node" "*" merge-stream "^2.0.0" @@ -13691,12 +13844,12 @@ merge2@^1.2.3, merge2@^1.3.0: integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== mermaid@^8.8.3: - version "8.12.1" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.12.1.tgz#6b55617bcfc970a7bf724e027368b281feb62539" - integrity sha512-0UCcSF0FLoNcPBsRF4f9OIV32t41fV18//z8o3S+FDz2PbDA1CRGKdQF9IX84VP4Tv9kcgJI/oqJdcBEtB/GPA== + version "8.13.0" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.13.0.tgz#2a65bb65d806323dfd813980cff6265181dbc4ad" + integrity sha512-/b8tCqyGhb+yiCQQ5cwpGcaesAfZV057kRBaUx+g6LHctebWaMvo5WmIPN+/jMHfLtAgCJIaQDZ1EsECz7FJIQ== dependencies: "@braintree/sanitize-url" "^3.1.0" - d3 "^5.16.0" + d3 "^7.0.0" dagre "^0.8.5" dagre-d3 "^0.6.4" dompurify "2.3.1" @@ -14307,10 +14460,20 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== -nanoid@3, nanoid@^3.1.23: - version "3.1.25" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" - integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== +nanocolors@^0.1.0, nanocolors@^0.1.5: + version "0.1.12" + resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6" + integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ== + +nanocolors@^0.2.2, nanocolors@^0.2.8: + version "0.2.9" + resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.2.9.tgz#319c5e7a73571abd60e4d273150c2cb95017ac5b" + integrity sha512-aymgS4Xe0LMqHOHl7jSUEkFh/6O/pcF0j61dBtreQZ1nmbyYdYjSYSJzz0iPLbKPkMtSmdRgyBGywNZGjKOEfw== + +nanoid@3, nanoid@^3.1.25: + version "3.1.28" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.28.tgz#3c01bac14cb6c5680569014cc65a2f26424c6bd4" + integrity sha512-gSu9VZ2HtmoKYe/lmyPFES5nknFrHa+/DT9muUFWFMi6Jh9E1I7bkvlQ8xxf1Kos9pi9o8lBnIOkatMhKX/YUw== nanomatch@^1.2.9: version "1.2.13" @@ -14399,9 +14562,9 @@ node-fetch@^1.0.1: is-stream "^1.0.1" node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@^2.5.0, node-fetch@^2.6.0, node-fetch@^2.6.1: - version "2.6.4" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.4.tgz#7f1d13b8f9ff0c1a994dc6f73c69f7d652c7ace2" - integrity sha512-aD1fO+xtLiSCc9vuD+sYMxpIuQyhHscGSkBEo2o5LTV/3bTEAYvdUii29n8LlO5uLCmWdGP7uVUVXFo5SRdkLA== + version "2.6.5" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" + integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== dependencies: whatwg-url "^5.0.0" @@ -14492,7 +14655,7 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.61, node-releases@^1.1.75: +node-releases@^1.1.61, node-releases@^1.1.76: version "1.1.76" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.76.tgz#df245b062b0cafbd5282ab6792f7dccc2d97f36e" integrity sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA== @@ -15477,9 +15640,9 @@ pino-std-serializers@^3.1.0: integrity sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg== pino@^6.13.0: - version "6.13.2" - resolved "https://registry.yarnpkg.com/pino/-/pino-6.13.2.tgz#948a0fcadca668f3b5fb8a427f2854b08661eccf" - integrity sha512-vmD/cabJ4xKqo9GVuAoAEeQhra8XJ7YydPV/JyIP+0zDtFTu5JSKdtt8eksGVWKtTSrNGcRrzJ4/IzvUWep3FA== + version "6.13.3" + resolved "https://registry.yarnpkg.com/pino/-/pino-6.13.3.tgz#60b93bcda1541f92fb37b3f2be0a25cf1d05b6fe" + integrity sha512-tJy6qVgkh9MwNgqX1/oYi3ehfl2Y9H0uHyEEMsBe74KinESIjdMrMQDWpcZPpPicg3VV35d/GLQZmo4QgU2Xkg== dependencies: fast-redact "^3.0.0" fast-safe-stringify "^2.0.8" @@ -15976,21 +16139,20 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.36" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb" - integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw== + version "7.0.38" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.38.tgz#5365a9c5126643d977046ad239f60eadda2491d6" + integrity sha512-wNrSHWjHDQJR/IZL5IKGxRtFgrYNaAA/UrkW2WqbtZO6uxSLMxMN+s2iqUMwnAWm3fMROlDYZB41dr0Mt7vBwQ== dependencies: - chalk "^2.4.2" + nanocolors "^0.2.2" source-map "^0.6.1" - supports-color "^6.1.0" postcss@^8.3.6: - version "8.3.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" - integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== + version "8.3.8" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.8.tgz#9ebe2a127396b4b4570ae9f7770e7fb83db2bac1" + integrity sha512-GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA== dependencies: - colorette "^1.2.2" - nanoid "^3.1.23" + nanocolors "^0.2.2" + nanoid "^3.1.25" source-map-js "^0.6.2" pouchdb-collections@^1.0.1: @@ -17188,10 +17350,15 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" +robust-predicates@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.1.tgz#ecde075044f7f30118682bd9fb3f123109577f9a" + integrity sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g== + rollup@2, rollup@^2, rollup@^2.38.5: - version "2.56.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.56.3.tgz#b63edadd9851b0d618a6d0e6af8201955a77aeff" - integrity sha512-Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg== + version "2.57.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.57.0.tgz#c1694475eb22e1022477c0f4635fd0ac80713173" + integrity sha512-bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg== optionalDependencies: fsevents "~2.3.2" @@ -18153,13 +18320,13 @@ string-width@^3.0.0, string-width@^3.1.0: strip-ansi "^5.1.0" string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" string.prototype.matchall@^4.0.5: version "4.0.5" @@ -18221,7 +18388,7 @@ stringify-object@^3.2.2: is-obj "^1.0.1" is-regexp "^1.0.0" -strip-ansi@6.0.0, strip-ansi@^6.0.0: +strip-ansi@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== @@ -18249,6 +18416,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-bom-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" @@ -20063,9 +20237,9 @@ webpack@4.43.0: webpack-sources "^1.4.1" webpack@5: - version "5.53.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.53.0.tgz#f463cd9c6fc1356ae4b9b7ac911fd1f5b2df86af" - integrity sha512-RZ1Z3z3ni44snoWjfWeHFyzvd9HMVYDYC5VXmlYUT6NWgEOWdCNpad5Fve2CzzHoRED7WtsKe+FCyP5Vk4pWiQ== + version "5.54.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.54.0.tgz#629f0cd14c7a4340af758a3c7cef25c50670ae4d" + integrity sha512-MAVKJMsIUotOQKzFOmN8ZkmMlj7BOyjDU6t1lomW9dWOme5WTStzGa3HMLdV1KYD1AiFETGsznL4LMSvj4tukw== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" @@ -20076,8 +20250,8 @@ webpack@5: acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.0" - es-module-lexer "^0.7.1" + enhanced-resolve "^5.8.3" + es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" From 62e5ba425fbffc688827605251079167b70317af Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sun, 26 Sep 2021 18:24:22 -0600 Subject: [PATCH 38/39] chore: release v3.0.0-alpha.6 --- app-config-cli/package.json | 20 ++++++++++---------- app-config-config/package.json | 18 +++++++++--------- app-config-core/package.json | 8 ++++---- app-config-cypress/package.json | 6 +++--- app-config-electron/package.json | 2 +- app-config-encryption/package.json | 18 +++++++++--------- app-config-esbuild/package.json | 8 ++++---- app-config-exec/package.json | 14 +++++++------- app-config-extension-utils/package.json | 4 ++-- app-config-extensions/package.json | 14 +++++++------- app-config-generate/package.json | 10 +++++----- app-config-git/package.json | 10 +++++----- app-config-inject/package.json | 10 +++++----- app-config-js/package.json | 10 +++++----- app-config-logging/package.json | 4 ++-- app-config-main/package.json | 24 ++++++++++++------------ app-config-meta/package.json | 12 ++++++------ app-config-node/package.json | 8 ++++---- app-config-react-native/package.json | 8 ++++---- app-config-rollup/package.json | 6 +++--- app-config-schema/package.json | 16 ++++++++-------- app-config-settings/package.json | 12 ++++++------ app-config-test-utils/package.json | 6 +++--- app-config-utils/package.json | 2 +- app-config-v1-compat/package.json | 16 ++++++++-------- app-config-vault/package.json | 8 ++++---- app-config-vite/package.json | 4 ++-- app-config-webpack/package.json | 10 +++++----- 28 files changed, 144 insertions(+), 144 deletions(-) diff --git a/app-config-cli/package.json b/app-config-cli/package.json index 216c5184..7a797808 100644 --- a/app-config-cli/package.json +++ b/app-config-cli/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cli", "description": "CLI for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -36,14 +36,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.5", - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/encryption": "^3.0.0-alpha.5", - "@app-config/generate": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/schema": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/config": "^3.0.0-alpha.6", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/encryption": "^3.0.0-alpha.6", + "@app-config/generate": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/schema": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "ajv": "8", "clipboardy": "2", "common-tags": "1", @@ -53,7 +53,7 @@ "yargs": "16" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.6", "@types/common-tags": "1", "@types/fs-extra": "9" }, diff --git a/app-config-config/package.json b/app-config-config/package.json index b5a8ad17..e399d018 100644 --- a/app-config-config/package.json +++ b/app-config-config/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/config", "description": "The config in @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/extensions": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/meta": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/schema": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5" + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/extensions": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/meta": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/schema": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-core/package.json b/app-config-core/package.json index b6b88462..06d4d9a9 100644 --- a/app-config-core/package.json +++ b/app-config-core/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/core", "description": "Core logic for App Config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "@iarna/toml": "3", "js-yaml": "^3.13.1", "json5": "2", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.6", "@types/js-yaml": "3", "@types/lodash.merge": "4" }, diff --git a/app-config-cypress/package.json b/app-config-cypress/package.json index 2886f9c0..0e960990 100644 --- a/app-config-cypress/package.json +++ b/app-config-cypress/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/cypress", "description": "Cypress testing plugin for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -31,11 +31,11 @@ }, "dependencies": {}, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.5", + "@app-config/main": "^3.0.0-alpha.6", "cypress": "6" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.5", + "@app-config/main": "^3.0.0-alpha.6", "cypress": "6" }, "prettier": "@lcdev/prettier", diff --git a/app-config-electron/package.json b/app-config-electron/package.json index 5150079a..04654e1a 100644 --- a/app-config-electron/package.json +++ b/app-config-electron/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/electron", "description": "Exposes app-config values to Electron render processes", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", diff --git a/app-config-encryption/package.json b/app-config-encryption/package.json index bcf71351..a32ce6ae 100644 --- a/app-config-encryption/package.json +++ b/app-config-encryption/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/encryption", "description": "Secret value encryption for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/extension-utils": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/meta": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/settings": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/extension-utils": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/meta": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/settings": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "@lcdev/ws-rpc": "0.4", "@types/openpgp": "4", "common-tags": "1", @@ -47,7 +47,7 @@ "ws": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.6", "get-port": "5" }, "prettier": "@lcdev/prettier", diff --git a/app-config-esbuild/package.json b/app-config-esbuild/package.json index 7ef493c7..e8b1c336 100644 --- a/app-config-esbuild/package.json +++ b/app-config-esbuild/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/esbuild", "description": "esbuild module resolution support for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,11 +30,11 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5" + "@app-config/config": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.6", "esbuild": "0.13" }, "prettier": "@lcdev/prettier", diff --git a/app-config-exec/package.json b/app-config-exec/package.json index 16178c08..0425fe98 100644 --- a/app-config-exec/package.json +++ b/app-config-exec/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/exec", "description": "Generate config by running arbitrary programs", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/extension-utils": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5" + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/extension-utils": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.5", - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/main": "^3.0.0-alpha.6", + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-extension-utils/package.json b/app-config-extension-utils/package.json index b0d09da5..73735398 100644 --- a/app-config-extension-utils/package.json +++ b/app-config-extension-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extension-utils", "description": "Utilities for writing @app-config parsing extensions", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", "@serafin/schema-builder": "0.14" }, "devDependencies": {}, diff --git a/app-config-extensions/package.json b/app-config-extensions/package.json index f3502cda..17d464e3 100644 --- a/app-config-extensions/package.json +++ b/app-config-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/extensions", "description": "Common parsing extensions for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/extension-utils": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/extension-utils": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "lodash.isequal": "4" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.6", "@types/lodash.isequal": "4" }, "prettier": "@lcdev/prettier", diff --git a/app-config-generate/package.json b/app-config-generate/package.json index 70d445e1..e6aaee5a 100644 --- a/app-config-generate/package.json +++ b/app-config-generate/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/generate", "description": "Code generation for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,9 +30,9 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/meta": "^3.0.0-alpha.5", - "@app-config/schema": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/meta": "^3.0.0-alpha.6", + "@app-config/schema": "^3.0.0-alpha.6", "@types/readable-stream": "2", "@types/urijs": "1", "common-tags": "1", @@ -41,7 +41,7 @@ "quicktype-core": "6.0.70" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-git/package.json b/app-config-git/package.json index 4d9f4623..da3ddba2 100644 --- a/app-config-git/package.json +++ b/app-config-git/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/git", "description": "$git directive parsing extension for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,13 +30,13 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/extension-utils": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/extension-utils": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", "simple-git": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-inject/package.json b/app-config-inject/package.json index 3483a1e9..472cfae1 100644 --- a/app-config-inject/package.json +++ b/app-config-inject/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/inject", "description": "Runtime injection of app-config into static HTML files", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,10 +34,10 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/schema": "^3.0.0-alpha.5", + "@app-config/config": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/schema": "^3.0.0-alpha.6", "@types/yargs": "16", "node-html-parser": "1", "yargs": "16" diff --git a/app-config-js/package.json b/app-config-js/package.json index 1c1686c2..bda6cea0 100644 --- a/app-config-js/package.json +++ b/app-config-js/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/js", "description": "Loads a JavaScript module to inject configuration", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/extension-utils": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5" + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/extension-utils": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-logging/package.json b/app-config-logging/package.json index 41aa7cc2..a316d189 100644 --- a/app-config-logging/package.json +++ b/app-config-logging/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/logging", "description": "Logging for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,7 +30,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/utils": "^3.0.0-alpha.5" + "@app-config/utils": "^3.0.0-alpha.6" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-main/package.json b/app-config-main/package.json index 042b2446..396f406f 100644 --- a/app-config-main/package.json +++ b/app-config-main/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/main", "description": "Easy to use configuration loader with schema validation", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -35,20 +35,20 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/cli": "^3.0.0-alpha.5", - "@app-config/config": "^3.0.0-alpha.5", - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/encryption": "^3.0.0-alpha.5", - "@app-config/extensions": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/meta": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/schema": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/cli": "^3.0.0-alpha.6", + "@app-config/config": "^3.0.0-alpha.6", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/encryption": "^3.0.0-alpha.6", + "@app-config/extensions": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/meta": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/schema": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "ajv": "8" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-meta/package.json b/app-config-meta/package.json index 9503b220..1cfc320e 100644 --- a/app-config-meta/package.json +++ b/app-config-meta/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/meta", "description": "Meta file parsing for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-node/package.json b/app-config-node/package.json index 0b07c4d4..7a6066cc 100644 --- a/app-config-node/package.json +++ b/app-config-node/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/node", "description": "Node.js API for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,14 +30,14 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", "@types/prompts": "2", "fs-extra": "9", "prompts": "2" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5", + "@app-config/test-utils": "^3.0.0-alpha.6", "@types/fs-extra": "9" }, "prettier": "@lcdev/prettier", diff --git a/app-config-react-native/package.json b/app-config-react-native/package.json index 5a1b25d8..ed48f831 100644 --- a/app-config-react-native/package.json +++ b/app-config-react-native/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/react-native", "description": "React Native Metro transformer that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,12 +30,12 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/node": "^3.0.0-alpha.5", + "@app-config/node": "^3.0.0-alpha.6", "semver": "7" }, "peerDependencies": { - "@app-config/config": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/config": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "react-native": ">=0.45.0" }, "devDependencies": { diff --git a/app-config-rollup/package.json b/app-config-rollup/package.json index 5a2e74bd..b63bfbd2 100644 --- a/app-config-rollup/package.json +++ b/app-config-rollup/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/rollup", "description": "Rollup plugin that resolves @app-config for you", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,8 +34,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5" + "@app-config/config": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6" }, "peerDependencies": {}, "devDependencies": { diff --git a/app-config-schema/package.json b/app-config-schema/package.json index 9770b120..63233ed8 100644 --- a/app-config-schema/package.json +++ b/app-config-schema/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/schema", "description": "Schema validation for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,19 +30,19 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "@types/json-schema": "7", "ajv": "8", "ajv-formats": "2", "json-schema-ref-parser": "9" }, "devDependencies": { - "@app-config/encryption": "^3.0.0-alpha.5", - "@app-config/extensions": "^3.0.0-alpha.5", - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/encryption": "^3.0.0-alpha.6", + "@app-config/extensions": "^3.0.0-alpha.6", + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-settings/package.json b/app-config-settings/package.json index 458b87ff..d5862e83 100644 --- a/app-config-settings/package.json +++ b/app-config-settings/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/settings", "description": "User settings for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,15 +30,15 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "env-paths": "2", "fs-extra": "7" }, "devDependencies": { - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-test-utils/package.json b/app-config-test-utils/package.json index 947ca546..07c8bf1b 100644 --- a/app-config-test-utils/package.json +++ b/app-config-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/test-utils", "description": "Internal test utilities", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,8 +30,8 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "@types/fs-extra": "9", "@types/tmp": "0.2", "fs-extra": "9", diff --git a/app-config-utils/package.json b/app-config-utils/package.json index 8b3dade1..0b34dbe5 100644 --- a/app-config-utils/package.json +++ b/app-config-utils/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/utils", "description": "Common utilities used in @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", diff --git a/app-config-v1-compat/package.json b/app-config-v1-compat/package.json index 31e52341..33a0a21d 100644 --- a/app-config-v1-compat/package.json +++ b/app-config-v1-compat/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/v1-compat", "description": "Version 1 compatibility layer for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/core": "^3.0.0-alpha.5", - "@app-config/extension-utils": "^3.0.0-alpha.5", - "@app-config/logging": "^3.0.0-alpha.5", - "@app-config/node": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/core": "^3.0.0-alpha.6", + "@app-config/extension-utils": "^3.0.0-alpha.6", + "@app-config/logging": "^3.0.0-alpha.6", + "@app-config/node": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "fs-extra": "7" }, "devDependencies": { - "@app-config/extensions": "^3.0.0-alpha.5", - "@app-config/test-utils": "^3.0.0-alpha.5" + "@app-config/extensions": "^3.0.0-alpha.6", + "@app-config/test-utils": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vault/package.json b/app-config-vault/package.json index 219f2023..3aa03c51 100644 --- a/app-config-vault/package.json +++ b/app-config-vault/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/vault", "description": "Hashicorp Vault support for App Config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -30,16 +30,16 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/extension-utils": "^3.0.0-alpha.5", + "@app-config/extension-utils": "^3.0.0-alpha.6", "@lcdev/fetch": "^0.1.10", "cross-fetch": "3", "node-vault": "0.9" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.5" + "@app-config/main": "^3.0.0-alpha.6" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.5" + "@app-config/main": "^3.0.0-alpha.6" }, "prettier": "@lcdev/prettier", "jest": { diff --git a/app-config-vite/package.json b/app-config-vite/package.json index ab9c831f..541dd9b6 100644 --- a/app-config-vite/package.json +++ b/app-config-vite/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/vite", "description": "Vite plugin for @app-config", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -34,7 +34,7 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/rollup": "^3.0.0-alpha.5" + "@app-config/rollup": "^3.0.0-alpha.6" }, "devDependencies": {}, "prettier": "@lcdev/prettier", diff --git a/app-config-webpack/package.json b/app-config-webpack/package.json index ff7f7bfb..d9397d16 100644 --- a/app-config-webpack/package.json +++ b/app-config-webpack/package.json @@ -1,7 +1,7 @@ { "name": "@app-config/webpack", "description": "Webpack plugin that loads your app-config values into bundles statically", - "version": "3.0.0-alpha.5", + "version": "3.0.0-alpha.6", "license": "MPL-2.0", "author": { "name": "Launchcode", @@ -31,17 +31,17 @@ "prepublishOnly": "yarn clean && yarn build && yarn build:es" }, "dependencies": { - "@app-config/config": "^3.0.0-alpha.5", - "@app-config/utils": "^3.0.0-alpha.5", + "@app-config/config": "^3.0.0-alpha.6", + "@app-config/utils": "^3.0.0-alpha.6", "loader-utils": "2" }, "peerDependencies": { - "@app-config/main": "^3.0.0-alpha.5", + "@app-config/main": "^3.0.0-alpha.6", "html-webpack-plugin": "4 || 5", "webpack": "4 || 5" }, "devDependencies": { - "@app-config/main": "^3.0.0-alpha.5", + "@app-config/main": "^3.0.0-alpha.6", "@types/loader-utils": "1", "@webpack-cli/serve": "1", "html-webpack-plugin": "5", From a3a4e964e86692dc58d2c0fe3da140235a21c852 Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Sun, 26 Sep 2021 18:25:00 -0600 Subject: [PATCH 39/39] chore: examples & test project deps --- examples/cli-project/package.json | 2 +- examples/frontend-webpack-project/package.json | 4 ++-- examples/nodejs-server/package.json | 2 +- examples/react-native-project/package.json | 6 +++--- tests/standalone-project/package.json | 2 +- .../app-config-core-in-browser/package.json | 4 ++-- tests/webpack-projects/cypress-plugin/package.json | 6 +++--- tests/webpack-projects/extending-other-files/package.json | 4 ++-- .../webpack-projects/query-parameter-overrides/package.json | 4 ++-- tests/webpack-projects/two-app-config-sources/package.json | 4 ++-- tests/webpack-projects/webpack5/package.json | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/cli-project/package.json b/examples/cli-project/package.json index fe17a2c5..5e50bcdc 100644 --- a/examples/cli-project/package.json +++ b/examples/cli-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4" + "@app-config/main": "3.0.0-alpha.6" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/examples/frontend-webpack-project/package.json b/examples/frontend-webpack-project/package.json index c570c32b..8aefafe9 100644 --- a/examples/frontend-webpack-project/package.json +++ b/examples/frontend-webpack-project/package.json @@ -10,10 +10,10 @@ "test": "jest" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4" + "@app-config/main": "3.0.0-alpha.6" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.4", + "@app-config/webpack": "3.0.0-alpha.6", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/examples/nodejs-server/package.json b/examples/nodejs-server/package.json index 5ef60b4a..fac102c0 100644 --- a/examples/nodejs-server/package.json +++ b/examples/nodejs-server/package.json @@ -13,7 +13,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4", + "@app-config/main": "3.0.0-alpha.6", "fastify": "3" }, "devDependencies": { diff --git a/examples/react-native-project/package.json b/examples/react-native-project/package.json index d636ec5e..b060e2d1 100644 --- a/examples/react-native-project/package.json +++ b/examples/react-native-project/package.json @@ -12,7 +12,7 @@ "eject": "expo eject" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4", + "@app-config/main": "3.0.0-alpha.6", "expo": "39", "expo-status-bar": "1", "expo-yarn-workspaces": "1", @@ -22,8 +22,8 @@ }, "devDependencies": { "@babel/core": "7", - "@app-config/main": "3.0.0-alpha.4", - "@app-config/react-native": "3.0.0-alpha.4", + "@app-config/main": "3.0.0-alpha.6", + "@app-config/react-native": "3.0.0-alpha.6", "@lcdev/tsconfig": "0.1", "@types/react": "16", "@types/react-native": "0.63", diff --git a/tests/standalone-project/package.json b/tests/standalone-project/package.json index 7eba4565..54838bb2 100644 --- a/tests/standalone-project/package.json +++ b/tests/standalone-project/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf dist *.tsbuildinfo" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4" + "@app-config/main": "3.0.0-alpha.6" }, "devDependencies": { "typescript": "*" diff --git a/tests/webpack-projects/app-config-core-in-browser/package.json b/tests/webpack-projects/app-config-core-in-browser/package.json index e7c61201..7de8e190 100644 --- a/tests/webpack-projects/app-config-core-in-browser/package.json +++ b/tests/webpack-projects/app-config-core-in-browser/package.json @@ -10,8 +10,8 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/core": "3.0.0-alpha.4", - "@app-config/utils": "3.0.0-alpha.4" + "@app-config/core": "3.0.0-alpha.6", + "@app-config/utils": "3.0.0-alpha.6" }, "devDependencies": { "@lcdev/tsconfig": "0.2", diff --git a/tests/webpack-projects/cypress-plugin/package.json b/tests/webpack-projects/cypress-plugin/package.json index fb73f8fa..6cfe6f2e 100644 --- a/tests/webpack-projects/cypress-plugin/package.json +++ b/tests/webpack-projects/cypress-plugin/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4", - "@app-config/cypress": "3.0.0-alpha.4" + "@app-config/main": "3.0.0-alpha.6", + "@app-config/cypress": "3.0.0-alpha.6" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.4", + "@app-config/webpack": "3.0.0-alpha.6", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5", diff --git a/tests/webpack-projects/extending-other-files/package.json b/tests/webpack-projects/extending-other-files/package.json index eedef444..653e5cd2 100644 --- a/tests/webpack-projects/extending-other-files/package.json +++ b/tests/webpack-projects/extending-other-files/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4" + "@app-config/main": "3.0.0-alpha.6" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.4", + "@app-config/webpack": "3.0.0-alpha.6", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/query-parameter-overrides/package.json b/tests/webpack-projects/query-parameter-overrides/package.json index f87e6de9..8250e18d 100644 --- a/tests/webpack-projects/query-parameter-overrides/package.json +++ b/tests/webpack-projects/query-parameter-overrides/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4", + "@app-config/main": "3.0.0-alpha.6", "lodash.merge": "^4.6.2" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.4", + "@app-config/webpack": "3.0.0-alpha.6", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/two-app-config-sources/package.json b/tests/webpack-projects/two-app-config-sources/package.json index d340ec85..15aec0ea 100644 --- a/tests/webpack-projects/two-app-config-sources/package.json +++ b/tests/webpack-projects/two-app-config-sources/package.json @@ -10,10 +10,10 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4" + "@app-config/main": "3.0.0-alpha.6" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.4", + "@app-config/webpack": "3.0.0-alpha.6", "@lcdev/tsconfig": "0.2", "cross-env": "7", "cypress": "6", diff --git a/tests/webpack-projects/webpack5/package.json b/tests/webpack-projects/webpack5/package.json index 7786c5b2..cfb0d45b 100644 --- a/tests/webpack-projects/webpack5/package.json +++ b/tests/webpack-projects/webpack5/package.json @@ -10,11 +10,11 @@ "clean": "rm -rf ./dist" }, "dependencies": { - "@app-config/main": "3.0.0-alpha.4", - "@app-config/cypress": "3.0.0-alpha.4" + "@app-config/main": "3.0.0-alpha.6", + "@app-config/cypress": "3.0.0-alpha.6" }, "devDependencies": { - "@app-config/webpack": "3.0.0-alpha.4", + "@app-config/webpack": "3.0.0-alpha.6", "@babel/core": "7", "@babel/preset-env": "7", "@cypress/webpack-preprocessor": "5",