mini naming refactor

ProjectEvergreen · Feb 17, 2021 · 1be7c07 · 1be7c07
1 parent da0d8ed
commit 1be7c07
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/cli/src/plugins/resource/plugin-optimization-mpa.js b/packages/cli/src/plugins/resource/plugin-optimization-mpa.js
@@ -16,6 +16,7 @@ class OptimizationMPAResource extends ResourceInterface {
     this.libPath = '@greenwood/router/router.js';
   }
 
+  // TODO make this work using this.libPath
   async shouldResolve(url) {
     return Promise.resolve(url.indexOf(this.libPath) >= 0);
   }
@@ -46,19 +47,19 @@ class OptimizationMPAResource extends ResourceInterface {
           .replace('.greenwood/', '')
           .replace('//', '/');
 
-        const routes = this.compilation.graph.map((page) => {
+        const routeTags = this.compilation.graph.map((page) => {
           const template = path.extname(page.filename) === '.html'
             ? page.route
             : page.template;
-          const id = page.route === '/'
+          const key = page.route === '/'
             ? ''
             : page.route.slice(0, page.route.lastIndexOf('/'));
 
           if (url.replace(scratchDir, '') === `${page.route}index.html`) {
             currentTemplate = template;
           }
           return `
-            <greenwood-route data-route="${page.route}" data-template="${template}" data-id="/_routes${id}/index.html"></greenwood-route>
+            <greenwood-route data-route="${page.route}" data-template="${template}" data-key="/_routes${key}/index.html"></greenwood-route>
           `;
         });
 
@@ -70,7 +71,7 @@ class OptimizationMPAResource extends ResourceInterface {
 
         await fs.promises.writeFile(outputBundlePath, bodyContents);
 
-        // TODO this should come from @greenwood/router in cli/lib/ folder 
+        // TODO this src should come from @greenwood/router in cli/lib/ folder 
         body = body.replace('</head>', `
           <script type="module" src="/scripts/router.js"></script>\n
           <script>
@@ -86,7 +87,7 @@ class OptimizationMPAResource extends ResourceInterface {
               ${bodyContents}\n
             </router-outlet>
             
-            ${routes.join('\n')}
+            ${routeTags.join('\n')}
           </body>
         `);
 

diff --git a/www/scripts/router.js b/www/scripts/router.js
@@ -21,8 +21,8 @@ document.addEventListener('click', function(e) {
 class RouteComponent extends HTMLElement {
   loadRoute() {
     console.debug('load route ->', this.getAttribute('data-route'));
-    console.debug('with bundle ->', this.getAttribute('data-id'));
-    fetch(this.getAttribute('data-id'))
+    console.debug('with bundle ->', this.getAttribute('data-key'));
+    fetch(this.getAttribute('data-key'))
       .then(res => res.text())
       .then((response) => {
         document.getElementsByTagName('router-outlet')[0].innerHTML = response;