Drop usage of fs-extra and switch to native fs

lib/plugins/save-resource-to-fs-plugin.js

@@ -1,5 +1,6 @@
 import path from 'path';
-import fs from 'fs-extra';
+import fs from 'fs';
+import { outputFile } from '../utils/fs.js';
 
 class SaveResourceToFileSystemPlugin {
 	apply (registerAction) {
@@ -20,13 +21,13 @@ class SaveResourceToFileSystemPlugin {
 		registerAction('saveResource', async ({resource}) => {
 			const filename = path.join(absoluteDirectoryPath, resource.getFilename());
 			const text = resource.getText();
-			await fs.outputFile(filename, text, { encoding: resource.getEncoding() });
+			await outputFile(filename, text, resource.getEncoding());
 			loadedResources.push(resource);
 		});
 
 		registerAction('error', async () => {
 			if (loadedResources.length > 0) {
-				await fs.remove(absoluteDirectoryPath);
+				await fs.promises.rm(absoluteDirectoryPath, {force: true, recursive: true});
 			}
 		});
 	}

lib/utils/fs.js

@@ -0,0 +1,13 @@
+import path from 'path';
+import fs from 'fs/promises';
+
+async function outputFile (file, data, encoding) {
+	const dir = path.dirname(file);
+	await fs.mkdir(dir, { recursive: true});
+
+	return fs.writeFile(file, data, { encoding: encoding });
+}
+
+export {
+	outputFile
+};

package.json

@@ -41,7 +41,6 @@
     "css-url-parser": "^1.0.0",
     "debug": "^4.3.1",
     "filenamify": "^7.0.0",
-    "fs-extra": "^11.1.0",
     "got": "^14.4.7",
     "normalize-url": "^9.0.0",
     "p-queue": "^9.0.0",

test/e2e/e2e-test.js

@@ -1,5 +1,5 @@
 import scrape from 'website-scraper';
-import fs from 'fs-extra';
+import fs from 'fs';
 import * as chai from 'chai';
 
 import { readFile } from 'fs/promises';
@@ -11,7 +11,8 @@ chai.should();
 
 describe('E2E', function() {
 	before(function() {
-		fs.emptyDirSync(resultDirname);
+		fs.rmSync(resultDirname, {recursive: true, force: true});
+		fs.mkdirSync(resultDirname, {recursive: true});
 	});
 
 	after(function() {

test/functional/base/base.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import * as cheerio from 'cheerio';
 import scrape from 'website-scraper';
 import Resource from '../../../lib/resource.js';
@@ -42,7 +42,7 @@ describe('Functional: base', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	beforeEach(() => {

test/functional/base/check-it-works.js

@@ -2,7 +2,7 @@ import * as chai from 'chai';
 chai.should();
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/base/.tmp2';
@@ -17,7 +17,7 @@ describe('Functional: check it works', function() {
 	afterEach(function () {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should work with promise', () => {

test/functional/binary-resources/images.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import * as cheerio from 'cheerio';
 import scrape from 'website-scraper';
 
@@ -31,7 +31,7 @@ describe('Functional: images', () => {
 	afterEach(() => {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	beforeEach(() => {

test/functional/callbacks/callbacks.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import sinon from 'sinon';
 import scrape from 'website-scraper';
 
@@ -19,7 +19,7 @@ describe('Functional: onResourceSaved and onResourceError callbacks in plugin',
 	afterEach(() => {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should call onResourceSaved callback and onResourceError callback if ignoreErrors = true', function() {

test/functional/circular-dependencies/circular-dependencies.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/circular-dependencies/.tmp';
@@ -19,7 +19,7 @@ describe('Functional circular dependencies', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should correctly load files with circular dependency', function() {

test/functional/css-handling/css-handling.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/css-handling/.tmp';
@@ -19,7 +19,7 @@ describe('Functional: css handling', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should correctly handle css files, style tags and style attributes and ignore css-like text inside common html tags', function() {

test/functional/data-url/data-url.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/data-url/.tmp';
@@ -19,7 +19,7 @@ describe('Functional: data urls handling', function () {
 	afterEach(function () {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should correctly handle html files with data urls in attributes', function () {

test/functional/error-handling/error-handling.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import sinon from 'sinon';
 import scrape from 'website-scraper';
 import Scraper from '../../../lib/scraper.js';
@@ -37,7 +37,7 @@ describe('Functional error handling', function() {
 	afterEach(function () {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	describe('FS Error', function () {

test/functional/html-entities/html-entities.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/html-entities/.tmp';
@@ -19,7 +19,7 @@ describe('Functional: html entities', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should decode all html-entities found in html files and not encode entities from css file', function() {

test/functional/html-id-href/html-id-href.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/html-id-href/.tmp';
@@ -19,7 +19,7 @@ describe('Functional html id href', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should ignore same-file paths and update other-file paths', function() {

test/functional/max-depth/max-depth.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/max-depth/.tmp';
@@ -19,7 +19,7 @@ describe('Functional: maxDepth and maxRecursiveDepth ', () => {
 	afterEach(() => {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should filter out all resources by depth > maxDepth', () => {

test/functional/recursive/recursive.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/recursive/.tmp';
@@ -19,7 +19,7 @@ describe('Functional recursive downloading', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should follow anchors if recursive flag is set', function () {

test/functional/redirect/redirect.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import sinon from 'sinon';
 import scrape from 'website-scraper';
 import Scraper from '../../../lib/scraper.js';
@@ -21,7 +21,7 @@ describe('Functional redirects', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should follow redirects and save resource once if it has different urls', function() {

test/functional/request-concurrency/request-concurrency.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/request-concurrency/.tmp';
@@ -59,7 +59,7 @@ describe('Functional concurrent requests', function() {
 	afterEach(function () {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should have maximum concurrent requests == requestConcurrency option', () => {

test/functional/request-response-customizations/after-response-action.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/req-res-customizations-after-response/.tmp';
@@ -19,7 +19,7 @@ describe('Functional: afterResponse action in plugin', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should skip downloading resource if afterResponse returns null', function() {

test/functional/request-response-customizations/request.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/req-res-customizations-request/.tmp';
@@ -19,7 +19,7 @@ describe('Functional: customize request options with plugin', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should use options from request property if no beforeRequest actions', function() {

test/functional/resource-saver/resource-saver.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import sinon from 'sinon';
 import scrape from 'website-scraper';
 
@@ -20,7 +20,7 @@ describe('Functional: plugin for saving resources', () => {
 	afterEach(() => {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	let saveResourceStub, handleErrorStub, saveResourcePlugin;

test/functional/resource-without-ext/resource-without-ext.test.js

@@ -3,7 +3,7 @@ chai.should();
 
 import '../../utils/assertions.js';
 import nock from 'nock';
-import fs from 'fs-extra';
+import fs from 'fs';
 import scrape from 'website-scraper';
 
 const testDirname = './test/functional/resource-without-ext/.tmp';
@@ -19,7 +19,7 @@ describe('Functional resources without extensions', function() {
 	afterEach(function() {
 		nock.cleanAll();
 		nock.enableNetConnect();
-		fs.removeSync(testDirname);
+		fs.rmSync(testDirname, {recursive: true, force: true});
 	});
 
 	it('should load resources without extensions with correct type and wrap with extensions', function () {