Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(css): provide filename for css-minify error #16006

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
+161 −35
Open

feat(css): provide filename for css-minify error #16006

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
cd7610a
feat: provide filename for css-minify error
chaejunlee Feb 22, 2024
ccd4cbd
feat: also handle `generateBundle()`
chaejunlee Feb 22, 2024
de30d83
fix(css): track error by fileMap
chaejunlee Feb 28, 2024
ccb18ae
refactor(css): rename variables
chaejunlee Feb 28, 2024
626bde6
fix(css): make the numbers more precise
chaejunlee Feb 28, 2024
589b3e2
fefactor(css): reduce redundant if check
chaejunlee Feb 28, 2024
a0cc001
chore(css): add comment for better explanation)
chaejunlee Feb 28, 2024
2cf9ea8
fix(css) apply review
chaejunlee Mar 1, 2024
bc90159
refactor: reduce unnecessary changes
chaejunlee Mar 1, 2024
7196772
Merge branch 'main' of https://github.com/vitejs/vite into fix/css-er…
chaejunlee Mar 1, 2024
39330c7
fix: set the fallback to the original default
chaejunlee Mar 2, 2024
86ec814
fix: apply review
chaejunlee Mar 2, 2024
7435ee4
refactor: clean up
chaejunlee Mar 2, 2024
2fb1493
refactor
chaejunlee Mar 6, 2024
6a59086
fix: correctly handle import line parsing
chaejunlee Mar 6, 2024
b0cf404
fix: narrow down the type of `collected`
chaejunlee Mar 6, 2024
3519c6a
Update packages/vite/src/node/plugins/css.ts
chaejunlee Mar 6, 2024
91e399c
Update packages/vite/src/node/plugins/css.ts
chaejunlee Mar 6, 2024
d9b237b
Update packages/vite/src/node/plugins/css.ts
chaejunlee Mar 6, 2024
e886065
Update packages/vite/src/node/plugins/css.ts
chaejunlee Mar 6, 2024
d42c20c
fix: calculating imported end lines when multiple imports
chaejunlee Mar 6, 2024
22c12a2
refactore: simplify logic
chaejunlee Mar 12, 2024
5113ff4
refactor: remove unused function
chaejunlee Mar 12, 2024
07cc0cd
fix: early return when content is null
chaejunlee Mar 12, 2024
39838f2
fix: 1-based line + concat css w/o `\n`
chaejunlee Mar 14, 2024
01aa47f
fix: refactor + line count
chaejunlee Mar 14, 2024
a3295ff
fix: new `start` should be before prev `end` (not concating with `\n`)
chaejunlee Mar 14, 2024
c1d624d
fix: concat with `\n`
chaejunlee Mar 14, 2024
58fcc12
chore: simplify
sapphi-red Mar 17, 2024
7c9d3e0
fix: line count of empty css is now 1
chaejunlee Mar 17, 2024
00e1b76
fix: don't push `content` if it is `null` or `''`
chaejunlee Apr 3, 2024
3f141d2
chore: reduce diff
sapphi-red May 4, 2024
f519538
chore: reduce diff
sapphi-red May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/vite/src/node/plugins/css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ import {
removeDirectQuery,
removeUrlQuery,
requireResolveFromRootWithFallback,
slash,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this line to resolve the merge conflict. Before merging, this needs to be double checked!

splitRE,
stripBase,
stripBomTag,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.