Skip to content

Commit

Permalink
refactor: use fs-extra.existsSync
Browse files Browse the repository at this point in the history
  • Loading branch information
dnalborczyk committed Dec 26, 2021
1 parent dc21e7e commit 0b440a8
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 20 deletions.
7 changes: 2 additions & 5 deletions test/cli/index.js
@@ -1,7 +1,7 @@
const assert = require('assert');
const { exec } = require('child_process');
const path = require('path');
const { readFileSync } = require('fs-extra');
const { existsSync, readFileSync } = require('fs-extra');
const sander = require('sander');
const {
normaliseOutput,
Expand Down Expand Up @@ -99,10 +99,7 @@ runTestSuiteWithSamples(
} catch (err) {
done(err);
}
} else if (
sander.existsSync('_expected') &&
sander.statSync('_expected').isDirectory()
) {
} else if (existsSync('_expected') && sander.statSync('_expected').isDirectory()) {
try {
assertDirectoriesAreEqual('_actual', '_expected');
done();
Expand Down
5 changes: 2 additions & 3 deletions test/form/index.js
@@ -1,14 +1,13 @@
const assert = require('assert');
const path = require('path');
const { readFileSync } = require('fs-extra');
const sander = require('sander');
const { existsSync, readFileSync } = require('fs-extra');
const rollup = require('../../dist/rollup');
const { normaliseOutput, runTestSuiteWithSamples } = require('../utils.js');

const FORMATS = ['amd', 'cjs', 'system', 'es', 'iife', 'umd'];

runTestSuiteWithSamples('form', path.resolve(__dirname, 'samples'), (dir, config) => {
const isSingleFormatTest = sander.existsSync(dir + '/_expected.js');
const isSingleFormatTest = existsSync(dir + '/_expected.js');
const itOrDescribe = isSingleFormatTest ? it : describe;
(config.skip ? itOrDescribe.skip : config.solo ? itOrDescribe.only : itOrDescribe)(
path.basename(dir) + ': ' + config.description,
Expand Down
24 changes: 12 additions & 12 deletions test/watch/index.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const path = require('path');
const { readFileSync } = require('fs-extra');
const { existsSync, readFileSync } = require('fs-extra');
const sander = require('sander');
const rollup = require('../../dist/rollup');

Expand Down Expand Up @@ -572,7 +572,7 @@ describe('rollup.watch', () => {
'BUNDLE_START',
'ERROR',
() => {
assert.strictEqual(sander.existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(existsSync('../_tmp/output/bundle.js'), false);
sander.writeFileSync('test/_tmp/input/main.js', 'export default 43;');
},
'START',
Expand Down Expand Up @@ -613,7 +613,7 @@ describe('rollup.watch', () => {
'BUNDLE_START',
'ERROR',
() => {
assert.strictEqual(sander.existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(existsSync('../_tmp/output/bundle.js'), false);
sander.writeFileSync('test/_tmp/input/main.js', 'export default 43;');
},
'START',
Expand Down Expand Up @@ -1048,11 +1048,11 @@ describe('rollup.watch', () => {
'END',
() => {
assert.strictEqual(
sander.existsSync(path.resolve(__dirname, '../_tmp/output/bundle1.js')),
existsSync(path.resolve(__dirname, '../_tmp/output/bundle1.js')),
false
);
assert.strictEqual(
sander.existsSync(path.resolve(__dirname, '../_tmp/output/bundle2.js')),
existsSync(path.resolve(__dirname, '../_tmp/output/bundle2.js')),
true
);
assert.deepStrictEqual(run('../_tmp/output/bundle2.js'), 43);
Expand Down Expand Up @@ -1275,15 +1275,15 @@ describe('rollup.watch', () => {
'END',
() => {
watchChangeCnt = 0;
assert.strictEqual(sander.existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(existsSync('../_tmp/output/bundle.js'), false);
sander.writeFileSync('test/_tmp/input/main.js', 'export default 43;');
},
'START',
'BUNDLE_START',
'BUNDLE_END',
'END',
() => {
assert.strictEqual(sander.existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(watchChangeCnt, 1);
sander.writeFileSync('test/_tmp/input/main.js', 'export default 43;');
},
Expand All @@ -1292,7 +1292,7 @@ describe('rollup.watch', () => {
'BUNDLE_END',
'END',
() => {
assert.strictEqual(sander.existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(watchChangeCnt, 2);
sander.writeFileSync('test/_tmp/input/main.js', 'export default 43;');
},
Expand All @@ -1301,7 +1301,7 @@ describe('rollup.watch', () => {
'BUNDLE_END',
// 'END',
evt => {
assert.strictEqual(sander.existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(existsSync('../_tmp/output/bundle.js'), false);
assert.strictEqual(watchChangeCnt, 3);
// still aware of its output destination
assert.strictEqual(evt.output[0], path.resolve('test/_tmp/output/bundle.js'));
Expand Down Expand Up @@ -1658,7 +1658,7 @@ describe('rollup.watch', () => {
plugins: {
transform() {
this.addWatchFile('test/_tmp/input');
return `export default ${sander.existsSync(WATCHED_ID)}`;
return `export default ${existsSync(WATCHED_ID)}`;
}
}
});
Expand Down Expand Up @@ -1699,7 +1699,7 @@ describe('rollup.watch', () => {
plugins: {
transform() {
this.addWatchFile('test/_tmp/input/dep');
return `export default ${sander.existsSync('test/_tmp/input/dep')}`;
return `export default ${existsSync('test/_tmp/input/dep')}`;
}
}
});
Expand Down Expand Up @@ -1740,7 +1740,7 @@ describe('rollup.watch', () => {
plugins: {
transform() {
this.addWatchFile('test/_tmp/input/dep');
return `export default ${sander.existsSync('test/_tmp/input/dep')}`;
return `export default ${existsSync('test/_tmp/input/dep')}`;
}
}
});
Expand Down

0 comments on commit 0b440a8

Please sign in to comment.