@henderea/static-site-builder 1.9.10 → 1.10.0

package/bin/static-site-builder.js

@@ -15,8 +15,13 @@ process.on('unhandledRejection', (err) => {
   throw err;
 });
 
-import spawn from 'cross-spawn';
+import { spawnSync } from 'child_process';
 const args = process.argv.slice(2);
+import _ from 'lodash';
+
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
 
 const scriptIndex = args.findIndex(
   (x) => x === 'build' || x === 'watch'
@@ -27,12 +32,13 @@ const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : [];
 switch(script) {
 case 'build':
 case 'watch': {
-  const result = spawn.sync(
+  const nodeEnv = script == 'build' ? 'production' : 'development';
+  const result = spawnSync(
     'node',
     nodeArgs
       .concat(require.resolve('../scripts/' + script))
       .concat(args.slice(scriptIndex + 1)),
-    { stdio: 'inherit' }
+    { stdio: 'inherit', env: _.extend({}, process.env, { NODE_ENV: nodeEnv, BABEL_ENV: nodeEnv }) }
   );
   if(result.signal) {
     if(result.signal === 'SIGKILL') {
@@ -52,6 +58,7 @@ case 'watch': {
   }
   process.exit(result.status);
 }
+// eslint-disable-next-line no-fallthrough
 default:
   console.log('Unknown script "' + script + '".');
   console.log('Perhaps you need to update static-site-builder?');

package/config/env.js

@@ -6,10 +6,12 @@
  */
 import fs from 'fs';
 import path from 'path';
-import paths from './paths';
+import * as paths from './paths.js';
+import dotenvExpand from 'dotenv-expand';
+import dotenv from 'dotenv';
 
 // Make sure that including paths.js after env.js will read .env variables.
-delete require.cache[require.resolve('./paths')];
+// delete require.cache[require.resolve('./paths')];
 
 const NODE_ENV = process.env.NODE_ENV;
 if(!NODE_ENV) {
@@ -36,8 +38,8 @@ var dotenvFiles = [
 // https://github.com/motdotla/dotenv-expand
 dotenvFiles.forEach((dotenvFile) => {
   if(fs.existsSync(dotenvFile)) {
-    require('dotenv-expand')(
-      require('dotenv').config({
+    dotenvExpand(
+      dotenv.config({
         path: dotenvFile,
       })
     );

package/config/paths.js

@@ -9,7 +9,10 @@
 import path from 'path';
 import fs from 'fs';
 import url from 'url';
-import { findMonorepo } from '../utils/workspaceUtils';
+import { findMonorepo } from '../utils/workspaceUtils.js';
+import { fileURLToPath } from 'url';
+
+const dirname = fileURLToPath(import.meta.url);
 
 // Make sure any symlinks in the project folder are resolved:
 // https://github.com/facebookincubator/create-react-app/issues/637
@@ -34,7 +37,7 @@ function ensureSlash(path, needsSlash) {
 }
 
 const getPublicUrl = (appPackageJson) =>
-  envPublicUrl || require(appPackageJson).homepage;
+  envPublicUrl || JSON.parse(fs.readFileSync(appPackageJson)).homepage;
 
 // We use `PUBLIC_URL` environment variable or "homepage" field to infer
 // "public path" at which the app is served.
@@ -49,37 +52,29 @@ function getServedPath(appPackageJson) {
   return ensureSlash(servedUrl, true);
 }
 
-const resolveOwn = (relativePath) => path.resolve(__dirname, '..', relativePath);
+const resolveOwn = (relativePath) => path.resolve(dirname, '..', relativePath);
 
 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
-};
-
-
-const srcPaths = [module.exports.appSrc];
+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');
+const srcPaths = [appSrc];
 
 let useYarn = fs.existsSync(
-  path.join(module.exports.appPath, 'yarn.lock')
+  path.join(appPath, 'yarn.lock')
 );
 
 let checkForMonorepo = true;
@@ -91,10 +86,14 @@ if(checkForMonorepo) {
   if(mono.isAppIncluded) {
     Array.prototype.push.apply(srcPaths, mono.pkgs);
   }
-  useYarn = module.exports.useYarn || mono.isYarnWs;
+  useYarn = useYarn || mono.isYarnWs;
 }
 
 export {
+  resolveApp,
+  resolveAppFirst,
+  resolveOwn,
+  ensureSlash,
   srcPaths,
   useYarn
 };

package/config/webpack.config.dev.js

@@ -6,9 +6,12 @@ import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import { WebpackManifestPlugin } from 'webpack-manifest-plugin';
 import CopyPlugin from 'copy-webpack-plugin';
 import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
-import getClientEnvironment from './env';
-import * as paths from './paths';
+import getClientEnvironment from './env.js';
+import * as paths from './paths.js';
 import _ from 'lodash';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
 
 // Webpack uses `publicPath` to determine where the app is being served from.
 // It requires a trailing slash, or the file assets will get an incorrect path.
@@ -123,7 +126,7 @@ if(ssbConfig.extraLoaders && _.isArray(ssbConfig.extraLoaders)) {
   extraLoaders.push(...ssbConfig.extraLoaders);
 }
 
-module.exports = _.defaultsDeep({}, ssbConfig.webpack || {}, {
+export default _.defaultsDeep({}, ssbConfig.webpack || {}, {
   mode: 'development',
   entry: {
     index: appIndex
@@ -222,7 +225,7 @@ module.exports = _.defaultsDeep({}, ssbConfig.webpack || {}, {
             // its runtime that would otherwise processed through "file" loader.
             // Also exclude `html` and `json` extensions so they get processed
             // by webpack's internal loaders.
-            exclude: [/\.js$/, /\.ts$/, /\.html$/, /\.ejs$/, /\.hbs$/, /\.json$/],
+            exclude: [/\.js$/, /\.ts$/, /\.svg$/, /\.html$/, /\.ejs$/, /\.hbs$/, /\.json$/],
             options: {
               name: '[name].[ext]'
             }

package/config/webpack.config.prod.js

@@ -9,11 +9,14 @@ import CopyPlugin from 'copy-webpack-plugin';
 import { GenerateSW } from 'workbox-webpack-plugin';
 import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
 import MomentLocalesPlugin from 'moment-locales-webpack-plugin';
-import getClientEnvironment from './env';
-import * as paths from './paths';
+import getClientEnvironment from './env.js';
+import * as paths from './paths.js';
 import _ from 'lodash';
 import crypto from 'crypto';
 import { globbySync } from 'globby';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
 
 // Webpack uses `publicPath` to determine where the app is being served from.
 // It requires a trailing slash, or the file assets will get an incorrect path.
@@ -74,7 +77,8 @@ if(ssbConfig.additionalManifestEntries && _.isArray(ssbConfig.additionalManifest
   additionalManifestEntries.push(...ssbConfig.additionalManifestEntries);
 }
 
-let runtimeCaching = require('./cache-config');
+import runtimeCachingTmp from './cache-config.js';
+let runtimeCaching = runtimeCachingTmp;
 
 if(ssbConfig.runtimeCaching && _.isArray(ssbConfig.runtimeCaching)) {
   runtimeCaching = ssbConfig.runtimeCaching;
@@ -230,7 +234,7 @@ if(ssbConfig.extraLoaders && _.isArray(ssbConfig.extraLoaders)) {
   extraLoaders.push(...ssbConfig.extraLoaders);
 }
 
-module.exports = _.defaultsDeep({}, ssbConfig.webpack || {}, {
+export default _.defaultsDeep({}, ssbConfig.webpack || {}, {
   mode: 'production',
   entry: {
     index: appIndex
@@ -354,7 +358,7 @@ module.exports = _.defaultsDeep({}, ssbConfig.webpack || {}, {
             // its runtime that would otherwise processed through "file" loader.
             // Also exclude `html` and `json` extensions so they get processed
             // by webpack's internal loaders.
-            exclude: [/\.js$/, /\.ts$/, /\.html$/, /\.ejs$/, /\.hbs$/, /\.json$/],
+            exclude: [/\.js$/, /\.ts$/, /\.svg$/, /\.html$/, /\.ejs$/, /\.hbs$/, /\.json$/],
             options: {
               name: '[name].[ext]'
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henderea/static-site-builder",
-  "version": "1.9.10",
+  "version": "1.10.0",
   "description": "A static site builder",
   "main": "index.js",
   "repository": "henderea/static-site-builder.git",

package/scripts/build.js

@@ -11,18 +11,18 @@ process.on('unhandledRejection', (err) => {
   throw err;
 });
 
-require('../config/env');
+import '../config/env.js';
 
 // import path from 'path';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import webpack from 'webpack';
-import config from '../config/webpack.config.prod';
-import * as paths from '../config/paths';
-import checkRequiredFiles from '../utils/checkRequiredFiles';
-import formatWebpackMessages from '../utils/formatWebpackMessages';
-import FileSizeReporter from '../utils/FileSizeReporter';
-import printBuildError from '../utils/printBuildError';
+import config from '../config/webpack.config.prod.js';
+import * as paths from '../config/paths.js';
+import checkRequiredFiles from '../utils/checkRequiredFiles.js';
+import formatWebpackMessages from '../utils/formatWebpackMessages.js';
+import * as FileSizeReporter from '../utils/FileSizeReporter.js';
+import printBuildError from '../utils/printBuildError.js';
 
 const measureFileSizesBeforeBuild =
     FileSizeReporter.measureFileSizesBeforeBuild;

package/scripts/watch.js

@@ -11,18 +11,18 @@ process.on('unhandledRejection', (err) => {
   throw err;
 });
 
-require('../config/env');
+import '../config/env.js';
 
 // import path from 'path';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import webpack from 'webpack';
-import config from '../config/webpack.config.dev';
-import * as paths from '../config/paths';
-import checkRequiredFiles from '../utils/checkRequiredFiles';
-import formatWebpackMessages from '../utils/formatWebpackMessages';
-import FileSizeReporter from '../utils/FileSizeReporter';
-import printBuildError from '../utils/printBuildError';
+import config from '../config/webpack.config.dev.js';
+import * as paths from '../config/paths.js';
+import checkRequiredFiles from '../utils/checkRequiredFiles.js';
+import formatWebpackMessages from '../utils/formatWebpackMessages.js';
+import * as FileSizeReporter from '../utils/FileSizeReporter.js';
+import printBuildError from '../utils/printBuildError.js';
 
 const measureFileSizesBeforeBuild =
     FileSizeReporter.measureFileSizesBeforeBuild;

package/utils/FileSizeReporter.js

@@ -13,7 +13,7 @@ import chalk from 'chalk';
 import filesize from 'filesize';
 import recursive from 'recursive-readdir';
 import stripAnsi from 'strip-ansi';
-import { sync as gzipSize } from 'gzip-size';
+import { gzipSizeSync } from 'gzip-size';
 
 // Prints a detailed summary of build files.
 function printFileSizesAfterBuild(
@@ -32,7 +32,7 @@ function printFileSizesAfterBuild(
         .assets.filter((asset) => /\.(js|css)$/.test(asset.name))
         .map((asset) => {
           var fileContents = fs.readFileSync(path.join(root, asset.name));
-          var size = gzipSize(fileContents);
+          var size = gzipSizeSync(fileContents);
           var previousSize = sizes[removeFileNameHash(root, asset.name)];
           var difference = getDifferenceLabel(size, previousSize);
           return {
@@ -132,7 +132,7 @@ function measureFileSizesBeforeBuild(buildFolder) {
           .reduce((memo, fileName) => {
             var contents = fs.readFileSync(fileName);
             var key = removeFileNameHash(buildFolder, fileName);
-            memo[key] = gzipSize(contents);
+            memo[key] = gzipSizeSync(contents);
             return memo;
           }, {});
       }

package/utils/workspaceUtils.js

@@ -8,7 +8,10 @@
 import fs from 'fs';
 import path from 'path';
 import findPkg from 'find-pkg';
-import globby from 'globby';
+import { globbySync } from 'globby';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
 
 const findPkgs = (rootPath, globPatterns) => {
   if(!globPatterns) {
@@ -22,7 +25,7 @@ const findPkgs = (rootPath, globPatterns) => {
   return globPatterns
     .reduce(
       (pkgs, pattern) =>
-        pkgs.concat(globby.sync(path.join(pattern, 'package.json'), globOpts)),
+        pkgs.concat(globbySync(path.join(pattern, 'package.json'), globOpts)),
       []
     )
     .map((f) => path.dirname(path.normalize(f)));