From ad9bc84cd813cfaa58e4cd0a0f5379ed62689a52 Mon Sep 17 00:00:00 2001 From: Philipp Spiess Date: Wed, 28 Aug 2024 14:32:11 +0200 Subject: [PATCH 1/3] Rename branch references to main --- .github/workflows/nodejs.yml | 4 ++-- .github/workflows/release-insiders.yml | 2 +- README.md | 4 ++-- demo/components/MarkdownSample.mdx | 2 +- demo/components/MarkdownSampleShort.mdx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 817efb3..bd11bad 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -5,9 +5,9 @@ name: Node.js CI on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] jobs: build: diff --git a/.github/workflows/release-insiders.yml b/.github/workflows/release-insiders.yml index f127e2a..10c201b 100644 --- a/.github/workflows/release-insiders.yml +++ b/.github/workflows/release-insiders.yml @@ -2,7 +2,7 @@ name: Release Insiders on: push: - branches: [master] + branches: [main] permissions: contents: read diff --git a/README.md b/README.md index 950c9a5..a4d73c5 100644 --- a/README.md +++ b/README.md @@ -288,7 +288,7 @@ module.exports = { } ``` -See our internal [style definitions](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/src/styles.js) for some more examples. +See our internal [style definitions](https://github.com/tailwindlabs/tailwindcss-typography/blob/main/src/styles.js) for some more examples. ### Changing the default class name @@ -383,7 +383,7 @@ module.exports = { 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. -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. +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. --- diff --git a/demo/components/MarkdownSample.mdx b/demo/components/MarkdownSample.mdx index 1350ea7..ad63ee3 100644 --- a/demo/components/MarkdownSample.mdx +++ b/demo/components/MarkdownSample.mdx @@ -31,7 +31,7 @@ It adds a new `prose` class that you can slap on any block of vanilla HTML conte ``` -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). +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). --- diff --git a/demo/components/MarkdownSampleShort.mdx b/demo/components/MarkdownSampleShort.mdx index b92b55f..dc3bd45 100644 --- a/demo/components/MarkdownSampleShort.mdx +++ b/demo/components/MarkdownSampleShort.mdx @@ -18,7 +18,7 @@ The `@tailwindcss/typography` plugin is our attempt to give you what you _actual

``` -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). +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). --- From 6be01acfeadb0bac4d6a15e4221781b516dc40a3 Mon Sep 17 00:00:00 2001 From: Philipp Spiess Date: Wed, 28 Aug 2024 14:32:43 +0200 Subject: [PATCH 2/3] Fix change log --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28b7b43..62498ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- 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)) +### Fixed + +- Support installing with alpha versions of Tailwind CSS v4 ([#358](https://github.com/tailwindlabs/tailwindcss-typography/pull/358)) ## [0.5.14] - 2024-08-07 +### Fixed + - Fix table text alignment ([#346](https://github.com/tailwindlabs/tailwindcss-typography/pull/346)) ## [0.5.13] - 2024-04-26 From ea6db8a5a0920165698e90738f99da1cc0d4d108 Mon Sep 17 00:00:00 2001 From: Philipp Spiess Date: Wed, 28 Aug 2024 14:36:46 +0200 Subject: [PATCH 3/3] Modernize CI workflows --- .github/workflows/nodejs.yml | 20 +++++--------------- .github/workflows/prepare-release.yml | 20 +++----------------- .github/workflows/release-insiders.yml | 14 +------------- .github/workflows/release.yml | 13 +------------ 4 files changed, 10 insertions(+), 57 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index bd11bad..b8d2692 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -18,24 +18,14 @@ jobs: node-version: [20, 22] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Use cached node_modules - id: cache - uses: actions/cache@v2 - with: - path: node_modules - key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }} - restore-keys: | - nodeModules- + cache: 'npm' + - name: Install dependencies - if: steps.cache.outputs.cache-hit != 'true' run: npm install - env: - CI: true + - run: npm test - env: - CI: true diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index c271d29..ae24c12 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -6,9 +6,6 @@ on: tags: - 'v*' -env: - CI: true - permissions: contents: read @@ -24,31 +21,20 @@ jobs: node-version: [22] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} registry-url: 'https://registry.npmjs.org' - - - name: Use cached node_modules - id: cache - uses: actions/cache@v3 - with: - path: node_modules - key: nodeModules-${{ hashFiles('./package-lock.json') }}-${{ matrix.node-version }} + cache: 'npm' - name: Install dependencies - if: steps.cache.outputs.cache-hit != 'true' run: npm install - env: - CI: true - name: Test run: npm test - env: - CI: true - name: Resolve version id: vars diff --git a/.github/workflows/release-insiders.yml b/.github/workflows/release-insiders.yml index 10c201b..88eb632 100644 --- a/.github/workflows/release-insiders.yml +++ b/.github/workflows/release-insiders.yml @@ -24,24 +24,13 @@ jobs: with: node-version: ${{ matrix.node-version }} registry-url: 'https://registry.npmjs.org' - - - name: Use cached node_modules - id: cache - uses: actions/cache@v3 - with: - path: node_modules - key: nodeModules-${{ hashFiles('./package-lock.json') }}-${{ matrix.node-version }} + cache: 'npm' - name: Install dependencies - if: steps.cache.outputs.cache-hit != 'true' run: npm install - env: - CI: true - name: Test run: npm test - env: - CI: true - name: Resolve version id: vars @@ -53,5 +42,4 @@ jobs: - name: Publish run: npm publish --provenance --tag insiders env: - CI: true NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33f0ae4..39a4aff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,24 +24,13 @@ jobs: with: node-version: ${{ matrix.node-version }} registry-url: 'https://registry.npmjs.org' - - - name: Use cached node_modules - id: cache - uses: actions/cache@v3 - with: - path: node_modules - key: nodeModules-${{ hashFiles('./package-lock.json') }}-${{ matrix.node-version }} + cache: 'npm' - name: Install dependencies - if: steps.cache.outputs.cache-hit != 'true' run: npm install - env: - CI: true - name: Test run: npm test - env: - CI: true - name: Calculate environment variables run: |