@epublishing/grunt-epublishing 0.3.1 → 0.3.3

package/lib/configure-sass.js

@@ -4,20 +4,13 @@
 
 'use strict';
 
-const _        = require('lodash');
-const sass     = require('node-sass');
+const sass     = require('sass');
 const NODE_ENV = process.env.NODE_ENV || 'development';
 
 module.exports = function configureSass(config) {
 
   config.sass.options.functions = {
-    'epub-show-deprecation-warnings()': () => {
-      if (_.includes([ 'local', 'development' ], NODE_ENV)) {
-        return sass.types.Boolean.TRUE;
-      }
-      return sass.types.Boolean.FALSE;
-    },
-    'epub-node-env()': () => new sass.types.String(NODE_ENV),
+    'epub-node-env()': () => new sass.String(NODE_ENV),
   };
 
   return config;

package/lib/configure-webpack.js

@@ -3,25 +3,26 @@
  * targets, including loaders and output plugins.
  */
 
-'use strict';
-
-const os                   = require('os');
-const fs                   = require('fs');
-const path                 = require('path');
-const webpack              = require('webpack');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-const CompressionPlugin    = require('compression-webpack-plugin');
-const UglifyJsPlugin       = require('uglifyjs-webpack-plugin');
-const lodashDir            = path.dirname(require.resolve('lodash'));
-const moduleDir            = path.dirname(lodashDir);
+"use strict";
+
+const os = require("os");
+const fs = require("fs");
+const path = require("path");
+const webpack = require("webpack");
+const BundleAnalyzerPlugin =
+  require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
+const CompressionPlugin = require("compression-webpack-plugin");
+const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+const lodashDir = path.dirname(require.resolve("lodash"));
+const moduleDir = path.dirname(lodashDir);
 
 module.exports = function configureWebpack(grunt, config) {
-  const { NODE_ENV = 'development' } = process.env;
-  const watch    = !!grunt.option('watch');
-  const verbose  = !!grunt.option('verbose');
-  const noMinify = !!grunt.option('no-minify');
-  const analyze  = !!grunt.option('analyze');
-  const lint     = NODE_ENV === 'test' || !!grunt.option('lint');
+  const { NODE_ENV = "development" } = process.env;
+  const watch = !!grunt.option("watch");
+  const verbose = !!grunt.option("verbose");
+  const noMinify = !!grunt.option("no-minify");
+  const analyze = !!grunt.option("analyze");
+  const lint = NODE_ENV === "test" || !!grunt.option("lint");
 
   for (const target in config.webpack) {
     const targetConfig = config.webpack[target];
@@ -42,45 +43,67 @@ module.exports = function configureWebpack(grunt, config) {
     // This prevents Webpack from loading every single locale definition file that Moment.js provides.
     // 99% of the time we only care about formatting dates in US English, so we have no need for i.e.
     // the preferred date formats of Esperanto-speaking residents of Papua New Guinea. American cultural hedgemony FTW!
-    const momentLocales = new webpack.ContextReplacementPlugin(/moment[/\\]locale$/, /en/);
+    const momentLocales = new webpack.ContextReplacementPlugin(
+      /moment[/\\]locale$/,
+      /en/
+    );
 
-    let plugins = [ environmentVars, momentLocales ];
+    let plugins = [environmentVars, momentLocales];
 
     if (!config.babelLoader) {
-      config.babelLoader = { exceptions: [], exclude: /(node_modules|bower_components)/ };
+      config.babelLoader = {
+        exceptions: [],
+        exclude: /(node_modules|bower_components)/,
+      };
     }
 
     const babelExclude = config.babelLoader.exclude;
-    const babelExceptions = config.babelLoader.exceptions.map((mod) => new RegExp(`node_modules/${mod}/(.+)\\.js$`));
+    const babelExceptions = config.babelLoader.exceptions.map(
+      (mod) => new RegExp(`node_modules/${mod}/(.+)\\.js$`)
+    );
 
-    targetConfig.watch                = watch;
-    targetConfig.keepalive            = watch || analyze;
-    targetConfig.stats.modules        = verbose;
-    targetConfig.stats.reasons        = verbose;
-    targetConfig.profile              = analyze;
+    targetConfig.watch = watch;
+    targetConfig.keepalive = watch || analyze;
+    targetConfig.stats.modules = verbose;
+    targetConfig.stats.reasons = verbose;
+    targetConfig.profile = analyze;
 
     // Tell babel-plugin-lodash where to find modularized Lo-Dash functions:
     targetConfig.resolve.alias.lodash = lodashDir;
 
     const babelOptions = {
       presets: [
-        [require.resolve('@epublishing/babel-preset-epublishing'), {
-          lodash: { cwd: moduleDir },
-          env: {
-            modules: false,
+        [
+          require.resolve("@epublishing/babel-preset-epublishing"),
+          {
+            lodash: { cwd: moduleDir },
+            env: {
+              modules: false,
+            },
+            minify: false,
           },
-          minify: false,
-        }],
+        ],
       ],
-    }
+      plugins: [
+        [
+          require.resolve("babel-plugin-transform-react-jsx"),
+          {
+            pragma: "h",
+            // pragmaFrag: "Fragment",
+          },
+        ],
+      ],
+    };
 
     const rules = [
       {
         test: /\.jsx?$/,
-        loader: 'babel-loader',
+        loader: "babel-loader",
         exclude: (input) => {
           // Check whether the asset has a matching exclusion exception pattern and allow it to transpile if it does:
-          const isException = babelExceptions.some((pattern) => pattern.test(input));
+          const isException = babelExceptions.some((pattern) =>
+            pattern.test(input)
+          );
           if (isException) return !isException;
 
           // Test asset against the default exclusion pattern and return result:
@@ -93,44 +116,43 @@ module.exports = function configureWebpack(grunt, config) {
         exclude: /node_modules/,
         use: [
           {
-            loader: 'babel-loader',
+            loader: "babel-loader",
             options: babelOptions,
           },
           {
-            loader: 'ts-loader',
+            loader: "ts-loader",
           },
         ],
       },
       {
         test: /\.css$/,
-        use: [
-          'style-loader',
-          'css-loader',
-        ],
+        use: ["style-loader", "css-loader"],
       },
       {
-        test: [ /\.svg$/, /\.jpe?g$/, /\.gif$/, /\.png$/ ],
-        loader: 'file-loader',
+        test: [/\.svg$/, /\.jpe?g$/, /\.gif$/, /\.png$/],
+        loader: "file-loader",
       },
     ];
 
     if (lint) {
-      const localEslintConfig = path.join(process.cwd(), '.eslintrc');
-      const globalEslintConfig = path.resolve(__dirname, '../.eslintrc');
-      const eslintConfig = fs.existsSync(localEslintConfig) ? localEslintConfig : globalEslintConfig;
+      const localEslintConfig = path.join(process.cwd(), ".eslintrc");
+      const globalEslintConfig = path.resolve(__dirname, "../.eslintrc");
+      const eslintConfig = fs.existsSync(localEslintConfig)
+        ? localEslintConfig
+        : globalEslintConfig;
 
       rules.push({
-        enforce: 'pre',
+        enforce: "pre",
         test: /\.js$/,
         exclude: /(node_modules|bower_components|public|vendor)/,
-        loader: 'eslint-loader',
+        loader: "eslint-loader",
         options: {
           configFile: eslintConfig,
-          formatter: require('eslint-friendly-formatter'),
+          formatter: require("eslint-friendly-formatter"),
           failOnError: true,
           outputReport: {
-            filePath: 'eslint.xml',
-            formatter: require('eslint/lib/formatters/junit'),
+            filePath: "eslint.xml",
+            formatter: require("eslint/lib/formatters/junit"),
           },
         },
       });
@@ -140,14 +162,14 @@ module.exports = function configureWebpack(grunt, config) {
 
     if (analyze) {
       const bundleAnalyzer = new BundleAnalyzerPlugin({
-        analyzerMode: 'server',
-        analyzerHost: '127.0.0.1',
-        analyzerPort: '8888',
-        reportFilename: 'webpack-analysis.html',
-        defaultSizes: 'parsed',
+        analyzerMode: "server",
+        analyzerHost: "127.0.0.1",
+        analyzerPort: "8888",
+        reportFilename: "webpack-analysis.html",
+        defaultSizes: "parsed",
         openAnalyzer: true,
         generateStatsFile: true,
-        statsFilename: 'webpack.stats.json',
+        statsFilename: "webpack.stats.json",
         statsOptions: { chunkModules: true },
       });
       plugins.push(bundleAnalyzer);
@@ -162,17 +184,21 @@ module.exports = function configureWebpack(grunt, config) {
       const { uglifyConfig = {} } = targetConfig;
       delete targetConfig.uglifyConfig;
 
-      plugins.push(new UglifyJsPlugin(Object.assign({}, uglifyDefaults, uglifyConfig)));
+      plugins.push(
+        new UglifyJsPlugin(Object.assign({}, uglifyDefaults, uglifyConfig))
+      );
     }
 
-    if (NODE_ENV === 'production') {
-      plugins.push(new CompressionPlugin({
-        asset: '[path].gz',
-        algorithm: 'gzip',
-        test: /\.js$/,
-        threshold: 10240,
-        minRatio: 0.8,
-      }));
+    if (NODE_ENV === "production") {
+      plugins.push(
+        new CompressionPlugin({
+          asset: "[path].gz",
+          algorithm: "gzip",
+          test: /\.js$/,
+          threshold: 10240,
+          minRatio: 0.8,
+        })
+      );
     }
 
     if (Array.isArray(targetConfig.appendPlugins)) {
@@ -182,7 +208,10 @@ module.exports = function configureWebpack(grunt, config) {
 
     targetConfig.plugins = plugins;
 
-    if (targetConfig.customize && typeof targetConfig.customize === 'function') {
+    if (
+      targetConfig.customize &&
+      typeof targetConfig.customize === "function"
+    ) {
       config.webpack[target] = targetConfig.customize(targetConfig, webpack);
       delete config.webpack[target].customize;
     }

package/lib/init-jade-config.js

@@ -7,7 +7,6 @@
 
 'use strict';
 
-const _                = require('lodash');
 const fs               = require('fs');
 const prettyjson       = require('prettyjson');
 const mergeConfigs     = require('./merge-configs');
@@ -31,7 +30,7 @@ module.exports = function initJadeConfig(grunt, jadePath, jadeChildPath, jadeChi
   baseConfig = mergeConfigs(baseConfig, jadePath);
 
   // Loop through all detected engine gem paths and merge their Grunt configurations into baseConfig
-  for (const childPath of _.values(jadeChildPaths)) {
+  for (const childPath of Object.values(jadeChildPaths)) {
     baseConfig = mergeConfigs(baseConfig, childPath);
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@epublishing/grunt-epublishing",
   "description": "Automated front-end tasks for ePublishing Jade and client sites.",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "homepage": "https://www.epublishing.com",
   "contributors": [
     {
@@ -11,21 +11,26 @@
     {
       "name": "Mike Green",
       "email": "mgreen@epublishing.com"
+    },
+    {
+      "name": "Michael Hedges",
+      "email": "mhedges@epublishing.com"
     }
   ],
   "repository": "bitbucket:epub_dev/grunt-epublishing",
   "license": "MIT",
   "engines": {
-    "node": ">= 8.0.0"
+    "node": ">= 12.22.12"
   },
   "dependencies": {
-    "@epublishing/babel-preset-epublishing": "^0.1.6",
+    "@epublishing/babel-preset-epublishing": "^0.1.8",
     "@epublishing/get-gem-paths": "^0.1.1",
     "@epublishing/grunt-install-eslint": "^0.1.1",
     "@epublishing/jade-resolver": "^0.1.2",
     "async": "^2.6.1",
     "babel-loader": "^7.1.5",
     "babel-minify-webpack-plugin": "^0.3.0",
+    "babel-plugin-transform-react-jsx": "^6.24.1",
     "bourbon": "^4.2.7",
     "breakpoint-sass": "^2.7.0",
     "chalk": "^2.4.1",
@@ -64,10 +69,10 @@
     "jit-grunt": "^0.10.0",
     "listr": "^0.14.1",
     "lodash": "^4.17.10",
-    "node-sass": "^6.0.1",
     "postcss-css-variables": "^0.9.0",
     "prettyjson": "^1.2.1",
     "read-pkg": "^4.0.1",
+    "sass": "^1.71.1",
     "style-loader": "^0.20.2",
     "susy": "^2.2.14",
     "time-grunt": "^1.4.0",

package/tasks/jade.js

@@ -14,11 +14,19 @@ const initJadeConfig = require('../lib/init-jade-config');
 module.exports = function(grunt) {
   grunt.option('siteRoot', process.cwd())
 
+  console.log('~~~~~~~~~~~~~~~~~~~~')
+  console.log('~~~~~~~DEBUG~~~~~~~~')
+  console.log('~~~~~~~~~~~~~~~~~~~~')
+
+
   if (!grunt.option('no-time')) timeGrunt(grunt);
+  
   jitGrunt(grunt, {
     'install-eslint': '@epublishing/grunt-install-eslint',
   });
 
+
+
   /**
    * This registers a grunt task which shells out and uses bundler to
    * determine the paths to the jade gem and any jade child engine gem