comments and TODOs cleanup

ProjectEvergreen · Feb 28, 2024 · 02dff52 · 02dff52
1 parent 200a40f
commit 02dff52
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 54 deletions.
diff --git a/packages/cli/src/lib/templating-utils.js b/packages/cli/src/lib/templating-utils.js
@@ -1,7 +1,6 @@
 import fs from 'fs/promises';
 import htmlparser from 'node-html-parser';
 import { checkResourceExists } from './resource-utils.js';
-// import { getPackageJson } from './node-modules-utils.js';
 
 async function getCustomPageTemplatesFromPlugins(contextPlugins, templateName) {
   const customTemplateLocations = [];
@@ -186,22 +185,6 @@ async function getUserScripts (contents, compilation) {
       </script>
   `);
 
-  // TODO get rid of lit polyfills in core
-  // https://github.com/ProjectEvergreen/greenwood/issues/728
-  // https://lit.dev/docs/tools/requirements/#polyfills
-  // if (process.env.__GWD_COMMAND__ === 'build') { // eslint-disable-line no-underscore-dangle
-  //   const userPackageJson = await getPackageJson(context);
-  //   const dependencies = userPackageJson?.dependencies || {};
-  //   const litPolyfill = dependencies && dependencies.lit
-  //     ? '<script src="/node_modules/lit/polyfill-support.js"></script>\n'
-  //     : '';
-
-  //   contents = contents.replace('<head>', `
-  //     <head>
-  //       ${litPolyfill}
-  //   `);
-  // }
-
   return contents;
 }
 

diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
@@ -224,20 +224,10 @@ async function bundleSsrPages(compilation) {
         staticHtml = data.template ? data.template : await getPageTemplate(staticHtml, compilation.context, template, []);
         staticHtml = await getAppTemplate(staticHtml, compilation.context, imports, [], false, title);
         staticHtml = await getUserScripts(staticHtml, compilation);
-        // TODO seems like we are missing general purpose intercepting and optimization when bundling SSR pages
         staticHtml = await (await interceptPage(new URL(`http://localhost:8080${route}`), new Request(new URL(`http://localhost:8080${route}`)), getPluginInstances(compilation), staticHtml)).text();
         staticHtml = await (await htmlOptimizer.optimize(new URL(`http://localhost:8080${route}`), new Response(staticHtml))).text();
         staticHtml = staticHtml.replace(/[`\\$]/g, '\\$&'); // https://stackoverflow.com/a/75688937/417806
 
-        // TODO prune graph of hydration data
-        // const g = [ ...compilation.graph ];
-
-        // g.forEach(page => {
-        //   delete page.pageData;
-        // })
-
-        // compilation.graph = g;
-
         // better way to write out this inline code?
         await fs.writeFile(entryFileUrl, `
           import { executeRouteModule } from '${normalizePathnameForWindows(executeModuleUrl)}';

diff --git a/packages/cli/src/lifecycles/graph.js b/packages/cli/src/lifecycles/graph.js
@@ -202,8 +202,8 @@ const generateGraph = async (compilation) => {
              * template: page template to use as a base for a generated component
              * title: a default value that can be used for <title></title>
              * isSSR: if this is a server side route
-             * prerednder: if this should be statically exported
-             * prerednder: if this page needs hydration support
+             * prerender: if this should be statically exported
+             * hydration: if this page needs hydration support
              */
             pages.push({
               data: customData || {},

diff --git a/packages/cli/src/plugins/resource/plugin-standard-html.js b/packages/cli/src/plugins/resource/plugin-standard-html.js
@@ -116,13 +116,6 @@ class StandardHtmlResource extends ResourceInterface {
             ssrTemplate = result.template;
           }
 
-          // if (result.hydrate) {
-          //   matchingRoute.hydrate = result.hydrate;
-          //   matchingRoute.pageData = result.pageData;
-
-          //   console.log('Update Page', this.compilation.graph.find((node) => node.route === pathname));
-          // }
-
           if (result.body) {
             ssrBody = result.body;
           }
@@ -209,20 +202,6 @@ class StandardHtmlResource extends ResourceInterface {
       }
     }
 
-    // if (matchingRoute.hydrate && matchingRoute.pageData) {
-    //   const id = '__GWD_HYDRATION_DATA__';
-    //   const { pageData } = matchingRoute;
-
-    //   console.log('hydrate with page data =>', { pageData });
-
-    //   body = body.replace('</head>', `
-    //     <script type="application/json" id="${id}">
-    //       ${JSON.stringify(pageData)}
-    //     </script>
-    //     </head>
-    //   `);
-    // }
-
     // give the user something to see so they know it works, if they have no content
     if (body.indexOf('<content-outlet></content-outlet>') > 0) {
       body = body.replace('<content-outlet></content-outlet>', `

diff --git a/packages/plugin-renderer-lit/src/index.js b/packages/plugin-renderer-lit/src/index.js
@@ -14,19 +14,16 @@ class LitHydrationResource extends ResourceInterface {
 
   async intercept(url, request, response) {
     let body = await response.text();
-    const { pathname } = url;
-    const matchingRoute = this.compilation.graph.find((node) => node.route === pathname) || {};
-    console.log('LIT intercept =>', { url, matchingRoute });
 
     // TODO would be nice not have to manually set module-shim
     // when we drop support for import-map shim - https://github.com/ProjectEvergreen/greenwood/pull/1115
     const type = process.env.__GWD_COMMAND__ === 'develop' // eslint-disable-line  no-underscore-dangle
       ? 'module-shim'
       : 'module';
 
+    // this needs to come first before any userland code
     body = body.replace('<head>', `
       <head>
-        <!-- this needs to come first before any userland code -->
         <script type="${type}" src="/node_modules/@lit-labs/ssr-client/lit-element-hydrate-support.js"></script>
     `);