Merge pull request #35 from jedmao/p6

jedmao · web-flow · commit 5203a10dbb83 · 2017-11-02T10:41:24.000-07:00
v2.0.0 - Upgrade to PostCSS 6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.0.0
+**Breaking:** Upgrade to PostCSS 6 (no longer works with PostCSS 5).
+
 ## 1.1.7
 - Fix module resolution ([#26](https://github.com/jedmao/postcss-nested-props/pull/26)).
 
diff --git a/README.md b/README.md
@@ -84,3 +84,29 @@ postcss([ postcssNestedProps ]);
 ### Options
 
 None at this time.
+
+## Testing
+
+Run the following command:
+
+```
+$ npm test
+```
+
+This will build scripts, run tests and generate a code coverage report. Anything less than 100% coverage will throw an error.
+
+### Watching
+
+For much faster development cycles, run the following commands in 2 separate processes:
+
+```
+$ npm run build:watch
+```
+
+Compiles TypeScript source into the `./dist` folder and watches for changes.
+
+```
+$ npm run watch
+```
+
+Runs the tests in the `./dist` folder and watches for changes.
diff --git a/package.json b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "postcss-nested-props",
-  "version": "1.1.7",
+  "version": "2.0.0",
   "description": "PostCSS plugin to unwrap nested properties.",
   "main": "dist/plugin.js",
   "types": "dist/plugin.d.ts",
   "scripts": {
     "clean": "rimraf coverage dist *.log",
     "codecov": "codecov -f coverage/lcov.info",
-    "compile": "tsc",
-    "compile:watch": "tsc --watch",
+    "build": "tsc",
+    "build:watch": "tsc --watch",
     "prepublish": "npm test",
-    "pretest": "npm run tslint && npm run clean && npm run compile",
+    "pretest": "npm run tslint && npm run clean && npm run build",
     "test": "nyc ava",
     "test:watch": "ava --watch",
     "tslint": "tslint --project tsconfig.json",
@@ -63,16 +63,16 @@
   },
   "homepage": "https://github.com/jedmao/postcss-nested-props#readme",
   "dependencies": {
-    "postcss": "^5.2.16",
+    "postcss": "^6.0.14",
     "pseudo-classes": "^1.0.0",
-    "pseudo-elements": "^1.0.0"
+    "pseudo-elements": "^1.1.0"
   },
   "devDependencies": {
-    "@types/node": "^7.0.8",
-    "ava": "^0.18.2",
-    "nyc": "^10.1.2",
-    "rimraf": "^2.6.1",
-    "tslint": "^4.5.1",
-    "typescript": "^2.2.1"
+    "@types/node": "^8.0.47",
+    "ava": "^0.23.0",
+    "nyc": "^11.3.0",
+    "rimraf": "^2.6.2",
+    "tslint": "^5.8.0",
+    "typescript": "^2.6.1"
   }
 }
diff --git a/src/plugin.spec.ts b/src/plugin.spec.ts
@@ -1,4 +1,4 @@
-﻿import test, { ContextualTestContext } from 'ava';
+﻿import test, { TestContext } from 'ava';
 import * as postcss from 'postcss';
 const pseudoClasses = require('pseudo-classes');
 const pseudoElements = require('pseudo-elements');
@@ -66,7 +66,7 @@ pseudoElements().forEach((pseudoElement: string) => {
 });
 
 function macro(
-	t: ContextualTestContext,
+	t: TestContext,
 	input: string,
 	expected?: string | RegExp
 ) {
diff --git a/src/plugin.ts b/src/plugin.ts
@@ -50,7 +50,7 @@ function unwrapRule(namespace: string[], rule: postcss.Rule) {
 		}
 	});
 	rule.walkDecls(decl2 => {
-		decl2.moveBefore(rule);
+		rule.before(decl2.remove());
 	});
 	rule.remove();
 	namespace.pop();

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ function unwrapRule(namespace: string[], rule: postcss.Rule) {`
`50`	`50`	`}`
`51`	`51`	`});`
`52`	`52`	`rule.walkDecls(decl2 => {`
`53`		`- decl2.moveBefore(rule);`
	`53`	`+ rule.before(decl2.remove());`
`54`	`54`	`});`
`55`	`55`	`rule.remove();`
`56`	`56`	`namespace.pop();`