fix(entry): improve init; fix test without info-layer

basics · May 13, 2022 · 5731c7f · 5731c7f
1 parent 62305c9
commit 5731c7f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/example/layouts/default.vue b/example/layouts/default.vue
@@ -2,7 +2,7 @@
   <div>
     <organism-page-header v-model="menuOpened" v-bind="pageHeader" />
     <nuxt :inert="menuOpened" />
-    <info-layer critical />
+    <info-layer v-if="!disableInfoLayer" critical />
     <github-corner />
     <google-lighthouse />
   </div>
@@ -22,6 +22,7 @@ export default {
 
   data () {
     return {
+      disableInfoLayer: String(process.env.DISABLE_INFO_LAYER).toLowerCase() === 'true',
       menuOpened: false,
       pageHeader: {
 

diff --git a/lib/templates/entry.js b/lib/templates/entry.js
@@ -80,16 +80,13 @@ if (!document.getElementById('nuxt-speedkit-layer')) {
 
   setup(<%= options.performanceMetrics %>);
 
-  setupSpeedkitLayer(() => initApp(true), supportedBrowser)
-
   if(('__NUXT_SPEEDKIT_AUTO_INIT__' in global && global.__NUXT_SPEEDKIT_AUTO_INIT__) || ((<%= !options.ignorePerformance %> && hasSufficientPerformance()) && supportedBrowser)) {
     initApp();
-  }
-
-  observeSpeedkitButton('nuxt-speedkit-button-init-font', initFont);
-
-  if('__NUXT_SPEEDKIT_FONT_INIT__' in global && global.__NUXT_SPEEDKIT_FONT_INIT__) {
+  } else if('__NUXT_SPEEDKIT_FONT_INIT__' in global && global.__NUXT_SPEEDKIT_FONT_INIT__) {
     initFont()
+  } else {
+    observeSpeedkitButton('nuxt-speedkit-button-init-font', initFont);
+    setupSpeedkitLayer(() => initApp(true), supportedBrowser)
   }
 
 }
diff --git a/test/default.test.js b/test/default.test.js
@@ -26,7 +26,10 @@ const generate = async (buildDir, distDir) => {
     target: 'static',
     modern: true,
     buildDir,
-    generate: { dir: distDir, crawler: false },
+    env: {
+      DISABLE_INFO_LAYER: true
+    },
+    generate: { cache: false, dir: distDir, crawler: false },
     dir: {
       pages: 'pages/tests'
     }