@epublishing/grunt-epublishing 0.3.16 → 0.3.18

package/lib/init-jade-config.js

@@ -11,7 +11,6 @@ const fs               = require('fs');
 const prettyjson       = require('prettyjson');
 const mergeConfigs     = require('./merge-configs');
 const configureWebpack = require('./configure-webpack');
-const configureSass    = require('./configure-sass');
 const configurePostCSS = require('./configure-postcss');
 
 module.exports = function initJadeConfig(grunt, jadePath, jadeChildPath, jadeChildPaths) {
@@ -40,9 +39,6 @@ module.exports = function initJadeConfig(grunt, jadePath, jadeChildPath, jadeChi
   // Update baseConfig's Webpack settings with ePublishing defaults:
   baseConfig = configureWebpack(grunt, baseConfig);
 
-  // Add custom functions and settings to the merged Sass config
-  baseConfig = configureSass(baseConfig);
-
   if (baseConfig.postcss) {
     baseConfig = configurePostCSS(baseConfig, grunt);
   }

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.16",
+  "version": "0.3.18",
   "homepage": "https://www.epublishing.com",
   "contributors": [
     {
@@ -40,7 +40,6 @@
     "compression-webpack-plugin": "^1.1.7",
     "css-loader": "^0.28.9",
     "cssnano": "^4.0.5",
-    "each-async": "^2.0.0",
     "es5-shim": "^4.5.10",
     "es6-promise": "^4.2.4",
     "eslint": "^4.2.0",
@@ -62,7 +61,6 @@
     "grunt-contrib-uglify": "^3.4.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-postcss": "^0.9.0",
-    "grunt-sass": "^3.1.0",
     "grunt-webpack": "^3.1.2",
     "handlebars": "^4.0.11",
     "handlebars-loader": "^1.6.0",
@@ -70,7 +68,6 @@
     "jit-grunt": "^0.10.0",
     "listr": "^0.14.1",
     "lodash": "^4.17.10",
-    "object-assign": "^4.1.1",
     "postcss-css-variables": "^0.9.0",
     "prettyjson": "^1.2.1",
     "read-pkg": "^4.0.1",

package/tasks/sass.js

@@ -0,0 +1,44 @@
+/* eslint-disable prefer-object-spread, promise/prefer-await-to-then */
+'use strict';
+const util = require('util');
+const sass = require('sass');
+const path = require('path');
+
+module.exports = grunt => {
+	grunt.registerMultiTask('sass', 'Compile Sass to CSS', function () {
+		const done = this.async();
+
+		const options = this.options({
+			precision: 10
+		});
+
+		if (!options.implementation) {
+			grunt.fatal('The implementation option must be passed to the Sass task');
+		}
+		grunt.verbose.writeln(`\n${options.implementation.info}\n`);
+
+		(async () => {
+			await Promise.all(this.files.map(async item => {
+				const [src] = item.src;
+
+				if (!src || path.basename(src)[0] === '_') {
+					return;
+				}
+
+				const result = await util.promisify(sass.render)(Object.assign({}, options, {
+					file: src,
+					outFile: item.dest,
+				}));
+
+				grunt.file.write(item.dest, result.css);
+
+				if (options.sourceMap) {
+					const filePath = options.sourceMap === true ? `${item.dest}.map` : options.sourceMap;
+					grunt.file.write(filePath, result.map);
+				}
+			}));
+		})().catch(error => {
+			grunt.fatal(error.formatted || error);
+		}).then(done);
+	});
+};

package/lib/configure-sass.js

@@ -1,45 +0,0 @@
-/**
- * This function merges custom SassScript functions into the base Sass config
- */
-
-'use strict';
-
-const sass = require('sass');
-const path = require('path');
-
-const sassAliases = {
-  '^compass': function (url) {
-    return path.join(
-      process.cwd(),
-      'node_modules',
-      'compass-mixins',
-      'lib',
-      url
-    );
-  },
-  '^bourbon$': 'bourbon/app/assets/stylesheets/bourbon',
-  '^breakpoint$': 'breakpoint-sass/stylesheets/breakpoint',
-  '^susyone$': 'susy/sass/susyone'
-};
-
-module.exports = function configureSass(config) {
-
-  config.sass.options.implementation = sass;
-
-  config.sass.options.importer = (url, prev, done) => {
-    for (const key in sassAliases) {
-      const pattern = new RegExp(key);
-      const alias = sassAliases[key];
-
-      if (pattern.test(url)) {
-        const value = alias instanceof Function ? alias(url) : alias;
-        return done({ file: value });
-      }
-    }
-
-    return done({ file: url });
-  }
-
-
-  return config;
-};