release/0.29.0

.eslintignore

@@ -3,4 +3,5 @@
 **/node_modules/**
 !.eslintrc.cjs
 !.mocharc.js
-packages/plugin-babel/test/cases/**/*main.js
+packages/plugin-babel/test/cases/**/*main.js
+TODO.md

.gitignore

@@ -7,4 +7,8 @@ coverage/
 node_modules/
 packages/**/test/**/yarn.lock
 packages/**/test/**/package-lock.json
-public/
+packages/**/test/**/netlify
+packages/**/test/**/.netlify
+packages/**/test/**/.vercel
+public/
+adapter-outlet/

.ls-lint.yml

@@ -14,4 +14,5 @@ ls:
 ignore: 
   - .git 
   - node_modules
-  - packages/init/node_modules
+  - packages/init/node_modules
+  - packages/plugin-typescript/node_modules

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.28.5",
+  "version": "0.29.0-alpha.6",
   "packages": [
     "packages/*",
     "www"

package.json

@@ -34,16 +34,16 @@
   },
   "devDependencies": {
     "@ls-lint/ls-lint": "^1.10.0",
-    "@typescript-eslint/eslint-plugin": "^4.28.2",
-    "@typescript-eslint/parser": "^4.28.2",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
     "babel-eslint": "^10.1.0",
     "c8": "^7.10.0",
     "chai": "^4.2.0",
     "cross-env": "^7.0.3",
-    "eslint": "^6.8.0",
+    "eslint": "^8.51.0",
     "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-no-only-tests": "^2.6.0",
-    "gallinago": "^0.6.0",
+    "gallinago": "^0.7.0",
     "glob-promise": "^3.4.0",
     "jsdom": "^16.5.0",
     "lerna": "^3.16.4",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greenwood/cli",
-  "version": "0.28.5",
+  "version": "0.29.0-alpha.6",
   "description": "Greenwood CLI.",
   "type": "module",
   "repository": "https://github.com/ProjectEvergreen/greenwood",
@@ -34,14 +34,14 @@
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@rollup/plugin-replace": "^2.3.4",
     "@rollup/plugin-terser": "^0.1.0",
-    "@web/rollup-plugin-import-meta-assets": "^1.0.0",
     "acorn": "^8.0.1",
     "acorn-walk": "^8.0.0",
     "commander": "^2.20.0",
     "css-tree": "^2.2.1",
     "es-module-shims": "^1.2.0",
     "front-matter": "^4.0.2",
     "koa": "^2.13.0",
+    "koa-body": "^6.0.1",
     "livereload": "^0.9.1",
     "markdown-toc": "^1.2.0",
     "node-html-parser": "^1.2.21",
@@ -52,7 +52,7 @@
     "remark-rehype": "^7.0.0",
     "rollup": "^2.58.0",
     "unified": "^9.2.0",
-    "wc-compiler": "~0.8.0"
+    "wc-compiler": "~0.9.0"
   },
   "devDependencies": {
     "@babel/runtime": "^7.10.4",

packages/cli/src/commands/build.js

@@ -5,7 +5,7 @@
 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('');
@@ -42,7 +42,7 @@
     });
 }
 
 // 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
@@ -71,6 +71,9 @@
       const prerenderPlugin = compilation.config.plugins.find(plugin => plugin.type === 'renderer')
         ? compilation.config.plugins.find(plugin => plugin.type === 'renderer').provider(compilation)
         : {};
+      const adapterPlugin = compilation.config.plugins.find(plugin => plugin.type === 'adapter')
+        ? compilation.config.plugins.find(plugin => plugin.type === 'adapter').provider(compilation)
+        : null;
 
       if (!await checkResourceExists(outputDir)) {
         await fs.mkdir(outputDir, {
@@ -98,7 +101,7 @@
           return Promise.resolve(server);
         }));
 
-        if (prerenderPlugin.workerUrl) {
+        if (prerenderPlugin.executeModuleUrl) {
           await trackResourcesForRoutes(compilation);
           await preRenderCompilationWorker(compilation, prerenderPlugin);
         } else {
@@ -114,6 +117,10 @@
       await bundleCompilation(compilation);
       await copyAssets(compilation);
 
+      if (adapterPlugin) {
+        await adapterPlugin();
+      }
+
       resolve();
     } catch (err) {
       reject(err);

packages/cli/src/commands/develop.js

@@ -6,11 +6,13 @@ const runDevServer = async (compilation) => {
   return new Promise(async (resolve, reject) => {
 
     try {
-      const { port } = compilation.config.devServer;
+      const { basePath, devServer } = compilation.config;
+      const { port } = devServer;
+      const postfixSlash = basePath === '' ? '' : '/';
 
       (await getDevServer(compilation)).listen(port, () => {
 
-        console.info(`Started local development server at localhost:${port}`);
+        console.info(`Started local development server at http://localhost:${port}${basePath}${postfixSlash}`);
 
         const servers = [...compilation.config.plugins.filter((plugin) => {
           return plugin.type === 'server';

packages/cli/src/commands/serve.js

@@ -6,13 +6,14 @@ const runProdServer = async (compilation) => {
   return new Promise(async (resolve, reject) => {
 
     try {
-      const port = compilation.config.port;
+      const { basePath, port } = compilation.config;
+      const postfixSlash = basePath === '' ? '' : '/';
       const hasApisDir = await checkResourceExists(compilation.context.apisDir);
-      const hasDynamicRoutes = compilation.graph.find(page => page.isSSR && !page.data.static);
+      const hasDynamicRoutes = compilation.graph.find(page => page.isSSR && !page.prerender);
       const server = (hasDynamicRoutes && !compilation.config.prerender) || hasApisDir ? getHybridServer : getStaticServer;
 
       (await server(compilation)).listen(port, () => {
-        console.info(`Started server at localhost:${port}`);
+        console.info(`Started server at http://localhost:${port}${basePath}${postfixSlash}`);
       });
     } catch (err) {
       reject(err);