Skip to content

Commit 2ed9485

Browse files
committed
Various minor tweaks
1 parent a1e08ab commit 2ed9485

11 files changed

+23
-22
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ charset = utf-8
77
trim_trailing_whitespace = true
88
insert_final_newline = true
99

10-
[{package.json,*.yml}]
10+
[*.yml]
1111
indent_style = space
1212
indent_size = 2

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* text=auto
2+
*.js text eol=lf
23
*.ai binary
34
*.psd binary

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ before_install:
1212
before_script:
1313
- 'npm prune'
1414
after_success:
15-
- '[ -z "$COVERALLS_REPO_TOKEN" ] && tap --coverage-report=text-lcov | ./node_modules/.bin/coveralls'
15+
- './node_modules/.bin/nyc report --reporter=text-lcov > coverage.lcov && ./node_modules/.bin/codecov'

bench/run.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const childProcess = require('child_process');
33
const path = require('path');
44
const fs = require('fs');
55
const arrify = require('arrify');
6-
const mkdirp = require('mkdirp');
6+
const makeDir = require('make-dir');
77
const branch = require('git-branch').sync(path.join(__dirname, '..'));
88

99
const cliPath = require.resolve('../cli');
@@ -124,7 +124,7 @@ Promise.each(combined, definition => {
124124
});
125125
});
126126
}).then(() => {
127-
mkdirp.sync(path.join(__dirname, '.results'));
127+
makeDir.sync(path.join(__dirname, '.results'));
128128
results['.time'] = Date.now();
129129

130130
fs.writeFileSync(

cli.js

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const debug = require('debug')('ava');
55

66
// Prefer the local installation of AVA.
77
const resolveCwd = require('resolve-cwd');
8+
89
const localCLI = resolveCwd('ava/cli');
910

1011
// Use `path.relative()` to detect local AVA installation,

lib/babel-config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const chalk = require('chalk');
55
const figures = require('figures');
66
const configManager = require('hullabaloo-config-manager');
77
const md5Hex = require('md5-hex');
8-
const mkdirp = require('mkdirp');
8+
const makeDir = require('make-dir');
99
const colors = require('./colors');
1010

1111
function validate(conf) {
@@ -90,7 +90,7 @@ function build(projectDir, cacheDir, userOptions, powerAssert) {
9090
const seed = md5Hex([process.versions.node, projectDir]);
9191

9292
// Ensure cacheDir exists
93-
mkdirp.sync(cacheDir);
93+
makeDir.sync(cacheDir);
9494

9595
// The file names predict where valid options may be cached, and thus should
9696
// include the seed.

package.json

+6-9
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
"arrify": "^1.0.0",
104104
"auto-bind": "^1.1.0",
105105
"ava-init": "^0.2.0",
106-
"babel-code-frame": "^6.16.0",
107106
"babel-core": "^6.17.0",
108107
"bluebird": "^3.0.0",
109108
"caching-transform": "^1.0.0",
@@ -149,11 +148,11 @@
149148
"lodash.flatten": "^4.2.0",
150149
"lodash.isequal": "^4.5.0",
151150
"loud-rejection": "^1.2.0",
151+
"make-dir": "^1.0.0",
152152
"matcher": "^0.1.1",
153153
"md5-hex": "^2.0.0",
154154
"meow": "^3.7.0",
155-
"mkdirp": "^0.5.1",
156-
"ms": "^0.7.1",
155+
"ms": "^1.0.0",
157156
"multimatch": "^2.1.0",
158157
"observable-to-promise": "^0.5.0",
159158
"option-chain": "^0.1.0",
@@ -174,12 +173,12 @@
174173
"update-notifier": "^2.1.0"
175174
},
176175
"devDependencies": {
177-
"babel-preset-react": "^6.5.0",
178176
"cli-table2": "^0.2.0",
179-
"coveralls": "^2.11.4",
180-
"delay": "^1.3.0",
177+
"codecov": "^2.1.0",
178+
"del": "^2.2.2",
179+
"delay": "^2.0.0",
181180
"execa": "^0.6.0",
182-
"flow-bin": "^0.42.0",
181+
"flow-bin": "^0.45.0",
183182
"get-stream": "^3.0.0",
184183
"git-branch": "^0.3.0",
185184
"has-ansi": "^2.0.0",
@@ -188,7 +187,6 @@
188187
"lolex": "^1.4.0",
189188
"nyc": "^10.0.0",
190189
"proxyquire": "^1.7.4",
191-
"rimraf": "^2.5.0",
192190
"signal-exit": "^3.0.0",
193191
"sinon": "^2.0.0",
194192
"source-map-fixtures": "^2.1.0",
@@ -202,7 +200,6 @@
202200
"typings": "types/generated.d.ts",
203201
"xo": {
204202
"rules": {
205-
"import/newline-after-import": "off",
206203
"no-use-extend-native/no-use-extend-native": "off"
207204
}
208205
},

test/api.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
const path = require('path');
33
const fs = require('fs');
44
const figures = require('figures');
5-
const rimraf = require('rimraf');
5+
const del = require('del');
66
const test = require('tap').test;
77
const Api = require('../api');
8+
89
const testCapitalizerPlugin = require.resolve('./fixture/babel-plugin-test-capitalizer');
910

1011
const ROOT_DIR = path.join(__dirname, '..');
@@ -658,7 +659,7 @@ function generateTests(prefix, apiCreator) {
658659
});
659660

660661
test(`${prefix} caching is enabled by default`, t => {
661-
rimraf.sync(path.join(__dirname, 'fixture/caching/node_modules'));
662+
del.sync(path.join(__dirname, 'fixture/caching/node_modules'));
662663

663664
const api = apiCreator({
664665
resolveTestsFrom: path.join(__dirname, 'fixture/caching')
@@ -687,7 +688,7 @@ function generateTests(prefix, apiCreator) {
687688
});
688689

689690
test(`${prefix} caching can be disabled`, t => {
690-
rimraf.sync(path.join(__dirname, 'fixture/caching/node_modules'));
691+
del.sync(path.join(__dirname, 'fixture/caching/node_modules'));
691692

692693
const api = apiCreator({
693694
resolveTestsFrom: path.join(__dirname, 'fixture/caching'),

test/babel-config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const fs = require('fs');
33
const path = require('path');
44
const test = require('tap').test;
5-
const mkdirp = require('mkdirp');
5+
const makeDir = require('make-dir');
66
const uniqueTempDir = require('unique-temp-dir');
77
const configManager = require('hullabaloo-config-manager');
88

@@ -154,7 +154,7 @@ test('updates cached verifier if dependency hashes change', t => {
154154
const cacheDir = path.join(projectDir, 'cache');
155155
const depFile = path.join(projectDir, 'plugin.js');
156156

157-
mkdirp.sync(cacheDir);
157+
makeDir.sync(cacheDir);
158158
fs.writeFileSync(depFile, 'foo');
159159

160160
const userOptions = {

test/beautify-stack.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22
const proxyquire = require('proxyquire').noPreserveCache();
33
const test = require('tap').test;
4+
45
const beautifyStack = proxyquire('../lib/beautify-stack', {
56
debug() {
67
return {

test/cli.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const childProcess = require('child_process');
55
const test = require('tap').test;
66
const getStream = require('get-stream');
77
const figures = require('figures');
8-
const mkdirp = require('mkdirp');
8+
const makeDir = require('make-dir');
99
const touch = require('touch');
1010
const proxyquire = require('proxyquire');
1111
const sinon = require('sinon');
@@ -451,7 +451,7 @@ test('workers ensure test files load the same version of ava', t => {
451451

452452
// Copy the index.js so the testFile imports it. It should then load the correct AVA install.
453453
const targetInstall = path.join(target, 'node_modules/ava');
454-
mkdirp.sync(targetInstall);
454+
makeDir.sync(targetInstall);
455455
fs.writeFileSync(
456456
path.join(targetInstall, 'index.js'),
457457
fs.readFileSync(path.join(__dirname, '../index.js'))

0 commit comments

Comments
 (0)