Repository navigation
Commit 9cb49ef
authored
refactor(html): minify inline CSS and JSON through renderEmbeddedSource alone (#21993)
* refactor(html): route every embedded body through one renderer
The printer called its own CSS and JSON minifiers directly at each site,
beside the caller's renderer. They are now one built-in renderer of the
same shape, asked wherever the caller passed none or declined, so every
site makes the same call and adding a language means adding one branch.
Output is unchanged.
* refactor(html): minify inline CSS and JSON through renderEmbeddedSource alone
The HTML printer no longer runs a CSS or JSON minifier of its own: every
nested body is offered to `renderEmbeddedSource`, and a body the renderer
declines is left as written. `builtinEmbeddedRenderer` exports webpack's
own CSS and JSON minifiers as such a renderer; `htmlMinify` composes it
behind the caller's, so a custom minimizer answers for the languages it
claims and webpack's own answers for the rest.
* test(css): decline the languages the embedded svg case does not render
Its renderer answered every language with the source unchanged, which
under the renderer-only path claims those bodies and leaves a `style=""`
as written. Declining them is what a renderer does for a language it does
not handle, and puts the case's generated code back to the byte.
* test(html): cover the shapes a sheet does not end cleanly in
The scan that decides whether a `<style>` run may absorb the next sheet
reads escapes, comments and strings, and none of those branches had a
test: a build never reaches them, since a sheet a document embeds is
normally well formed.
* refactor(html): move webpack's own embedded renderer out of the printer
The printer ran no CSS through it any more, but still held the code that
did: `builtinEmbeddedRenderer` reached for the CSS `SourceProcessor` from
`lib/html/syntax.js`. It and `stripJsonWhitespace` move to a module of
their own, so the printer file names no minifier but the HTML one, and
`html.syntax` re-exports both where callers already look. Its remaining
use of the CSS module is the lexer `parseCssUrls` reads `url()` with.
* docs(html): cut the JSON stripper's description to two sentences1 parent a12775b commit 9cb49ef
10 files changed
Lines changed: 437 additions & 386 deletions
File tree
- .changeset
- lib/html
- test
- configCases/css/minify-embedded-svg
- __snapshots__
- helpers
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
37 | | - | |
| 38 | + | |
38 | 39 | | |
39 | 40 | | |
40 | 41 | | |
| |||
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| 51 | + | |
50 | 52 | | |
51 | 53 | | |
52 | 54 | | |
| |||
78 | 80 | | |
79 | 81 | | |
80 | 82 | | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
81 | 93 | | |
82 | 94 | | |
83 | 95 | | |
84 | 96 | | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | 97 | | |
93 | 98 | | |
94 | 99 | | |
| |||
117 | 122 | | |
118 | 123 | | |
119 | 124 | | |
120 | | - | |
121 | | - | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
122 | 129 | | |
123 | 130 | | |
124 | 131 | | |
| |||
217 | 224 | | |
218 | 225 | | |
219 | 226 | | |
220 | | - | |
221 | | - | |
222 | | - | |
| 227 | + | |
223 | 228 | | |
224 | 229 | | |
225 | 230 | | |
| |||
0 commit comments