Merge pull request #859 from GrabarzUndPartner/feature/ssr-css

fix(module): improve critters handling
basics · Sep 13, 2023 · 2bda3ee · 2bda3ee
2 parents ee510c6 + 315e2fe
commit 2bda3ee
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/src/module.mjs b/src/module.mjs
@@ -111,7 +111,8 @@ async function addBuildTemplates(nuxt, options) {
 
   addTemplate({
     filename: MODULE_NAME + '/fonts.css',
-    getContents: () => fontConfig.toCSS(),
+    getContents: () =>
+      `/*! speedkit-font-faces start */${fontConfig.toCSS()}/*! speedkit-font-faces end */`,
     write: true
   });
 

diff --git a/src/utils/preload.mjs b/src/utils/preload.mjs
@@ -5,13 +5,16 @@ import { load } from 'cheerio';
 import { render } from 'dom-serializer';
 import { isViteBuild, logger } from '../utils.mjs';
 
+// eslint-disable-next-line sonarjs/cognitive-complexity
 export function optimizePreloads(nuxt) {
   if (isViteBuild(nuxt)) {
     nuxt.options.vite.build.manifest = false;
-    nuxt.options.vite.build.cssCodeSplit = false;
+    if (nuxt.options.speedkit.disableNuxtCritters) {
+      nuxt.options.vite.build.cssCodeSplit = false;
+    }
   }
 
-  nuxt.options.experimental.inlineSSRStyles = false;
+  nuxt.options.experimental.inlineSSRStyles = true;
 
   nuxt.hook('nitro:init', nitro => {
     nitro.hooks.hook('prerender:generate', async route => {
@@ -30,7 +33,7 @@ export function optimizePreloads(nuxt) {
 
       // embed css files
       try {
-        await Promise.all(
+        const css = await Promise.all(
           Array.from($('link[rel="stylesheet"]'))
             .map(el => $(el))
             .map(async $el => {
@@ -43,19 +46,35 @@ export function optimizePreloads(nuxt) {
                 nuxt.options.vite.build.assetsDir
               );
               const filepath = join(publicDir, basename($el.attr('href')));
+              const fileContent = await fsPromises.readFile(filepath, 'utf-8');
 
-              let css = await fsPromises.readFile(filepath, 'utf-8');
-              logger.info(
-                `Embed CSS File \`${basename($el.attr('href'))}\`; Route: \`${
-                  route.route
-                }\``
-              );
-
-              css = css.replace(/url\(.\//g, `url(${dir}/`);
-              $('head').append(`<style>${css}</style>`);
-              $el.remove();
+              if (nuxt.options.speedkit.disableNuxtCritters) {
+                const css = fileContent.replace(/url\(.\//g, `url(${dir}/`);
+                $el.remove();
+                logger.info(
+                  `Embed CSS File \`${basename($el.attr('href'))}\`; Route: \`${
+                    route.route
+                  }\``
+                );
+                return css;
+              } else {
+                const matches = fileContent.match(
+                  /\/\*! speedkit-font-faces start \*\/(.*)\/\*! speedkit-font-faces end \*\//
+                );
+                if (matches) {
+                  logger.info(
+                    `Embed Font-Faces CSS \`${basename(
+                      $el.attr('href')
+                    )}\`; Route: \`${route.route}\``
+                  );
+                  return matches[1].replace(/url\(.\//g, `url(${dir}/`);
+                }
+              }
             })
         );
+        if (css.length) {
+          $('head').append(`<style>${css.join('')}</style>`);
+        }
       } catch (error) {
         logger.error("can't embed css file.", error);
       }