Merge remote-tracking branch 'upstream/master' into finish-multi-env-encryption

Author: johnb8

.github/workflows/cypress.yml

@@ -1,8 +1,10 @@
 name: cypress
 
 on:
+  pull_request:
+      branches: '**'
   push:
-    branches: '**'
+      branches: '**'
 
 jobs:
   all:

.github/workflows/docker-image.yml

@@ -2,8 +2,8 @@ name: docker-image
 
 on:
   push:
-    branches: 'master'
-    tags: '*'
+      branches: 'master'
+      tags: '*'
 
 jobs:
   publish:

.github/workflows/linux.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -21,7 +21,10 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - uses: bahmutov/npm-install@v1
 
+    - run: yarn playwright install-deps chromium
     - run: yarn build
-    - run: yarn test --testTimeout 20000
+    - run: yarn build:es
+    - run: yarn build:all
+    - run: xvfb-run yarn test --testTimeout 20000
       env: { CI: 1 }
 

.github/workflows/macos.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -21,7 +21,10 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - uses: bahmutov/npm-install@v1
 
+    - run: yarn playwright install-deps chromium
     - run: yarn build
+    - run: yarn build:es
+    - run: yarn build:all
     - run: yarn test --testTimeout 20000
       env: { CI: 1 }
 

.github/workflows/main.yml

@@ -1,14 +1,16 @@
 name: main
 
 on:
+  pull_request:
+      branches: '**'
   push:
-    branches: '**'
+      branches: '**'
 
 jobs:
   # for branches, we only need to check Linux + Node LTS
   # note that we do linting here, but not on Windows / MacOS (no need to)
   linux-and-lts:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
@@ -21,15 +23,21 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - uses: bahmutov/npm-install@v1
+    - run: yarn playwright install-deps chromium
     - run: yarn build
     - run: yarn build:es
     - run: yarn build:all
     - run: yarn lint
+    - run: xvfb-run yarn test --coverage --testTimeout 20000
+      env: { CI: 1 }
+      if: matrix.os == 'ubuntu-latest'
     - run: yarn test --coverage --testTimeout 20000
       env: { CI: 1 }
+      if: matrix.os != 'ubuntu-latest'
 
-    # sanity check that the rollup plugin made a file without needing to loadConfig
+    # sanity check that plugins made a file without needing to loadConfig
     - run: yarn --cwd ./examples/rollup-project start
+    - run: yarn --cwd ./examples/esbuild-project start
 
     - uses: codecov/codecov-action@v1
       if: matrix.os == 'ubuntu-latest'
@@ -61,5 +69,6 @@ jobs:
           ./app-config-webpack/coverage/coverage-final.json,
           ./app-config-rollup/coverage/coverage-final.json,
           ./app-config-vite/coverage/coverage-final.json,
+          ./app-config-electron/coverage/coverage-final.json,
         fail_ci_if_error: true
         verbose: true

.github/workflows/publishing.yml

@@ -34,6 +34,12 @@ jobs:
         token: ${{ secrets.NPM_TOKEN }}
         access: public
         package: ./app-config-cypress/package.json
+    - name: app-config-electron
+      uses: JS-DevTools/npm-publish@v1
+      with:
+        token: ${{ secrets.NPM_TOKEN }}
+        access: public
+        package: ./app-config-electron/package.json
     - name: app-config-default-extensions
       uses: JS-DevTools/npm-publish@v1
       with:
@@ -160,6 +166,12 @@ jobs:
         token: ${{ secrets.NPM_TOKEN }}
         access: public
         package: ./app-config-vite/package.json
+    - name: app-config-esbuild
+      uses: JS-DevTools/npm-publish@v1
+      with:
+        token: ${{ secrets.NPM_TOKEN }}
+        access: public
+        package: ./app-config-esbuild/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: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -21,7 +21,10 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - uses: bahmutov/npm-install@v1
 
+    - run: yarn playwright install-deps chromium
     - run: yarn build
+    - run: yarn build:es
+    - run: yarn build:all
     - run: yarn test --testTimeout 20000
       env: { CI: 1 }
 

.gitignore

@@ -2,6 +2,8 @@ node_modules/
 
 # app-config files, when developing
 .app-config.*
+# keep example files though
+!examples/**/.app-config.*
 
 # common build sites
 dist/

CHANGELOG.md

@@ -1,3 +1,43 @@
+## v2.8.5
+
+Fixes #205
+
+## v2.8.3
+
+Adds `noBundledConfig` option to Webpack, esbuild, vite and rollup plugins - useful if you always use `@app-config/inject`.
+
+## v2.8.2
+
+Some bug fixes and improvements for Rollup, ESBuild and Vite plugins.
+
+## v2.8.1
+
+Adds support for injecting `currentEnvironment` from `@app-config/inject`.
+
+Adds support for reading `APP_CONFIG_SECRETS_KEY_FILE`.
+
+## v2.8.0
+
+Adds plugin for [esbuild](https://esbuild.github.io)!
+
+## v2.7.2
+
+Ensures that `window._appConfig` is always written in webpack and rollup loaders.
+
+## v2.7.1
+
+Fixes bug in $extends directive when using specific environments.
+
+## v2.7.0
+
+Adds [Electron](https://app-config.dev/guide/electron.html) support!
+
+Supports named export in react native #167.
+
+## v2.6.1
+
+Ensures that NotFoundErrors aren't ignored when transitive in optional files ([#160](https://github.com/launchcodedev/app-config/issues/160)).
+
 ## v2.6.0
 
 Adds plugins for [vite](https://vitejs.dev) and [rollup](https://rollupjs.org)!

CONTRIBUTING.md

@@ -53,6 +53,7 @@ If you are adding anything new or changing behavior, please add applicable tests
 - `@app-config/webpack`: webpack plugin
 - `@app-config/rollup`: rollup plugin
 - `@app-config/vite`: vite plugin
+- `@app-config/electron`: injects config into Electron renderer processes
 - `@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`