Merge branch 'master' into greenkeeper/eslint-config-problems-3.1.0

postcss · Jan 7, 2020 · b289daf · b289daf
2 parents 5d62557 + 5b47456
commit b289daf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "test": "nyc ava -v"
   },
   "dependencies": {
-    "chalk": "^2.1.0",
+    "chalk": "^3.0.0",
     "chokidar": "^3.3.0",
     "dependency-graph": "^0.8.0",
     "fs-extra": "^8.1.0",
@@ -32,13 +32,13 @@
     "yargs": "^15.0.2"
   },
   "devDependencies": {
-    "ava": "^1.0.1",
+    "ava": "^2.4.0",
     "coveralls": "^3.0.0",
-    "eslint": "^5.0.0",
+    "eslint": "^6.8.0",
     "eslint-config-problems": "3.1.0",
-    "nyc": "^14.0.0",
+    "nyc": "^15.0.0",
     "postcss-import": "^12.0.0",
-    "prettier": "~1.18.0",
+    "prettier": "~1.19.1",
     "sugarss": "^2.0.0",
     "uuid": "^3.0.1"
   },
@@ -70,5 +70,10 @@
     "url": "https://github.com/postcss/postcss-cli/issues"
   },
   "homepage": "https://github.com/postcss/postcss-cli#readme",
-  "license": "MIT"
+  "license": "MIT",
+  "ava": {
+    "helpers": [
+      "test/helpers/*"
+    ]
+  }
 }
diff --git a/test/error.js b/test/error.js
@@ -56,7 +56,7 @@ test('plugin throws on require', t => {
   return cli([
     'test/fixtures/a.css',
     '-u',
-    './test/fixtures/bad-plugin',
+    './test/fixtures/_bad-plugin',
     '-o',
     tmp()
   ]).then(({ error, code }) => {

diff --git a/test/fixtures/bad-plugin.js → test/fixtures/_bad-plugin.js b/test/fixtures/bad-plugin.js → test/fixtures/_bad-plugin.js
diff --git a/test/watch.js b/test/watch.js
@@ -62,9 +62,10 @@ testCb('--watch works', t => {
 
       // Helper functions:
       function isEqual(p, expected) {
-        return Promise.all([read(path.join(dir, p)), read(expected)]).then(
-          ([a, e]) => t.is(a, e)
-        )
+        return Promise.all([
+          read(path.join(dir, p)),
+          read(expected)
+        ]).then(([a, e]) => t.is(a, e))
       }
 
       function done(err) {
@@ -142,9 +143,10 @@ testCb('--watch postcss.config.js', t => {
 
       // Helper functions:
       function isEqual(p, expected) {
-        return Promise.all([read(path.join(dir, p)), read(expected)]).then(
-          ([a, e]) => t.is(a, e)
-        )
+        return Promise.all([
+          read(path.join(dir, p)),
+          read(expected)
+        ]).then(([a, e]) => t.is(a, e))
       }
 
       function done(err) {
@@ -212,9 +214,10 @@ testCb('--watch dependencies', t => {
 
       // Helper functions:
       function isEqual(p, expected) {
-        return Promise.all([read(path.join(dir, p)), read(expected)]).then(
-          ([a, e]) => t.is(a, e)
-        )
+        return Promise.all([
+          read(path.join(dir, p)),
+          read(expected)
+        ]).then(([a, e]) => t.is(a, e))
       }
 
       function done(err) {