fix: windicss extraction on frontmatter

slidevjs · May 2, 2021 · 960c499 · 960c499
1 parent 298218a
commit 960c499
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "typeit": "^7.0.4",
     "typescript": "^4.2.4",
     "typewriter-effect": "^2.17.0",
-    "vite-plugin-windicss": "^0.16.0-beta.7",
+    "vite-plugin-windicss": "^0.16.0-beta.8",
     "vitepress": "^0.13.2"
   }
 }
diff --git a/packages/slidev/node/plugins/loaders.ts b/packages/slidev/node/plugins/loaders.ts
@@ -134,7 +134,7 @@ export function createSlidesLoader({ data, entry, clientRoot, themeRoots, userRo
           const a = data.slides[i]
           const b = newData.slides[i]
 
-          if (a?.content.trim() === b?.content.trim())
+          if (a?.content.trim() === b?.content.trim() && JSON.stringify(a.frontmatter) === JSON.stringify(b.frontmatter))
             continue
 
           moduleIds.push(

diff --git a/packages/slidev/node/plugins/preset.ts b/packages/slidev/node/plugins/preset.ts
@@ -79,6 +79,22 @@ export async function ViteSlidevPlugin(
   }
 
   return [
+    WindiCSS(
+      {
+        configFiles: [
+          ...defaultConfigureFiles,
+          ...themeRoots.map(i => `${i}/windi.config.ts`),
+          resolve(clientRoot, 'windi.config.ts'),
+        ],
+        ...windiOptions,
+      },
+      {
+        hookOptions: {
+          ignoreNodeModules: false,
+        },
+      },
+    ),
+
     <Plugin>{
       name: 'slidev:flags',
       enforce: 'pre',
@@ -159,22 +175,6 @@ export async function ViteSlidevPlugin(
       ...iconsOptions,
     }),
 
-    WindiCSS(
-      {
-        configFiles: [
-          ...defaultConfigureFiles,
-          ...themeRoots.map(i => `${i}/windi.config.ts`),
-          resolve(clientRoot, 'windi.config.ts'),
-        ],
-        ...windiOptions,
-      },
-      {
-        hookOptions: {
-          ignoreNodeModules: false,
-        },
-      },
-    ),
-
     (config.remoteAssets === true || config.remoteAssets === mode)
       ? RemoteAssets({
         rules: [

diff --git a/packages/slidev/package.json b/packages/slidev/package.json
@@ -75,7 +75,7 @@
     "vite-plugin-icons": "^0.5.0",
     "vite-plugin-md": "^0.6.3",
     "vite-plugin-remote-assets": "^0.2.0",
-    "vite-plugin-windicss": "^0.16.0-beta.7",
+    "vite-plugin-windicss": "^0.16.0-beta.8",
     "vue": "^3.0.11",
     "windicss": "^3.0.0-beta.5",
     "yargs": "^16.2.0"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml