Merge pull request #78 from suitcss/node-4

Switch to Node 4

Author: simonsmith

.eslintrc

@@ -19,13 +19,9 @@
     "one-var": [2, { "uninitialized": "always", "initialized": "never" }],
     "space-before-function-paren": 0,
     "vars-on-top": 0,
+    "arrow-parens": 0,
+    "strict": 0,
 
-    "import/no-dynamic-require": 0,
-
-    // Disable until using node 4 as base
-    "no-var": 0,
-    "prefer-arrow-callback": 0,
-    "object-shorthand": 0,
-    "prefer-template": 0
+    "import/no-dynamic-require": 0
   }
 }

.travis.yml

@@ -2,8 +2,8 @@ language: node_js
 sudo: required
 node_js:
   - "4"
-  - "5"
   - "6"
+  - "stable"
 addons:
   apt:
     packages:

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### HEAD
 
+* Refactor to support Node 4 upwards
 * Update `fs-extra` to `2.0.0`
 * Update `postcss-apply` to `0.5.0`
 * Update `postcss-color-function` to `3.0.0`

appveyor.yml

@@ -2,8 +2,8 @@
 
 environment:
   matrix:
+    - nodejs_version: 7
     - nodejs_version: 6
-    - nodejs_version: 5
     - nodejs_version: 4
 
 version: "{build}"

bin/suitcss

@@ -1,17 +1,19 @@
 #!/usr/bin/env node
 
-var fs = require('fs-extra');
-var assign = require('object-assign-deep');
-var logger = require('./logger');
-var suitcss = require('..');
-var path = require('path');
-var program = require('commander');
-var read = require('read-file-stdin');
-var chokidar = require('chokidar');
-
-var exists = fs.existsSync;
-var resolve = path.resolve;
-var writeFileSync = fs.outputFileSync;
+'use strict';
+
+const fs = require('fs-extra');
+const assign = require('object-assign-deep');
+const logger = require('./logger');
+const suitcss = require('..');
+const path = require('path');
+const program = require('commander');
+const read = require('read-file-stdin');
+const chokidar = require('chokidar');
+
+const exists = fs.existsSync;
+const resolve = path.resolve;
+const writeFileSync = fs.outputFileSync;
 
 /**
  * Usage.
@@ -34,7 +36,7 @@ program
  * Examples.
  */
 
-program.on('--help', function() {
+program.on('--help', () => {
   console.log('  Examples:');
   console.log();
   console.log('    # pass an input and output file:');
@@ -65,17 +67,17 @@ program.parse(process.argv);
  */
 
 function requireOrParse(configFile) {
-  var configPath = resolve(configFile);
-  var ext = path.extname(configPath);
-  var readFn = /js|json/.test(ext) ? require : fs.readJsonSync;
+  const configPath = resolve(configFile);
+  const ext = path.extname(configPath);
+  const readFn = /js|json/.test(ext) ? require : fs.readJsonSync;
   return readFn(configPath);
 }
 
-var input = program.args[0] ? resolve(program.args[0]) : null;
-var output = program.args[1] ? resolve(program.args[1]) : null;
-var config = program.config ? requireOrParse(program.config) : {};
-var verbose = program.verbose;
-var regen = program.watch && input && output;
+const input = program.args[0] ? resolve(program.args[0]) : null;
+const output = program.args[1] ? resolve(program.args[1]) : null;
+const config = program.config ? requireOrParse(program.config) : {};
+const verbose = program.verbose;
+const regen = program.watch && input && output;
 
 /**
  * Exists?
@@ -93,18 +95,18 @@ run();
  * Watch
  */
 
-var currentWatchedFiles;
+let currentWatchedFiles;
 if (regen) {
-  var watcher = chokidar.watch(input);
+  const watcher = chokidar.watch(input);
   watcher.on('change', run);
-  watcher.on('change', function(file) {
-    if (verbose) logger.log(path.basename(file) + ' changed');
+  watcher.on('change', file => {
+    if (verbose) logger.log(`${path.basename(file)} changed`);
   });
-  watcher.on('ready', function() {
-    if (verbose) logger.log('Watching ' + path.basename(input));
+  watcher.on('ready', () => {
+    if (verbose) logger.log(`Watching ${path.basename(input)}`);
   });
 
-  global.watchCSS = function(imported) {
+  global.watchCSS = imported => {
     watcher.unwatch(currentWatchedFiles);
     watcher.add(imported);
     currentWatchedFiles = imported;
@@ -115,25 +117,25 @@ if (regen) {
  * Run for the given input and output.
  */
 function run() {
-  read(input, function(err, buffer) {
+  read(input, (err, buffer) => {
     if (err) logger.throw(err);
-    var css = buffer.toString();
-    var optsAliases = {
+    const css = buffer.toString();
+    const optsAliases = {
       importRoot: 'root'
     };
-    var flags = [
+    const flags = [
       'minify',
       'encapsulate',
       'importRoot',
       'lint'
-    ].reduce(function(acc, inFlag) {
+    ].reduce((acc, inFlag) => {
       if (({}).hasOwnProperty.call(program, inFlag)) {
-        var flag = optsAliases[inFlag] || inFlag;
+        const flag = optsAliases[inFlag] || inFlag;
         acc[flag] = program[inFlag];
       }
       return acc;
     }, {});
-    var opts = assign({}, config, flags);
+    const opts = assign({}, config, flags);
 
     if (program.throwError) {
       assign(opts, {
@@ -143,14 +145,14 @@ function run() {
       });
     }
 
-    suitcss(css, opts, input).then(function(result) {
+    suitcss(css, opts, input).then(result => {
       if (output) {
-        writeFileSync(output, result.css + '\n');
+        writeFileSync(output, `${result.css}\n`);
       } else {
         console.log(result.css);
       }
       if (verbose && output) logger.log('write', output);
-    }).catch(function(e) {
+    }).catch(e => {
       logger.throw(e);
     });
   });

lib/encapsulation.js

@@ -1,7 +1,9 @@
+'use strict';
+
 /* eslint-disable quote-props */
-var autoreset = require('postcss-autoreset');
+const autoreset = require('postcss-autoreset');
 
-var rules = {
+const rules = {
   inherited: {
     'border-collapse': 'separate',
     'border-spacing': 0,
@@ -101,10 +103,10 @@ var rules = {
 // This applies only to the Component Root
 // to stop inheritance and ensure
 // styles encapsulation
-var resetInherited = autoreset({
+const resetInherited = autoreset({
   reset: rules.inherited,
-  rulesMatcher: function (rule) {
-    var selector = rule.selector;
+  rulesMatcher(rule) {
+    const selector = rule.selector;
     return (
       selector.charAt(0) === '.' &&
       /^\.(?:[a-z0-9]*-)?[A-Z](?:[a-zA-Z0-9]+)$/.test(selector)
@@ -115,14 +117,15 @@ var resetInherited = autoreset({
 resetInherited.postcssPlugin = 'autoreset-suitcss-encapsulation-inherited';
 
 // This applies to the Component Root and Descendants
-var resetGeneric = autoreset({
+const resetGeneric = autoreset({
   reset: rules.nonInherited,
   rulesMatcher: 'suit'
 });
 
 resetGeneric.postcssPlugin = 'autoreset-suitcss-encapsulation-nonInherited';
 
 module.exports = {
-  resetInherited: resetInherited,
-  resetGeneric: resetGeneric
+  resetInherited,
+  resetGeneric
 };
+

lib/index.js

@@ -1,15 +1,17 @@
-var assign = require('object-assign-deep');
-var autoprefixer = require('autoprefixer');
-var bemLinter = require('postcss-bem-linter');
-var cssnano = require('cssnano');
-var difference = require('lodash.difference');
-var encapsulationPlugins = require('./encapsulation');
-var isEmpty = require('lodash.isempty');
-var postcss = require('postcss');
-var postcssEasyImport = require('postcss-easy-import');
-var reporter = require('postcss-reporter');
-var stylelint = require('stylelint');
-var stylelintConfigSuit = require('stylelint-config-suitcss');
+'use strict';
+
+const assign = require('object-assign-deep');
+const autoprefixer = require('autoprefixer');
+const bemLinter = require('postcss-bem-linter');
+const cssnano = require('cssnano');
+const difference = require('lodash.difference');
+const encapsulationPlugins = require('./encapsulation');
+const isEmpty = require('lodash.isempty');
+const postcssEasyImport = require('postcss-easy-import');
+const reporter = require('postcss-reporter');
+const stylelint = require('stylelint');
+const stylelintConfigSuit = require('stylelint-config-suitcss');
+let postcss = require('postcss'); // eslint-disable-line prefer-const
 
 module.exports = preprocessor;
 
@@ -18,7 +20,7 @@ module.exports = preprocessor;
  * and options to PostCSS plugins
  */
 
-var defaults = {
+const defaults = {
   debug: identity,
   lint: true,
   minify: false,
@@ -31,8 +33,8 @@ var defaults = {
     'postcss-apply'
   ],
   autoprefixer: {
-    browsers: '> 1%, last 2 versions, safari > 6, ie > 9, ' +
-      'ios > 6, android > 4.3, samsung > 3, chromeandroid > 50'
+    browsers: `> 1%, last 2 versions, safari > 6, ie > 9,
+    ios > 6, android > 4.3, samsung > 3, chromeandroid > 50`
   },
   'postcss-easy-import': {
     transform: identity,
@@ -62,14 +64,14 @@ var defaults = {
 function preprocessor(css, options, filename) {
   options = mergeOptions(options);
 
-  var plugins = [
+  let plugins = [
     postcssEasyImport(options['postcss-easy-import'])
   ];
 
   plugins = plugins.concat(
-    options.use.map(function(p) {
-      var plugin = require(p);
-      var settings = options[p];
+    options.use.map(p => {
+      const plugin = require(p);
+      const settings = options[p];
       return settings ? plugin(settings) : plugin;
     })
   );
@@ -88,15 +90,14 @@ function preprocessor(css, options, filename) {
     reporter(options['postcss-reporter'])
   ]);
 
-  var processor = postcss(options.debug(plugins));
+  const processor = postcss(options.debug(plugins));
 
   if (options.minify) {
     processor.use(cssnano(options.cssnano));
   }
 
-  return lintFile(css, options, filename).then(function(result) {
-    return processor.process(result.css, options.postcss);
-  });
+  return lintFile(css, options, filename)
+    .then(result => processor.process(result.css, options.postcss));
 }
 
 /**
@@ -108,33 +109,31 @@ function preprocessor(css, options, filename) {
 
 function mergeOptions(options) {
   options = options || {};
-  var mergedOpts = assign({}, defaults, options);
-  var easyImportOpts = mergedOpts['postcss-easy-import'];
-  var origTransform = easyImportOpts.transform;
-  var origOnImport = easyImportOpts.onImport;
+  const mergedOpts = assign({}, defaults, options);
+  const easyImportOpts = mergedOpts['postcss-easy-import'];
+  const origTransform = easyImportOpts.transform;
+  const origOnImport = easyImportOpts.onImport;
 
   if (mergedOpts.root) {
     easyImportOpts.root = mergedOpts.root;
   }
 
-  easyImportOpts.transform = function(css, filename) {
-    var transformedCss = origTransform(css);
-    return lintFile(transformedCss, mergedOpts, filename).then(function(result) {
-      return result.css;
-    });
+  easyImportOpts.transform = (css, filename) => {
+    const transformedCss = origTransform(css);
+    return lintFile(transformedCss, mergedOpts, filename).then(result => result.css);
   };
 
-  easyImportOpts.onImport = function(importedFiles) {
+  easyImportOpts.onImport = importedFiles => {
     updateWatchTaskFiles(importedFiles);
     origOnImport(importedFiles);
   };
 
   // Allow additional plugins to be merged with the defaults
   // but remove any duplicates so that it respects the new order
   if (!isEmpty(options.use)) {
-    var plugins = difference(mergedOpts.use, options.use);
+    const plugins = difference(mergedOpts.use, options.use);
     // Remove core plugins. Can't reorder them
-    var userPlugins = difference(options.use, [
+    const userPlugins = difference(options.use, [
       'postcss-easy-import',
       'autoprefixer',
       'postcss-reporter'
@@ -153,7 +152,7 @@ function mergeOptions(options) {
  * @returns {Promise} Used by postcss-import transform
  */
 function lintFile(css, options, filename) {
-  var processor = postcss();
+  const processor = postcss();
 
   if (options.lint) {
     processor
@@ -170,9 +169,7 @@ function lintFile(css, options, filename) {
     .use(reporter(options['postcss-reporter']));
 
   if (isPromise(css)) {
-    return css.then(function(css) { // eslint-disable-line no-shadow
-      return processor.process(css, options.postcss);
-    });
+    return css.then(css => processor.process(css, options.postcss)); // eslint-disable-line no-shadow
   }
 
   return processor.process(css, options.postcss);