Skip to content

Commit a1adbcb

Browse files
mcgoismcgois
authored
Merge branch 'main' into inline-code
2 parents 63146c0 + bbb1c21 commit a1adbcb

File tree

15 files changed

+2931
-7280
lines changed

15 files changed

+2931
-7280
lines changed

‎.github/workflows/nodejs.yml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,27 @@ name: Node.js CI
55

66
on:
77
push:
8-
branches: [master]
8+
branches: [main]
99
pull_request:
10-
branches: [master]
10+
branches: [main]
1111

1212
jobs:
1313
build:
1414
runs-on: ubuntu-latest
1515

1616
strategy:
1717
matrix:
18-
node-version: [12, 14, 16]
18+
node-version: [20, 22]
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
- name: Use Node.js ${{ matrix.node-version }}
23-
uses: actions/setup-node@v2
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ matrix.node-version }}
26-
- name: Use cached node_modules
27-
id: cache
28-
uses: actions/cache@v2
29-
with:
30-
path: node_modules
31-
key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
32-
restore-keys: |
33-
nodeModules-
26+
cache: 'npm'
27+
3428
- name: Install dependencies
35-
if: steps.cache.outputs.cache-hit != 'true'
3629
run: npm install
37-
env:
38-
CI: true
30+
3931
- run: npm test
40-
env:
41-
CI: true

‎.github/workflows/prepare-release.yml‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on:
66
tags:
77
- 'v*'
88

9-
env:
10-
CI: true
11-
129
permissions:
1310
contents: read
1411

@@ -21,34 +18,23 @@ jobs:
2118

2219
strategy:
2320
matrix:
24-
node-version: [18]
21+
node-version: [22]
2522

2623
steps:
27-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2825

2926
- name: Use Node.js ${{ matrix.node-version }}
30-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v4
3128
with:
3229
node-version: ${{ matrix.node-version }}
3330
registry-url: 'https://registry.npmjs.org'
34-
35-
- name: Use cached node_modules
36-
id: cache
37-
uses: actions/cache@v3
38-
with:
39-
path: node_modules
40-
key: nodeModules-${{ hashFiles('./package-lock.json') }}-${{ matrix.node-version }}
31+
cache: 'npm'
4132

4233
- name: Install dependencies
43-
if: steps.cache.outputs.cache-hit != 'true'
4434
run: npm install
45-
env:
46-
CI: true
4735

4836
- name: Test
4937
run: npm test
50-
env:
51-
CI: true
5238

5339
- name: Resolve version
5440
id: vars

‎.github/workflows/release-insiders.yml‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release Insiders
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66

77
permissions:
88
contents: read
@@ -14,34 +14,23 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
node-version: [12]
17+
node-version: [22]
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2121

2222
- name: Use Node.js ${{ matrix.node-version }}
23-
uses: actions/setup-node@v2
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ matrix.node-version }}
2626
registry-url: 'https://registry.npmjs.org'
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 }}
27+
cache: 'npm'
3428

3529
- name: Install dependencies
36-
if: steps.cache.outputs.cache-hit != 'true'
3730
run: npm install
38-
env:
39-
CI: true
4031

4132
- name: Test
4233
run: npm test
43-
env:
44-
CI: true
4534

4635
- name: Resolve version
4736
id: vars
@@ -53,5 +42,4 @@ jobs:
5342
- name: Publish
5443
run: npm publish --provenance --tag insiders
5544
env:
56-
CI: true
5745
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
node-version: [18]
17+
node-version: [22]
1818

1919
steps:
2020
- uses: actions/checkout@v3
@@ -24,24 +24,13 @@ jobs:
2424
with:
2525
node-version: ${{ matrix.node-version }}
2626
registry-url: 'https://registry.npmjs.org'
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 }}
27+
cache: 'npm'
3428

3529
- name: Install dependencies
36-
if: steps.cache.outputs.cache-hit != 'true'
3730
run: npm install
38-
env:
39-
CI: true
4031

4132
- name: Test
4233
run: npm test
43-
env:
44-
CI: true
4534

4635
- name: Calculate environment variables
4736
run: |

‎CHANGELOG.md‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,55 @@ 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+
- Fixed broken color styles ([#405](https://github.com/tailwindlabs/tailwindcss-typography/pull/405))
13+
14+
## [0.5.18] - 2025-09-19
15+
16+
### Fixed
17+
18+
- Fixed undefined variable error ([#403](https://github.com/tailwindlabs/tailwindcss-typography/pull/403))
19+
20+
## [0.5.17] - 2025-09-19
21+
22+
### Added
23+
24+
- Add modifiers for description list elements ([#357](https://github.com/tailwindlabs/tailwindcss-typography/pull/357))
25+
- Add `prose-picture` modifier ([#367](https://github.com/tailwindlabs/tailwindcss-typography/pull/367))
26+
27+
### Fixed
28+
29+
- Include unit in `hr` border-width value ([#379](https://github.com/tailwindlabs/tailwindcss-typography/pull/379))
30+
- Ensure `<kbd>` styles work with Tailwind CSS v4 ([#387](https://github.com/tailwindlabs/tailwindcss-typography/pull/387))
31+
32+
### Changed
33+
34+
- Remove lodash dependencies ([#402](https://github.com/tailwindlabs/tailwindcss-typography/pull/402))
35+
36+
## [0.5.16] - 2025-01-07
37+
38+
### Fixed
39+
40+
- Support installing with beta versions of Tailwind CSS v4 ([#365](https://github.com/tailwindlabs/tailwindcss-typography/pull/365))
41+
42+
## [0.5.15] - 2024-08-28
43+
44+
### Fixed
45+
46+
- Support installing with alpha versions of Tailwind CSS v4 ([#358](https://github.com/tailwindlabs/tailwindcss-typography/pull/358))
47+
48+
## [0.5.14] - 2024-08-07
49+
50+
### Fixed
51+
52+
- Fix table text alignment ([#346](https://github.com/tailwindlabs/tailwindcss-typography/pull/346))
53+
54+
## [0.5.13] - 2024-04-26
55+
56+
### Fixed
57+
58+
- Don't apply margins to `<br>` elements contained in an `<li>` in FF ([#350](https://github.com/tailwindlabs/tailwindcss-typography/pull/350))
1159

1260
## [0.5.12] - 2024-03-27
1361

@@ -191,7 +239,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
191239

192240
- Everything!
193241

194-
[unreleased]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.12...HEAD
242+
[unreleased]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.18...HEAD
243+
[0.5.18]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.17...v0.5.18
244+
[0.5.17]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.16...v0.5.17
245+
[0.5.16]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.15...v0.5.16
246+
[0.5.15]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.14...v0.5.15
247+
[0.5.14]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.13...v0.5.14
248+
[0.5.13]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.12...v0.5.13
195249
[0.5.12]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.11...v0.5.12
196250
[0.5.11]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.10...v0.5.11
197251
[0.5.10]: https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.9...v0.5.10

0 commit comments

Comments
 (0)