From 8c9bd6d4960070c106b3f2afcce49addb7a304dd Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Sun, 26 Dec 2021 20:30:59 -0500 Subject: [PATCH] remove sander --- cli/run/watch-cli.ts | 2 +- package-lock.json | 31 ------------------------------- package.json | 1 - src/watch/watch.ts | 4 ++-- test/watch/index.js | 11 +++++------ 5 files changed, 8 insertions(+), 41 deletions(-) diff --git a/cli/run/watch-cli.ts b/cli/run/watch-cli.ts index 3beee5d2027..43e9f198a3b 100644 --- a/cli/run/watch-cli.ts +++ b/cli/run/watch-cli.ts @@ -26,7 +26,7 @@ export async function watch(command: Record): Promise { const configFile = command.config ? getConfigPath(command.config) : null; onExit(close); - process.on('uncaughtException' as any, close); + process.on('uncaughtException', close); if (!process.stdin.isTTY) { process.stdin.on('end', close); process.stdin.resume(); diff --git a/package-lock.json b/package-lock.json index d0e97dca0ac..042b0af3eb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4128,37 +4128,6 @@ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true }, - "sander": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/sander/-/sander-0.6.0.tgz", - "integrity": "sha1-rxYkzX+2362Y6+9WUxn5IAeNqSU=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.3", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.2" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } - } - }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", diff --git a/package.json b/package.json index 240d4a6cdf5..83eb6855820 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,6 @@ "rollup-plugin-string": "^3.0.0", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-thatworks": "^1.0.4", - "sander": "^0.6.0", "shx": "^0.3.3", "signal-exit": "^3.0.6", "source-map": "^0.7.3", diff --git a/src/watch/watch.ts b/src/watch/watch.ts index 9ed301f729e..16cb21961fd 100644 --- a/src/watch/watch.ts +++ b/src/watch/watch.ts @@ -1,4 +1,4 @@ -import * as path from 'path'; +import { resolve } from 'path'; import { createFilter } from '@rollup/pluginutils'; import { rollupInternal } from '../rollup/rollup'; import { @@ -140,7 +140,7 @@ export class Task { this.options = mergeOptions(config); this.outputs = this.options.output; this.outputFiles = this.outputs.map(output => { - if (output.file || output.dir) return path.resolve(output.file || output.dir!); + if (output.file || output.dir) return resolve(output.file || output.dir!); return undefined as never; }); diff --git a/test/watch/index.js b/test/watch/index.js index dcf0fa497ea..6649d5f2453 100644 --- a/test/watch/index.js +++ b/test/watch/index.js @@ -3,7 +3,6 @@ const { promises } = require('fs'); const { resolve } = require('path'); const process = require('process'); const { copy, pathExists, remove } = require('fs-extra'); -const sander = require('sander'); const rollup = require('../../dist/rollup'); const cwd = process.cwd(); @@ -1090,7 +1089,7 @@ describe('rollup.watch', () => { it('runs transforms again on previously erroring files that were changed back', () => { const brokenFiles = new Set(); const INITIAL_CONTENT = 'export default 42;'; - sander.writeFileSync('test/_tmp/input/main.js', INITIAL_CONTENT); + await promises.writeFile('test/_tmp/input/main.js', INITIAL_CONTENT); watcher = rollup.watch({ input: 'test/_tmp/input/main.js', plugins: { @@ -1119,15 +1118,15 @@ describe('rollup.watch', () => { 'BUNDLE_START', 'BUNDLE_END', 'END', - () => { + async () => { assert.strictEqual(run('../_tmp/output/bundle.js'), 42); - sander.writeFileSync('test/_tmp/input/main.js', 'export default "broken";'); + await promises.writeFile('test/_tmp/input/main.js', 'export default "broken";'); }, 'START', 'BUNDLE_START', 'ERROR', - () => { - sander.writeFileSync('test/_tmp/input/main.js', INITIAL_CONTENT); + async () => { + await promises.writeFile('test/_tmp/input/main.js', INITIAL_CONTENT); }, 'START', 'BUNDLE_START',