Skip to content
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.

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

upgrades postcss-modules-local-by-default to v4.1.0 to support using global animation names #72622

Open
wants to merge 12 commits into
base: canary
Choose a base branch
from
Open
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
"platform": "1.3.6",
"postcss-flexbugs-fixes": "5.0.2",
"postcss-modules-extract-imports": "3.0.0",
"postcss-modules-local-by-default": "4.0.4",
"postcss-modules-local-by-default": "4.2.0",
"postcss-modules-scope": "3.0.0",
"postcss-modules-values": "4.0.0",
"postcss-preset-env": "7.4.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/compiled/lru-cache/index.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/next/src/compiled/postcss-preset-env/index.cjs

Large diffs are not rendered by default.

45 changes: 27 additions & 18 deletions pnpm-lock.yaml

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

8 changes: 8 additions & 0 deletions test/integration/css-fixtures/global-function/app/globals.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@keyframes fadeIn {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.home {
animation: global(fadeIn) 0.5s ease-in;
}
15 changes: 15 additions & 0 deletions test/integration/css-fixtures/global-function/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import './globals.css'

export default function RootLayout({
children,
}: {
children: React.ReactNode
}) {
return (
<html lang="en">
<body>
<main>{children}</main>
</body>
</html>
)
}
9 changes: 9 additions & 0 deletions test/integration/css-fixtures/global-function/app/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import styles from './home.module.css'

export default function Home() {
return (
<div id="my-div" className={styles.home}>
<div>Hello world!</div>
</div>
)
}
24 changes: 24 additions & 0 deletions test/integration/css-fixtures/global-function/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"compilerOptions": {
"target": "ES2017",
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
"noEmit": true,
"incremental": true,
"module": "esnext",
"esModuleInterop": true,
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"plugins": [
{
"name": "next"
}
]
},
"include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
}
69 changes: 69 additions & 0 deletions test/integration/css-modules/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -724,3 +724,72 @@ describe('Catch-all Route CSS Module Usage', () => {
}
)
})

describe('global() function usage', () => {
;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
'production mode',
() => {
const appDir = join(fixturesDir, 'global-function')

let stdout
let code
let app
let appPort

beforeAll(async () => {
await remove(join(appDir, '.next'))
;({ code, stdout } = await nextBuild(appDir, [], {
stdout: true,
}))
appPort = await findPort()
app = await nextStart(appDir, appPort)
})

afterAll(() => killApp(app))

it('should have compiled successfully', () => {
expect(code).toBe(0)
expect(stdout).toMatch(/Compiled successfully/)
})

it('should apply styles correctly', async () => {
const browser = await webdriver(appPort, '/')

const animation = await browser
.elementByCss('#my-div')
.getComputedCss('animation')

expect(animation).toMatch(
/0.5s ease-in 0s 1 normal none running fadeIn/
)
})

it(`should've emitted two CSS files`, async () => {
const content = await renderViaHTTP(appPort, '/')
const $ = cheerio.load(content)

const cssSheet = $('link[rel="stylesheet"]')
expect(cssSheet.length).toBe(2)
const stylesheet = cssSheet[1].attribs['href']

const cssContent = await fetchViaHTTP(appPort, stylesheet).then((res) =>
res.text()
)

if (process.env.TURBOPACK) {
expect(
cssContent.replace(/\/\*.*?\*\//g, '').trim()
).toMatchInlineSnapshot(
`"home-module__txgM7a__home{animation:fadeIn .5s ease-in}"`
)
} else {
expect(
cssContent.replace(/\/\*.*?\*\//g, '').trim()
).toMatchInlineSnapshot(
`".home_home__kcaw_{animation:fadeIn .5s ease-in}"`
)
}
})
}
)
})
Loading