🐛 Fix pathing for module loading (#2643)

* 🐛 Fix pathing for module loading * 🐛 Fix initial tour buttons
shipshapecode · Mar 18, 2024 · f8cc647 · f8cc647
1 parent 0c90c85
commit f8cc647
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/landing/package.json b/landing/package.json
@@ -4,10 +4,8 @@
   "type": "module",
   "version": "0.0.1",
   "scripts": {
-    "dev": "pnpm run copy && astro dev",
+    "dev": "astro dev",
     "start": "astro dev",
-    "copy": "cp -r ../shepherd.js/dist ./public",
-    "prebuild": "pnpm run copy",
     "build": "astro check && astro build",
     "preview": "astro preview",
     "astro": "astro"

diff --git a/landing/src/layouts/MainPage.astro b/landing/src/layouts/MainPage.astro
@@ -174,9 +174,10 @@ const shepherdIncludeCode = `
 </Base>
 
 <!-- Welcome page -->
-<script type='module' is:inline>
+<script>
   'use strict';
-  import Shepherd from './dist/shepherd.js';
+  import Shepherd from 'shepherd.js';
+  import type { StepOptionsButton } from 'shepherd.js/step';
 
   (function () {
     function init() {
@@ -187,9 +188,8 @@ const shepherdIncludeCode = `
     }
 
     function setupShepherd() {
-      Shepherd.init(
-        'shp_97943967a5cb84a5ccd46febff8972cd4667e142e5996030130498eebc3f8236'
-      );
+      Shepherd.init(import.meta.env.PUBLIC_SHEPHERD_PUBLIC_KEY);
+      // @ts-ignore
       var shepherd = new Shepherd.Tour({
         defaultStepOptions: {
           cancelIcon: {
@@ -223,7 +223,7 @@ const shepherdIncludeCode = `
                 },
                 text: 'Next'
               }
-            ],
+            ] as StepOptionsButton[],
             id: 'welcome'
           }
         ],
@@ -257,7 +257,7 @@ const shepherdIncludeCode = `
               },
               text: 'Next'
             }
-          ],
+          ] as StepOptionsButton[],
           id: 'including'
         },
         {
@@ -283,7 +283,7 @@ const shepherdIncludeCode = `
               },
               text: 'Next'
             }
-          ],
+          ] as StepOptionsButton[],
           id: 'creating'
         },
         {
@@ -307,7 +307,7 @@ const shepherdIncludeCode = `
               },
               text: 'Next'
             }
-          ],
+          ] as StepOptionsButton[],
           id: 'attaching'
         }
       ];
@@ -332,7 +332,7 @@ const shepherdIncludeCode = `
             },
             text: 'Next'
           }
-        ],
+        ] as StepOptionsButton[],
         id: 'centered-example'
       });
 
@@ -357,23 +357,15 @@ const shepherdIncludeCode = `
             },
             text: 'Done'
           }
-        ],
+        ] as StepOptionsButton[],
         id: 'followup',
         modalOverlayOpeningPadding: '10'
       });
       return shepherd;
     }
 
     function ready() {
-      if (
-        document.attachEvent
-          ? document.readyState === 'complete'
-          : document.readyState !== 'loading'
-      ) {
-        init();
-      } else {
-        document.addEventListener('DOMContentLoaded', init);
-      }
+      document.addEventListener('DOMContentLoaded', init);
     }
 
     ready();