Skip to content

Replace __OXIDE__ at build time to prevent @tailwindcss/oxide leaks in the stable engine #10988

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

Merged
RobinMalfait merged 8 commits into from
Apr 18, 2023
Merged

Replace __OXIDE__ at build time to prevent @tailwindcss/oxide leaks in the stable engine #10988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
98e8e33
replace `env.OXIDE` with global `__OXIDE__`
RobinMalfait Apr 11, 2023
a49f3d8
update changelog
RobinMalfait Apr 11, 2023
290176a
use `env.ENGINE` in integration tests
RobinMalfait Apr 12, 2023
a359a10
drop oxide branching for the PostCSS plugin for now
RobinMalfait Apr 12, 2023
34b6b74
Enable better dead-code elimination
thecrypticace Apr 12, 2023
59c6360
Update CLI tests
thecrypticace Apr 17, 2023
6e4d6ce
Merge branch '3.3' into fix/oxide-leaks
thecrypticace Apr 17, 2023
121cc4f
Fix indentation
thecrypticace Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use env.ENGINE in integration tests
  • Loading branch information
@RobinMalfait
RobinMalfait committed Apr 12, 2023
commit 290176a825f0569c5d212c566c8c6eb596efb92e
20 changes: 10 additions & 10 deletions integrations/parcel/tests/integration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('static build', () => {
env: { NODE_ENV: 'production' },
})

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

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
css`
.bg-primary {
Expand Down Expand Up @@ -138,7 +138,7 @@ describe('static build', () => {
env: { NODE_ENV: 'production' },
})

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

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

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

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

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

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
css`
.bg-red-500 {
Expand Down Expand Up @@ -445,7 +445,7 @@ describe('watcher', () => {
)
})

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
css`
.btn {
Expand All @@ -461,7 +461,7 @@ describe('watcher', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile(/index\.\w+\.css$/)).toIncludeCss(
css`
.btn {
Expand Down
12 changes: 6 additions & 6 deletions integrations/postcss-cli/tests/integration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('watcher', () => {
await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
await runningProcess.onStderr(ready)

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
.bg-red-500 {
Expand All @@ -78,7 +78,7 @@ describe('watcher', () => {
)
}

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

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
.bg-red-500 {
Expand All @@ -145,7 +145,7 @@ describe('watcher', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
.bg-red-500 {
Expand Down Expand Up @@ -284,7 +284,7 @@ describe('watcher', () => {
)
await runningProcess.onStderr(ready)

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
.btn {
Expand All @@ -303,7 +303,7 @@ describe('watcher', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
/* prettier-ignore */
Expand Down
16 changes: 8 additions & 8 deletions integrations/rollup-sass/tests/integration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('watcher', () => {
await appendToInputFile('index.html', html`<div class="bg-red-500"></div>`)
await runningProcess.onStderr(ready)

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-red-500 {
Expand All @@ -78,7 +78,7 @@ describe('watcher', () => {
)
}

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

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-red-500 {
Expand All @@ -145,7 +145,7 @@ describe('watcher', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-red-500 {
Expand Down Expand Up @@ -282,7 +282,7 @@ describe('watcher', () => {
)
await runningProcess.onStderr(ready)

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.btn {
Expand All @@ -298,7 +298,7 @@ describe('watcher', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.btn {
Expand Down Expand Up @@ -377,7 +377,7 @@ describe('watcher', () => {
)
await runningProcess.onStderr(ready)

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.btn {
Expand All @@ -393,7 +393,7 @@ describe('watcher', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.btn {
Expand Down
20 changes: 10 additions & 10 deletions integrations/rollup/tests/integration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('static build', () => {
env: { NODE_ENV: 'production' },
})

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-primary {
Expand All @@ -73,7 +73,7 @@ describe('static build', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-primary {
Expand Down Expand Up @@ -120,7 +120,7 @@ describe('static build', () => {
env: { NODE_ENV: 'production' },
})

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-primary {
Expand All @@ -131,7 +131,7 @@ describe('static build', () => {
)
}

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

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-red-500 {
Expand All @@ -192,7 +192,7 @@ describe('watcher', () => {
)
}

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

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-red-500 {
Expand All @@ -259,7 +259,7 @@ describe('watcher', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.bg-red-500 {
Expand Down Expand Up @@ -396,7 +396,7 @@ describe('watcher', () => {
)
await runningProcess.onStderr(ready)

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.btn {
Expand All @@ -415,7 +415,7 @@ describe('watcher', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('index.css')).toIncludeCss(
css`
.btn {
Expand Down
8 changes: 4 additions & 4 deletions integrations/tailwindcss-cli/tests/cli.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ describe('Build command', () => {

await $(`${EXECUTABLE} --output ./dist/main.css --postcss`)

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
.font-bold-after {
Expand All @@ -235,7 +235,7 @@ describe('Build command', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
.font-bold-after {
Expand Down Expand Up @@ -287,7 +287,7 @@ describe('Build command', () => {

await $(`${EXECUTABLE} --output ./dist/main.css --postcss ./custom.postcss.config.js`)

if (!env.OXIDE) {
if (env.ENGINE === 'stable') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
.font-bold-after {
Expand All @@ -306,7 +306,7 @@ describe('Build command', () => {
)
}

if (env.OXIDE) {
if (env.ENGINE === 'oxide') {
expect(await readOutputFile('main.css')).toIncludeCss(
css`
.font-bold-after {
Expand Down
Loading