@henderea/static-site-builder 1.9.9 → 1.9.10

package/bin/static-site-builder.js

@@ -11,50 +11,49 @@
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
 // terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', err => {
+process.on('unhandledRejection', (err) => {
   throw err;
 });
 
-const spawn = require('cross-spawn');
+import spawn from 'cross-spawn';
 const args = process.argv.slice(2);
 
 const scriptIndex = args.findIndex(
-  x => x === 'build' || x === 'watch'
+  (x) => x === 'build' || x === 'watch'
 );
 const script = scriptIndex === -1 ? args[0] : args[scriptIndex];
 const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : [];
 
-switch (script) {
-  case 'build':
-  case 'watch': {
-    const result = spawn.sync(
-      'node',
-      nodeArgs
-        .concat(require.resolve('../scripts/' + script))
-        .concat(args.slice(scriptIndex + 1)),
-      { stdio: 'inherit' }
-    );
-    if (result.signal) {
-      if (result.signal === 'SIGKILL') {
-        console.log(
-          'The build failed because the process exited too early. ' +
+switch(script) {
+case 'build':
+case 'watch': {
+  const result = spawn.sync(
+    'node',
+    nodeArgs
+      .concat(require.resolve('../scripts/' + script))
+      .concat(args.slice(scriptIndex + 1)),
+    { stdio: 'inherit' }
+  );
+  if(result.signal) {
+    if(result.signal === 'SIGKILL') {
+      console.log(
+        'The build failed because the process exited too early. ' +
             'This probably means the system ran out of memory or someone called ' +
             '`kill -9` on the process.'
-        );
-      } else if (result.signal === 'SIGTERM') {
-        console.log(
-          'The build failed because the process exited too early. ' +
+      );
+    } else if(result.signal === 'SIGTERM') {
+      console.log(
+        'The build failed because the process exited too early. ' +
             'Someone might have called `kill` or `killall`, or the system could ' +
             'be shutting down.'
-        );
-      }
-      process.exit(1);
+      );
     }
-    process.exit(result.status);
-    break;
+    process.exit(1);
   }
-  default:
-    console.log('Unknown script "' + script + '".');
-    console.log('Perhaps you need to update static-site-builder?');
-    break;
-}
+  process.exit(result.status);
+}
+default:
+  console.log('Unknown script "' + script + '".');
+  console.log('Perhaps you need to update static-site-builder?');
+  break;
+}

package/config/cache-config.js

@@ -1,106 +1,106 @@
-module.exports = [
-    {
-      urlPattern: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
-      handler: 'CacheFirst',
-      options: {
-        cacheName: 'google-fonts',
-        expiration: {
-          maxEntries: 4,
-          maxAgeSeconds: 365 * 24 * 60 * 60 // 365 days
-        }
+export default [
+  {
+    urlPattern: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
+    handler: 'CacheFirst',
+    options: {
+      cacheName: 'google-fonts',
+      expiration: {
+        maxEntries: 4,
+        maxAgeSeconds: 365 * 24 * 60 * 60 // 365 days
       }
-    },
-    {
-      urlPattern: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
-      handler: 'StaleWhileRevalidate',
-      options: {
-        cacheName: 'static-font-assets',
-        expiration: {
-          maxEntries: 4,
-          maxAgeSeconds: 7 * 24 * 60 * 60 // 7 days
-        }
-      }
-    },
-    {
-      urlPattern: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
-      handler: 'StaleWhileRevalidate',
-      options: {
-        cacheName: 'static-image-assets',
-        expiration: {
-          maxEntries: 64,
-          maxAgeSeconds: 24 * 60 * 60 // 24 hours
-        }
-      }
-    },
-    {
-      urlPattern: /\.(?:js)$/i,
-      handler: 'StaleWhileRevalidate',
-      options: {
-        cacheName: 'static-js-assets',
-        expiration: {
-          maxEntries: 32,
-          maxAgeSeconds: 24 * 60 * 60 // 24 hours
-        }
-      }
-    },
-    {
-      urlPattern: /\.(?:css|less)$/i,
-      handler: 'StaleWhileRevalidate',
-      options: {
-        cacheName: 'static-style-assets',
-        expiration: {
-          maxEntries: 32,
-          maxAgeSeconds: 24 * 60 * 60 // 24 hours
-        }
+    }
+  },
+  {
+    urlPattern: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
+    handler: 'StaleWhileRevalidate',
+    options: {
+      cacheName: 'static-font-assets',
+      expiration: {
+        maxEntries: 4,
+        maxAgeSeconds: 7 * 24 * 60 * 60 // 7 days
       }
-    },
-    {
-      urlPattern: /\.(?:json|xml|csv)$/i,
-      handler: 'NetworkFirst',
-      options: {
-        cacheName: 'static-data-assets',
-        expiration: {
-          maxEntries: 32,
-          maxAgeSeconds: 24 * 60 * 60 // 24 hours
-        }
+    }
+  },
+  {
+    urlPattern: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
+    handler: 'StaleWhileRevalidate',
+    options: {
+      cacheName: 'static-image-assets',
+      expiration: {
+        maxEntries: 64,
+        maxAgeSeconds: 24 * 60 * 60 // 24 hours
       }
-    },
-    {
-      urlPattern: /\/api\/.*$/i,
-      handler: 'NetworkFirst',
-      method: 'GET',
-      options: {
-        cacheName: 'apis',
-        expiration: {
-          maxEntries: 16,
-          maxAgeSeconds: 24 * 60 * 60 // 24 hours
-        },
-        networkTimeoutSeconds: 10 // fall back to cache if api does not response within 10 seconds
+    }
+  },
+  {
+    urlPattern: /\.(?:js)$/i,
+    handler: 'StaleWhileRevalidate',
+    options: {
+      cacheName: 'static-js-assets',
+      expiration: {
+        maxEntries: 32,
+        maxAgeSeconds: 24 * 60 * 60 // 24 hours
       }
-    },
-    {
-      urlPattern: /\/api\/.*$/i,
-      handler: 'NetworkFirst',
-      method: 'POST',
-      options: {
-        cacheName: 'apis',
-        expiration: {
-          maxEntries: 16,
-          maxAgeSeconds: 24 * 60 * 60 // 24 hours
-        },
-        networkTimeoutSeconds: 10 // fall back to cache if api does not response within 10 seconds
+    }
+  },
+  {
+    urlPattern: /\.(?:css|less)$/i,
+    handler: 'StaleWhileRevalidate',
+    options: {
+      cacheName: 'static-style-assets',
+      expiration: {
+        maxEntries: 32,
+        maxAgeSeconds: 24 * 60 * 60 // 24 hours
       }
-    },
-    {
-      urlPattern: /.*/i,
-      handler: 'NetworkFirst',
-      options: {
-        cacheName: 'others',
-        expiration: {
-          maxEntries: 32,
-          maxAgeSeconds: 24 * 60 * 60 // 24 hours
-        },
-        networkTimeoutSeconds: 10
+    }
+  },
+  {
+    urlPattern: /\.(?:json|xml|csv)$/i,
+    handler: 'NetworkFirst',
+    options: {
+      cacheName: 'static-data-assets',
+      expiration: {
+        maxEntries: 32,
+        maxAgeSeconds: 24 * 60 * 60 // 24 hours
       }
     }
-  ]
+  },
+  {
+    urlPattern: /\/api\/.*$/i,
+    handler: 'NetworkFirst',
+    method: 'GET',
+    options: {
+      cacheName: 'apis',
+      expiration: {
+        maxEntries: 16,
+        maxAgeSeconds: 24 * 60 * 60 // 24 hours
+      },
+      networkTimeoutSeconds: 10 // fall back to cache if api does not response within 10 seconds
+    }
+  },
+  {
+    urlPattern: /\/api\/.*$/i,
+    handler: 'NetworkFirst',
+    method: 'POST',
+    options: {
+      cacheName: 'apis',
+      expiration: {
+        maxEntries: 16,
+        maxAgeSeconds: 24 * 60 * 60 // 24 hours
+      },
+      networkTimeoutSeconds: 10 // fall back to cache if api does not response within 10 seconds
+    }
+  },
+  {
+    urlPattern: /.*/i,
+    handler: 'NetworkFirst',
+    options: {
+      cacheName: 'others',
+      expiration: {
+        maxEntries: 32,
+        maxAgeSeconds: 24 * 60 * 60 // 24 hours
+      },
+      networkTimeoutSeconds: 10
+    }
+  }
+];

package/config/env.js

@@ -4,15 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const fs = require('fs');
-const path = require('path');
-const paths = require('./paths');
+import fs from 'fs';
+import path from 'path';
+import paths from './paths';
 
 // Make sure that including paths.js after env.js will read .env variables.
 delete require.cache[require.resolve('./paths')];
 
 const NODE_ENV = process.env.NODE_ENV;
-if (!NODE_ENV) {
+if(!NODE_ENV) {
   throw new Error(
     'The NODE_ENV environment variable is required but was not specified.'
   );
@@ -34,8 +34,8 @@ var dotenvFiles = [
 // that have already been set.  Variable expansion is supported in .env files.
 // https://github.com/motdotla/dotenv
 // https://github.com/motdotla/dotenv-expand
-dotenvFiles.forEach(dotenvFile => {
-  if (fs.existsSync(dotenvFile)) {
+dotenvFiles.forEach((dotenvFile) => {
+  if(fs.existsSync(dotenvFile)) {
     require('dotenv-expand')(
       require('dotenv').config({
         path: dotenvFile,
@@ -56,17 +56,17 @@ dotenvFiles.forEach(dotenvFile => {
 const appDirectory = fs.realpathSync(process.cwd());
 process.env.NODE_PATH = (process.env.NODE_PATH || '')
   .split(path.delimiter)
-  .filter(folder => folder && !path.isAbsolute(folder))
-  .map(folder => path.resolve(appDirectory, folder))
+  .filter((folder) => folder && !path.isAbsolute(folder))
+  .map((folder) => path.resolve(appDirectory, folder))
   .join(path.delimiter);
 
 // Grab NODE_ENV and SSB_APP_* environment variables and prepare them to be
 // injected into the application via DefinePlugin in Webpack configuration.
 const ALLOWED_ENV = /^(SSB_APP_|VERCEL_|NOW_)/i;
 
-function getClientEnvironment(publicUrl) {
+export default function getClientEnvironment(publicUrl) {
   const raw = Object.keys(process.env)
-    .filter(key => ALLOWED_ENV.test(key))
+    .filter((key) => ALLOWED_ENV.test(key))
     .reduce(
       (env, key) => {
         env[key] = process.env[key];
@@ -94,4 +94,3 @@ function getClientEnvironment(publicUrl) {
   return { raw, stringified };
 }
 
-module.exports = getClientEnvironment;

package/config/paths.js

@@ -6,35 +6,35 @@
  */
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
-const url = require('url');
-const findMonorepo = require('../utils/workspaceUtils').findMonorepo;
+import path from 'path';
+import fs from 'fs';
+import url from 'url';
+import { findMonorepo } from '../utils/workspaceUtils';
 
 // Make sure any symlinks in the project folder are resolved:
 // https://github.com/facebookincubator/create-react-app/issues/637
 const appDirectory = fs.realpathSync(process.cwd());
-const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
+const resolveApp = (relativePath) => path.resolve(appDirectory, relativePath);
 
 const resolveAppFirst = (...paths) => {
-    return resolveApp(paths.find((e) => fs.existsSync(resolveApp(e))) || paths[0]);
-}
+  return resolveApp(paths.find((e) => fs.existsSync(resolveApp(e))) || paths[0]);
+};
 
 const envPublicUrl = process.env.PUBLIC_URL;
 
 function ensureSlash(path, needsSlash) {
-    const hasSlash = path.endsWith('/');
-    if(hasSlash && !needsSlash) {
-        return path.substr(path, path.length - 1);
-    } else if(!hasSlash && needsSlash) {
-        return `${path}/`;
-    } else {
-        return path;
-    }
+  const hasSlash = path.endsWith('/');
+  if(hasSlash && !needsSlash) {
+    return path.substr(path, path.length - 1);
+  } else if(!hasSlash && needsSlash) {
+    return `${path}/`;
+  } else {
+    return path;
+  }
 }
 
-const getPublicUrl = appPackageJson =>
-    envPublicUrl || require(appPackageJson).homepage;
+const getPublicUrl = (appPackageJson) =>
+  envPublicUrl || require(appPackageJson).homepage;
 
 // We use `PUBLIC_URL` environment variable or "homepage" field to infer
 // "public path" at which the app is served.
@@ -43,53 +43,58 @@ const getPublicUrl = appPackageJson =>
 // We can't use a relative path in HTML because we don't want to load something
 // like /todos/42/static/js/bundle.7289d.js. We have to know the root.
 function getServedPath(appPackageJson) {
-    const publicUrl = getPublicUrl(appPackageJson);
-    const servedUrl =
+  const publicUrl = getPublicUrl(appPackageJson);
+  const servedUrl =
         envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
-    return ensureSlash(servedUrl, true);
+  return ensureSlash(servedUrl, true);
 }
 
-const resolveOwn = relativePath => path.resolve(__dirname, '..', relativePath);
+const resolveOwn = (relativePath) => path.resolve(__dirname, '..', relativePath);
 
-module.exports = {
-    dotenv: resolveApp('.env'),
-    ssbConfig: resolveApp('static-site-builder.config.js'),
-    publicDir: resolveApp('public'),
-    tsConfig: resolveApp('tsconfig.json'),
-    appPath: resolveApp('.'),
-    appBuild: resolveApp('build'),
-    appDist: resolveApp('dist'),
-    appTemplate: resolveAppFirst('src/index.html', 'src/index.ejs', 'src/index.hbs'),
-    appIndex: resolveAppFirst('src/index.js', 'src/index.ts'),
-    appPackageJson: resolveApp('package.json'),
-    appSrc: resolveApp('src'),
-    testsSetup: resolveApp('src/setupTests.js'),
-    appNodeModules: resolveApp('node_modules'),
-    publicUrl: getPublicUrl(resolveApp('package.json')),
-    servedPath: getServedPath(resolveApp('package.json')),
-    ownPath: resolveOwn('.'),
-    ownNodeModules: resolveOwn('node_modules'),
-    resolveApp,
-    resolveAppFirst,
-    resolveOwn,
-    ensureSlash
+export const dotenv = resolveApp('.env');
+export const ssbConfig = resolveApp('static-site-builder.config.js');
+export const publicDir = resolveApp('public');
+export const tsConfig= resolveApp('tsconfig.json');
+export const appPath= resolveApp('.');
+export const appBuild= resolveApp('build');
+export const appDist= resolveApp('dist');
+export const appTemplate= resolveAppFirst('src/index.html', 'src/index.ejs', 'src/index.hbs');
+export const appIndex= resolveAppFirst('src/index.js', 'src/index.ts');
+export const appPackageJson= resolveApp('package.json');
+export const appSrc= resolveApp('src');
+export const testsSetup= resolveApp('src/setupTests.js');
+export const appNodeModules= resolveApp('node_modules');
+export const publicUrl= getPublicUrl(resolveApp('package.json'));
+export const servedPath= getServedPath(resolveApp('package.json'));
+export const ownPath= resolveOwn('.');
+export const ownNodeModules= resolveOwn('node_modules');
+export {
+  resolveApp,
+  resolveAppFirst,
+  resolveOwn,
+  ensureSlash
 };
 
 
-module.exports.srcPaths = [module.exports.appSrc];
+const srcPaths = [module.exports.appSrc];
 
-module.exports.useYarn = fs.existsSync(
+let useYarn = fs.existsSync(
   path.join(module.exports.appPath, 'yarn.lock')
 );
 
 let checkForMonorepo = true;
 
-if (checkForMonorepo) {
+if(checkForMonorepo) {
   // if app is in a monorepo (lerna or yarn workspace), treat other packages in
   // the monorepo as if they are app source
   const mono = findMonorepo(appDirectory);
-  if (mono.isAppIncluded) {
-    Array.prototype.push.apply(module.exports.srcPaths, mono.pkgs);
+  if(mono.isAppIncluded) {
+    Array.prototype.push.apply(srcPaths, mono.pkgs);
   }
-  module.exports.useYarn = module.exports.useYarn || mono.isYarnWs;
-}
+  useYarn = module.exports.useYarn || mono.isYarnWs;
+}
+
+export {
+  srcPaths,
+  useYarn
+};