Improve production build performance for the case of many small non-tailwind stylesheets

package.json

@@ -67,7 +67,7 @@
     "postcss": "^8.0.9"
   },
   "dependencies": {
-    "@fullhuman/postcss-purgecss": "^4.0.3",
+    "purgecss": "^4.0.3",
     "arg": "^5.0.0",
     "bytes": "^3.0.0",
     "chalk": "^4.1.1",

package.postcss7.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@fullhuman/postcss-purgecss": "^3.1.3",
+    "purgecss": "^4.0.3",
     "autoprefixer": "^9",
     "postcss": "^7",
     "postcss-functions": "^3",

src/lib/purgeUnusedStyles.js

@@ -1,6 +1,6 @@
 import _ from 'lodash'
 import postcss from 'postcss'
-import purgecss from '@fullhuman/postcss-purgecss'
+import PurgeCSS, { defaultOptions, standardizeSafelist, mergeExtractorSelectors } from 'purgecss'
 import log from '../util/log'
 import htmlTags from 'html-tags'
 import path from 'path'
@@ -141,10 +141,11 @@ export default function purgeUnusedUtilities(
     registerDependency(parseDependency(fileOrGlob))
   }
 
+  let hasLayers = false
+
+  const mode = _.get(config, 'purge.mode', 'layers')
   return postcss([
     function (css) {
-      const mode = _.get(config, 'purge.mode', 'layers')
-
       if (!['all', 'layers'].includes(mode)) {
         throw new Error('Purge `mode` must be one of `layers` or `all`.')
       }
@@ -171,6 +172,7 @@ export default function purgeUnusedUtilities(
           switch (comment.text.trim()) {
             case `tailwind start ${layer}`:
               comment.text = 'purgecss end ignore'
+              hasLayers = true
               break
             case `tailwind end ${layer}`:
               comment.text = 'purgecss start ignore'
@@ -185,14 +187,44 @@ export default function purgeUnusedUtilities(
       css.append(postcss.comment({ text: 'purgecss end ignore' }))
     },
     removeTailwindMarkers,
-    purgecss({
-      defaultExtractor: (content) => {
-        const transformer = getTransformer(config)
-        return defaultExtractor(transformer(content))
-      },
-      extractors: fileSpecificExtractors,
-      ...purgeOptions,
-      content,
-    }),
+
+    async function (css) {
+      if (mode === 'layers' && !hasLayers) {
+        return
+      }
+      const purgeCSS = new PurgeCSS()
+      purgeCSS.options = {
+        ...defaultOptions,
+
+        defaultExtractor: (content) => {
+          const transformer = getTransformer(config)
+          return defaultExtractor(transformer(content))
+        },
+        extractors: fileSpecificExtractors,
+        ...purgeOptions,
+        safelist: standardizeSafelist(purgeOptions.safelist),
+      }
+
+      if (purgeCSS.options.variables) {
+        purgeCSS.variablesStructure.safelist = purgeCSS.options.safelist.variables || []
+      }
+
+      const fileFormatContents = content.filter((o) => typeof o === 'string')
+      const rawFormatContents = content.filter((o) => typeof o === 'object')
+
+      const cssFileSelectors = await purgeCSS.extractSelectorsFromFiles(
+        fileFormatContents,
+        purgeCSS.options.extractors
+      )
+      const cssRawSelectors = await purgeCSS.extractSelectorsFromString(
+        rawFormatContents,
+        purgeCSS.options.extractors
+      )
+      const cssSelectors = mergeExtractorSelectors(cssFileSelectors, cssRawSelectors)
+      purgeCSS.walkThroughCSS(css, cssSelectors)
+      if (purgeCSS.options.fontFace) purgeCSS.removeUnusedFontFaces()
+      if (purgeCSS.options.keyframes) purgeCSS.removeUnusedKeyframes()
+      if (purgeCSS.options.variables) purgeCSS.removeUnusedCSSVariables()
+    },
   ])
 }

tests/purgeUnusedStyles.test.js

@@ -639,6 +639,67 @@ test(
   })
 )
 
+test('purges unused css variables in "all" mode', () => {
+  return inProduction(
+    suppressConsoleLogs(() => {
+      return postcss([
+        tailwind({
+          ...config,
+          purge: {
+            mode: 'all',
+            content: [path.resolve(`${__dirname}/fixtures/**/*.html`)],
+            options: {
+              variables: true,
+            },
+          },
+        }),
+      ])
+        .process(
+          `
+        :root {
+          --unused-var: 1;
+        }
+        `
+        )
+        .then((result) => {
+          expect(result.css).not.toContain('--unused-var')
+        })
+    })
+  )
+})
+
+test('respects safelist.variables in "all" mode', () => {
+  return inProduction(
+    suppressConsoleLogs(() => {
+      return postcss([
+        tailwind({
+          ...config,
+          purge: {
+            mode: 'all',
+            content: [path.resolve(`${__dirname}/fixtures/**/*.html`)],
+            options: {
+              variables: true,
+              safelist: {
+                variables: ['--unused-var'],
+              },
+            },
+          },
+        }),
+      ])
+        .process(
+          `
+        :root {
+          --unused-var: 1;
+        }
+        `
+        )
+        .then((result) => {
+          expect(result.css).toContain('--unused-var')
+        })
+    })
+  )
+})
+
 test('element selectors are preserved by default', () => {
   return inProduction(
     suppressConsoleLogs(() => {