vercel · ijjk · Oct 24, 2022 · Oct 23, 2022 · Oct 23, 2022 · Oct 23, 2022
@@ -456,6 +456,28 @@ export const css = curry(async function css(
           ],
         })
       )
+      fns.push(
+        loader({
+          oneOf: [
+            markRemovable({
+              // A global SASS import always has side effects. Webpack will tree
+              // shake the CSS without this option if the issuer claims to have
+              // no side-effects.
+              // See https://github.com/webpack/webpack/issues/6571
+              sideEffects: true,
+              test: regexSassGlobal,
+              use: [
+                require.resolve('../../../loaders/next-flight-css-dev-loader'),
+                ...getGlobalCssLoader(
+                  ctx,
+                  lazyPostCSSInitializer,
+                  sassPreprocessors
+                ),
+              ],
+            }),
+          ],
+        })
+      )
       fns.push(
         loader({
           oneOf: [
@@ -470,6 +492,24 @@ export const css = curry(async function css(
           ],
         })
       )
+      fns.push(
+        loader({
+          oneOf: [
+            markRemovable({
+              sideEffects: false,
+              test: regexSassModules,
+              use: [
+                require.resolve('../../../loaders/next-flight-css-dev-loader'),
+                ...getCssModuleLoader(
+                  ctx,
+                  lazyPostCSSInitializer,
+                  sassPreprocessors
+                ),
+              ],
+            }),
+          ],
+        })
+      )
     } else {
       fns.push(
         loader({

@@ -25,7 +25,7 @@ export default async function transformSource(this: any): Promise<string> {
     // Filter out css files on the server
     .filter((request) => (isServer ? !regexCSS.test(request) : true))
     .map((request) =>
-      request.endsWith('.css')
+      regexCSS.test(request)
         ? `(() => import(/* webpackMode: "lazy" */ ${JSON.stringify(request)}))`
         : `import(/* webpackMode: "eager" */ ${JSON.stringify(request)})`
     )

@@ -5,7 +5,7 @@
  */
 
 export function pitch(this: any) {
-  const content = this.fs.readFileSync(this.resource)
+  const content = this.fs.readFileSync(this.resourcePath)
   this.data.__checksum = (
     typeof content === 'string' ? Buffer.from(content) : content
   ).toString('hex')
@@ -14,7 +14,7 @@ export function pitch(this: any) {
 const NextServerCSSLoader = function (this: any, content: string) {
   this.cacheable && this.cacheable()
 
-  const isCSSModule = this.resource.match(/\.module\.css$/)
+  const isCSSModule = this.resourcePath.match(/\.module\.(css|sass|scss)$/)
   if (isCSSModule) {
     return (
       content +

@@ -11,5 +11,4 @@ export function isClientComponentModule(mod: {
   return hasClientDirective || imageRegex.test(mod.resource)
 }
 
-// TODO-APP: ensure .scss / .sass also works.
-export const regexCSS = /\.css(\?.*)?$/
+export const regexCSS = /\.(css|scss|sass)(\?.*)?$/
@@ -0,0 +1,3 @@
+#sass-client-layout
+  color: brown
+
@@ -0,0 +1,3 @@
+#scss-client-layout {
+  color: burlywood;
+}
@@ -0,0 +1,3 @@
+#sass-client-page
+  color: wheat
+
@@ -0,0 +1,3 @@
+#scss-client-page {
+  color: tomato;
+}
@@ -0,0 +1,19 @@
+'use client'
+
+import './global.scss'
+import './global.sass'
+import sass from './styles.module.sass'
+import scss from './styles.module.scss'
+
+export default function Page() {
+  return (
+    <>
+      <div id="sass-client-page" className={sass.mod}>
+        sass client page
+      </div>
+      <div id="scss-client-page" className={scss.mod}>
+        scss client page
+      </div>
+    </>
+  )
+}
@@ -0,0 +1,2 @@
+.mod
+  background-color: indigo
@@ -0,0 +1,3 @@
+.mod {
+  background-color: aqua;
+}
@@ -0,0 +1,20 @@
+'use client'
+
+import './global.scss'
+import './global.sass'
+import sass from './styles.module.sass'
+import scss from './styles.module.scss'
+
+export default function Layout({ children }) {
+  return (
+    <>
+      <div id="sass-client-layout" className={sass.mod}>
+        sass client layout
+      </div>
+      <div id="scss-client-layout" className={scss.mod}>
+        scss client layout
+      </div>
+      {children}
+    </>
+  )
+}
@@ -0,0 +1,2 @@
+.mod
+  background-color: darksalmon
@@ -0,0 +1,3 @@
+.mod {
+  background-color: darkred;
+}
@@ -0,0 +1,3 @@
+#sass-server-layout
+  color: brown
+
@@ -0,0 +1,3 @@
+#scss-server-layout {
+  color: burlywood;
+}
@@ -0,0 +1,3 @@
+#sass-server-page
+  color: wheat
+
@@ -0,0 +1,3 @@
+#scss-server-page {
+  color: tomato;
+}
@@ -0,0 +1,17 @@
+import './global.scss'
+import './global.sass'
+import sass from './styles.module.sass'
+import scss from './styles.module.scss'
+
+export default function Page() {
+  return (
+    <>
+      <div id="sass-server-page" className={sass.mod}>
+        sass server page
+      </div>
+      <div id="scss-server-page" className={scss.mod}>
+        scss server page
+      </div>
+    </>
+  )
+}
@@ -0,0 +1,2 @@
+.mod
+  background-color: indigo
@@ -0,0 +1,3 @@
+.mod {
+  background-color: aqua;
+}
@@ -0,0 +1,18 @@
+import './global.scss'
+import './global.sass'
+import sass from './styles.module.sass'
+import scss from './styles.module.scss'
+
+export default function Layout({ children }) {
+  return (
+    <>
+      <div id="sass-server-layout" className={sass.mod}>
+        sass server layout
+      </div>
+      <div id="scss-server-layout" className={scss.mod}>
+        scss server layout
+      </div>
+      {children}
+    </>
+  )
+}
@@ -0,0 +1,2 @@
+.mod
+  background-color: darksalmon
@@ -0,0 +1,3 @@
+.mod {
+  background-color: darkred;
+}
@@ -30,6 +30,7 @@ describe('app dir', () => {
         dependencies: {
           react: 'experimental',
           'react-dom': 'experimental',
+          sass: 'latest',
         },
         skipStart: true,
       })
@@ -1374,6 +1375,144 @@ describe('app dir', () => {
         })
       })
     })
+    describe('sass support', () => {
+      describe('server layouts', () => {
+        it('should support global sass/scss inside server layouts', async () => {
+          const browser = await webdriver(next.url, '/css/sass/inner')
+          // .sass
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#sass-server-layout')).color`
+            )
+          ).toBe('rgb(165, 42, 42)')
+          // .scss
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#scss-server-layout')).color`
+            )
+          ).toBe('rgb(222, 184, 135)')
+        })
+
+        it('should support sass/scss modules inside server layouts', async () => {
+          const browser = await webdriver(next.url, '/css/sass/inner')
+          // .sass
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#sass-server-layout')).backgroundColor`
+            )
+          ).toBe('rgb(233, 150, 122)')
+          // .scss
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#scss-server-layout')).backgroundColor`
+            )
+          ).toBe('rgb(139, 0, 0)')
+        })
+      })
+
+      describe('server pages', () => {
+        it('should support global sass/scss inside server pages', async () => {
+          const browser = await webdriver(next.url, '/css/sass/inner')
+          // .sass
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#sass-server-page')).color`
+            )
+          ).toBe('rgb(245, 222, 179)')
+          // .scss
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#scss-server-page')).color`
+            )
+          ).toBe('rgb(255, 99, 71)')
+        })
+
+        it('should support sass/scss modules inside server pages', async () => {
+          const browser = await webdriver(next.url, '/css/sass/inner')
+          // .sass
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#sass-server-page')).backgroundColor`
+            )
+          ).toBe('rgb(75, 0, 130)')
+          // .scss
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#scss-server-page')).backgroundColor`
+            )
+          ).toBe('rgb(0, 255, 255)')
+        })
+      })
+
+      describe('client layouts', () => {
+        it('should support global sass/scss inside client layouts', async () => {
+          const browser = await webdriver(next.url, '/css/sass-client/inner')
+          // .sass
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#sass-client-layout')).color`
+            )
+          ).toBe('rgb(165, 42, 42)')
+          // .scss
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#scss-client-layout')).color`
+            )
+          ).toBe('rgb(222, 184, 135)')
+        })
+
+        it('should support sass/scss modules inside client layouts', async () => {
+          const browser = await webdriver(next.url, '/css/sass-client/inner')
+          // .sass
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#sass-client-layout')).backgroundColor`
+            )
+          ).toBe('rgb(233, 150, 122)')
+          // .scss
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('#scss-client-layout')).backgroundColor`
+            )
+          ).toBe('rgb(139, 0, 0)')
+        })
+      })
+    })
+
+    describe('client pages', () => {
+      it('should support global sass/scss inside client pages', async () => {
+        const browser = await webdriver(next.url, '/css/sass-client/inner')
+        await waitFor(5000)
+        // .sass
+        expect(
+          await browser.eval(
+            `window.getComputedStyle(document.querySelector('#sass-client-page')).color`
+          )
+        ).toBe('rgb(245, 222, 179)')
+        // .scss
+        expect(
+          await browser.eval(
+            `window.getComputedStyle(document.querySelector('#scss-client-page')).color`
+          )
+        ).toBe('rgb(255, 99, 71)')
+      })
+
+      it('should support sass/scss modules inside client pages', async () => {
+        const browser = await webdriver(next.url, '/css/sass-client/inner')
+        // .sass
+        expect(
+          await browser.eval(
+            `window.getComputedStyle(document.querySelector('#sass-client-page')).backgroundColor`
+          )
+        ).toBe('rgb(75, 0, 130)')
+        // .scss
+        expect(
+          await browser.eval(
+            `window.getComputedStyle(document.querySelector('#scss-client-page')).backgroundColor`
+          )
+        ).toBe('rgb(0, 255, 255)')
+      })
+    })
     ;(isDev ? describe.skip : describe)('Subresource Integrity', () => {
       function fetchWithPolicy(policy: string | null) {
         return fetchViaHTTP(next.url, '/dashboard', undefined, {