Skip to content

Commit

Permalink
Upgrade lightningcss, disable grid prefixing (#65986)
Browse files Browse the repository at this point in the history
## What?

Requires vercel/turborepo#8176 first.

Grid scoping in CSS Modules is disabled because Webpack CSS Modules
handling doesn't handle grid currently. This ensures moving from Webpack
to Turbopack doesn't have mismatching behavior around CSS grid.

Fixes #64509
Fixes #63758
Fixes PACK-2976

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
  • Loading branch information
timneutkens authored May 21, 2024
1 parent 39bd310 commit 413d122
Show file tree
Hide file tree
Showing 11 changed files with 166 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.27.1",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240517.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240521.2",
"acorn": "8.11.3",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@keyframes example {
0% {
background-color: red;
}
25% {
background-color: yellow;
}
50% {
background-color: blue;
}
75% {
background-color: green;
}
100% {
background-color: red;
}
}

.animated-item {
position: relative;
animation-name: example;
animation-duration: 4s;
animation-iteration-count: infinite;
}
9 changes: 9 additions & 0 deletions test/e2e/app-dir/css-modules-scoping/app/animation/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import styles from './animation.module.css'

export default function Page() {
return (
<h1 id="animated" className={styles['animated-item']}>
Animated
</h1>
)
}
25 changes: 25 additions & 0 deletions test/e2e/app-dir/css-modules-scoping/app/grid/grid.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.grid-container {
display: grid;
grid-template-areas:
'header header'
'sidebar main'
'footer footer';
grid-gap: 10px;
}
.header {
grid-area: header;
}
.sidebar {
grid-area: sidebar;
}
.main {
grid-area: main;
}
.footer {
grid-area: footer;
}

.grid-item {
padding: 20px;
background-color: lightgrey;
}
22 changes: 22 additions & 0 deletions test/e2e/app-dir/css-modules-scoping/app/grid/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import styles from './grid.module.css'
export default function Page() {
return (
<div className={styles['grid-container']}>
<div id="header" className={`${styles['grid-item']} ${styles['header']}`}>
Header
</div>
<div
id="sidebar"
className={`${styles['grid-item']} ${styles['sidebar']}`}
>
Sidebar
</div>
<div id="main" className={`${styles['grid-item']} ${styles['main']}`}>
Main
</div>
<div id="footer" className={`${styles['grid-item']} ${styles['footer']}`}>
Footer
</div>
</div>
)
}
9 changes: 9 additions & 0 deletions test/e2e/app-dir/css-modules-scoping/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { ReactNode } from 'react'

export default function Root({ children }: { children: ReactNode }) {
return (
<html>
<body>{children}</body>
</html>
)
}
63 changes: 63 additions & 0 deletions test/e2e/app-dir/css-modules-scoping/css-modules-scoping.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { nextTestSetup } from 'e2e-utils'
import { retry } from 'next-test-utils'

describe('css-modules-scoping', () => {
const { next } = nextTestSetup({
files: __dirname,
})

it('should not prefix grid areas', async () => {
const browser = await next.browser('/grid')

// Check grid-area of header
await retry(async () => {
expect(
await browser.eval(
`window.getComputedStyle(document.querySelector('#header')).gridArea`
)
).toBe('header')
})

// Check grid-area of sidebar
await retry(async () => {
expect(
await browser.eval(
`window.getComputedStyle(document.querySelector('#sidebar')).gridArea`
)
).toBe('sidebar')
})

// Check grid-area of main
await retry(async () => {
expect(
await browser.eval(
`window.getComputedStyle(document.querySelector('#main')).gridArea`
)
).toBe('main')
})

// Check grid-area of footer
await retry(async () => {
expect(
await browser.eval(
`window.getComputedStyle(document.querySelector('#footer')).gridArea`
)
).toBe('footer')
})
})

it('should prefix animation', async () => {
const browser = await next.browser('/animation')

// Check animation-name
await retry(async () => {
const animationName = await browser.eval(
`window.getComputedStyle(document.querySelector('#animated')).animationName`
)
// Check if the animation name is not `example` exactly. If it's exactly `example` then it's not scoped.
expect(animationName).not.toBe('example')
// Check if the animation name has `example` anywhere in it
expect(animationName).toContain('example')
})
})
})
6 changes: 6 additions & 0 deletions test/e2e/app-dir/css-modules-scoping/next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {}

module.exports = nextConfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export default function Root({ children }: { children: React.ReactNode }) {
import { ReactNode } from 'react'
export default function Root({ children }: { children: ReactNode }) {
return (
<html>
<body>{children}</body>
Expand Down

0 comments on commit 413d122

Please sign in to comment.