rfc/issue 955 layouts and pages

.github/CONTRIBUTING.md

@@ -57,7 +57,7 @@ The [layout](https://github.com/ProjectEvergreen/greenwood/tree/master/packages/
 - _lib/_ - Custom utility and client facing files
 - _lifecycles/_ - Tasks that can be composed by commands to support the full needs of that command
 - _plugins/_ - Custom default plugins maintained by the CLI project
-- _templates/_ - Default templates and / or pages provided by Greenwood.
+- _layouts/_ - Default layouts and / or pages provided by Greenwood.
 
 
 #### Lifecycles

packages/cli/package.json

@@ -52,7 +52,7 @@
     "remark-rehype": "^7.0.0",
     "rollup": "^3.29.4",
     "unified": "^9.2.0",
-    "wc-compiler": "~0.13.0"
+    "wc-compiler": "~0.14.0"
   },
   "devDependencies": {
     "@babel/runtime": "^7.10.4",

packages/cli/src/commands/build.js

@@ -1,70 +1,10 @@
 import { bundleCompilation } from '../lifecycles/bundle.js';
-import { checkResourceExists, trackResourcesForRoute } from '../lib/resource-utils.js';
+import { checkResourceExists } from '../lib/resource-utils.js';
 import { copyAssets } from '../lifecycles/copy.js';
 import fs from 'fs/promises';
 import { preRenderCompilationWorker, preRenderCompilationCustom, staticRenderCompilation } from '../lifecycles/prerender.js';
 import { ServerInterface } from '../lib/server-interface.js';
 
-// TODO a lot of these are duplicated in the prerender lifecycle too
-// would be good to refactor
-async function servePage(url, request, plugins) {
-  let response = new Response('');
-
-  for (const plugin of plugins) {
-    if (plugin.shouldServe && await plugin.shouldServe(url, request)) {
-      response = await plugin.serve(url, request);
-      break;
-    }
-  }
-
-  return response;
-}
-
-async function interceptPage(url, request, plugins, body) {
-  let response = new Response(body, {
-    headers: new Headers({ 'Content-Type': 'text/html' })
-  });
-
-  for (const plugin of plugins) {
-    if (plugin.shouldPreIntercept && await plugin.shouldPreIntercept(url, request, response)) {
-      response = await plugin.preIntercept(url, request, response);
-    }
-
-    if (plugin.shouldIntercept && await plugin.shouldIntercept(url, request, response)) {
-      response = await plugin.intercept(url, request, response);
-    }
-  }
-
-  return response;
-}
-
-function getPluginInstances (compilation) {
-  return [...compilation.config.plugins]
-    .filter(plugin => plugin.type === 'resource' && plugin.name !== 'plugin-node-modules:resource')
-    .map((plugin) => {
-      return plugin.provider(compilation);
-    });
-}
-
-// TODO does this make more sense in bundle lifecycle?
-// https://github.com/ProjectEvergreen/greenwood/issues/970
-// or could this be done sooner (like in appTemplate building in html resource plugin)?
-// Or do we need to ensure userland code / plugins have gone first
-async function trackResourcesForRoutes(compilation) {
-  const plugins = getPluginInstances(compilation);
-
-  for (const page of compilation.graph) {
-    const { route } = page;
-    const url = new URL(`http://localhost:${compilation.config.port}${route}`);
-    const request = new Request(url);
-
-    let body = await (await servePage(url, request, plugins)).text();
-    body = await (await interceptPage(url, request, plugins, body)).text();
-
-    await trackResourcesForRoute(body, compilation, route);
-  }
-}
-
 const runProductionBuild = async (compilation) => {
 
   return new Promise(async (resolve, reject) => {
@@ -106,13 +46,11 @@ const runProductionBuild = async (compilation) => {
         }));
 
         if (prerenderPlugin.executeModuleUrl) {
-          await trackResourcesForRoutes(compilation);
           await preRenderCompilationWorker(compilation, prerenderPlugin);
         } else {
           await preRenderCompilationCustom(compilation, prerenderPlugin);
         }
       } else {
-        await trackResourcesForRoutes(compilation);
         await staticRenderCompilation(compilation);
       }
 

packages/cli/src/config/rollup.config.js

@@ -315,7 +315,7 @@
             }
           }
         } else {
           // TODO figure out how to handle URL chunk from SSR pages
           // https://github.com/ProjectEvergreen/greenwood/issues/1163
         }
 
@@ -423,10 +423,10 @@
 };
 
 const getRollupConfigForApis = async (compilation) => {
-  const { outputDir, userWorkspace } = compilation.context;
+  const { outputDir, pagesDir } = compilation.context;
 
   return [...compilation.manifest.apis.values()]
-    .map(api => normalizePathnameForWindows(new URL(`.${api.path}`, userWorkspace)))
+    .map(api => normalizePathnameForWindows(new URL(`.${api.path}`, pagesDir)))
     .map(filepath => ({
       input: filepath,
       output: {
@@ -445,7 +445,27 @@
         }),
         commonjs(),
         greenwoodImportMetaUrl(compilation)
-      ]
+      ],
+      onwarn: (errorObj) => {
+        const { code, message } = errorObj;
+
+        switch (code) {
+
+          case 'CIRCULAR_DEPENDENCY':
+            // let this through for WCC + sucrase
+            // Circular dependency: ../../../../../node_modules/sucrase/dist/esm/parser/tokenizer/index.js ->
+            //   ../../../../../node_modules/sucrase/dist/esm/parser/traverser/util.js -> ../../../../../node_modules/sucrase/dist/esm/parser/tokenizer/index.js
+            // Circular dependency: ../../../../../node_modules/sucrase/dist/esm/parser/tokenizer/index.js ->
+            //   ../../../../../node_modules/sucrase/dist/esm/parser/tokenizer/readWord.js -> ../../../../../node_modules/sucrase/dist/esm/parser/tokenizer/index.js
+            // https://github.com/ProjectEvergreen/greenwood/pull/1212
+            // https://github.com/lit/lit/issues/449#issuecomment-416688319
+            break;
+          default:
+            // otherwise, log all warnings from rollup
+            console.debug(message);
+
+        }
+      }
     }));
 };
 
@@ -483,11 +503,12 @@
         switch (code) {
 
           case 'CIRCULAR_DEPENDENCY':
-            // TODO let this through for lit by suppressing it
+            // let this through for lit
             // Error: the string "Circular dependency: ../../../../../node_modules/@lit-labs/ssr/lib/render-lit-html.js ->
             // ../../../../../node_modules/@lit-labs/ssr/lib/lit-element-renderer.js -> ../../../../../node_modules/@lit-labs/ssr/lib/render-lit-html.js\n" was thrown, throw an Error :)
-            // https://github.com/lit/lit/issues/449
             // https://github.com/ProjectEvergreen/greenwood/issues/1118
+            // https://github.com/lit/lit/issues/449#issuecomment-416688319
+            // https://github.com/rollup/rollup/issues/1089#issuecomment-402109607
             break;
           default:
             // otherwise, log all warnings from rollup

packages/cli/src/lib/execute-route-module.js

@@ -2,7 +2,7 @@
 
 async function executeRouteModule({ moduleUrl, compilation, page = {}, prerender = false, htmlContents = null, scripts = [], request }) {
   const data = {
-    template: null,
+    layout: null,
     body: null,
     frontmatter: null,
     html: null
@@ -15,7 +15,7 @@
     data.html = html;
   } else {
     const module = await import(moduleUrl).then(module => module);
-    const { prerender = false, getTemplate = null, getBody = null, getFrontmatter = null, isolation } = module;
+    const { prerender = false, getLayout = null, getBody = null, getFrontmatter = null, isolation } = module;
 
     if (module.default) {
       const { html } = await renderToString(new URL(moduleUrl), false, request);
@@ -27,15 +27,15 @@
       }
     }
 
-    if (getTemplate) {
-      data.template = await getTemplate(compilation, page);
+    if (getLayout) {
+      data.layout = await getLayout(compilation, page);
     }
 
     if (getFrontmatter) {
       data.frontmatter = await getFrontmatter(compilation, page);
     }
 
     // TODO cant we get these from just pulling from the file during the graph phase?
     // https://github.com/ProjectEvergreen/greenwood/issues/991
     data.prerender = prerender;
     data.isolation = isolation;