refactor: use fs-extra.readFileSync

rollup · Dec 26, 2021 · dc21e7e · dc21e7e
1 parent 2a899d5
commit dc21e7e
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -88,6 +88,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "execa": "^5.1.1",
     "fixturify": "^2.1.1",
+    "fs-extra": "^10.0.0",
     "hash.js": "^1.1.7",
     "husky": "^7.0.4",
     "is-reference": "^3.0.0",

diff --git a/test/cli/index.js b/test/cli/index.js
@@ -1,6 +1,7 @@
 const assert = require('assert');
 const { exec } = require('child_process');
 const path = require('path');
+const { readFileSync } = require('fs-extra');
 const sander = require('sander');
 const {
 	normaliseOutput,
@@ -109,7 +110,7 @@ runTestSuiteWithSamples(
 								done(err);
 							}
 						} else {
-							const expected = sander.readFileSync('_expected.js').toString();
+							const expected = readFileSync('_expected.js', 'utf8');
 							try {
 								assert.equal(normaliseOutput(code), normaliseOutput(expected));
 								done();

diff --git a/test/form/index.js b/test/form/index.js
@@ -1,5 +1,6 @@
 const assert = require('assert');
 const path = require('path');
+const { readFileSync } = require('fs-extra');
 const sander = require('sander');
 const rollup = require('../../dist/rollup');
 const { normaliseOutput, runTestSuiteWithSamples } = require('../utils.js');
@@ -79,19 +80,19 @@ runTestSuiteWithSamples('form', path.resolve(__dirname, 'samples'), (dir, config
 
 async function generateAndTestBundle(bundle, outputOptions, expectedFile, { show }) {
 	await bundle.write(outputOptions);
-	const actualCode = normaliseOutput(sander.readFileSync(outputOptions.file));
+	const actualCode = normaliseOutput(readFileSync(outputOptions.file, 'utf8'));
 	let expectedCode;
 	let actualMap;
 	let expectedMap;
 
 	try {
-		expectedCode = normaliseOutput(sander.readFileSync(expectedFile));
+		expectedCode = normaliseOutput(readFileSync(expectedFile, 'utf8'));
 	} catch (err) {
 		expectedCode = 'missing file';
 	}
 
 	try {
-		actualMap = JSON.parse(sander.readFileSync(outputOptions.file + '.map').toString());
+		actualMap = JSON.parse(readFileSync(outputOptions.file + '.map', 'utf8'));
 		actualMap.sourcesContent = actualMap.sourcesContent
 			? actualMap.sourcesContent.map(normaliseOutput)
 			: null;
@@ -100,7 +101,7 @@ async function generateAndTestBundle(bundle, outputOptions, expectedFile, { show
 	}
 
 	try {
-		expectedMap = JSON.parse(sander.readFileSync(expectedFile + '.map').toString());
+		expectedMap = JSON.parse(readFileSync(expectedFile + '.map', 'utf8'));
 		expectedMap.sourcesContent = actualMap.sourcesContent
 			? expectedMap.sourcesContent.map(normaliseOutput)
 			: null;

diff --git a/test/watch/index.js b/test/watch/index.js
@@ -1,5 +1,6 @@
 const assert = require('assert');
 const path = require('path');
+const { readFileSync } = require('fs-extra');
 const sander = require('sander');
 const rollup = require('../../dist/rollup');
 
@@ -1083,9 +1084,7 @@ describe('rollup.watch', () => {
 					'BUNDLE_END',
 					'END',
 					() => {
-						const generated = sander.readFileSync('test/_tmp/output/bundle.js', {
-							encoding: 'utf-8'
-						});
+						const generated = readFileSync('test/_tmp/output/bundle.js', 'utf8');
 						assert.ok(/jQuery/.test(generated));
 					}
 				]);
@@ -1505,7 +1504,7 @@ describe('rollup.watch', () => {
 						plugins: {
 							load() {
 								this.addWatchFile(WATCHED_ID);
-								return `export default "${sander.readFileSync(WATCHED_ID).toString().trim()}"`;
+								return `export default "${readFileSync(WATCHED_ID, 'utf8').trim()}"`;
 							}
 						}
 					});
@@ -1562,10 +1561,7 @@ describe('rollup.watch', () => {
 									if (addWatchFile) {
 										this.addWatchFile(WATCHED_ID);
 									}
-									return `export const value = "${sander
-										.readFileSync(WATCHED_ID)
-										.toString()
-										.trim()}"`;
+									return `export const value = "${readFileSync(WATCHED_ID, 'utf8').trim()}"`;
 								}
 							}
 						}
@@ -1613,7 +1609,7 @@ describe('rollup.watch', () => {
 							transform(code, id) {
 								if (id.endsWith('dep1.js')) {
 									this.addWatchFile(path.resolve('test/_tmp/input/dep2.js'));
-									const text = sander.readFileSync('test/_tmp/input/dep2.js').toString().trim();
+									const text = readFileSync('test/_tmp/input/dep2.js', 'utf8').trim();
 									return `export default ${JSON.stringify(text)}`;
 								}
 							}
@@ -1800,7 +1796,7 @@ describe('rollup.watch', () => {
 							transform() {
 								transformRuns++;
 								this.addWatchFile(WATCHED_ID);
-								return `export default "${sander.readFileSync(WATCHED_ID).toString().trim()}"`;
+								return `export default "${readFileSync(WATCHED_ID, 'utf8').trim()}"`;
 							}
 						}
 					});