Skip to content

Commit 9c48973

Browse files
Fix content path detection on Windows (#9569)
* Fix content path detection on Windows * Update changelog * Drop npm caches for now
1 parent 042089a commit 9c48973

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

.github/workflows/nodejs.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626
uses: actions/setup-node@v3
2727
with:
2828
node-version: ${{ matrix.node-version }}
29-
cache: 'npm'
29+
# cache: 'npm'
3030

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

4040
- name: Install dependencies
41-
if: steps.cache.outputs.cache-hit != 'true'
41+
# if: steps.cache.outputs.cache-hit != 'true'
4242
run: npm install
4343
env:
4444
CI: true

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5555
- Implement fallback plugins when arbitrary values result in css from multiple plugins ([#9376](https://github.com/tailwindlabs/tailwindcss/pull/9376))
5656
- Improve type checking for formal syntax ([#9349](https://github.com/tailwindlabs/tailwindcss/pull/9349), [#9448](https://github.com/tailwindlabs/tailwindcss/pull/9448))
5757
- 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))
58+
- Fix content path detection on Windows ([#9569](https://github.com/tailwindlabs/tailwindcss/pull/9569))
5859

5960
## [3.1.8] - 2022-08-05
6061

src/lib/content.js

+6
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ function resolveGlobPattern(contentPath) {
100100

101101
contentPath.pattern = contentPath.ignore ? `!${contentPath.pattern}` : contentPath.pattern
102102

103+
// This is required for Windows support to properly pick up Glob paths.
104+
// Afaik, this technically shouldn't be needed but there's probably
105+
// some internal, direct path matching with a normalized path in
106+
// a package which can't handle mixed directory separators
107+
contentPath.pattern = normalizePath(contentPath.pattern)
108+
103109
return contentPath
104110
}
105111

0 commit comments

Comments
 (0)