Skip to content

Commit fa5beec

Browse files
Modernize repository setup (#359)
1 parent 1da9d14 commit fa5beec

File tree

8 files changed

+22
-65
lines changed

8 files changed

+22
-65
lines changed

.github/workflows/nodejs.yml

+7-17
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ 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:
@@ -18,24 +18,14 @@ jobs:
1818
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

+3-17
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

@@ -24,31 +21,20 @@ jobs:
2421
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

+2-14
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
@@ -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: 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

+1-12
Original file line numberDiff line numberDiff line change
@@ -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

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10-
- Update peer dependency versions to include Tailwind `4.0.0-alpha.20` with support for this plugin ([#358](https://github.com/tailwindlabs/tailwindcss-typography/pull/358))
10+
### Fixed
11+
12+
- Support installing with alpha versions of Tailwind CSS v4 ([#358](https://github.com/tailwindlabs/tailwindcss-typography/pull/358))
1113

1214
## [0.5.14] - 2024-08-07
1315

16+
### Fixed
17+
1418
- Fix table text alignment ([#346](https://github.com/tailwindlabs/tailwindcss-typography/pull/346))
1519

1620
## [0.5.13] - 2024-04-26

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ module.exports = {
288288
}
289289
```
290290

291-
See our internal [style definitions](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/src/styles.js) for some more examples.
291+
See our internal [style definitions](https://github.com/tailwindlabs/tailwindcss-typography/blob/main/src/styles.js) for some more examples.
292292

293293
### Changing the default class name
294294

@@ -383,7 +383,7 @@ module.exports = {
383383

384384
Customizations should be applied to a specific modifier like `DEFAULT` or `xl`, and must be added under the `css` property. Customizations are authored in the same [CSS-in-JS syntax](https://tailwindcss.com/docs/plugins#css-in-js-syntax) used to write Tailwind plugins.
385385

386-
See [the default styles](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/src/styles.js) for this plugin for more in-depth examples of configuring each modifier.
386+
See [the default styles](https://github.com/tailwindlabs/tailwindcss-typography/blob/main/src/styles.js) for this plugin for more in-depth examples of configuring each modifier.
387387

388388
---
389389

demo/components/MarkdownSample.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ It adds a new `prose` class that you can slap on any block of vanilla HTML conte
3131
</article>
3232
```
3333

34-
For more information about how to use the plugin and the features it includes, [read the documentation](https://github.com/tailwindcss/typography/blob/master/README.md).
34+
For more information about how to use the plugin and the features it includes, [read the documentation](https://github.com/tailwindcss/typography/blob/main/README.md).
3535

3636
---
3737

demo/components/MarkdownSampleShort.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The `@tailwindcss/typography` plugin is our attempt to give you what you _actual
1818
</p>
1919
```
2020

21-
For more information about how to use the plugin and the features it includes, [read the documentation](https://github.com/tailwindcss/typography/blob/master/README.md).
21+
For more information about how to use the plugin and the features it includes, [read the documentation](https://github.com/tailwindcss/typography/blob/main/README.md).
2222

2323
---
2424

0 commit comments

Comments
 (0)