Skip to content

Commit d819852

Browse files
committed
Merge branch 'master' into v3
2 parents d887cc4 + 187c22e commit d819852

Some content is hidden

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

74 files changed

+3118
-1389
lines changed

.github/workflows/cypress.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name: cypress
22

33
on:
4+
pull_request:
45
push:
5-
branches: '**'
6+
branches: '**'
67

78
jobs:
89
all:

.github/workflows/docker-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: docker-image
22

33
on:
44
push:
5-
branches: 'master'
6-
tags: '*'
5+
branches: 'master'
6+
tags: '*'
77

88
jobs:
99
publish:

.github/workflows/linux.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ jobs:
2121
node-version: ${{ matrix.node-version }}
2222
- uses: bahmutov/npm-install@v1
2323

24+
- run: yarn playwright install-deps chromium
2425
- run: yarn build
25-
- run: yarn test --testTimeout 20000
26+
- run: yarn build:es
27+
- run: yarn build:all
28+
- run: xvfb-run yarn test --testTimeout 20000
2629
env: { CI: 1 }
2730

.github/workflows/macos.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ jobs:
2121
node-version: ${{ matrix.node-version }}
2222
- uses: bahmutov/npm-install@v1
2323

24+
- run: yarn playwright install-deps chromium
2425
- run: yarn build
26+
- run: yarn build:es
27+
- run: yarn build:all
2528
- run: yarn test --testTimeout 20000
2629
env: { CI: 1 }
2730

.github/workflows/main.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
name: main
22

33
on:
4+
pull_request:
45
push:
5-
branches: '**'
6+
branches: '**'
67

78
jobs:
89
# for branches, we only need to check Linux + Node LTS
910
# note that we do linting here, but not on Windows / MacOS (no need to)
1011
linux-and-lts:
11-
runs-on: ubuntu-latest
12+
runs-on: ${{ matrix.os }}
1213

1314
strategy:
1415
matrix:
@@ -21,15 +22,21 @@ jobs:
2122
with:
2223
node-version: ${{ matrix.node-version }}
2324
- uses: bahmutov/npm-install@v1
25+
- run: yarn playwright install-deps chromium
2426
- run: yarn build
2527
- run: yarn build:es
2628
- run: yarn build:all
2729
- run: yarn lint
30+
- run: xvfb-run yarn test --coverage --testTimeout 20000
31+
env: { CI: 1 }
32+
if: matrix.os == 'ubuntu-latest'
2833
- run: yarn test --coverage --testTimeout 20000
2934
env: { CI: 1 }
35+
if: matrix.os != 'ubuntu-latest'
3036

31-
# sanity check that the rollup plugin made a file without needing to loadConfig
37+
# sanity check that plugins made a file without needing to loadConfig
3238
- run: yarn --cwd ./examples/rollup-project start
39+
- run: yarn --cwd ./examples/esbuild-project start
3340

3441
- uses: codecov/codecov-action@v1
3542
if: matrix.os == 'ubuntu-latest'
@@ -61,5 +68,6 @@ jobs:
6168
./app-config-webpack/coverage/coverage-final.json,
6269
./app-config-rollup/coverage/coverage-final.json,
6370
./app-config-vite/coverage/coverage-final.json,
71+
./app-config-electron/coverage/coverage-final.json,
6472
fail_ci_if_error: true
6573
verbose: true

.github/workflows/publishing.yml

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,20 @@ jobs:
3737
access: public
3838
package: ./app-config-cypress/package.json
3939
tag: next
40+
- name: app-config-electron
41+
uses: JS-DevTools/npm-publish@v1
42+
with:
43+
token: ${{ secrets.NPM_TOKEN }}
44+
access: public
45+
package: ./app-config-electron/package.json
46+
tag: next
47+
- name: app-config-default-extensions
48+
uses: JS-DevTools/npm-publish@v1
49+
with:
50+
token: ${{ secrets.NPM_TOKEN }}
51+
access: public
52+
package: ./app-config-default-extensions/package.json
53+
tag: next
4054
- name: app-config-encryption
4155
uses: JS-DevTools/npm-publish@v1
4256
with:
@@ -177,26 +191,12 @@ jobs:
177191
access: public
178192
package: ./app-config-vite/package.json
179193
tag: next
180-
- name: lcdev-app-config-inject
194+
- name: app-config-esbuild
181195
uses: JS-DevTools/npm-publish@v1
182196
with:
183197
token: ${{ secrets.NPM_TOKEN }}
184198
access: public
185-
package: ./lcdev-app-config-inject/package.json
186-
tag: next
187-
- name: lcdev-app-config-webpack-plugin
188-
uses: JS-DevTools/npm-publish@v1
189-
with:
190-
token: ${{ secrets.NPM_TOKEN }}
191-
access: public
192-
package: ./lcdev-app-config-webpack-plugin/package.json
193-
tag: next
194-
- name: lcdev-react-native-app-config-transformer
195-
uses: JS-DevTools/npm-publish@v1
196-
with:
197-
token: ${{ secrets.NPM_TOKEN }}
198-
access: public
199-
package: ./lcdev-react-native-app-config-transformer/package.json
199+
package: ./app-config-esbuild/package.json
200200
tag: next
201201

202202
# Do these last, since they're most commonly used by consumers
@@ -214,10 +214,3 @@ jobs:
214214
access: public
215215
package: ./app-config-main/package.json
216216
tag: next
217-
- name: lcdev-app-config
218-
uses: JS-DevTools/npm-publish@v1
219-
with:
220-
token: ${{ secrets.NPM_TOKEN }}
221-
access: public
222-
package: ./lcdev-app-config/package.json
223-
tag: next

.github/workflows/windows.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ jobs:
2121
node-version: ${{ matrix.node-version }}
2222
- uses: bahmutov/npm-install@v1
2323

24+
- run: yarn playwright install-deps chromium
2425
- run: yarn build
26+
- run: yarn build:es
27+
- run: yarn build:all
2528
- run: yarn test --testTimeout 20000
2629
env: { CI: 1 }
2730

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ node_modules/
22

33
# app-config files, when developing
44
.app-config.*
5+
# keep example files though
6+
!examples/**/.app-config.*
57

68
# common build sites
79
dist/

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## v2.8.0
2+
3+
Adds plugin for [esbuild](https://esbuild.github.io)!
4+
5+
## v2.7.2
6+
7+
Ensures that `window._appConfig` is always written in webpack and rollup loaders.
8+
9+
## v2.7.1
10+
11+
Fixes bug in $extends directive when using specific environments.
12+
13+
## v2.7.0
14+
15+
Adds [Electron](https://app-config.dev/guide/electron.html) support!
16+
17+
Supports named export in react native #167.
18+
119
## v2.6.1
220

321
Ensures that NotFoundErrors aren't ignored when transitive in optional files ([#160](https://github.com/launchcodedev/app-config/issues/160)).

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ If you are adding anything new or changing behavior, please add applicable tests
5252
- `@app-config/webpack`: webpack plugin
5353
- `@app-config/rollup`: rollup plugin
5454
- `@app-config/vite`: vite plugin
55+
- `@app-config/electron`: injects config into Electron renderer processes
5556
- `@app-config/main`: main config singleton and loading logic
5657
- `@lcdev/app-config`: alias for `@app-config/main`
5758
- `@lcdev/app-config-webpack-plugin`: alias for `@app-config/webpack`

0 commit comments

Comments
 (0)