acrylblends 0.6.2 → 0.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -1
- package/docs/framework/README.md +3 -2
- package/docs/framework/UPSTREAM.md +1 -1
- package/docs/framework/cordis/acryl-in-a-cordis-app.md +6 -0
- package/docs/framework/getting-started/basic.md +1 -0
- package/docs/framework/getting-started/desktop.md +41 -0
- package/docs/framework/guides/jsx-dom.md +0 -3
- package/docs/framework/guides/jsx.md +0 -3
- package/docs/framework/helpers/css.md +0 -3
- package/docs/framework/upstream.json +3 -3
- package/lib/accepts.d.ts +1 -1
- package/lib/acryl-base.d.ts +1 -1
- package/lib/adapter.d.ts +1 -1
- package/lib/{app-BdrVHBlJ.d.ts → app-wFwpg-bt.d.ts} +1 -1
- package/lib/base-BpQy2Rk7.d.ts +783 -0
- package/lib/base-ddiVmiE7.js +721 -0
- package/lib/basic-auth.d.ts +1 -1
- package/lib/bearer-auth.d.ts +1 -1
- package/lib/body-limit.d.ts +1 -1
- package/lib/cache.d.ts +1 -1
- package/lib/client.d.ts +2 -2
- package/lib/combine.d.ts +1 -1
- package/lib/common-D8Z4JRCw.d.ts +46 -0
- package/lib/components-Ce5FRyHU.js +268 -0
- package/lib/components-DYZdxJIJ.js +24 -0
- package/lib/compress.d.ts +1 -1
- package/lib/conninfo.d.ts +2 -2
- package/lib/constants-BR9jM9BC.js +9 -0
- package/lib/{context-B5Y1lLha.d.ts → context-DVQBjuns.d.ts} +1 -1
- package/lib/context-DxFdY_un.d.ts +250 -0
- package/lib/context-storage.d.ts +1 -1
- package/lib/{cookie-D9_nQbsM.d.ts → cookie-CCelEqky.d.ts} +1 -1
- package/lib/cookie.d.ts +3 -3
- package/lib/cors.d.ts +1 -1
- package/lib/csrf.d.ts +1 -1
- package/lib/css-D2jb7X8b.js +320 -0
- package/lib/css.d.ts +82 -0
- package/lib/css.js +134 -0
- package/lib/dev.d.ts +2 -2
- package/lib/etag.d.ts +1 -1
- package/lib/factory.d.ts +2 -2
- package/lib/hooks-Bq5q9IMl.js +762 -0
- package/lib/html-SllAe0YT.d.ts +46 -0
- package/lib/html.d.ts +1 -1
- package/lib/index-C850MeBA.d.ts +94 -0
- package/lib/{index-m12zcmph.d.ts → index-CUTfU69R.d.ts} +3 -3
- package/lib/{index-DtEoak1i.d.ts → index-Cqcdluyn.d.ts} +2 -2
- package/lib/{index-Kqou8Fjh.d.ts → index-CsvB-F9j.d.ts} +2 -2
- package/lib/index.d.ts +4 -4
- package/lib/ip-restriction.d.ts +2 -2
- package/lib/jsx/dom/client.d.ts +30 -0
- package/lib/jsx/dom/client.js +49 -0
- package/lib/jsx/dom/css.d.ts +84 -0
- package/lib/jsx/dom/css.js +2 -0
- package/lib/jsx/dom/jsx-dev-runtime.d.ts +3 -0
- package/lib/jsx/dom/jsx-dev-runtime.js +2 -0
- package/lib/jsx/dom/jsx-runtime.d.ts +3 -0
- package/lib/jsx/dom/jsx-runtime.js +2 -0
- package/lib/jsx/dom/server.d.ts +105 -0
- package/lib/jsx/dom/server.js +37 -0
- package/lib/jsx/dom.d.ts +5 -0
- package/lib/jsx/dom.js +74 -0
- package/lib/jsx/jsx-dev-runtime.d.ts +6 -0
- package/lib/jsx/jsx-dev-runtime.js +14 -0
- package/lib/jsx/jsx-runtime.d.ts +10 -0
- package/lib/jsx/jsx-runtime.js +30 -0
- package/lib/jsx/streaming.d.ts +2 -0
- package/lib/jsx/streaming.js +2 -0
- package/lib/jsx-dev-runtime-B22O-Npk.d.ts +7 -0
- package/lib/jsx-dev-runtime-kAhR_4C7.js +354 -0
- package/lib/jsx-runtime-BVVgDSdq.d.ts +1 -0
- package/lib/jsx.d.ts +3 -0
- package/lib/jsx.js +47 -0
- package/lib/jwk.d.ts +4 -4
- package/lib/{jwt-BA65QhnJ.d.ts → jwt-BARhotDz.d.ts} +1 -1
- package/lib/jwt.d.ts +4 -4
- package/lib/language.d.ts +1 -1
- package/lib/logger.d.ts +1 -1
- package/lib/loopback-only.d.ts +1 -1
- package/lib/method-not-allowed.d.ts +2 -2
- package/lib/method-override.d.ts +2 -2
- package/lib/mount.d.ts +1 -1
- package/lib/node-server/conninfo.d.ts +1 -1
- package/lib/node-server/serve-static.d.ts +1 -1
- package/lib/node-server/serve-static.js +1 -1
- package/lib/node-server.d.ts +1 -1
- package/lib/node-server.js +1 -1
- package/lib/powered-by.d.ts +1 -1
- package/lib/pretty-json.d.ts +1 -1
- package/lib/proxy.d.ts +1 -1
- package/lib/quick.d.ts +1 -1
- package/lib/request-id.d.ts +1 -1
- package/lib/request.d.ts +1 -1
- package/lib/route.d.ts +1 -1
- package/lib/schema-validator.d.ts +1 -1
- package/lib/secure-headers.d.ts +1 -1
- package/lib/{serve-static-Dw_m6KxR.js → serve-static-Cw23shXv.js} +1 -0
- package/lib/serve-static.d.ts +1 -1
- package/lib/streaming.d.ts +1 -1
- package/lib/testing.d.ts +4 -4
- package/lib/timeout.d.ts +1 -1
- package/lib/timing.d.ts +1 -1
- package/lib/tiny.d.ts +1 -1
- package/lib/trailing-slash.d.ts +1 -1
- package/lib/{types-Bd29gh2o.d.ts → types-CQiGmsWW.d.ts} +3 -3
- package/lib/{types-D9DEXMjE.d.ts → types-Lqx5BxQF.d.ts} +8 -1
- package/lib/{types-ZM9gIiKh.d.ts → types-nEL8VPDC.d.ts} +1 -1
- package/lib/types.d.ts +1 -1
- package/lib/utils/body.d.ts +1 -1
- package/lib/utils/cookie.d.ts +1 -1
- package/lib/utils/crypto.d.ts +1 -1
- package/lib/utils/html.d.ts +1 -45
- package/lib/utils/ipaddr.d.ts +1 -1
- package/lib/utils/jwt.d.ts +1 -1
- package/lib/utils/types.d.ts +2 -2
- package/lib/validator.d.ts +2 -2
- package/lib/ws.d.ts +1 -1
- package/package.json +45 -1
- package/plugins/acryl-inspect/upstream.json +1 -1
- package/plugins/acryl-node-server/upstream.json +1 -1
- package/plugins/acryl-router/src/core/helper/css/common.case.test.tsx +506 -0
- package/plugins/acryl-router/src/core/helper/css/common.ts +337 -0
- package/plugins/acryl-router/src/core/helper/css/index.test.tsx +678 -0
- package/plugins/acryl-router/src/core/helper/css/index.ts +262 -0
- package/plugins/acryl-router/src/core/helper/streaming/sse.test.tsx +557 -0
- package/plugins/acryl-router/src/core/jsx/base.test.tsx +97 -0
- package/plugins/acryl-router/src/core/jsx/base.ts +490 -0
- package/plugins/acryl-router/src/core/jsx/children.test.ts +52 -0
- package/plugins/acryl-router/src/core/jsx/children.ts +20 -0
- package/plugins/acryl-router/src/core/jsx/components.test.tsx +936 -0
- package/plugins/acryl-router/src/core/jsx/components.ts +257 -0
- package/plugins/acryl-router/src/core/jsx/constants.ts +6 -0
- package/plugins/acryl-router/src/core/jsx/context-isolation.test.ts +655 -0
- package/plugins/acryl-router/src/core/jsx/context.ts +266 -0
- package/plugins/acryl-router/src/core/jsx/dom/client.test.tsx +128 -0
- package/plugins/acryl-router/src/core/jsx/dom/client.ts +89 -0
- package/plugins/acryl-router/src/core/jsx/dom/components.test.tsx +330 -0
- package/plugins/acryl-router/src/core/jsx/dom/components.ts +39 -0
- package/plugins/acryl-router/src/core/jsx/dom/context.test.tsx +184 -0
- package/plugins/acryl-router/src/core/jsx/dom/context.ts +52 -0
- package/plugins/acryl-router/src/core/jsx/dom/css.test.tsx +149 -0
- package/plugins/acryl-router/src/core/jsx/dom/css.ts +263 -0
- package/plugins/acryl-router/src/core/jsx/dom/hooks/index.test.tsx +172 -0
- package/plugins/acryl-router/src/core/jsx/dom/hooks/index.ts +91 -0
- package/plugins/acryl-router/src/core/jsx/dom/index.test.tsx +3681 -0
- package/plugins/acryl-router/src/core/jsx/dom/index.ts +170 -0
- package/plugins/acryl-router/src/core/jsx/dom/intrinsic-element/components.test.tsx +1344 -0
- package/plugins/acryl-router/src/core/jsx/dom/intrinsic-element/components.ts +438 -0
- package/plugins/acryl-router/src/core/jsx/dom/jsx-dev-runtime.ts +23 -0
- package/plugins/acryl-router/src/core/jsx/dom/jsx-runtime.ts +8 -0
- package/plugins/acryl-router/src/core/jsx/dom/render.ts +879 -0
- package/plugins/acryl-router/src/core/jsx/dom/server.test.tsx +199 -0
- package/plugins/acryl-router/src/core/jsx/dom/server.ts +76 -0
- package/plugins/acryl-router/src/core/jsx/dom/utils.ts +7 -0
- package/plugins/acryl-router/src/core/jsx/hooks/dom.test.tsx +859 -0
- package/plugins/acryl-router/src/core/jsx/hooks/index.ts +437 -0
- package/plugins/acryl-router/src/core/jsx/hooks/string.test.tsx +40 -0
- package/plugins/acryl-router/src/core/jsx/index.test.tsx +1744 -0
- package/plugins/acryl-router/src/core/jsx/index.ts +115 -0
- package/plugins/acryl-router/src/core/jsx/intrinsic-element/common.ts +23 -0
- package/plugins/acryl-router/src/core/jsx/intrinsic-element/components.test.tsx +666 -0
- package/plugins/acryl-router/src/core/jsx/intrinsic-element/components.ts +210 -0
- package/plugins/acryl-router/src/core/jsx/intrinsic-elements.ts +938 -0
- package/plugins/acryl-router/src/core/jsx/jsx-dev-runtime.ts +26 -0
- package/plugins/acryl-router/src/core/jsx/jsx-runtime.test.tsx +85 -0
- package/plugins/acryl-router/src/core/jsx/jsx-runtime.ts +51 -0
- package/plugins/acryl-router/src/core/jsx/streaming.test.tsx +1281 -0
- package/plugins/acryl-router/src/core/jsx/streaming.ts +231 -0
- package/plugins/acryl-router/src/core/jsx/types.ts +41 -0
- package/plugins/acryl-router/src/core/jsx/utils.test.ts +366 -0
- package/plugins/acryl-router/src/core/jsx/utils.ts +202 -0
- package/plugins/acryl-router/src/core/utils/types.ts +6 -0
- package/plugins/acryl-router/src/helpers/index.ts +1 -0
- package/plugins/acryl-router/tests/jsx.spec.tsx +63 -0
- package/plugins/acryl-router/upstream.json +3 -3
- package/plugins/acryl-router-http/upstream.json +1 -1
- package/plugins/acryl-state/upstream.json +1 -1
- package/plugins/desktop/upstream.json +1 -1
- package/plugins/desktop-web/upstream.json +1 -1
- package/plugins/save/plugin.json +1 -1
- package/templates/todo/upstream.json +1 -1
|
@@ -0,0 +1,678 @@
|
|
|
1
|
+
/** @jsxImportSource ../../jsx */
|
|
2
|
+
import { Acryl } from '../../index.ts'
|
|
3
|
+
import { html } from '../html/index.ts'
|
|
4
|
+
import type { JSXNode } from '../../jsx/index.ts'
|
|
5
|
+
import { isValidElement } from '../../jsx/index.ts'
|
|
6
|
+
import { Suspense, renderToReadableStream } from '../../jsx/streaming.ts'
|
|
7
|
+
import type { HtmlEscapedString } from '../../utils/html.ts'
|
|
8
|
+
import { HtmlEscapedCallbackPhase, resolveCallback } from '../../utils/html.ts'
|
|
9
|
+
import { renderTest } from './common.case.test.tsx'
|
|
10
|
+
import { Style, createCssContext, css, cx, keyframes, rawCssString, viewTransition } from './index.ts'
|
|
11
|
+
|
|
12
|
+
async function toString(
|
|
13
|
+
template: JSXNode | Promise<HtmlEscapedString> | Promise<string> | HtmlEscapedString
|
|
14
|
+
) {
|
|
15
|
+
if (template instanceof Promise) {
|
|
16
|
+
template = (await template) as HtmlEscapedString
|
|
17
|
+
}
|
|
18
|
+
if (isValidElement(template)) {
|
|
19
|
+
template = template.toString() as Promise<HtmlEscapedString>
|
|
20
|
+
}
|
|
21
|
+
return resolveCallback(await template, HtmlEscapedCallbackPhase.Stringify, false, template)
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
async function toCSS(
|
|
25
|
+
template: JSXNode | Promise<HtmlEscapedString> | Promise<string> | HtmlEscapedString
|
|
26
|
+
) {
|
|
27
|
+
return (await toString(template))
|
|
28
|
+
.replace(/.*?=(".*")<\/script.*/, '$1')
|
|
29
|
+
.replace(/\.css-\d+/g, '.css-123')
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
describe('CSS Helper', () => {
|
|
33
|
+
renderTest(() => {
|
|
34
|
+
return {
|
|
35
|
+
css,
|
|
36
|
+
Style,
|
|
37
|
+
keyframes,
|
|
38
|
+
viewTransition,
|
|
39
|
+
rawCssString,
|
|
40
|
+
createCssContext,
|
|
41
|
+
toString,
|
|
42
|
+
toCSS,
|
|
43
|
+
support: {
|
|
44
|
+
nest: true,
|
|
45
|
+
},
|
|
46
|
+
}
|
|
47
|
+
})
|
|
48
|
+
|
|
49
|
+
describe('with `html` tag function', () => {
|
|
50
|
+
it('Should render CSS styles with `html` tag function', async () => {
|
|
51
|
+
const headerClass = css`
|
|
52
|
+
background-color: blue;
|
|
53
|
+
`
|
|
54
|
+
const template = html`${Style()}
|
|
55
|
+
<h1 class="${headerClass}">Hello!</h1>`
|
|
56
|
+
expect(await toString(template)).toBe(
|
|
57
|
+
`<style id="acryl-css">.css-2458908649{background-color:blue}</style>
|
|
58
|
+
<h1 class="css-2458908649">Hello!</h1>`
|
|
59
|
+
)
|
|
60
|
+
})
|
|
61
|
+
|
|
62
|
+
it('Should render CSS styles with `html` tag function and CSP nonce', async () => {
|
|
63
|
+
const headerClass = css`
|
|
64
|
+
background-color: blue;
|
|
65
|
+
`
|
|
66
|
+
const template = html`${Style({ nonce: '1234' })}
|
|
67
|
+
<h1 class="${headerClass}">Hello!</h1>`
|
|
68
|
+
expect(await toString(template)).toBe(
|
|
69
|
+
`<style id="acryl-css" nonce="1234">.css-2458908649{background-color:blue}</style>
|
|
70
|
+
<h1 class="css-2458908649">Hello!</h1>`
|
|
71
|
+
)
|
|
72
|
+
})
|
|
73
|
+
})
|
|
74
|
+
|
|
75
|
+
describe('Style with content', () => {
|
|
76
|
+
it('Should append styles when the content has a newline', async () => {
|
|
77
|
+
const headerClass = css`
|
|
78
|
+
font-size: 1rem;
|
|
79
|
+
`
|
|
80
|
+
const template = (
|
|
81
|
+
<>
|
|
82
|
+
<Style>{css`
|
|
83
|
+
/* multi
|
|
84
|
+
line */
|
|
85
|
+
html {
|
|
86
|
+
color: red;
|
|
87
|
+
}
|
|
88
|
+
`}</Style>
|
|
89
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
90
|
+
</>
|
|
91
|
+
)
|
|
92
|
+
expect(await toString(template)).toBe(
|
|
93
|
+
'<style id="acryl-css">/* multi\nline */\nhtml{color:red}.css-1740067317{font-size:1rem}</style><h1 class="css-1740067317">Hello!</h1>'
|
|
94
|
+
)
|
|
95
|
+
})
|
|
96
|
+
})
|
|
97
|
+
|
|
98
|
+
describe('cx()', () => {
|
|
99
|
+
it('Should render CSS with cx()', async () => {
|
|
100
|
+
const btn = css`
|
|
101
|
+
border-radius: 4px;
|
|
102
|
+
`
|
|
103
|
+
const btnPrimary = css`
|
|
104
|
+
background-color: blue;
|
|
105
|
+
color: white;
|
|
106
|
+
`
|
|
107
|
+
|
|
108
|
+
const template = (
|
|
109
|
+
<>
|
|
110
|
+
<Style />
|
|
111
|
+
<h1 class={cx(btn, btnPrimary)}>Hello!</h1>
|
|
112
|
+
</>
|
|
113
|
+
)
|
|
114
|
+
expect(await toString(template)).toBe(
|
|
115
|
+
'<style id="acryl-css">.css-2395710522{border-radius:4px;background-color:blue;color:white}</style><h1 class="css-2395710522">Hello!</h1>'
|
|
116
|
+
)
|
|
117
|
+
})
|
|
118
|
+
|
|
119
|
+
it('Should render CSS with cx() includes external class name', async () => {
|
|
120
|
+
const btn = css`
|
|
121
|
+
border-radius: 4px;
|
|
122
|
+
`
|
|
123
|
+
|
|
124
|
+
const template = (
|
|
125
|
+
<>
|
|
126
|
+
<Style />
|
|
127
|
+
<h1 class={cx(btn, 'external-class')}>Hello!</h1>
|
|
128
|
+
</>
|
|
129
|
+
)
|
|
130
|
+
expect(await toString(template)).toBe(
|
|
131
|
+
'<style id="acryl-css">.css-3467431616{border-radius:4px}</style><h1 class="css-3467431616 external-class">Hello!</h1>'
|
|
132
|
+
)
|
|
133
|
+
})
|
|
134
|
+
|
|
135
|
+
it('Should render CSS with cx() includes nested external class name', async () => {
|
|
136
|
+
const btn = css`
|
|
137
|
+
border-radius: 4px;
|
|
138
|
+
`
|
|
139
|
+
const btn2 = cx(btn, 'external-class')
|
|
140
|
+
const btn3 = css`
|
|
141
|
+
${btn2}
|
|
142
|
+
color: white;
|
|
143
|
+
`
|
|
144
|
+
const btn4 = cx(btn3, 'external-class2')
|
|
145
|
+
const template = (
|
|
146
|
+
<>
|
|
147
|
+
<Style />
|
|
148
|
+
<h1 class={btn4}>Hello!</h1>
|
|
149
|
+
</>
|
|
150
|
+
)
|
|
151
|
+
expect(await toString(template)).toBe(
|
|
152
|
+
'<style id="acryl-css">.css-3358636561{border-radius:4px;color:white}</style><h1 class="css-3358636561 external-class external-class2">Hello!</h1>'
|
|
153
|
+
)
|
|
154
|
+
})
|
|
155
|
+
|
|
156
|
+
it('Should escape external class name to prevent XSS via attribute injection', async () => {
|
|
157
|
+
const btn = css`
|
|
158
|
+
border-radius: 4px;
|
|
159
|
+
`
|
|
160
|
+
|
|
161
|
+
const template = (
|
|
162
|
+
<>
|
|
163
|
+
<Style />
|
|
164
|
+
<h1 class={cx(btn, '" onmouseover=alert(1) x="')}>Hello!</h1>
|
|
165
|
+
</>
|
|
166
|
+
)
|
|
167
|
+
// the injected `"` is escaped to `"`, so it cannot close the class attribute
|
|
168
|
+
const result = await toString(template)
|
|
169
|
+
expect(result).toContain('class="css-3467431616 " onmouseover=alert(1) x=""')
|
|
170
|
+
})
|
|
171
|
+
|
|
172
|
+
it('Should keep special characters in external class name working in attribute context', async () => {
|
|
173
|
+
const btn = css`
|
|
174
|
+
border-radius: 4px;
|
|
175
|
+
`
|
|
176
|
+
|
|
177
|
+
const template = (
|
|
178
|
+
<>
|
|
179
|
+
<Style />
|
|
180
|
+
<h1 class={cx(btn, '[&>*]:p-1')}>Hello!</h1>
|
|
181
|
+
</>
|
|
182
|
+
)
|
|
183
|
+
// escaped entities are decoded back to the original class name by the browser
|
|
184
|
+
expect(await toString(template)).toContain('class="css-3467431616 [&>*]:p-1"')
|
|
185
|
+
})
|
|
186
|
+
|
|
187
|
+
it('Should keep special characters in external class name working as a selector', async () => {
|
|
188
|
+
const btn = css`
|
|
189
|
+
border-radius: 4px;
|
|
190
|
+
`
|
|
191
|
+
const wrapper = css`
|
|
192
|
+
${cx(btn, '[&>*]:p-1')} {
|
|
193
|
+
color: red;
|
|
194
|
+
}
|
|
195
|
+
`
|
|
196
|
+
|
|
197
|
+
const template = (
|
|
198
|
+
<>
|
|
199
|
+
<Style />
|
|
200
|
+
<div class={wrapper}>Hello!</div>
|
|
201
|
+
</>
|
|
202
|
+
)
|
|
203
|
+
// legitimate class names (incl. Tailwind arbitrary values) are kept verbatim in the selector
|
|
204
|
+
expect(await toString(template)).toContain('.css-3467431616 [&>*]:p-1{')
|
|
205
|
+
})
|
|
206
|
+
|
|
207
|
+
it('Should drop external class names that could break out of a style element', async () => {
|
|
208
|
+
const btn = css`
|
|
209
|
+
border-radius: 4px;
|
|
210
|
+
`
|
|
211
|
+
// `</style>` (HTML breakout) and `{}` (CSS rule injection) are dropped from the selector
|
|
212
|
+
for (const payload of ['</style><script>alert(1)</script>', 'a{}body{display:none}']) {
|
|
213
|
+
const wrapper = css`
|
|
214
|
+
${cx(btn, payload)} {
|
|
215
|
+
color: red;
|
|
216
|
+
}
|
|
217
|
+
`
|
|
218
|
+
const result = await toString(
|
|
219
|
+
<>
|
|
220
|
+
<Style />
|
|
221
|
+
<div class={wrapper}>Hello!</div>
|
|
222
|
+
</>
|
|
223
|
+
)
|
|
224
|
+
expect(result).not.toContain('</style><script>')
|
|
225
|
+
expect(result).not.toContain('body{display:none}')
|
|
226
|
+
}
|
|
227
|
+
})
|
|
228
|
+
})
|
|
229
|
+
|
|
230
|
+
describe('minify', () => {
|
|
231
|
+
const data: [string, Promise<string>, string][] = [
|
|
232
|
+
[
|
|
233
|
+
'basic CSS styles',
|
|
234
|
+
css`
|
|
235
|
+
background-color: blue;
|
|
236
|
+
color: white;
|
|
237
|
+
padding: 1rem;
|
|
238
|
+
`,
|
|
239
|
+
'.css-123{background-color:blue;color:white;padding:1rem}',
|
|
240
|
+
],
|
|
241
|
+
[
|
|
242
|
+
'remove comments',
|
|
243
|
+
css`
|
|
244
|
+
/* background-color: blue; */
|
|
245
|
+
color: white;
|
|
246
|
+
padding: 1rem;
|
|
247
|
+
// inline comment
|
|
248
|
+
margin: 1rem;
|
|
249
|
+
`,
|
|
250
|
+
'.css-123{color:white;padding:1rem;margin:1rem}',
|
|
251
|
+
],
|
|
252
|
+
[
|
|
253
|
+
'preserve string',
|
|
254
|
+
css`
|
|
255
|
+
background-color: blue;
|
|
256
|
+
color: white;
|
|
257
|
+
padding: 1rem;
|
|
258
|
+
content: "Hel \\\n \\' lo!";
|
|
259
|
+
content: 'Hel \\\n \\" lo!';
|
|
260
|
+
`,
|
|
261
|
+
'.css-123{background-color:blue;color:white;padding:1rem;content:"Hel \\\n \\\' lo!";content:\'Hel \\\n \\" lo!\'}',
|
|
262
|
+
],
|
|
263
|
+
[
|
|
264
|
+
'preserve nested selectors',
|
|
265
|
+
css`
|
|
266
|
+
padding: 1rem;
|
|
267
|
+
&:hover {
|
|
268
|
+
padding: 2rem;
|
|
269
|
+
}
|
|
270
|
+
`,
|
|
271
|
+
'.css-123{padding:1rem;&:hover{padding:2rem}}',
|
|
272
|
+
],
|
|
273
|
+
[
|
|
274
|
+
'preserve unquoted url',
|
|
275
|
+
css`
|
|
276
|
+
background-image: url(https://example.com/a.png);
|
|
277
|
+
mask-image: url(${'//cdn.example.com/b.svg'});
|
|
278
|
+
color: red;
|
|
279
|
+
`,
|
|
280
|
+
'.css-123{background-image:url(https://example.com/a.png);mask-image:url(//cdn.example.com/b.svg);color:red}',
|
|
281
|
+
],
|
|
282
|
+
[
|
|
283
|
+
'preserve descendant combinator before pseudo-class',
|
|
284
|
+
css`
|
|
285
|
+
& :first-child {
|
|
286
|
+
margin: 0;
|
|
287
|
+
}
|
|
288
|
+
&:hover :is(h1, h2) {
|
|
289
|
+
color: red;
|
|
290
|
+
}
|
|
291
|
+
`,
|
|
292
|
+
'.css-123{& :first-child{margin:0}&:hover :is(h1,h2){color:red}}',
|
|
293
|
+
],
|
|
294
|
+
]
|
|
295
|
+
data.forEach(([name, str, expected]) => {
|
|
296
|
+
it(`Should be minified while preserving content accurately: ${name}`, async () => {
|
|
297
|
+
expect(JSON.parse(await toCSS(str))).toBe(expected)
|
|
298
|
+
})
|
|
299
|
+
})
|
|
300
|
+
})
|
|
301
|
+
|
|
302
|
+
describe('createCssContext()', () => {
|
|
303
|
+
it('Should create a new CSS context', async () => {
|
|
304
|
+
const { css: css1, Style: Style1 } = createCssContext({ id: 'context1' })
|
|
305
|
+
const { css: css2, Style: Style2 } = createCssContext({ id: 'context2' })
|
|
306
|
+
const headerClass1 = css1`
|
|
307
|
+
background-color: blue;
|
|
308
|
+
`
|
|
309
|
+
const headerClass2 = css2`
|
|
310
|
+
background-color: red;
|
|
311
|
+
`
|
|
312
|
+
const template = (
|
|
313
|
+
<>
|
|
314
|
+
<Style1 />
|
|
315
|
+
<Style2 />
|
|
316
|
+
<h1 class={headerClass1}>Hello!</h1>
|
|
317
|
+
<h1 class={headerClass2}>Hello!</h1>
|
|
318
|
+
</>
|
|
319
|
+
)
|
|
320
|
+
expect(await toString(template)).toBe(
|
|
321
|
+
'<style id="context1">.css-2458908649{background-color:blue}</style><style id="context2">.css-960045552{background-color:red}</style><h1 class="css-2458908649">Hello!</h1><h1 class="css-960045552">Hello!</h1>'
|
|
322
|
+
)
|
|
323
|
+
})
|
|
324
|
+
})
|
|
325
|
+
|
|
326
|
+
describe('classNameSlug', () => {
|
|
327
|
+
it('Should use custom classNameSlug function', async () => {
|
|
328
|
+
const { css: customCss, Style: customStyle } = createCssContext({
|
|
329
|
+
id: 'custom-slug',
|
|
330
|
+
classNameSlug: (hash, _label, _css) => `btn-${hash.split('-')[1]}`,
|
|
331
|
+
})
|
|
332
|
+
const btnClass = customCss`
|
|
333
|
+
background-color: blue;
|
|
334
|
+
`
|
|
335
|
+
const template = (
|
|
336
|
+
<>
|
|
337
|
+
{customStyle()}
|
|
338
|
+
<button class={btnClass}>Click</button>
|
|
339
|
+
</>
|
|
340
|
+
)
|
|
341
|
+
const result = await toString(template)
|
|
342
|
+
expect(result).toContain('.btn-')
|
|
343
|
+
expect(result).not.toContain('.css-')
|
|
344
|
+
})
|
|
345
|
+
|
|
346
|
+
it('Should pass label to classNameSlug', async () => {
|
|
347
|
+
const { css: customCss, Style: customStyle } = createCssContext({
|
|
348
|
+
id: 'label-slug',
|
|
349
|
+
classNameSlug: (hash, label) => (label ? `h-${label}` : hash),
|
|
350
|
+
})
|
|
351
|
+
const headerClass = customCss`
|
|
352
|
+
/* hero section */
|
|
353
|
+
background-color: blue;
|
|
354
|
+
`
|
|
355
|
+
const template = (
|
|
356
|
+
<>
|
|
357
|
+
{customStyle()}
|
|
358
|
+
<div class={headerClass}>Hero</div>
|
|
359
|
+
</>
|
|
360
|
+
)
|
|
361
|
+
const result = await toString(template)
|
|
362
|
+
expect(result).toContain('.h-hero-section')
|
|
363
|
+
expect(result).toContain('background-color:blue')
|
|
364
|
+
})
|
|
365
|
+
|
|
366
|
+
it('Should fall back to different hash values for labels with special characters', async () => {
|
|
367
|
+
const { css: customCss, Style: customStyle } = createCssContext({
|
|
368
|
+
id: 'label-deferent-slug',
|
|
369
|
+
classNameSlug: (hash, label) => (label ? `h-${label}` : hash),
|
|
370
|
+
})
|
|
371
|
+
const headerClass1 = customCss`
|
|
372
|
+
/* hero section! */
|
|
373
|
+
background-color: blue;
|
|
374
|
+
`
|
|
375
|
+
const headerClass2 = customCss`
|
|
376
|
+
/* hero section? */
|
|
377
|
+
background-color: blue;
|
|
378
|
+
`
|
|
379
|
+
const template = (
|
|
380
|
+
<>
|
|
381
|
+
{customStyle()}
|
|
382
|
+
<div class={headerClass1}>Hero</div>
|
|
383
|
+
<div class={headerClass2}>Hero</div>
|
|
384
|
+
</>
|
|
385
|
+
)
|
|
386
|
+
const result = await toString(template)
|
|
387
|
+
|
|
388
|
+
const classes = new Set<string>()
|
|
389
|
+
result.match(/class="(.*?)"/g)?.forEach((match) => {
|
|
390
|
+
classes.add(match)
|
|
391
|
+
})
|
|
392
|
+
expect(classes.size).toBe(2)
|
|
393
|
+
})
|
|
394
|
+
|
|
395
|
+
it('Should fall back to hash when label is empty', async () => {
|
|
396
|
+
const { css: customCss, Style: customStyle } = createCssContext({
|
|
397
|
+
id: 'fallback-slug',
|
|
398
|
+
classNameSlug: (hash, label) => (label ? `h-${label}` : hash),
|
|
399
|
+
})
|
|
400
|
+
const noLabelClass = customCss`
|
|
401
|
+
color: red;
|
|
402
|
+
`
|
|
403
|
+
const template = (
|
|
404
|
+
<>
|
|
405
|
+
{customStyle()}
|
|
406
|
+
<div class={noLabelClass}>No label</div>
|
|
407
|
+
</>
|
|
408
|
+
)
|
|
409
|
+
const result = await toString(template)
|
|
410
|
+
expect(result).toContain('.css-')
|
|
411
|
+
expect(result).toContain('color:red')
|
|
412
|
+
})
|
|
413
|
+
|
|
414
|
+
it('Should not affect default context when classNameSlug is not set', async () => {
|
|
415
|
+
const headerClass = css`
|
|
416
|
+
background-color: blue;
|
|
417
|
+
`
|
|
418
|
+
const template = (
|
|
419
|
+
<>
|
|
420
|
+
<Style />
|
|
421
|
+
<h1 class={headerClass}>Default</h1>
|
|
422
|
+
</>
|
|
423
|
+
)
|
|
424
|
+
const result = await toString(template)
|
|
425
|
+
expect(result).toContain('.css-2458908649')
|
|
426
|
+
expect(result).toContain('background-color:blue')
|
|
427
|
+
})
|
|
428
|
+
|
|
429
|
+
it('Should apply classNameSlug to keyframes', async () => {
|
|
430
|
+
const {
|
|
431
|
+
css: customCss,
|
|
432
|
+
keyframes: customKeyframes,
|
|
433
|
+
Style: customStyle,
|
|
434
|
+
} = createCssContext({
|
|
435
|
+
id: 'kf-slug',
|
|
436
|
+
classNameSlug: (hash, label) => (label ? `h-${label}` : hash),
|
|
437
|
+
})
|
|
438
|
+
const animation = customKeyframes`
|
|
439
|
+
/* fade-in */
|
|
440
|
+
from { opacity: 0; }
|
|
441
|
+
to { opacity: 1; }
|
|
442
|
+
`
|
|
443
|
+
const headerClass = customCss`
|
|
444
|
+
animation: ${animation} 1s ease-in-out;
|
|
445
|
+
`
|
|
446
|
+
const template = (
|
|
447
|
+
<>
|
|
448
|
+
{customStyle()}
|
|
449
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
450
|
+
</>
|
|
451
|
+
)
|
|
452
|
+
const result = await toString(template)
|
|
453
|
+
expect(result).toContain('@keyframes h-fade-in')
|
|
454
|
+
expect(result).toContain('animation:h-fade-in 1s ease-in-out')
|
|
455
|
+
})
|
|
456
|
+
|
|
457
|
+
it('Should apply classNameSlug to viewTransition', async () => {
|
|
458
|
+
const {
|
|
459
|
+
css: customCss,
|
|
460
|
+
viewTransition: customViewTransition,
|
|
461
|
+
Style: customStyle,
|
|
462
|
+
} = createCssContext({
|
|
463
|
+
id: 'vt-slug',
|
|
464
|
+
classNameSlug: (hash, label) => (label ? `h-${label}` : hash),
|
|
465
|
+
})
|
|
466
|
+
const transition = customViewTransition(customCss`
|
|
467
|
+
/* hero */
|
|
468
|
+
display: flex;
|
|
469
|
+
`)
|
|
470
|
+
const template = (
|
|
471
|
+
<>
|
|
472
|
+
{customStyle()}
|
|
473
|
+
<h1 class={transition}>Hello!</h1>
|
|
474
|
+
</>
|
|
475
|
+
)
|
|
476
|
+
const result = await toString(template)
|
|
477
|
+
expect(result).toContain('view-transition-name:h-hero')
|
|
478
|
+
})
|
|
479
|
+
|
|
480
|
+
it('Should fall back to hash when classNameSlug returns invalid characters', async () => {
|
|
481
|
+
const { css: customCss, Style: customStyle } = createCssContext({
|
|
482
|
+
id: 'empty-slug',
|
|
483
|
+
classNameSlug: () => 'name!',
|
|
484
|
+
})
|
|
485
|
+
const headerClass = customCss`
|
|
486
|
+
display: flex;
|
|
487
|
+
`
|
|
488
|
+
const template = (
|
|
489
|
+
<>
|
|
490
|
+
{customStyle()}
|
|
491
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
492
|
+
</>
|
|
493
|
+
)
|
|
494
|
+
const result = await toString(template)
|
|
495
|
+
expect(result).toContain('.css-')
|
|
496
|
+
expect(result).toContain('display:flex')
|
|
497
|
+
})
|
|
498
|
+
|
|
499
|
+
it('Should fall back to hash when classNameSlug starts with a number', async () => {
|
|
500
|
+
const { css: customCss, Style: customStyle } = createCssContext({
|
|
501
|
+
id: 'numeric-slug',
|
|
502
|
+
classNameSlug: () => '1hero',
|
|
503
|
+
})
|
|
504
|
+
const headerClass = customCss`
|
|
505
|
+
display: flex;
|
|
506
|
+
`
|
|
507
|
+
const template = (
|
|
508
|
+
<>
|
|
509
|
+
{customStyle()}
|
|
510
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
511
|
+
</>
|
|
512
|
+
)
|
|
513
|
+
const result = await toString(template)
|
|
514
|
+
expect(result).toContain('.css-')
|
|
515
|
+
expect(result).toContain('display:flex')
|
|
516
|
+
expect(result).not.toContain('.1hero')
|
|
517
|
+
})
|
|
518
|
+
|
|
519
|
+
it('Should fall back to hash when label is empty and classNameSlug returns label', async () => {
|
|
520
|
+
const { css: customCss, Style: customStyle } = createCssContext({
|
|
521
|
+
id: 'empty-label-slug',
|
|
522
|
+
classNameSlug: (_, label) => label,
|
|
523
|
+
})
|
|
524
|
+
const headerClass = customCss`
|
|
525
|
+
display: flex;
|
|
526
|
+
`
|
|
527
|
+
const template = (
|
|
528
|
+
<>
|
|
529
|
+
{customStyle()}
|
|
530
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
531
|
+
</>
|
|
532
|
+
)
|
|
533
|
+
const result = await toString(template)
|
|
534
|
+
expect(result).toContain('.css-')
|
|
535
|
+
expect(result).toContain('display:flex')
|
|
536
|
+
})
|
|
537
|
+
|
|
538
|
+
it('Should fall back to hash when keyframes name is a reserved keyword', async () => {
|
|
539
|
+
const {
|
|
540
|
+
css: customCss,
|
|
541
|
+
keyframes: customKeyframes,
|
|
542
|
+
Style: customStyle,
|
|
543
|
+
} = createCssContext({
|
|
544
|
+
id: 'reserved-kf-slug',
|
|
545
|
+
classNameSlug: () => 'none',
|
|
546
|
+
})
|
|
547
|
+
const animation = customKeyframes`
|
|
548
|
+
from { opacity: 0; }
|
|
549
|
+
to { opacity: 1; }
|
|
550
|
+
`
|
|
551
|
+
const headerClass = customCss`
|
|
552
|
+
animation: ${animation} 1s ease-in-out;
|
|
553
|
+
`
|
|
554
|
+
const template = (
|
|
555
|
+
<>
|
|
556
|
+
{customStyle()}
|
|
557
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
558
|
+
</>
|
|
559
|
+
)
|
|
560
|
+
const result = await toString(template)
|
|
561
|
+
expect(result).toContain('@keyframes css-')
|
|
562
|
+
expect(result).toContain('animation:css-')
|
|
563
|
+
expect(result).not.toContain('@keyframes none')
|
|
564
|
+
expect(result).not.toContain('animation:none 1s ease-in-out')
|
|
565
|
+
})
|
|
566
|
+
|
|
567
|
+
it('Should call onInvalidSlug when an invalid slug is returned', async () => {
|
|
568
|
+
const onInvalidSlug = vi.fn()
|
|
569
|
+
const { css: customCss, Style: customStyle } = createCssContext({
|
|
570
|
+
id: 'on-invalid-slug',
|
|
571
|
+
classNameSlug: () => '123',
|
|
572
|
+
onInvalidSlug,
|
|
573
|
+
})
|
|
574
|
+
const headerClass = customCss`
|
|
575
|
+
display: flex;
|
|
576
|
+
`
|
|
577
|
+
const template = (
|
|
578
|
+
<>
|
|
579
|
+
{customStyle()}
|
|
580
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
581
|
+
</>
|
|
582
|
+
)
|
|
583
|
+
await toString(template)
|
|
584
|
+
expect(onInvalidSlug).toHaveBeenCalledWith('123')
|
|
585
|
+
})
|
|
586
|
+
})
|
|
587
|
+
|
|
588
|
+
describe('with application', () => {
|
|
589
|
+
const app = new Acryl()
|
|
590
|
+
|
|
591
|
+
const headerClass = css`
|
|
592
|
+
background-color: blue;
|
|
593
|
+
`
|
|
594
|
+
|
|
595
|
+
app.get('/sync', (c) =>
|
|
596
|
+
c.html(
|
|
597
|
+
<>
|
|
598
|
+
<Style />
|
|
599
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
600
|
+
</>
|
|
601
|
+
)
|
|
602
|
+
)
|
|
603
|
+
|
|
604
|
+
app.get('/stream', (c) => {
|
|
605
|
+
const stream = renderToReadableStream(
|
|
606
|
+
<>
|
|
607
|
+
<Style />
|
|
608
|
+
<Suspense fallback={<p>Loading...</p>}>
|
|
609
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
610
|
+
</Suspense>
|
|
611
|
+
</>
|
|
612
|
+
)
|
|
613
|
+
return c.body(stream, {
|
|
614
|
+
headers: {
|
|
615
|
+
'Content-Type': 'text/html; charset=UTF-8',
|
|
616
|
+
'Transfer-Encoding': 'chunked',
|
|
617
|
+
},
|
|
618
|
+
})
|
|
619
|
+
})
|
|
620
|
+
|
|
621
|
+
app.get('/stream-with-nonce', (c) => {
|
|
622
|
+
const stream = renderToReadableStream(
|
|
623
|
+
<>
|
|
624
|
+
<Style nonce='1234' />
|
|
625
|
+
<Suspense fallback={<p>Loading...</p>}>
|
|
626
|
+
<h1 class={headerClass}>Hello!</h1>
|
|
627
|
+
</Suspense>
|
|
628
|
+
</>
|
|
629
|
+
)
|
|
630
|
+
return c.body(stream, {
|
|
631
|
+
headers: {
|
|
632
|
+
'Content-Type': 'text/html; charset=UTF-8',
|
|
633
|
+
'Transfer-Encoding': 'chunked',
|
|
634
|
+
},
|
|
635
|
+
})
|
|
636
|
+
})
|
|
637
|
+
|
|
638
|
+
it('/sync', async () => {
|
|
639
|
+
const res = await app.request('http://localhost/sync')
|
|
640
|
+
expect(res).not.toBeNull()
|
|
641
|
+
expect(await res.text()).toBe(
|
|
642
|
+
'<style id="acryl-css">.css-2458908649{background-color:blue}</style><h1 class="css-2458908649">Hello!</h1>'
|
|
643
|
+
)
|
|
644
|
+
})
|
|
645
|
+
|
|
646
|
+
it('/stream', async () => {
|
|
647
|
+
const res = await app.request('http://localhost/stream')
|
|
648
|
+
expect(res).not.toBeNull()
|
|
649
|
+
expect(await res.text()).toBe(
|
|
650
|
+
`<style id="acryl-css"></style><template id="H:0"></template><p>Loading...</p><!--/$--><script>document.querySelector('#acryl-css').textContent+=".css-2458908649{background-color:blue}"</script><template data-acryl-target="H:0"><h1 class="css-2458908649">Hello!</h1></template><script>
|
|
651
|
+
((d,c,n) => {
|
|
652
|
+
c=d.currentScript.previousSibling
|
|
653
|
+
d=d.getElementById('H:0')
|
|
654
|
+
if(!d)return
|
|
655
|
+
do{n=d.nextSibling;n.remove()}while(n.nodeType!=8||n.nodeValue!='/$')
|
|
656
|
+
d.replaceWith(c.content)
|
|
657
|
+
})(document)
|
|
658
|
+
</script>`
|
|
659
|
+
)
|
|
660
|
+
})
|
|
661
|
+
|
|
662
|
+
it('/stream-with-nonce', async () => {
|
|
663
|
+
const res = await app.request('http://localhost/stream-with-nonce')
|
|
664
|
+
expect(res).not.toBeNull()
|
|
665
|
+
expect(await res.text()).toBe(
|
|
666
|
+
`<style id="acryl-css" nonce="1234"></style><template id="H:1"></template><p>Loading...</p><!--/$--><script nonce="1234">document.querySelector('#acryl-css').textContent+=".css-2458908649{background-color:blue}"</script><template data-acryl-target="H:1"><h1 class="css-2458908649">Hello!</h1></template><script>
|
|
667
|
+
((d,c,n) => {
|
|
668
|
+
c=d.currentScript.previousSibling
|
|
669
|
+
d=d.getElementById('H:1')
|
|
670
|
+
if(!d)return
|
|
671
|
+
do{n=d.nextSibling;n.remove()}while(n.nodeType!=8||n.nodeValue!='/$')
|
|
672
|
+
d.replaceWith(c.content)
|
|
673
|
+
})(document)
|
|
674
|
+
</script>`
|
|
675
|
+
)
|
|
676
|
+
})
|
|
677
|
+
})
|
|
678
|
+
})
|