chore(deps): drop mz dependency (#3215)

package.json

@@ -75,7 +75,6 @@
     "jszip": "3.10.1",
     "mkdirp": "3.0.1",
     "multimatch": "6.0.0",
-    "mz": "2.7.0",
     "node-fetch": "3.3.2",
     "node-notifier": "10.0.1",
     "open": "9.1.0",

src/cmd/build.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import { createWriteStream } from 'fs';
+import fs from 'fs/promises';
 
-import { fs } from 'mz';
 import parseJSON from 'parse-json';
 import stripBom from 'strip-bom';
 import defaultFromEvent from 'promise-toolbox/fromEvent';

src/cmd/run.js

@@ -1,6 +1,6 @@
 import path from 'path';
-
-import { fs } from 'mz';
+import fs from 'fs/promises';
+import nodeFs from 'fs';
 
 import defaultBuildExtension from './build.js';
 import { showDesktopNotification as defaultDesktopNotifications } from '../util/desktop-notifier.js';
@@ -94,7 +94,7 @@ export default async function run(
           '--firefox-profile or --chromium-profile',
       );
     }
-    const isDir = fs.existsSync(profileDir);
+    const isDir = nodeFs.existsSync(profileDir);
     if (isDir) {
       log.info(`Profile directory ${profileDir} already exists`);
     } else {

src/config.js

@@ -1,9 +1,9 @@
 import os from 'os';
 import path from 'path';
+import fs from 'fs/promises';
 
 import camelCase from 'camelcase';
 import decamelize from 'decamelize';
-import { fs } from 'mz';
 import parseJSON from 'parse-json';
 
 import fileExists from './util/file-exists.js';

src/firefox/index.js

@@ -1,10 +1,10 @@
 import nodeFs from 'fs';
 import path from 'path';
 import { promisify } from 'util';
+import fs from 'fs/promises';
 
 import { default as defaultFxRunner } from 'fx-runner';
 import FirefoxProfile from 'firefox-profile';
-import { fs } from 'mz';
 import fromEvent from 'promise-toolbox/fromEvent';
 
 import isDirectory from '../util/is-directory.js';

src/util/artifacts.js

@@ -1,4 +1,5 @@
-import { fs } from 'mz';
+import fs from 'fs/promises';
+
 import { mkdirp as defaultAsyncMkdirp } from 'mkdirp';
 
 import { UsageError, isErrorWithCode } from '../errors.js';
@@ -24,7 +25,7 @@ export async function prepareArtifactsDir(
     }
     // If the artifactsDir already exists, check that we have the write permissions on it.
     try {
-      await asyncFsAccess(artifactsDir, fs.W_OK);
+      await asyncFsAccess(artifactsDir, fs.constants.W_OK);
     } catch (accessErr) {
       if (isErrorWithCode('EACCES', accessErr)) {
         throw new UsageError(

src/util/file-exists.js

@@ -1,4 +1,4 @@
-import { fs } from 'mz';
+import fs from 'fs/promises';
 
 import { isErrorWithCode } from '../errors.js';
 

src/util/is-directory.js

@@ -1,4 +1,4 @@
-import { fs } from 'mz';
+import fs from 'fs/promises';
 
 import { onlyErrorsWithCode } from '../errors.js';
 

src/util/manifest.js

@@ -1,6 +1,6 @@
 import path from 'path';
+import fs from 'fs/promises';
 
-import { fs } from 'mz';
 import parseJSON from 'parse-json';
 import stripBom from 'strip-bom';
 import stripJsonComments from 'strip-json-comments';

src/watcher.js

@@ -1,4 +1,5 @@
-import { fs } from 'mz';
+import { existsSync, lstatSync } from 'fs';
+
 import Watchpack from 'watchpack';
 import debounce from 'debounce';
 
@@ -46,7 +47,7 @@ export default function onSourceChange({
 
   if (watchFile) {
     for (const filePath of watchFile) {
-      if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isFile()) {
+      if (existsSync(filePath) && !lstatSync(filePath).isFile()) {
         throw new UsageError(
           'Invalid --watch-file value: ' + `"${filePath}" is not a file.`,
         );

tests/functional/test.cli.run.js

@@ -1,8 +1,8 @@
 import path from 'path';
+import { writeFileSync } from 'fs';
 
 import { describe, it } from 'mocha';
 import { assert } from 'chai';
-import { fs } from 'mz';
 
 import {
   minimalAddonPath,
@@ -29,10 +29,10 @@ describe('web-ext run', () => {
         );
         const watchIgnoredFile = path.join(srcDir, 'ignoredFile3.txt');
 
-        fs.writeFileSync(watchedFile, '');
-        watchedFilesArr.forEach((file) => fs.writeFileSync(file, ''));
-        watchIgnoredArr.forEach((file) => fs.writeFileSync(file, ''));
-        fs.writeFileSync(watchIgnoredFile, '');
+        writeFileSync(watchedFile, '');
+        watchedFilesArr.forEach((file) => writeFileSync(file, ''));
+        watchIgnoredArr.forEach((file) => writeFileSync(file, ''));
+        writeFileSync(watchIgnoredFile, '');
 
         const argv = [
           'run',

tests/functional/test.cli.sign.js

@@ -1,9 +1,9 @@
 import { spawn } from 'child_process';
 import path from 'path';
+import { writeFileSync } from 'fs';
 
 import { assert } from 'chai';
 import { describe, it, beforeEach, afterEach } from 'mocha';
-import { fs } from 'mz';
 
 import {
   minimalAddonPath,
@@ -85,12 +85,12 @@ describe('web-ext sign', () => {
 
   it('should use config file if required parameters are not in the arguments', () =>
     withTempAddonDir({ addonPath: minimalAddonPath }, (srcDir, tmpDir) => {
-      fs.writeFileSync(
+      writeFileSync(
         path.join(tmpDir, 'web-ext-config.js'),
         GOOD_EXAMPLE_OF_WEB_EXT_CONFIG_JS,
       );
 
-      fs.writeFileSync(
+      writeFileSync(
         path.join(tmpDir, 'package.json'),
         JSON.stringify({
           webExt: {
@@ -121,7 +121,7 @@ describe('web-ext sign', () => {
   it('should show an error message if the api-key is not set in the config', () =>
     withTempAddonDir({ addonPath: minimalAddonPath }, (srcDir, tmpDir) => {
       const configFilePath = path.join(tmpDir, 'web-ext-config.js');
-      fs.writeFileSync(configFilePath, BAD_EXAMPLE_OF_WEB_EXT_CONFIG_JS);
+      writeFileSync(configFilePath, BAD_EXAMPLE_OF_WEB_EXT_CONFIG_JS);
       const argv = [
         'sign',
         '--verbose',

tests/unit/test-cmd/test.build.js

@@ -1,6 +1,7 @@
 import path from 'path';
+import fs from 'fs/promises';
+import { writeFileSync } from 'fs';
 
-import { fs } from 'mz';
 import { it, describe } from 'mocha';
 import { assert } from 'chai';
 import * as sinon from 'sinon';
@@ -192,7 +193,7 @@ describe('build', () => {
   it('handles repeating localization keys', () => {
     return withTempDir((tmpDir) => {
       const messageFileName = path.join(tmpDir.path(), 'messages.json');
-      fs.writeFileSync(
+      writeFileSync(
         messageFileName,
         `{"extensionName": {
               "message": "example extension",
@@ -233,7 +234,7 @@ describe('build', () => {
   it('handles comments in messages.json', () => {
     return withTempDir((tmpDir) => {
       const messageFileName = path.join(tmpDir.path(), 'messages.json');
-      fs.writeFileSync(
+      writeFileSync(
         messageFileName,
         `{"extensionName": {
               "message": "example extension", // comments
@@ -257,7 +258,7 @@ describe('build', () => {
   it('checks locale file for malformed json', () => {
     return withTempDir((tmpDir) => {
       const messageFileName = path.join(tmpDir.path(), 'messages.json');
-      fs.writeFileSync(messageFileName, '{"simulated:" "json syntax error"');
+      writeFileSync(messageFileName, '{"simulated:" "json syntax error"');
 
       return getDefaultLocalizedName({
         messageFile: messageFileName,
@@ -285,7 +286,7 @@ describe('build', () => {
     return withTempDir((tmpDir) => {
       const messageFileName = path.join(tmpDir.path(), 'messages.json');
       //This is missing the 'message' key
-      fs.writeFileSync(
+      writeFileSync(
         messageFileName,
         `{"extensionName": {
               "description": "example extension"

tests/unit/test-cmd/test.run.js

@@ -1,6 +1,7 @@
 import path from 'path';
+import nodeFs from 'fs';
+import fs from 'fs/promises';
 
-import { fs } from 'mz';
 import { afterEach, beforeEach, describe, it } from 'mocha';
 import { assert } from 'chai';
 import * as sinon from 'sinon';
@@ -368,18 +369,18 @@ describe('run', () => {
   describe('profile-create-new option', () => {
     beforeEach(() => {
       sinon.stub(fs, 'mkdir');
-      sinon.stub(fs, 'existsSync');
+      sinon.stub(nodeFs, 'existsSync');
     });
 
     afterEach(() => {
       fs.mkdir.restore();
-      fs.existsSync.restore();
+      nodeFs.existsSync.restore();
     });
 
     const fakeProfile = '/pretend/path/to/profile';
 
     async function testCreateProfileIfMissing(expectProfileExists, runParams) {
-      fs.existsSync.returns(expectProfileExists);
+      nodeFs.existsSync.returns(expectProfileExists);
       const cmd = await prepareRun();
 
       await cmd.run(runParams);

tests/unit/test-cmd/test.sign.js

@@ -1,8 +1,8 @@
 import path from 'path';
 import { promisify } from 'util';
+import fs from 'fs/promises';
 
 import copyDir from 'copy-dir';
-import { fs } from 'mz';
 import { describe, it } from 'mocha';
 import { assert } from 'chai';
 import * as sinon from 'sinon';