diff --git a/lib/plugins/gcs/index.js b/lib/plugins/gcs/index.js index 823174c67..46e38a63f 100644 --- a/lib/plugins/gcs/index.js +++ b/lib/plugins/gcs/index.js @@ -1,5 +1,5 @@ import { relative, join, resolve, sep } from 'node:path'; -import { statSync, remove } from 'fs-extra'; +import fs from 'fs-extra/esm'; import { SitespeedioPlugin } from '@sitespeed.io/plugin'; import readdir from 'recursive-readdir'; // Documentation of @google-cloud/storage: https://cloud.google.com/nodejs/docs/reference/storage/2.3.x/Bucket#upload @@ -41,7 +41,7 @@ async function upload(dir, gcsOptions, prefix) { const bucket = storage.bucket(gcsOptions.bucketname); for (let file of files) { - const stats = statSync(file); + const stats = fs.statSync(file); if (stats.isFile()) { promises.push(uploadFile(file, bucket, gcsOptions, prefix, dir)); @@ -123,7 +123,7 @@ export default class GcsPlugin extends SitespeedioPlugin { ); } if (gcsOptions.removeLocalResult) { - await remove(baseDir); + await fs.remove(baseDir); log.debug(`Removed local files and directory ${baseDir}`); } else { log.debug( diff --git a/lib/plugins/s3/index.js b/lib/plugins/s3/index.js index 7dafb6248..2e78440cb 100644 --- a/lib/plugins/s3/index.js +++ b/lib/plugins/s3/index.js @@ -1,6 +1,6 @@ import { relative, join, resolve as _resolve, sep } from 'node:path'; -import { createReadStream, remove } from 'fs-extra'; +import fs from 'fs-extra/esm'; import { Endpoint, S3 } from 'aws-sdk'; import readdir from 'recursive-readdir'; import pLimit from 'p-limit'; @@ -57,7 +57,7 @@ async function uploadLatestFiles(dir, s3Options, prefix) { } async function uploadFile(file, s3, s3Options, prefix, baseDir) { - const stream = createReadStream(file); + const stream = fs.createReadStream(file); const contentType = getContentType(file); return new Promise((resolve, reject) => { const onUpload = error => { @@ -130,7 +130,7 @@ export default class S3Plugin extends SitespeedioPlugin { } log.info('Finished upload to s3'); if (s3Options.removeLocalResult) { - await remove(baseDir); + await fs.remove(baseDir); log.debug(`Removed local files and directory ${baseDir}`); } } catch (error) { diff --git a/lib/plugins/scp/index.js b/lib/plugins/scp/index.js index 2344dc148..4ef761df0 100644 --- a/lib/plugins/scp/index.js +++ b/lib/plugins/scp/index.js @@ -1,11 +1,11 @@ import { join, basename, resolve } from 'node:path'; import { SitespeedioPlugin } from '@sitespeed.io/plugin'; -import { readFileSync, remove } from 'fs-extra'; +import fs from 'fs-extra/esm'; import { Client } from 'node-scp'; import readdir from 'recursive-readdir'; import intel from 'intel'; -import { throwIfMissing } from '../../support/util'; +import { throwIfMissing } from '../../support/util.js'; const log = intel.getLogger('sitespeedio.plugin.scp'); @@ -21,7 +21,7 @@ async function getClient(scpOptions) { options.password = scpOptions.password; } if (scpOptions.privateKey) { - options.privateKey = readFileSync(scpOptions.privateKey); + options.privateKey = fs.readFileSync(scpOptions.privateKey); } if (scpOptions.passphrase) { options.passphrase = scpOptions.passphrase; @@ -126,7 +126,7 @@ export default class ScpPlugin extends SitespeedioPlugin { } log.info('Finished upload using scp'); if (this.scpOptions.removeLocalResult) { - await remove(baseDir); + await fs.remove(baseDir); log.debug(`Removed local files and directory ${baseDir}`); } } catch (error) {