Skip to content

Commit 3a793f8

Browse files
authored
Ensure types are published to npm (#11)
* improve CI - Ensure that we use a the cache modules consistently - Ensure that `npm run build` is executed (which generates the types) - Make CI jobs consistent between workflows * update changelog
1 parent fc44171 commit 3a793f8

File tree

5 files changed

+42
-59
lines changed

5 files changed

+42
-59
lines changed

.github/workflows/nodejs.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,16 @@ jobs:
2828
node-version: ${{ matrix.node-version }}
2929

3030
- name: Use cached node_modules
31-
id: cache
3231
uses: actions/cache@v3
3332
with:
3433
path: node_modules
35-
key: nodeModules-${{ hashFiles('./package.json') }}-${{ matrix.node-version }}
36-
restore-keys: |
37-
nodeModules-
34+
key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
3835

3936
- name: Install dependencies
40-
if: steps.cache.outputs.cache-hit != 'true'
4137
run: npm install
42-
env:
43-
CI: true
38+
39+
- name: Build
40+
run: npm run build
4441

4542
- name: Test
4643
run: npm test
47-
env:
48-
CI: true

.github/workflows/prepare-release.yml

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515
jobs:
1616
prepare:
1717
permissions:
18-
contents: write # for softprops/action-gh-release to create GitHub release
18+
contents: write # for softprops/action-gh-release to create GitHub release
1919

2020
runs-on: ubuntu-latest
2121

@@ -31,16 +31,21 @@ jobs:
3131
with:
3232
node-version: ${{ matrix.node-version }}
3333
registry-url: 'https://registry.npmjs.org'
34-
# cache: 'npm'
35-
#
36-
# - name: Use cached node_modules
37-
# id: cache
38-
# uses: actions/cache@v3
39-
# with:
40-
# path: node_modules
41-
# key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
42-
# restore-keys: |
43-
# nodeModules-
34+
35+
- name: Use cached node_modules
36+
uses: actions/cache@v3
37+
with:
38+
path: node_modules
39+
key: nodeModules-${{ hashFiles('**/package.json') }}-${{ matrix.node-version }}
40+
41+
- name: Install dependencies
42+
run: npm install
43+
44+
- name: Build
45+
run: npm run build
46+
47+
- name: Test
48+
run: npm test
4449

4550
- name: Resolve version
4651
id: vars
@@ -54,20 +59,9 @@ jobs:
5459
echo "$RELEASE_NOTES" >> $GITHUB_ENV
5560
echo "EOF" >> $GITHUB_ENV
5661
57-
- name: Install dependencies
58-
# if: steps.cache.outputs.cache-hit != 'true'
59-
run: npm install
60-
env:
61-
CI: true
62-
63-
- name: Test
64-
run: npm test
65-
env:
66-
CI: true
67-
6862
- name: Release
6963
uses: softprops/action-gh-release@v1
7064
with:
7165
draft: true
7266
tag_name: ${{ env.TAG_NAME }}
73-
body: ${{ env.RELEASE_NOTES }}
67+
body: ${{ env.RELEASE_NOTES }}

.github/workflows/release-insiders.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,29 @@ jobs:
2222
registry-url: 'https://registry.npmjs.org'
2323

2424
- name: Use cached node_modules
25-
id: cache
2625
uses: actions/cache@v3
2726
with:
2827
path: node_modules
29-
key: nodeModules-${{ hashFiles('**/package.json') }}-${{ matrix.node-version }}
30-
restore-keys: |
31-
nodeModules-
28+
key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
3229

3330
- name: Install dependencies
34-
if: steps.cache.outputs.cache-hit != 'true'
3531
run: npm install
36-
env:
37-
CI: true
32+
33+
- name: Build
34+
run: npm run build
35+
36+
- name: Test
37+
run: npm test
3838

3939
- name: Resolve version
4040
id: vars
41-
run: |
41+
run: |
4242
echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
4343
44-
- name: "Version based on commit: 0.0.0-insiders.${{ env.SHA_SHORT }}"
44+
- name: 'Version based on commit: 0.0.0-insiders.${{ env.SHA_SHORT }}'
4545
run: npm version 0.0.0-insiders.${{ env.SHA_SHORT }} --force --no-git-tag-version
4646

4747
- name: Publish
4848
run: npm publish --tag insiders
4949
env:
50-
CI: true
5150
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,21 @@ jobs:
2323
with:
2424
node-version: ${{ matrix.node-version }}
2525
registry-url: 'https://registry.npmjs.org'
26-
# cache: 'npm'
27-
#
28-
# - name: Use cached node_modules
29-
# id: cache
30-
# uses: actions/cache@v3
31-
# with:
32-
# path: node_modules
33-
# key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
34-
# restore-keys: |
35-
# nodeModules-
26+
27+
- name: Use cached node_modules
28+
uses: actions/cache@v3
29+
with:
30+
path: node_modules
31+
key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
3632

3733
- name: Install dependencies
38-
# if: steps.cache.outputs.cache-hit != 'true'
3934
run: npm install
40-
env:
41-
CI: true
35+
36+
- name: Build
37+
run: npm run build
4238

4339
- name: Test
4440
run: npm test
45-
env:
46-
CI: true
4741

4842
- name: Calculate environment variables
4943
run: |
@@ -52,5 +46,4 @@ jobs:
5246
- name: Publish
5347
run: npm publish --tag ${{ env.RELEASE_CHANNEL }}
5448
env:
55-
CI: true
5649
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10-
- Nothing yet!
10+
### Fixed
11+
12+
- Ensure types are published to npm ([#11](https://github.com/tailwindlabs/tailwindcss-container-queries/pull/11))
1113

1214
## [0.1.0] - 2022-10-19
1315

0 commit comments

Comments
 (0)