Skip to content

Commit 72bc318

Browse files
RobinMalfaitthecrypticace
RobinMalfait
and
thecrypticace
authored
Replace __OXIDE__ at build time to prevent @tailwindcss/oxide leaks in the stable engine (#10988)
* replace `env.OXIDE` with global `__OXIDE__` This will allow us to replace the `__OXIDE__` at build time, and fully remove the branches from the final code so that there is not even any reference to `@tailwindcss/oxide` on the stable engine. * update changelog * use `env.ENGINE` in integration tests * drop oxide branching for the PostCSS plugin for now This is currently a redirect to the same file, so doesn't hurt. * Enable better dead-code elimination * Update CLI tests Fix indentation * Fix indentation --------- Co-authored-by: Jordan Pittman <[email protected]>
1 parent 9f86019 commit 72bc318

23 files changed

+195
-169
lines changed

‎.swcrc

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
"parser": {
1212
"syntax": "typescript",
1313
"tsx": false
14+
},
15+
"minify": {
16+
"compress": {
17+
"unused": true
18+
}
1419
}
1520
}
1621
}

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
- Don’t move unknown pseudo-elements to the end of selectors ([#10943](https://github.com/tailwindlabs/tailwindcss/pull/10943), [#10962](https://github.com/tailwindlabs/tailwindcss/pull/10962))
1313
- Inherit gradient stop positions when using variants ([#11002](https://github.com/tailwindlabs/tailwindcss/pull/11002))
1414
- Honor default `to` position of gradient when using implicit transparent colors ([#11002](https://github.com/tailwindlabs/tailwindcss/pull/11002))
15+
- Replace `__OXIDE__` at build time to prevent `@tailwindcss/oxide` leaks in the stable engine ([#10988](https://github.com/tailwindlabs/tailwindcss/pull/10988))
1516

1617
## [3.3.1] - 2023-03-30
1718

‎integrations/parcel/tests/integration.test.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ describe('static build', () => {
7474
env: { NODE_ENV: 'production' },
7575
})
7676

77-
if (!env.OXIDE) {
77+
if (env.ENGINE === 'stable') {
7878
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
7979
css`
8080
.bg-primary {
@@ -85,7 +85,7 @@ describe('static build', () => {
8585
)
8686
}
8787

88-
if (env.OXIDE) {
88+
if (env.ENGINE === 'oxide') {
8989
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
9090
css`
9191
.bg-primary {
@@ -138,7 +138,7 @@ describe('static build', () => {
138138
env: { NODE_ENV: 'production' },
139139
})
140140

141-
if (!env.OXIDE) {
141+
if (env.ENGINE === 'stable') {
142142
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
143143
css`
144144
.bg-primary {
@@ -149,7 +149,7 @@ describe('static build', () => {
149149
)
150150
}
151151

152-
if (env.OXIDE) {
152+
if (env.ENGINE === 'oxide') {
153153
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
154154
css`
155155
.bg-primary {
@@ -202,7 +202,7 @@ describe('watcher', () => {
202202
await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
203203
})
204204

205-
if (!env.OXIDE) {
205+
if (env.ENGINE === 'stable') {
206206
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
207207
css`
208208
.bg-red-500 {
@@ -219,7 +219,7 @@ describe('watcher', () => {
219219
)
220220
}
221221

222-
if (env.OXIDE) {
222+
if (env.ENGINE === 'oxide') {
223223
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
224224
css`
225225
.bg-red-500 {
@@ -274,7 +274,7 @@ describe('watcher', () => {
274274
await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
275275
})
276276

277-
if (!env.OXIDE) {
277+
if (env.ENGINE === 'stable') {
278278
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
279279
css`
280280
.bg-red-500 {
@@ -291,7 +291,7 @@ describe('watcher', () => {
291291
)
292292
}
293293

294-
if (env.OXIDE) {
294+
if (env.ENGINE === 'oxide') {
295295
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
296296
css`
297297
.bg-red-500 {
@@ -445,7 +445,7 @@ describe('watcher', () => {
445445
)
446446
})
447447

448-
if (!env.OXIDE) {
448+
if (env.ENGINE === 'stable') {
449449
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
450450
css`
451451
.btn {
@@ -461,7 +461,7 @@ describe('watcher', () => {
461461
)
462462
}
463463

464-
if (env.OXIDE) {
464+
if (env.ENGINE === 'oxide') {
465465
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
466466
css`
467467
.btn {

‎integrations/postcss-cli/tests/integration.test.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('watcher', () => {
6161
await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
6262
await runningProcess.onStderr(ready)
6363

64-
if (!env.OXIDE) {
64+
if (env.ENGINE === 'stable') {
6565
expect(await readOutputFile('main.css')).toIncludeCss(
6666
css`
6767
.bg-red-500 {
@@ -78,7 +78,7 @@ describe('watcher', () => {
7878
)
7979
}
8080

81-
if (env.OXIDE) {
81+
if (env.ENGINE === 'oxide') {
8282
expect(await readOutputFile('main.css')).toIncludeCss(
8383
css`
8484
.bg-red-500 {
@@ -128,7 +128,7 @@ describe('watcher', () => {
128128
await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
129129
await runningProcess.onStderr(ready)
130130

131-
if (!env.OXIDE) {
131+
if (env.ENGINE === 'stable') {
132132
expect(await readOutputFile('main.css')).toIncludeCss(
133133
css`
134134
.bg-red-500 {
@@ -145,7 +145,7 @@ describe('watcher', () => {
145145
)
146146
}
147147

148-
if (env.OXIDE) {
148+
if (env.ENGINE === 'oxide') {
149149
expect(await readOutputFile('main.css')).toIncludeCss(
150150
css`
151151
.bg-red-500 {
@@ -284,7 +284,7 @@ describe('watcher', () => {
284284
)
285285
await runningProcess.onStderr(ready)
286286

287-
if (!env.OXIDE) {
287+
if (env.ENGINE === 'stable') {
288288
expect(await readOutputFile('main.css')).toIncludeCss(
289289
css`
290290
.btn {
@@ -303,7 +303,7 @@ describe('watcher', () => {
303303
)
304304
}
305305

306-
if (env.OXIDE) {
306+
if (env.ENGINE === 'oxide') {
307307
expect(await readOutputFile('main.css')).toIncludeCss(
308308
css`
309309
/* prettier-ignore */

‎integrations/rollup-sass/tests/integration.test.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('watcher', () => {
6161
await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
6262
await runningProcess.onStderr(ready)
6363

64-
if (!env.OXIDE) {
64+
if (env.ENGINE === 'stable') {
6565
expect(await readOutputFile('index.css')).toIncludeCss(
6666
css`
6767
.bg-red-500 {
@@ -78,7 +78,7 @@ describe('watcher', () => {
7878
)
7979
}
8080

81-
if (env.OXIDE) {
81+
if (env.ENGINE === 'oxide') {
8282
expect(await readOutputFile('index.css')).toIncludeCss(
8383
css`
8484
.bg-red-500 {
@@ -128,7 +128,7 @@ describe('watcher', () => {
128128
await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
129129
await runningProcess.onStderr(ready)
130130

131-
if (!env.OXIDE) {
131+
if (env.ENGINE === 'stable') {
132132
expect(await readOutputFile('index.css')).toIncludeCss(
133133
css`
134134
.bg-red-500 {
@@ -145,7 +145,7 @@ describe('watcher', () => {
145145
)
146146
}
147147

148-
if (env.OXIDE) {
148+
if (env.ENGINE === 'oxide') {
149149
expect(await readOutputFile('index.css')).toIncludeCss(
150150
css`
151151
.bg-red-500 {
@@ -282,7 +282,7 @@ describe('watcher', () => {
282282
)
283283
await runningProcess.onStderr(ready)
284284

285-
if (!env.OXIDE) {
285+
if (env.ENGINE === 'stable') {
286286
expect(await readOutputFile('index.css')).toIncludeCss(
287287
css`
288288
.btn {
@@ -298,7 +298,7 @@ describe('watcher', () => {
298298
)
299299
}
300300

301-
if (env.OXIDE) {
301+
if (env.ENGINE === 'oxide') {
302302
expect(await readOutputFile('index.css')).toIncludeCss(
303303
css`
304304
.btn {
@@ -377,7 +377,7 @@ describe('watcher', () => {
377377
)
378378
await runningProcess.onStderr(ready)
379379

380-
if (!env.OXIDE) {
380+
if (env.ENGINE === 'stable') {
381381
expect(await readOutputFile('index.css')).toIncludeCss(
382382
css`
383383
.btn {
@@ -393,7 +393,7 @@ describe('watcher', () => {
393393
)
394394
}
395395

396-
if (env.OXIDE) {
396+
if (env.ENGINE === 'oxide') {
397397
expect(await readOutputFile('index.css')).toIncludeCss(
398398
css`
399399
.btn {

‎integrations/rollup/tests/integration.test.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('static build', () => {
6262
env: { NODE_ENV: 'production' },
6363
})
6464

65-
if (!env.OXIDE) {
65+
if (env.ENGINE === 'stable') {
6666
expect(await readOutputFile('index.css')).toIncludeCss(
6767
css`
6868
.bg-primary {
@@ -73,7 +73,7 @@ describe('static build', () => {
7373
)
7474
}
7575

76-
if (env.OXIDE) {
76+
if (env.ENGINE === 'oxide') {
7777
expect(await readOutputFile('index.css')).toIncludeCss(
7878
css`
7979
.bg-primary {
@@ -120,7 +120,7 @@ describe('static build', () => {
120120
env: { NODE_ENV: 'production' },
121121
})
122122

123-
if (!env.OXIDE) {
123+
if (env.ENGINE === 'stable') {
124124
expect(await readOutputFile('index.css')).toIncludeCss(
125125
css`
126126
.bg-primary {
@@ -131,7 +131,7 @@ describe('static build', () => {
131131
)
132132
}
133133

134-
if (env.OXIDE) {
134+
if (env.ENGINE === 'oxide') {
135135
expect(await readOutputFile('index.css')).toIncludeCss(
136136
css`
137137
.bg-primary {
@@ -175,7 +175,7 @@ describe('watcher', () => {
175175
await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
176176
await runningProcess.onStderr(ready)
177177

178-
if (!env.OXIDE) {
178+
if (env.ENGINE === 'stable') {
179179
expect(await readOutputFile('index.css')).toIncludeCss(
180180
css`
181181
.bg-red-500 {
@@ -192,7 +192,7 @@ describe('watcher', () => {
192192
)
193193
}
194194

195-
if (env.OXIDE) {
195+
if (env.ENGINE === 'oxide') {
196196
expect(await readOutputFile('index.css')).toIncludeCss(
197197
css`
198198
.bg-red-500 {
@@ -242,7 +242,7 @@ describe('watcher', () => {
242242
await appendToInputFile('glob/index.html', html`<div class="bg-red-500"></div>`)
243243
await runningProcess.onStderr(ready)
244244

245-
if (!env.OXIDE) {
245+
if (env.ENGINE === 'stable') {
246246
expect(await readOutputFile('index.css')).toIncludeCss(
247247
css`
248248
.bg-red-500 {
@@ -259,7 +259,7 @@ describe('watcher', () => {
259259
)
260260
}
261261

262-
if (env.OXIDE) {
262+
if (env.ENGINE === 'oxide') {
263263
expect(await readOutputFile('index.css')).toIncludeCss(
264264
css`
265265
.bg-red-500 {
@@ -396,7 +396,7 @@ describe('watcher', () => {
396396
)
397397
await runningProcess.onStderr(ready)
398398

399-
if (!env.OXIDE) {
399+
if (env.ENGINE === 'stable') {
400400
expect(await readOutputFile('index.css')).toIncludeCss(
401401
css`
402402
.btn {
@@ -415,7 +415,7 @@ describe('watcher', () => {
415415
)
416416
}
417417

418-
if (env.OXIDE) {
418+
if (env.ENGINE === 'oxide') {
419419
expect(await readOutputFile('index.css')).toIncludeCss(
420420
css`
421421
.btn {

0 commit comments

Comments
 (0)