Merge branch 'master' into multi-env-encryption

Author: joelgallant

.github/workflows/cypress.yml

@@ -15,6 +15,8 @@ jobs:
     - uses: bahmutov/npm-install@v1
 
     - run: yarn build
+    - run: yarn build:es
+    - run: yarn build:all
 
     - name: Cypress dependencies
       uses: cypress-io/github-action@v2
@@ -85,3 +87,12 @@ jobs:
         start: yarn serve -l 8995 ./dist
       env:
         CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+    - uses: cypress-io/github-action@v2
+      with:
+        group: app-config-vite
+        working-directory: examples/vite-project
+        install: false
+        record: true
+        start: yarn serve -l 8996 ./dist
+      env:
+        CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

.github/workflows/linux.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [12.x, 14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/macos.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [12.x, 14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/main.yml

@@ -22,9 +22,15 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - uses: bahmutov/npm-install@v1
     - run: yarn build
+    - run: yarn build:es
+    - run: yarn build:all
     - run: yarn lint
     - run: yarn test --coverage --testTimeout 20000
       env: { CI: 1 }
+
+    # sanity check that the rollup plugin made a file without needing to loadConfig
+    - run: yarn --cwd ./examples/rollup-project start
+
     - uses: codecov/codecov-action@v1
       if: matrix.os == 'ubuntu-latest'
       with:
@@ -53,5 +59,7 @@ jobs:
           ./app-config-v1-compat/coverage/coverage-final.json,
           ./app-config-vault/coverage/coverage-final.json,
           ./app-config-webpack/coverage/coverage-final.json,
+          ./app-config-rollup/coverage/coverage-final.json,
+          ./app-config-vite/coverage/coverage-final.json,
         fail_ci_if_error: true
         verbose: true

.github/workflows/publishing.yml

@@ -148,6 +148,18 @@ jobs:
         token: ${{ secrets.NPM_TOKEN }}
         access: public
         package: ./app-config-webpack/package.json
+    - name: app-config-rollup
+      uses: JS-DevTools/npm-publish@v1
+      with:
+        token: ${{ secrets.NPM_TOKEN }}
+        access: public
+        package: ./app-config-rollup/package.json
+    - name: app-config-vite
+      uses: JS-DevTools/npm-publish@v1
+      with:
+        token: ${{ secrets.NPM_TOKEN }}
+        access: public
+        package: ./app-config-vite/package.json
     - name: lcdev-app-config-inject
       uses: JS-DevTools/npm-publish@v1
       with:

.github/workflows/windows.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [12.x, 14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
     steps:

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.6.0
+
+Adds plugins for [vite](https://vitejs.dev) and [rollup](https://rollupjs.org)!
+
+Adds `ac` as an npx alias for `app-config`.
+
 ## v2.5.2
 
 Adds support for calling `currentEnvironment` when using the Webpack plugin.

CONTRIBUTING.md

@@ -51,6 +51,8 @@ If you are adding anything new or changing behavior, please add applicable tests
 - `@app-config/schema`: schema loading and validation
 - `@app-config/inject`: runtime injection into HTML files
 - `@app-config/webpack`: webpack plugin
+- `@app-config/rollup`: rollup plugin
+- `@app-config/vite`: vite plugin
 - `@app-config/main`: main config singleton and loading logic
 - `@lcdev/app-config`: alias for `@app-config/main`
 - `@lcdev/app-config-webpack-plugin`: alias for `@app-config/webpack`

app-config-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@app-config/cli",
   "description": "CLI for @app-config",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "license": "MPL-2.0",
   "author": {
     "name": "Launchcode",
@@ -21,6 +21,7 @@
     "!**/*.test.*"
   ],
   "bin": {
+    "ac": "dist/index.js",
     "app-config": "dist/index.js",
     "app-config-secret-agent": "dist/start-secret-agent.js"
   },
@@ -35,14 +36,14 @@
     "prepublishOnly": "yarn clean && yarn build && yarn build:es"
   },
   "dependencies": {
-    "@app-config/config": "^2.5.2",
-    "@app-config/core": "^2.5.2",
-    "@app-config/encryption": "^2.5.2",
-    "@app-config/generate": "^2.5.2",
-    "@app-config/logging": "^2.5.2",
-    "@app-config/node": "^2.5.2",
-    "@app-config/schema": "^2.5.2",
-    "@app-config/utils": "^2.5.2",
+    "@app-config/config": "^2.6.0",
+    "@app-config/core": "^2.6.0",
+    "@app-config/encryption": "^2.6.0",
+    "@app-config/generate": "^2.6.0",
+    "@app-config/logging": "^2.6.0",
+    "@app-config/node": "^2.6.0",
+    "@app-config/schema": "^2.6.0",
+    "@app-config/utils": "^2.6.0",
     "ajv": "7",
     "clipboardy": "2",
     "common-tags": "1",

app-config-cli/src/index.ts

@@ -57,7 +57,7 @@ enum OptionGroups {
 
 type SubcommandOptions<
   Options extends { [name: string]: yargs.Options },
-  PositionalOptions extends { [name: string]: yargs.PositionalOptions }
+  PositionalOptions extends { [name: string]: yargs.PositionalOptions },
 > = {
   name: string | string[];
   description?: string;
@@ -72,7 +72,7 @@ type SubcommandFn<Options extends { [name: string]: yargs.Options }> = (
 
 function subcommand<
   Options extends { [name: string]: yargs.Options },
-  PositionalOptions extends { [name: string]: yargs.PositionalOptions }
+  PositionalOptions extends { [name: string]: yargs.PositionalOptions },
 >(
   desc: SubcommandOptions<Options, PositionalOptions>,
   run: SubcommandFn<Options & PositionalOptions>,