feat(core)!: generate preflights after utilties (#1617)

unocss · Oct 25, 2022 · 3bca691 · 3bca691
1 parent dd0d6cb
commit 3bca691
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/packages/core/src/generator/index.ts b/packages/core/src/generator/index.ts
@@ -165,7 +165,8 @@ export class UnoGenerator {
       }
     })
 
-    const preflightPromise = (async () => {
+    await Promise.all(tokenPromises)
+    await (async () => {
       if (!preflights)
         return
 
@@ -197,11 +198,6 @@ export class UnoGenerator {
       )
     })()
 
-    await Promise.all([
-      ...tokenPromises,
-      preflightPromise,
-    ])
-
     const layers = this.config.sortLayers(Array
       .from(layerSet)
       .sort((a, b) => ((this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0)) || a.localeCompare(b)),

diff --git a/test/generate-async.test.ts b/test/generate-async.test.ts
@@ -24,21 +24,21 @@ describe('generate-async', () => {
     expect(order).eql([1, 2])
   })
 
-  test('preflight-first', async () => {
+  test('preflight at the end', async () => {
     const order: number[] = []
     const uno = createGenerator({
       rules: [
         [/^rule$/, () => new Promise(resolve => setTimeout(() => {
-          order.push(2)
+          order.push(1)
           resolve('/* rule */')
         }, 20))],
       ],
       preflights: [
         {
-          getCSS: () => new Promise(resolve => setTimeout(() => {
-            order.push(1)
+          getCSS: () => new Promise((resolve) => {
+            order.push(2)
             resolve('/* preflight */')
-          }, 10)),
+          }),
         },
       ],
     })