From e4f35c11b5c786f8d9d773dc3975e77673cce26b Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Sun, 16 Oct 2022 08:25:07 -0400 Subject: [PATCH 1/3] Fix content path detection on Windows --- src/lib/content.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/content.js b/src/lib/content.js index 475706e0b47d..708bb687bb08 100644 --- a/src/lib/content.js +++ b/src/lib/content.js @@ -100,6 +100,12 @@ function resolveGlobPattern(contentPath) { contentPath.pattern = contentPath.ignore ? `!${contentPath.pattern}` : contentPath.pattern + // This is required for Windows support to properly pick up Glob paths. + // Afaik, this technically shouldn't be needed but there's probably + // some internal, direct path matching with a normalized path in + // a package which can't handle mixed directory separators + contentPath.pattern = normalizePath(contentPath.pattern) + return contentPath } From 39ae539a37f80c39c223a2ebc4ba56268e67192c Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Sun, 16 Oct 2022 08:28:23 -0400 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c4c34a35db2..1b24a4c00fde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Implement fallback plugins when arbitrary values result in css from multiple plugins ([#9376](https://github.com/tailwindlabs/tailwindcss/pull/9376)) - Improve type checking for formal syntax ([#9349](https://github.com/tailwindlabs/tailwindcss/pull/9349), [#9448](https://github.com/tailwindlabs/tailwindcss/pull/9448)) - Don't require `content` key in custom plugin configs ([#9502](https://github.com/tailwindlabs/tailwindcss/pull/9502), [#9545](https://github.com/tailwindlabs/tailwindcss/pull/9545)) +- Fix content path detection on Windows ([#9569](https://github.com/tailwindlabs/tailwindcss/pull/9569)) ## [3.1.8] - 2022-08-05 From 22cea32fc9ee17c5d5c0dcfac4dcbcc2161af1c2 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Sun, 16 Oct 2022 08:37:58 -0400 Subject: [PATCH 3/3] Drop npm caches for now --- .github/workflows/nodejs.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 30c16a31bc51..4a5ec2bbc1eb 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -26,19 +26,19 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - cache: 'npm' + # cache: 'npm' - - name: Use cached node_modules - id: cache - uses: actions/cache@v3 - with: - path: node_modules - key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }} - restore-keys: | - nodeModules- + # - name: Use cached node_modules + # id: cache + # uses: actions/cache@v3 + # with: + # path: node_modules + # key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }} + # restore-keys: | + # nodeModules- - name: Install dependencies - if: steps.cache.outputs.cache-hit != 'true' + # if: steps.cache.outputs.cache-hit != 'true' run: npm install env: CI: true