chore: lighter transformation (#65)

* test(cli): add failing integration test * fix: determine git root correctly from sub directories * chore: make transformation lighter * chore: unify babel config in babel-preset-commitlint * fix: make this work * fix: sudo make this work * fix: sudo make this work * fix(babel-preset-commitlint): use correct imports * fix: remove usage of [].includes * docs: clarify lowest node version

Author: marionebl

@commitlint/cli/cli.test.js

@@ -1,6 +1,7 @@
 import path from 'path';
 import test from 'ava';
 import execa from 'execa';
+import {includes} from 'lodash';
 import {sync as bin} from 'resolve-bin';
 import * as sander from 'sander';
 import stream from 'string-to-stream';
@@ -44,7 +45,7 @@ test('should throw when called without [input]', t => {
 
 test('should reprint input from stdin', async t => {
 const actual = await cli([], {cwd: EMPTY})('foo: bar');
-t.true(actual.stdout.includes('foo: bar'));
+t.true(includes(actual.stdout, 'foo: bar'));
 });
 
 test('should produce no success output with --quiet flag', async t => {
@@ -66,15 +67,15 @@ test('should succeed for input from stdin without rules', async t => {
 
 test('should fail for input from stdin with rule from rc', async t => {
 const actual = await t.throws(cli([], {cwd: SIMPLE})('foo: bar'));
-t.true(actual.stdout.includes('type must not be one of [foo]'));
+t.true(includes(actual.stdout, 'type must not be one of [foo]'));
 t.is(actual.code, 1);
 });
 
 test('should fail for input from stdin with rule from js', async t => {
 const actual = await t.throws(
 cli(['--extends', './extended'], {cwd: EXTENDS_ROOT})('foo: bar')
 );
-t.true(actual.stdout.includes('type must not be one of [foo]'));
+t.true(includes(actual.stdout, 'type must not be one of [foo]'));
 t.is(actual.code, 1);
 });
 

@commitlint/core/package.json

@@ -6,7 +6,8 @@
  "scripts": {
  "pretest": "dep-check",
  "test": "ava -c 4",
- "build": "cross-env NODE_ENV=production babel src --out-dir lib",
+ "build": "cross-env NODE_ENV=production babel src --out-dir lib --source-maps",
+ "watch": "babel src --out-dir lib --watch --source-maps",
  "clean": "rimraf lib",
  "prepublish": "npm run build"
  },
@@ -21,53 +22,11 @@
  ],
  "babel": "inherit",
  "require": [
- "babel-register",
- "babel-polyfill"
+ "babel-register"
  ]
  },
  "babel": {
- "env": {
- "development": {
- "sourceMaps": "inline",
- "plugins": [
- "add-module-exports",
- "istanbul",
- [
- "transform-runtime",
- {
- "polyfill": false,
- "regenerator": true
- }
- ]
- ]
- },
- "production": {
- "ignore": [
- "**/*.test.js"
- ]
- }
- },
- "presets": [
- [
- "env",
- {
- "targets": {
- "node": 4
- }
- }
- ],
- "stage-0"
- ],
- "plugins": [
- "add-module-exports",
- [
- "transform-runtime",
- {
- "polyfill": false,
- "regenerator": true
- }
- ]
- ]
+ "presets": ["babel-preset-commitlint"]
  },
  "xo": false,
  "nyc": {
@@ -105,20 +64,11 @@
  "ansi-styles": "3.1.0",
  "ava": "0.18.2",
  "babel-cli": "^6.18.0",
- "babel-plugin-add-module-exports": "0.2.1",
- "babel-plugin-istanbul": "4.1.3",
- "babel-plugin-transform-runtime": "6.23.0",
- "babel-polyfill": "^6.20.0",
- "babel-preset-env": "^1.2.1",
- "babel-preset-stage-0": "^6.16.0",
+ "babel-preset-commitlint": "^3.1.3",
  "babel-register": "6.24.1",
- "conventional-changelog-cli": "1.2.0",
- "conventional-recommended-bump": "0.3.0",
  "cross-env": "^5.0.1",
- "cz-conventional-changelog-lint": "0.1.3",
  "denodeify": "1.2.1",
  "dependency-check": "2.7.0",
- "eslint-plugin-flow-check": "1.1.1",
  "execa": "0.6.3",
  "globby": "6.1.0",
  "has-ansi": "3.0.0",

@commitlint/core/src/format.test.js

@@ -2,6 +2,7 @@ import test from 'ava';
 import hasAnsi from 'has-ansi';
 import chalk from 'chalk';
 import {yellow, red, magenta, blue} from 'ansi-styles';
+import {includes} from 'lodash';
 import format from './format';
 
 const ok = chalk.bold(`${chalk.green('✔')} found 0 problems, 0 warnings`);
@@ -43,9 +44,9 @@ test('returns a correct of empty .errors and .warnings', t => {
 ]
 });
 
-t.true(err.includes('There was an error'));
-t.true(prob.includes('There was a problem'));
-t.true(msg.includes('1 problems, 1 warnings'));
+t.true(includes(err, 'There was an error'));
+t.true(includes(prob, 'There was a problem'));
+t.true(includes(msg, '1 problems, 1 warnings'));
 });
 
 test('colors messages by default', t => {
@@ -79,8 +80,8 @@ test('uses appropriate signs by default', t => {
 ]
 });
 
-t.true(err.includes('✖'));
-t.true(warn.includes('⚠'));
+t.true(includes(err, '✖'));
+t.true(includes(warn, '⚠'));
 });
 
 test('uses signs as configured', t => {
@@ -106,8 +107,8 @@ test('uses signs as configured', t => {
 }
 );
 
-t.true(err.includes('ERR'));
-t.true(warn.includes('WRN'));
+t.true(includes(err, 'ERR'));
+t.true(includes(warn, 'WRN'));
 });
 
 test('uses appropriate colors by default', t => {
@@ -128,8 +129,8 @@ test('uses appropriate colors by default', t => {
 ]
 });
 
-t.true(err.includes(red.open));
-t.true(warn.includes(yellow.open));
+t.true(includes(err, red.open));
+t.true(includes(warn, yellow.open));
 });
 
 if (process.platform !== 'win32') {
@@ -156,7 +157,7 @@ if (process.platform !== 'win32') {
 }
 );
 
-t.true(err.includes(blue.open));
-t.true(warn.includes(magenta.open));
+t.true(includes(err, blue.open));
+t.true(includes(warn, magenta.open));
 });
 }

@commitlint/core/src/library/ensure-language.test.js

@@ -1,62 +1,63 @@
 import test from 'ava';
+import {includes} from 'lodash';
 import ensure from './ensure-language';
 
 test('true for no params', t => {
 const actual = ensure();
 t.is(actual.matches, true);
-t.is(actual.detected.includes('und'), true);
+t.is(includes(actual.detected, 'und'), true);
 });
 
 test.failing('true for chinese on chi', t => {
 const actual = ensure('這是一個嚴重的問題', 'chi');
 t.is(actual.matches, true);
-t.is(actual.detected.includes('chi'), true);
+t.is(includes(actual.detected, 'chi'), true);
 });
 
 test('true for spanish on spa', t => {
 const actual = ensure('Este es un asunto serio', 'spa');
 t.is(actual.matches, true);
-t.is(actual.detected.includes('spa'), true);
+t.is(includes(actual.detected, 'spa'), true);
 });
 
 test('true for english on eng', t => {
 const actual = ensure('This is a serious subject', 'eng');
 t.is(actual.matches, true);
-t.is(actual.detected.includes('eng'), true);
+t.is(includes(actual.detected, 'eng'), true);
 });
 
 test('true for hindi on hin', t => {
 const actual = ensure('यह एक गंभीर मुद्दा है', 'hin');
 t.is(actual.matches, true);
-t.is(actual.detected.includes('hin'), true);
+t.is(includes(actual.detected, 'hin'), true);
 });
 
 test('true for portugese on por', t => {
 const actual = ensure('Este é um assunto sério', 'por');
 t.is(actual.matches, true);
-t.is(actual.detected.includes('por'), true);
+t.is(includes(actual.detected, 'por'), true);
 });
 
 test.failing('false for chinese on eng', t => {
 const actual = ensure('這是一個嚴重的問題', 'eng');
 t.is(actual.matches, false);
-t.is(actual.detected.includes('chi'), true);
+t.is(includes(actual.detected, 'chi'), true);
 });
 
 test('false for spanish on eng', t => {
 const actual = ensure('Este es un asunto serio', 'eng');
 t.is(actual.matches, false);
-t.is(actual.detected.includes('spa'), true);
+t.is(includes(actual.detected, 'spa'), true);
 });
 
 test('false for hindi on eng', t => {
 const actual = ensure('यह एक गंभीर मुद्दा है', 'eng');
 t.is(actual.matches, false);
-t.is(actual.detected.includes('hin'), true);
+t.is(includes(actual.detected, 'hin'), true);
 });
 
 test('false for portugese on eng', t => {
 const actual = ensure('Este é um assunto sério', 'eng');
 t.is(actual.matches, false);
-t.is(actual.detected.includes('por'), true);
+t.is(includes(actual.detected, 'por'), true);
 });

@commitlint/core/src/load.js

@@ -41,10 +41,8 @@ export default async (seed = {}) => {
 key,
 executedValue.reduce((registry, item) => {
 const [key, value] = item;
-return {
-...registry,
-[key]: value
-};
+registry[key] = value;
+return registry;
 }, {})
 ];
 })
@@ -53,10 +51,8 @@ export default async (seed = {}) => {
 // Merge executed config keys into preset
 return executed.reduce((registry, item) => {
 const [key, value] = item;
-return {
-...registry,
-[key]: value
-};
+registry[key] = value;
+return registry;
 }, preset);
 };
 

@commitlint/prompt/package.json

@@ -4,7 +4,8 @@
  "description": "commitizen prompt using commitlint.config.js",
  "main": "./lib/index.js",
  "scripts": {
- "build": "cross-env NODE_ENV=production babel src --out-dir lib",
+ "build": "cross-env NODE_ENV=production babel src --out-dir lib --source-maps",
+ "watch": "babel src --out-dir lib --watch --source-maps",
  "clean": "rimraf lib",
  "commit": "git-cz",
  "pretest": "dep-check",
@@ -24,47 +25,7 @@
  ]
  },
  "babel": {
- "env": {
- "development": {
- "sourceMaps": "inline",
- "plugins": [
- "add-module-exports",
- [
- "transform-runtime",
- {
- "polyfill": false,
- "regenerator": true
- }
- ]
- ]
- },
- "production": {
- "ignore": [
- "**/*.test.js"
- ]
- }
- },
- "presets": [
- [
- "env",
- {
- "targets": {
- "node": 4
- }
- }
- ],
- "stage-0"
- ],
- "plugins": [
- "add-module-exports",
- [
- "transform-runtime",
- {
- "polyfill": false,
- "regenerator": true
- }
- ]
- ]
+ "presets": ["commitlint"]
  },
  "config": {
  "commitizen": {
@@ -93,18 +54,14 @@
  "@commitlint/utils": "^3.1.1",
  "ava": "^0.20.0",
  "babel-cli": "^6.24.1",
- "babel-plugin-add-module-exports": "^0.2.1",
- "babel-plugin-transform-runtime": "^6.23.0",
- "babel-preset-env": "^1.6.0",
- "babel-preset-stage-0": "^6.24.1",
+ "babel-preset-commitlint": "3.1.3",
  "babel-register": "^6.24.1",
  "commitizen": "^2.9.6",
  "cross-env": "^5.0.1",
  "throat": "^4.1.0"
  },
  "dependencies": {
  "@commitlint/core": "^3.1.3",
- "babel-polyfill": "^6.23.0",
  "babel-runtime": "^6.23.0",
  "chalk": "^1.1.1",
  "lodash": "^4.17.4",

@commitlint/prompt/src/index.js

@@ -1,5 +1,4 @@
 /* eslint-disable import/no-unassigned-import, import/prefer-default-export */
-import 'babel-polyfill';
 import vorpal from 'vorpal';
 import input from './input';
 

@commitlint/prompt/src/library/format.js

@@ -13,10 +13,8 @@ function format(input, debug = false) {
 const results = debug
 ? entries(input).reduce((registry, item) => {
 const [name, value] = item;
-return {
-...registry,
-[name]: value === null ? chalk.grey(`<${name}>`) : chalk.bold(value)
-};
+registry[name] = value === null ? chalk.grey(`<${name}>`) : chalk.bold(value)
+return registry;
 }, {})
 : input;