release/0.28.0

.gitattributes

@@ -13,4 +13,15 @@
 *.woff    binary
 *.woff2   binary
 *.ttf     binary
-*.eot     binary
+*.eot     binary
+*.flv     binary
+*.mp4     binary
+*.3gp     binary
+*.mov     binary
+*.avi     binary
+*.wmv     binary
+*.ogg     binary
+*.oga     binary
+*.ogg     binary
+*.mp3     binary
+*.wav     binary

.github/CONTRIBUTING.md

@@ -255,15 +255,25 @@ Note: If you have issues running tests due to timeouts, you can increase the set
 
 ## Release Management
 
-Lerna is used to manage the publishing of packages within the workspace under a single unified version.  Assuming you are logged into **npm** locally and have 2FA access to publish, the command to run is
+Lerna is used to manage the publishing of packages within the workspace under a single unified version.  Assuming you are logged into **npm** locally and have 2FA access to publish, the following workflows should be used
+
+After running these commands, Lerna should then prompt you through the steps to pick the version and all packages that will get updated.
+
+### Alpha Release
+
+Greenwood typically works on new minor versions in a dedicated branch and release line called "alpha".  This leverages NPM's concept of dist tags.  While on a release branch, run the following to publish a new _alpha_ release.
+
 ```sh
 # from the root of the repo
-$ yarn lerna publish
-
-# if Lerna is not displaying all packages as needing publishing, cancel and use
-$ yarn lerna publish --force-publish
+$ yarn lerna publish --force-publish --dist-tag alpha
 ```
 
-Lerna should then prompt you through the steps to pick the version and all packages that will get updated.
+> Typically you will want to select the _Custom Preminor_ option from the list, which Lerna should appropriately yield the expected version.
+
+### Standard Release
 
-> _Sometimes when doing pre-minor releases, it will be required to manually bump the `version` in www/package.json_
+For a normal release (e.g. "latest") the following command can be run from the mainline branch of the repo.
+```sh
+# from the root of the repo
+$ yarn lerna publish --force-publish
+```

.github/workflows/ci-exp.yml

@@ -5,19 +5,19 @@ on: [pull_request]
 jobs:
 
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
-        node: [16]
+        node: [18]
 
     steps:
     - uses: actions/checkout@v1
     - name: Install Chromium Library Dependencies
       run: |
         sh ./.github/workflows/chromium-lib-install.sh
     - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - name: Installing project dependencies

.github/workflows/ci-win-exp.yml

@@ -9,12 +9,12 @@ jobs:
 
     strategy:
       matrix:
-        node: [16]
+        node: [18]
 
     steps:
     - uses: actions/checkout@v1
     - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - name: Installing project dependencies

.github/workflows/ci-win.yml

@@ -9,12 +9,12 @@ jobs:
 
     strategy:
       matrix:
-        node: [14, 16]
+        node: [18]
 
     steps:
     - uses: actions/checkout@v1
     - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - name: Installing project dependencies

.github/workflows/ci.yml

@@ -5,19 +5,19 @@ on: [pull_request]
 jobs:
 
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
-        node: [14, 16]
+        node: [18]
 
     steps:
     - uses: actions/checkout@v1
     - name: Install Chromium Library Dependencies
       run: |
         sh ./.github/workflows/chromium-lib-install.sh
     - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - name: Installing project dependencies

.github/workflows/master.yml

@@ -8,19 +8,19 @@ on:
 jobs:
 
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
-        node: [14]
+        node: [18]
 
     steps:
     - uses: actions/checkout@v1
     - name: Install Chromium Library Dependencies
       run: |
         sh ./.github/workflows/chromium-lib-install.sh
     - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - name: Installing project dependencies

.github/workflows/release.yml

@@ -8,19 +8,19 @@ on:
 jobs:
 
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
-        node-version: [14]
+        node-version: [18]
 
     steps:
     - uses: actions/checkout@v1
     - name: Install Chromium Library Dependencies
       run: |
         sh ./.github/workflows/chromium-lib-install.sh
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - name: Installing project dependencies

.gitignore

@@ -1,3 +1,4 @@
+*.DS_Store
 *.log
 .greenwood/
 .nyc_output/

.nvmrc

@@ -1 +1 @@
-16.17.0
+18.12.1

greenwood.config.js

@@ -6,10 +6,9 @@ import { greenwoodPluginPolyfills } from '@greenwood/plugin-polyfills';
 import { greenwoodPluginPostCss } from '@greenwood/plugin-postcss';
 import { greenwoodPluginRendererPuppeteer } from '@greenwood/plugin-renderer-puppeteer';
 import rollupPluginAnalyzer from 'rollup-plugin-analyzer';
-import { fileURLToPath, URL } from 'url';
 
 export default {
-  workspace: fileURLToPath(new URL('./www', import.meta.url)),
+  workspace: new URL('./www/', import.meta.url),
   optimization: 'inline',
   staticRouter: true,
   interpolateFrontmatter: true,
@@ -19,6 +18,8 @@ export default {
     greenwoodPluginPostCss(),
     greenwoodPluginImportJson(),
     greenwoodPluginImportCss(),
+    greenwoodPluginIncludeHTML(),
+    greenwoodPluginRendererPuppeteer(),
     {
       type: 'rollup',
       name: 'rollup-plugin-analyzer',
@@ -32,9 +33,7 @@ export default {
           })
         ];
       }
-    },
-    greenwoodPluginIncludeHTML(),
-    greenwoodPluginRendererPuppeteer()
+    }
   ],
   markdown: {
     plugins: [

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.27.5",
+  "version": "0.28.0-alpha.5",
   "packages": [
     "packages/*",
     "www"

netlify.toml

@@ -6,7 +6,7 @@
   skip_processing = true
 
 [build.environment]
-  NODE_VERSION = "14.16.0"
+  NODE_VERSION = "18.12.1"
 
 [[redirects]]
   from = "/docs/tech-stack/"

package.json

@@ -20,7 +20,7 @@
     "build": "cross-env __GWD_ROLLUP_MODE__=strict node . build",
     "serve": "node . serve",
     "develop": "node . develop",
-    "test": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict c8 mocha --exclude \"./packages/**/test/cases/exp-*/**\" \"./packages/**/**/*.spec.js\"",
+    "test": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 c8 mocha --exclude \"./packages/**/test/cases/exp-*/**\" --exclude \"./packages/cli/test/cases/serve.default.ssr/**\" --exclude \"./packages/cli/test/cases/*.default.ssr-static-export/**\" \"./packages/**/**/*.spec.js\"",
     "test:exp": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 node --experimental-loader $(pwd)/test/test-loader.js ./node_modules/mocha/bin/mocha \"./packages/**/**/*.spec.js\"",
     "test:exp:win": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 node --experimental-loader file:\\\\%cd%\\test\\test-loader.js ./node_modules/mocha/bin/mocha --exclude \"./packages/init/test/cases/**\" \"./packages/**/**/*.spec.js\"",
     "test:tdd": "yarn test --watch",

packages/cli/package.json

@@ -1,18 +1,24 @@
 {
   "name": "@greenwood/cli",
-  "version": "0.27.5",
+  "version": "0.28.0-alpha.5",
   "description": "Greenwood CLI.",
   "type": "module",
-  "repository": "https://github.com/ProjectEvergreen/greenwood/tree/master/packages/cli",
+  "repository": "https://github.com/ProjectEvergreen/greenwood",
+  "homepage": "https://github.com/ProjectEvergreen/greenwood/tree/master/packages/cli",
   "author": "Owen Buckley <owen@thegreenhouse.io>",
   "license": "MIT",
   "keywords": [
     "Greenwood",
     "Static Site Generator",
-    "Web Components"
+    "Full Stack Web Development",
+    "Web Components",
+    "HTML",
+    "CSS",
+    "JavaScript",
+    "NodeJS"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18.12.1"
   },
   "bin": {
     "greenwood": "./src/index.js"
@@ -24,9 +30,11 @@
     "access": "public"
   },
   "dependencies": {
+    "@rollup/plugin-commonjs": "^21.0.0",
     "@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",
@@ -36,7 +44,6 @@
     "koa": "^2.13.0",
     "livereload": "^0.9.1",
     "markdown-toc": "^1.2.0",
-    "node-fetch": "^2.6.1",
     "node-html-parser": "^1.2.21",
     "rehype-raw": "^5.0.0",
     "rehype-stringify": "^8.0.0",
@@ -45,7 +52,7 @@
     "remark-rehype": "^7.0.0",
     "rollup": "^2.58.0",
     "unified": "^9.2.0",
-    "wc-compiler": "~0.6.1"
+    "wc-compiler": "~0.8.0"
   },
   "devDependencies": {
     "@babel/runtime": "^7.10.4",

packages/cli/src/commands/build.js

@@ -1,6 +1,7 @@
 import { bundleCompilation } from '../lifecycles/bundle.js';
+import { checkResourceExists } from '../lib/resource-utils.js';
 import { copyAssets } from '../lifecycles/copy.js';
-import fs from 'fs';
+import fs from 'fs/promises';
 import { preRenderCompilationWorker, preRenderCompilationCustom, staticRenderCompilation } from '../lifecycles/prerender.js';
 import { ServerInterface } from '../lib/server-interface.js';
 
@@ -11,12 +12,14 @@ const runProductionBuild = async (compilation) => {
     try {
       const { prerender } = compilation.config;
       const outputDir = compilation.context.outputDir;
-      const prerenderPlugin = (compilation.config.plugins.filter(plugin => plugin.type === 'renderer') || []).length === 1
-        ? compilation.config.plugins.filter(plugin => plugin.type === 'renderer')[0].provider(compilation)
+      const prerenderPlugin = compilation.config.plugins.find(plugin => plugin.type === 'renderer')
+        ? compilation.config.plugins.find(plugin => plugin.type === 'renderer').provider(compilation)
         : {};
 
-      if (!fs.existsSync(outputDir)) {
-        fs.mkdirSync(outputDir);
+      if (!await checkResourceExists(outputDir)) {
+        await fs.mkdir(outputDir, {
+          recursive: true
+        });
       }
 
       if (prerender || prerenderPlugin.prerender) {

packages/cli/src/commands/eject.js

@@ -1,21 +1,19 @@
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath, URL } from 'url';
+import fs from 'fs/promises';
 
 const ejectConfiguration = async (compilation) => {
   return new Promise(async (resolve, reject) => {
     try {
-      const configFilePath = fileURLToPath(new URL('../config', import.meta.url));
-      const configFiles = fs.readdirSync(configFilePath);
+      const configFileDirUrl = new URL('../config/', import.meta.url);
+      const configFiles = await fs.readdir(configFileDirUrl);
 
-      configFiles.forEach((configFile) => {
-        const from = path.join(configFilePath, configFile);
-        const to = `${compilation.context.projectDirectory}/${configFile}`;
+      for (const file of configFiles) {
+        const from = new URL(`./${file}`, configFileDirUrl);
+        const to = new URL(`./${file}`, compilation.context.projectDirectory);
 
-        fs.copyFileSync(from, to);
+        await fs.copyFile(from, to);
 
-        console.log(`Ejected ${configFile} successfully.`);
-      });
+        console.log(`Ejected ${file} successfully.`);
+      }
 
       console.debug('all configuration files ejected.');
 

packages/cli/src/commands/serve.js

@@ -1,13 +1,15 @@
 import { getStaticServer, getHybridServer } from '../lifecycles/serve.js';
+import { checkResourceExists } from '../lib/resource-utils.js';
 
 const runProdServer = async (compilation) => {
 
   return new Promise(async (resolve, reject) => {
 
     try {
       const port = compilation.config.port;
-      const hasDynamicRoutes = compilation.graph.filter(page => page.isSSR && ((page.data.hasOwnProperty('static') && !page.data.static) || !compilation.config.prerender));
-      const server = hasDynamicRoutes.length > 0 ? getHybridServer : getStaticServer;
+      const hasApisDir = await checkResourceExists(compilation.context.apisDir);
+      const hasDynamicRoutes = compilation.graph.find(page => page.isSSR && !page.data.static);
+      const server = (hasDynamicRoutes && !compilation.config.prerender) || hasApisDir ? getHybridServer : getStaticServer;
 
       (await server(compilation)).listen(port, () => {
         console.info(`Started server at localhost:${port}`);