Skip to content

Commit

Permalink
refactor: use fs.readFileSync
Browse files Browse the repository at this point in the history
  • Loading branch information
dnalborczyk committed Dec 26, 2021
1 parent 2a899d5 commit 11a2ff8
Show file tree
Hide file tree
Showing 24 changed files with 70 additions and 72 deletions.
8 changes: 4 additions & 4 deletions build-plugins/generate-license-file.ts
@@ -1,9 +1,9 @@
import fs from 'fs';
import { readFileSync, writeFileSync } from 'fs';
import { PluginImpl } from 'rollup';
import license, { Dependency, Person } from 'rollup-plugin-license';

function generateLicenseFile(dependencies: Dependency[]) {
const coreLicense = fs.readFileSync('LICENSE-CORE.md');
const coreLicense = readFileSync('LICENSE-CORE.md');
const licenses = new Set();
const dependencyLicenseTexts = dependencies
.sort(({ name: nameA }, { name: nameB }) => (nameA! > nameB! ? 1 : -1))
Expand Down Expand Up @@ -52,9 +52,9 @@ function generateLicenseFile(dependencies: Dependency[]) {
`${Array.from(licenses).join(', ')}\n\n` +
`# Bundled dependencies:\n` +
dependencyLicenseTexts;
const existingLicenseText = fs.readFileSync('LICENSE.md', 'utf8');
const existingLicenseText = readFileSync('LICENSE.md', 'utf8');
if (existingLicenseText !== licenseText) {
fs.writeFileSync('LICENSE.md', licenseText);
writeFileSync('LICENSE.md', licenseText);
console.warn('LICENSE.md updated. You should commit the updated file.');
}
}
Expand Down
6 changes: 3 additions & 3 deletions cli/run/watch-cli.ts
@@ -1,4 +1,4 @@
import fs from 'fs';
import { FSWatcher, readFileSync } from 'fs';
import chokidar from 'chokidar';
import dateTime from 'date-time';
import ms from 'pretty-ms';
Expand All @@ -22,7 +22,7 @@ export async function watch(command: Record<string, any>): Promise<void> {
let configs: MergedRollupOptions[];
let warnings: BatchWarnings;
let watcher: RollupWatcher;
let configWatcher: fs.FSWatcher;
let configWatcher: FSWatcher;
const configFile = command.config ? getConfigPath(command.config) : null;

onExit(close);
Expand All @@ -42,7 +42,7 @@ export async function watch(command: Record<string, any>): Promise<void> {

async function reloadConfigFile() {
try {
const newConfigFileData = fs.readFileSync(configFile, 'utf-8');
const newConfigFileData = readFileSync(configFile, 'utf-8');
if (newConfigFileData === configFileData) {
return;
}
Expand Down
4 changes: 2 additions & 2 deletions rollup.config.ts
@@ -1,4 +1,4 @@
import fs from 'fs';
import { readFileSync } from 'fs';
import path from 'path';
import alias from '@rollup/plugin-alias';
import commonjs from '@rollup/plugin-commonjs';
Expand All @@ -18,7 +18,7 @@ import pkg from './package.json';

const commitHash = (function () {
try {
return fs.readFileSync('.commithash', 'utf-8');
return readFileSync('.commithash', 'utf-8');
} catch {
return 'unknown';
}
Expand Down
6 changes: 3 additions & 3 deletions scripts/perf.js
@@ -1,6 +1,6 @@
/* global gc */

const fs = require('fs');
const { readFileSync, writeFileSync } = require('fs');
const path = require('path');
const colorette = require('colorette');
const prettyBytes = require('pretty-bytes');
Expand Down Expand Up @@ -137,7 +137,7 @@ function clearLines(numberOfLines) {

function getExistingTimings() {
try {
const timings = JSON.parse(fs.readFileSync(perfFile, 'utf8'));
const timings = JSON.parse(readFileSync(perfFile, 'utf8'));
console.info(
colorette.bold(
`Comparing with ${colorette.cyan(perfFile)}. Delete this file to create a new base line.`
Expand All @@ -151,7 +151,7 @@ function getExistingTimings() {

function persistTimings(timings) {
try {
fs.writeFileSync(perfFile, JSON.stringify(timings, null, 2), 'utf8');
writeFileSync(perfFile, JSON.stringify(timings, null, 2), 'utf8');
console.info(
colorette.bold(
`Saving performance information to new reference file ${colorette.cyan(perfFile)}.`
Expand Down
4 changes: 2 additions & 2 deletions test/chunking-form/samples/deprecated/emit-asset/_config.js
@@ -1,4 +1,4 @@
const fs = require('fs');
const { readFileSync } = require('fs');
const path = require('path');

module.exports = {
Expand All @@ -21,7 +21,7 @@ module.exports = {
if (id.endsWith('.svg')) {
return `export default import.meta.ROLLUP_ASSET_URL_${this.emitAsset(
path.basename(id),
fs.readFileSync(id)
readFileSync(id)
)};`;
}
}
Expand Down
@@ -1,4 +1,4 @@
const fs = require('fs');
const { readFileSync } = require('fs');
const path = require('path');

module.exports = {
Expand All @@ -21,7 +21,7 @@ module.exports = {
return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({
type: 'asset',
name: path.basename(id),
source: fs.readFileSync(id)
source: readFileSync(id)
})};`;
}
}
Expand Down
3 changes: 2 additions & 1 deletion test/cli/index.js
@@ -1,5 +1,6 @@
const assert = require('assert');
const { exec } = require('child_process');
const { readFileSync } = require('fs');
const path = require('path');
const sander = require('sander');
const {
Expand Down Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions test/cli/samples/config-no-output/_config.js
@@ -1,12 +1,12 @@
const assert = require('assert');
const fs = require('fs');
const { readFileSync, unlinkSync } = require('fs');

module.exports = {
description: 'uses -o from CLI',
command: 'rollup -c -o output.js',
test() {
const output = fs.readFileSync('output.js', 'utf-8');
const output = readFileSync('output.js', 'utf-8');
assert.equal(output.trim(), 'console.log(42);');
fs.unlinkSync('output.js');
unlinkSync('output.js');
}
};
10 changes: 5 additions & 5 deletions test/cli/samples/sourcemap-hidden/_config.js
@@ -1,16 +1,16 @@
const assert = require('assert');
const fs = require('fs');
const { readFileSync, unlinkSync } = require('fs');

module.exports = {
description: 'omits sourcemap comments',
command: 'rollup -i main.js -f es -m hidden -o output.js',
test() {
assert.equal(fs.readFileSync('output.js', 'utf-8').trim(), 'console.log( 42 );');
fs.unlinkSync('output.js');
assert.equal(readFileSync('output.js', 'utf-8').trim(), 'console.log( 42 );');
unlinkSync('output.js');
assert.equal(
fs.readFileSync('output.js.map', 'utf-8').trim(),
readFileSync('output.js.map', 'utf-8').trim(),
'{"version":3,"file":"output.js","sources":["main.js"],"sourcesContent":["console.log( 42 );\\n"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE"}'
);
fs.unlinkSync('output.js.map');
unlinkSync('output.js.map');
}
};
8 changes: 4 additions & 4 deletions test/cli/samples/watch/close-stdin/wrapper.js
@@ -1,7 +1,7 @@
#!/usr/bin/env node

const stream = require('stream');
const fs = require('fs');
const { mkdirSync, readFileSync, writeFileSync } = require('fs');
const chokidar = require('chokidar');
const path = require('path');

Expand All @@ -14,13 +14,13 @@ process.stdin = new stream.Readable({
});

const outputDir = path.resolve(__dirname, '_actual');
fs.mkdirSync(outputDir);
mkdirSync(outputDir);
const outputFile = path.resolve(outputDir, 'out.js');
const INITIAL_OUTPUT = 'NOT WRITTEN';
fs.writeFileSync(outputFile, INITIAL_OUTPUT);
writeFileSync(outputFile, INITIAL_OUTPUT);

const watcher = chokidar.watch(outputFile).on('change', () => {
if (fs.readFileSync(outputFile, 'utf8') !== INITIAL_OUTPUT) {
if (readFileSync(outputFile, 'utf8') !== INITIAL_OUTPUT) {
watcher.close();
// This closes stdin
process.stdin.push(null);
Expand Down
9 changes: 5 additions & 4 deletions test/form/index.js
@@ -1,4 +1,5 @@
const assert = require('assert');
const { readFileSync } = require('fs');
const path = require('path');
const sander = require('sander');
const rollup = require('../../dist/rollup');
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions test/form/samples/deprecated/emit-asset/_config.js
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('fs');
const { readFileSync } = require('fs');
const path = require('path');

module.exports = {
Expand All @@ -17,7 +17,7 @@ module.exports = {
if (id.endsWith('.svg')) {
return `export default import.meta.ROLLUP_ASSET_URL_${this.emitAsset(
path.basename(id),
fs.readFileSync(id)
readFileSync(id)
)};`;
}
},
Expand All @@ -30,7 +30,7 @@ module.exports = {
assert.strictEqual(asset.isAsset, true);
assert.strictEqual(asset.type, 'asset');
assert.ok(
asset.source.equals(fs.readFileSync(path.resolve(__dirname, 'logo.svg'))),
asset.source.equals(readFileSync(path.resolve(__dirname, 'logo.svg'))),
'asset has correct source'
);
assert.ok(keys[1].endsWith('.js'), `${keys[1]} ends with ".js"`);
Expand Down
6 changes: 3 additions & 3 deletions test/form/samples/emit-asset-file/_config.js
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('fs');
const { readFileSync } = require('fs');
const path = require('path');

module.exports = {
Expand All @@ -16,7 +16,7 @@ module.exports = {
return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({
type: 'asset',
name: path.basename(id),
source: fs.readFileSync(id)
source: readFileSync(id)
})};`;
}
},
Expand All @@ -28,7 +28,7 @@ module.exports = {
assert.strictEqual(asset.fileName, 'assets/logo-25585ac1.svg');
assert.strictEqual(asset.type, 'asset');
assert.ok(
asset.source.equals(fs.readFileSync(path.resolve(__dirname, 'logo.svg'))),
asset.source.equals(readFileSync(path.resolve(__dirname, 'logo.svg'))),
'asset has correct source'
);
assert.ok(keys[1].endsWith('.js'), `${keys[1]} ends with ".js"`);
Expand Down
4 changes: 2 additions & 2 deletions test/form/samples/emit-file-tree-shaken-access/_config.js
@@ -1,4 +1,4 @@
const fs = require('fs');
const { readFileSync } = require('fs');
const path = require('path');

module.exports = {
Expand All @@ -15,7 +15,7 @@ module.exports = {
return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({
type: 'asset',
name: path.basename(id),
source: fs.readFileSync(id)
source: readFileSync(id)
})};`;
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/function/samples/custom-loaders/_config.js
@@ -1,4 +1,4 @@
const fs = require('fs');
const { readFileSync } = require('fs');

module.exports = {
description: 'uses custom loaders, falling back to default',
Expand All @@ -7,14 +7,14 @@ module.exports = {
{
load(id) {
if (/foo\.js/.test(id)) {
return fs.readFileSync(id, 'utf-8').replace('@', 1);
return readFileSync(id, 'utf-8').replace('@', 1);
}
}
},
{
load(id) {
if (/bar\.js/.test(id)) {
return fs.readFileSync(id, 'utf-8').replace('@', 2);
return readFileSync(id, 'utf-8').replace('@', 2);
}
}
}
Expand Down
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('fs');
const { readFileSync } = require('fs');
const path = require('path');

const cachedModules = {
Expand All @@ -25,7 +25,7 @@ module.exports = {
return cachedModules[moduleId];
}

return fs.readFileSync(moduleId, 'utf-8');
return readFileSync(moduleId, 'utf-8');
}
}
]
Expand Down
@@ -1,4 +1,4 @@
const fs = require('fs');
const { readFileSync } = require('fs');
const path = require('path');

module.exports = {
Expand All @@ -10,7 +10,7 @@ module.exports = {
return path.basename(importee).replace(/\..+/, '');
},
load(id) {
return fs.readFileSync(path.join(__dirname, id + '.js'), 'utf-8');
return readFileSync(path.join(__dirname, id + '.js'), 'utf-8');
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions test/function/samples/transform-without-code/_config.js
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('fs');
const { readFileSync } = require('fs');
const path = require('path');
const { SourceMapConsumer } = require('source-map');

Expand All @@ -21,7 +21,7 @@ module.exports = {
const smc = await new SourceMapConsumer(map);
const originalLoc = smc.originalPositionFor({ line, column });
assert.notStrictEqual(originalLoc.line, null);
const originalCode = fs.readFileSync(path.join(__dirname, 'main.js'), 'utf8');
const originalCode = readFileSync(path.join(__dirname, 'main.js'), 'utf8');
assert.strictEqual(
originalCode.split('\n')[originalLoc.line - 1].substr(originalLoc.column, 2),
'42'
Expand Down
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('fs');
const { readFileSync } = require('fs');
const buble = require('buble');
const MagicString = require('magic-string');
const { SourceMapConsumer } = require('source-map');
Expand All @@ -11,7 +11,7 @@ module.exports = {
plugins: [
{
load(id) {
const code = fs.readFileSync(id, 'utf-8');
const code = readFileSync(id, 'utf-8');
const out = buble.transform(code, {
transforms: { modules: false },
sourceMap: true,
Expand Down

0 comments on commit 11a2ff8

Please sign in to comment.