Merge pull request #12 from jedmao/updates

Gut gulp, introduce ava

Author: jedmao

.editorconfig

@@ -5,3 +5,7 @@ indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[{package.json,*.yml}]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -1,7 +1,4 @@
-*.log
-.vs/
-build/**/*.js
-build/**/*.ts
-coverage/
-dist/
-node_modules/
+*.log
+.vscode/
+dist/
+node_modules/

.gitignore

@@ -1,21 +1,8 @@
-.*
-!.d.ts
-*.sln*
-*.suo
-build/
-coverage/
-lib/
-test/
-!dist/lib
-!dist/d.ts/lib
-scripts/
-typings/chai/
-typings/mocha/
-typings/sinon/
-typings/sinon-chai/
-appveyor.yml
-gulpfile.babel.js
-jsconfig.json
-tsconfig.json
-tsd.json
-tslint.json
+.*
+lib/
+test/
+!dist/lib
+appveyor.yml
+jsconfig.json
+tsconfig.json
+tslint.json

.istanbul.yml

@@ -2,7 +2,7 @@ language: node_js
 
 node_js:
   - "node"
-  - "4"
+  - "6"
 
 notifications:
   email:

.npmignore

@@ -75,7 +75,6 @@ postcss([ require('postcss-nested-props') ]);
 ### TypeScript
 
 ```ts
-///<reference path="node_modules/postcss-nested-props/.d.ts" />
 import * as postcssNestedProps from 'postcss-nested-props';
 
 postcss([ postcssNestedProps ]);

.tasks/gulp-clean.ts

@@ -3,13 +3,25 @@
   "version": "1.1.5",
   "description": "PostCSS plugin to unwrap nested properties.",
   "main": "dist/lib/plugin.js",
-  "typings": "dist/lib/plugin.d.ts",
+  "types": "dist/lib/plugin.d.ts",
   "scripts": {
-    "prepublish": "gulp && npm run tsc && gulp copy",
+    "ava": "ava",
+    "build": "npm run tsc",
+    "build:watch": "npm run tsc -- --watch",
+    "lint": "npm run tslint",
+    "prepublish": "npm run lint && npm run build",
     "tsc": "tsc",
-    "test": "gulp && npm run tsc && npm run mocha",
-    "mocha": "mocha",
-    "watch": "sh scripts/watch"
+    "test": "npm run tsc && npm run ava",
+    "test:watch": "npm run ava -- --watch",
+    "tslint": "tslint --project tsconfig.json"
+  },
+  "ava": {
+    "files": [
+      "dist/test/**/*.js"
+    ],
+    "source": [
+      "dist/**/*.js"
+    ]
   },
   "repository": {
     "type": "git",
@@ -31,39 +43,14 @@
   },
   "homepage": "https://github.com/jedmao/postcss-nested-props#readme",
   "dependencies": {
-    "postcss": "^5.2.11",
+    "postcss": "^5.2.15",
     "pseudo-classes": "^1.0.0",
     "pseudo-elements": "^1.0.0"
   },
   "devDependencies": {
-    "@types/chai": "^3.4.34",
-    "@types/glob": "^5.0.30",
-    "@types/glob-stream": "^3.1.30",
-    "@types/gulp": "^3.8.32",
-    "@types/minimatch": "^2.0.29",
-    "@types/mocha": "^2.2.38",
-    "@types/node": "^7.0.0",
-    "@types/orchestrator": "0.0.30",
-    "@types/q": "0.0.32",
-    "@types/sinon": "^1.16.34",
-    "@types/sinon-chai": "^2.7.27",
-    "@types/vinyl": "^2.0.0",
-    "@types/vinyl-fs": "0.0.28",
-    "chai": "^3.5.0",
-    "gulp": "^3.9.1",
-    "gulp-filter": "^5.0.0",
-    "gulp-istanbul": "^1.1.1",
-    "gulp-mocha": "^3.0.1",
-    "gulp-plumber": "^1.1.0",
-    "gulp-rimraf": "^0.2.1",
-    "gulp-tslint": "^7.0.1",
-    "gulp-typescript": "^3.1.4",
-    "istanbul": "^0.4.5",
-    "merge2": "^1.0.3",
-    "mocha": "^3.2.0",
-    "through2": "^2.0.3",
-    "ts-node": "^2.0.0",
-    "tslint": "^4.3.1",
-    "typescript": "^2.1.5"
+    "@types/node": "^7.0.5",
+    "ava": "^0.18.2",
+    "tslint": "^4.4.2",
+    "typescript": "^2.2.1"
   }
 }

.tasks/gulp-copy.ts

@@ -1,100 +1,73 @@
-import { expect } from 'chai';
-import * as plugin from '../lib/plugin';
-import * as postcss from 'postcss';
+import test, { ContextualTestContext } from 'ava';
+import * as postcss from 'postcss';
 const pseudoClasses = require('pseudo-classes');
 const pseudoElements = require('pseudo-elements');
 
-describe('postcss-nested-props plugin', () => {
+import * as plugin from '../lib/plugin';
 
-	it('unwraps a nested property', () => {
-		check(
-			'a{b:{c:d}}',
-			'a{b-c:d}'
-		);
-	});
+test('unwraps a nested property', scenario(
+	'a{b:{c:d}}',
+	'a{b-c:d}'
+));
 
-	it('unwraps a deeply nested property', () => {
-		check(
-			'a{b:{c:{d:{e:{f:g}}}}}',
-			'a{b-c-d-e-f:g}'
-		);
-	});
+test('unwraps a deeply nested property', scenario(
+	'a{b:{c:{d:{e:{f:g}}}}}',
+	'a{b-c-d-e-f:g}'
+));
 
-	it('unwraps two nested properties in the same rule', () => {
-		check(
-			'a{b:{c:{d:e}}f:{g:{h:i}}}',
-			'a{b-c-d:e;f-g-h:i}'
-		);
-	});
+test('unwraps two nested properties in the same rule', scenario(
+	'a{b:{c:{d:e}}f:{g:{h:i}}}',
+	'a{b-c-d:e;f-g-h:i}'
+));
 
-	it('unwraps a property namespace paired with a value', () => {
-		check(
-			'a{b:c{d:e}}',
-			'a{b:c;b-d:e}'
-		);
-	});
+test('unwraps a property namespace paired with a value', scenario(
+	'a{b:c{d:e}}',
+	'a{b:c;b-d:e}'
+));
 
-	it('preserves nested rules w/o a colon in the selector', () => {
-		check(
-			'a{b{c{d:e}}}',
-			'a{b{c{d:e}}}'
-		);
-	});
+test('preserves nested rules w/o a colon in the selector', scenario(
+	'a{b{c{d:e}}}',
+	'a{b{c{d:e}}}'
+));
 
-	it('preserves a rule with a :global pseudo-selector', () => {
-		check(
-			`:global .a{b:c;d:e;}`,
-			`:global .a{b:c;d:e;}`
-		);
-	});
+test('preserves a rule with a :global pseudo-selector', scenario(
+	`:global .a{b:c;d:e;}`,
+	`:global .a{b:c;d:e;}`
+));
 
-	it('preserves a rule with a :local pseudo-selector', () => {
-		check(
-			`:local .a{b:c;d:e;}`,
-			`:local .a{b:c;d:e;}`
-		);
-	});
+test('preserves a rule with a :local pseudo-selector', scenario(
+	`:local .a{b:c;d:e;}`,
+	`:local .a{b:c;d:e;}`
+));
 
-	describe('pseudo classes', () => {
-		pseudoClasses().forEach((pseudoClass: string) => {
-			it(`preserves the :${pseudoClass}() pseudo-class`, () => {
-				check(
-					`a{b:${pseudoClass}(c){d:e}}`,
-					`a{b:${pseudoClass}(c){d:e}}`
-				);
-			});
-		});
-	});
-
-	describe('pseudo elements', () => {
-		pseudoElements().forEach((pseudoElement: string) => {
-			it(`preserves the ::${pseudoElement} pseudo-element`, () => {
-				check(
-					`a{b::${pseudoElement}{c:d}}`,
-					`a{b::${pseudoElement}{c:d}}`
-				);
-			});
-		});
-	});
+pseudoClasses().forEach((pseudoClass: string) => {
+	test(`preserves the :${pseudoClass}() pseudo-class`, scenario(
+		`a{b:${pseudoClass}(c){d:e}}`,
+		`a{b:${pseudoClass}(c){d:e}}`
+	));
+});
 
-	describe('vendor pseudo elements', () => {
-		[
-			'-ms-clear',
-			'-webkit-progress-bar',
-			'-moz-focus-outer'
-		].forEach(vendorPseudoElement => {
-			it(`preserves the ::${vendorPseudoElement} pseudo-element`, () => {
-				check(
-					`a{b::${vendorPseudoElement}{c:d}}`,
-					`a{b::${vendorPseudoElement}{c:d}}`
-				);
-			});
-		});
-	});
+pseudoElements().forEach((pseudoElement: string) => {
+	test(`preserves the ::${pseudoElement} pseudo-element`, scenario(
+		`a{b::${pseudoElement}{c:d}}`,
+		`a{b::${pseudoElement}{c:d}}`
+	));
+});
 
+[
+	'-ms-clear',
+	'-webkit-progress-bar',
+	'-moz-focus-outer'
+].forEach(vendorPseudoElement => {
+	test(`preserves the ::${vendorPseudoElement} pseudo-element`, scenario(
+		`a{b::${vendorPseudoElement}{c:d}}`,
+		`a{b::${vendorPseudoElement}{c:d}}`
+	));
 });
 
-function check(input: string, output: string) {
+function scenario(input: string, expectedOutput: string) {
 	const processor = postcss([plugin()]);
-	expect(processor.process(input).css).to.equal(output);
+	return (t: ContextualTestContext) => {
+		t.is(processor.process(input).css, expectedOutput);
+	};
 }