From 11a2ff83db249aaeb0a2ea31a911b278692839a3 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Sat, 25 Dec 2021 22:40:02 -0500 Subject: [PATCH] refactor: use fs.readFileSync --- build-plugins/generate-license-file.ts | 8 ++++---- cli/run/watch-cli.ts | 6 +++--- rollup.config.ts | 4 ++-- scripts/perf.js | 6 +++--- .../samples/deprecated/emit-asset/_config.js | 4 ++-- .../samples/emit-file/reference-files/_config.js | 4 ++-- test/cli/index.js | 3 ++- test/cli/samples/config-no-output/_config.js | 6 +++--- test/cli/samples/sourcemap-hidden/_config.js | 10 +++++----- test/cli/samples/watch/close-stdin/wrapper.js | 8 ++++---- test/form/index.js | 9 +++++---- .../samples/deprecated/emit-asset/_config.js | 6 +++--- test/form/samples/emit-asset-file/_config.js | 6 +++--- .../emit-file-tree-shaken-access/_config.js | 4 ++-- test/function/samples/custom-loaders/_config.js | 6 +++--- .../custom-path-resolver-on-entry/_config.js | 4 ++-- .../export-default-anonymous-function/_config.js | 4 ++-- .../samples/transform-without-code/_config.js | 4 ++-- .../combined-sourcemap-with-loader/_config.js | 4 ++-- .../samples/excludes-plugin-helpers/_config.js | 4 ++-- test/sourcemaps/samples/loaders/_config.js | 4 ++-- .../samples/reified-namespace/_config.js | 4 ++-- .../samples/single-length-segments/_config.js | 8 ++++---- test/watch/index.js | 16 ++++++---------- 24 files changed, 70 insertions(+), 72 deletions(-) diff --git a/build-plugins/generate-license-file.ts b/build-plugins/generate-license-file.ts index e64391c9617..42f1e363c38 100644 --- a/build-plugins/generate-license-file.ts +++ b/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)) @@ -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.'); } } diff --git a/cli/run/watch-cli.ts b/cli/run/watch-cli.ts index 7baa555d876..3beee5d2027 100644 --- a/cli/run/watch-cli.ts +++ b/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'; @@ -22,7 +22,7 @@ export async function watch(command: Record): Promise { 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); @@ -42,7 +42,7 @@ export async function watch(command: Record): Promise { async function reloadConfigFile() { try { - const newConfigFileData = fs.readFileSync(configFile, 'utf-8'); + const newConfigFileData = readFileSync(configFile, 'utf-8'); if (newConfigFileData === configFileData) { return; } diff --git a/rollup.config.ts b/rollup.config.ts index 3273078b6bf..cebab7ed828 100644 --- a/rollup.config.ts +++ b/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'; @@ -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'; } diff --git a/scripts/perf.js b/scripts/perf.js index 0ccbeaacd25..be74ae5c56f 100644 --- a/scripts/perf.js +++ b/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'); @@ -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.` @@ -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)}.` diff --git a/test/chunking-form/samples/deprecated/emit-asset/_config.js b/test/chunking-form/samples/deprecated/emit-asset/_config.js index dad3aeeaf09..f9625ac7974 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_config.js +++ b/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 = { @@ -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) )};`; } } diff --git a/test/chunking-form/samples/emit-file/reference-files/_config.js b/test/chunking-form/samples/emit-file/reference-files/_config.js index 57ba1d3de55..6569204399f 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_config.js +++ b/test/chunking-form/samples/emit-file/reference-files/_config.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +const { readFileSync } = require('fs'); const path = require('path'); module.exports = { @@ -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) })};`; } } diff --git a/test/cli/index.js b/test/cli/index.js index 5401bf699a0..963f3d03fb5 100644 --- a/test/cli/index.js +++ b/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 { @@ -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/cli/samples/config-no-output/_config.js b/test/cli/samples/config-no-output/_config.js index 148b688c86b..1f0696157c2 100644 --- a/test/cli/samples/config-no-output/_config.js +++ b/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'); } }; diff --git a/test/cli/samples/sourcemap-hidden/_config.js b/test/cli/samples/sourcemap-hidden/_config.js index 6bd4d61f101..5dd0871d5a0 100644 --- a/test/cli/samples/sourcemap-hidden/_config.js +++ b/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'); } }; diff --git a/test/cli/samples/watch/close-stdin/wrapper.js b/test/cli/samples/watch/close-stdin/wrapper.js index a978de79c4b..32506153c5d 100755 --- a/test/cli/samples/watch/close-stdin/wrapper.js +++ b/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'); @@ -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); diff --git a/test/form/index.js b/test/form/index.js index 928a9cdd641..97c1e752308 100644 --- a/test/form/index.js +++ b/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'); @@ -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/form/samples/deprecated/emit-asset/_config.js b/test/form/samples/deprecated/emit-asset/_config.js index 6d4c88ac239..f7930b32270 100644 --- a/test/form/samples/deprecated/emit-asset/_config.js +++ b/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 = { @@ -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) )};`; } }, @@ -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"`); diff --git a/test/form/samples/emit-asset-file/_config.js b/test/form/samples/emit-asset-file/_config.js index 5976fabd374..b4bbd8926d7 100644 --- a/test/form/samples/emit-asset-file/_config.js +++ b/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 = { @@ -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) })};`; } }, @@ -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"`); diff --git a/test/form/samples/emit-file-tree-shaken-access/_config.js b/test/form/samples/emit-file-tree-shaken-access/_config.js index 1feae6664f4..3b52af0c675 100644 --- a/test/form/samples/emit-file-tree-shaken-access/_config.js +++ b/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 = { @@ -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) })};`; } } diff --git a/test/function/samples/custom-loaders/_config.js b/test/function/samples/custom-loaders/_config.js index e2f0cec12b1..e9e52b0b884 100644 --- a/test/function/samples/custom-loaders/_config.js +++ b/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', @@ -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); } } } diff --git a/test/function/samples/custom-path-resolver-on-entry/_config.js b/test/function/samples/custom-path-resolver-on-entry/_config.js index 7d49020fd95..c92be833424 100644 --- a/test/function/samples/custom-path-resolver-on-entry/_config.js +++ b/test/function/samples/custom-path-resolver-on-entry/_config.js @@ -1,5 +1,5 @@ const assert = require('assert'); -const fs = require('fs'); +const { readFileSync } = require('fs'); const path = require('path'); const cachedModules = { @@ -25,7 +25,7 @@ module.exports = { return cachedModules[moduleId]; } - return fs.readFileSync(moduleId, 'utf-8'); + return readFileSync(moduleId, 'utf-8'); } } ] diff --git a/test/function/samples/export-default-anonymous-function/_config.js b/test/function/samples/export-default-anonymous-function/_config.js index 030af6269a7..14a8ec085be 100644 --- a/test/function/samples/export-default-anonymous-function/_config.js +++ b/test/function/samples/export-default-anonymous-function/_config.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +const { readFileSync } = require('fs'); const path = require('path'); module.exports = { @@ -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'); } } ] diff --git a/test/function/samples/transform-without-code/_config.js b/test/function/samples/transform-without-code/_config.js index dc9d1447d13..cfe8d21e839 100644 --- a/test/function/samples/transform-without-code/_config.js +++ b/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'); @@ -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' diff --git a/test/sourcemaps/samples/combined-sourcemap-with-loader/_config.js b/test/sourcemaps/samples/combined-sourcemap-with-loader/_config.js index 1f670313146..c9d16748ce3 100644 --- a/test/sourcemaps/samples/combined-sourcemap-with-loader/_config.js +++ b/test/sourcemaps/samples/combined-sourcemap-with-loader/_config.js @@ -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'); @@ -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, diff --git a/test/sourcemaps/samples/excludes-plugin-helpers/_config.js b/test/sourcemaps/samples/excludes-plugin-helpers/_config.js index 393c9e825a3..e64a91e702f 100644 --- a/test/sourcemaps/samples/excludes-plugin-helpers/_config.js +++ b/test/sourcemaps/samples/excludes-plugin-helpers/_config.js @@ -1,5 +1,5 @@ const assert = require('assert'); -const fs = require('fs'); +const { readFileSync } = require('fs'); const path = require('path'); const HELPER = '\0helper'; @@ -18,7 +18,7 @@ module.exports = { load(id) { if (id === HELPER) { - return fs.readFileSync(path.join(__dirname, 'helper.js'), 'utf-8'); + return readFileSync(path.join(__dirname, 'helper.js'), 'utf-8'); } } } diff --git a/test/sourcemaps/samples/loaders/_config.js b/test/sourcemaps/samples/loaders/_config.js index 9e45fa58ec9..7df0a3b4fef 100644 --- a/test/sourcemaps/samples/loaders/_config.js +++ b/test/sourcemaps/samples/loaders/_config.js @@ -1,5 +1,5 @@ const assert = require('assert'); -const fs = require('fs'); +const { readFileSync } = require('fs'); const buble = require('buble'); const { SourceMapConsumer } = require('source-map'); const getLocation = require('../../getLocation'); @@ -16,7 +16,7 @@ module.exports = { id = id.replace(/bar.js$/, 'foo.js'); } - const code = fs.readFileSync(id, 'utf-8'); + const code = readFileSync(id, 'utf-8'); const out = buble.transform(code, { transforms: { modules: false }, diff --git a/test/sourcemaps/samples/reified-namespace/_config.js b/test/sourcemaps/samples/reified-namespace/_config.js index 431758d276a..09fd70e39f5 100644 --- a/test/sourcemaps/samples/reified-namespace/_config.js +++ b/test/sourcemaps/samples/reified-namespace/_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'); const getLocation = require('../../getLocation'); @@ -9,7 +9,7 @@ module.exports = { async test(code, map) { const smc = await new SourceMapConsumer(map); - const main = fs.readFileSync(path.join(__dirname, 'main.js'), 'utf-8'); + const main = readFileSync(path.join(__dirname, 'main.js'), 'utf-8'); const generatedLoc = getLocation(code, 'deepEqual'); const actual = smc.originalPositionFor(generatedLoc); diff --git a/test/sourcemaps/samples/single-length-segments/_config.js b/test/sourcemaps/samples/single-length-segments/_config.js index 1b38deb956d..7850b91ad7a 100644 --- a/test/sourcemaps/samples/single-length-segments/_config.js +++ b/test/sourcemaps/samples/single-length-segments/_config.js @@ -1,10 +1,10 @@ const assert = require('assert'); -const fs = require('fs'); +const { readFileSync } = require('fs'); const path = require('path'); const { SourceMapConsumer } = require('source-map'); const getLocation = require('../../getLocation'); -const original = fs.readFileSync(path.resolve(__dirname, 'main.js'), 'utf-8'); +const original = readFileSync(path.resolve(__dirname, 'main.js'), 'utf-8'); module.exports = { description: 'handles single-length sourcemap segments', @@ -13,8 +13,8 @@ module.exports = { { transform() { return { - code: fs.readFileSync(path.resolve(__dirname, 'output.js'), 'utf-8'), - map: fs.readFileSync(path.resolve(__dirname, 'output.js.map'), 'utf-8') + code: readFileSync(path.resolve(__dirname, 'output.js'), 'utf-8'), + map: readFileSync(path.resolve(__dirname, 'output.js.map'), 'utf-8') }; } } diff --git a/test/watch/index.js b/test/watch/index.js index f7d9124fb52..4390f3b65ef 100644 --- a/test/watch/index.js +++ b/test/watch/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'); @@ -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()}"`; } } });