web-ext 7.1.1 → 7.3.0

package/lib/watcher.js

@@ -1,9 +1,12 @@
+
 import { fs } from 'mz';
 import Watchpack from 'watchpack';
 import debounce from 'debounce';
 import { UsageError } from './errors.js';
 import { createLogger } from './util/logger.js';
-const log = createLogger(import.meta.url); // onSourceChange types and implementation
+const log = createLogger(import.meta.url);
+
+// onSourceChange types and implementation
 
 export default function onSourceChange({
   sourceDir,
@@ -17,12 +20,14 @@ export default function onSourceChange({
   // When running on Windows, transform the ignored paths and globs
   // as Watchpack does translate the changed files path internally
   // (See https://github.com/webpack/watchpack/blob/v2.1.1/lib/DirectoryWatcher.js#L99-L103).
-  const ignored = watchIgnored && process.platform === 'win32' ? watchIgnored.map(it => it.replace(/\\/g, '/')) : watchIgnored; // TODO: For network disks, we would need to add {poll: true}.
+  const ignored = watchIgnored && process.platform === 'win32' ? watchIgnored.map(it => it.replace(/\\/g, '/')) : watchIgnored;
 
+  // TODO: For network disks, we would need to add {poll: true}.
   const watcher = ignored ? new Watchpack({
     ignored
-  }) : new Watchpack(); // Allow multiple files to be changed before reloading the extension
+  }) : new Watchpack();
 
+  // Allow multiple files to be changed before reloading the extension
   const executeImmediately = false;
   onChange = debounce(onChange, debounceTime, executeImmediately);
   watcher.on('change', filePath => {
@@ -36,30 +41,30 @@ export default function onSourceChange({
   log.debug(`Watching ${watchFile ? watchFile.join(',') : sourceDir} for changes`);
   const watchedDirs = [];
   const watchedFiles = [];
-
   if (watchFile) {
     for (const filePath of watchFile) {
       if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isFile()) {
         throw new UsageError('Invalid --watch-file value: ' + `"${filePath}" is not a file.`);
       }
-
       watchedFiles.push(filePath);
     }
   } else {
     watchedDirs.push(sourceDir);
   }
-
   watcher.watch({
     files: watchedFiles,
     directories: watchedDirs,
     missing: [],
     startTime: Date.now()
-  }); // TODO: support interrupting the watcher on Windows.
-  // https://github.com/mozilla/web-ext/issues/225
+  });
 
+  // TODO: support interrupting the watcher on Windows.
+  // https://github.com/mozilla/web-ext/issues/225
   process.on('SIGINT', () => watcher.close());
   return watcher;
-} // proxyFileChanges types and implementation.
+}
+
+// proxyFileChanges types and implementation.
 
 export function proxyFileChanges({
   artifactsDir,

package/lib/watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.js","names":["fs","Watchpack","debounce","UsageError","createLogger","log","import","meta","url","onSourceChange","sourceDir","watchFile","watchIgnored","artifactsDir","onChange","shouldWatchFile","debounceTime","ignored","process","platform","map","it","replace","watcher","executeImmediately","on","filePath","proxyFileChanges","debug","join","watchedDirs","watchedFiles","existsSync","lstatSync","isFile","push","watch","files","directories","missing","startTime","Date","now","close","indexOf","toTimeString"],"sources":["../src/watcher.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\nimport Watchpack from 'watchpack';\nimport debounce from 'debounce';\n\nimport { UsageError } from './errors.js';\nimport {createLogger} from './util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\n\n// onSourceChange types and implementation\n\nexport type ShouldWatchFn = (filePath: string) => boolean;\n\nexport type OnChangeFn = () => any;\n\nexport type OnSourceChangeParams = {|\n  sourceDir: string,\n  watchFile?: Array<string>,\n  watchIgnored?: Array<string>,\n  artifactsDir: string,\n  onChange: OnChangeFn,\n  shouldWatchFile: ShouldWatchFn,\n  debounceTime?: number,\n|};\n\nexport type OnSourceChangeFn = (params: OnSourceChangeParams) => Watchpack;\n\nexport default function onSourceChange(\n  {\n    sourceDir,\n    watchFile,\n    watchIgnored,\n    artifactsDir,\n    onChange,\n    shouldWatchFile,\n    debounceTime = 500,\n  }: OnSourceChangeParams\n): Watchpack {\n  // When running on Windows, transform the ignored paths and globs\n  // as Watchpack does translate the changed files path internally\n  // (See https://github.com/webpack/watchpack/blob/v2.1.1/lib/DirectoryWatcher.js#L99-L103).\n  const ignored = (watchIgnored && process.platform === 'win32')\n    ? watchIgnored.map((it) => it.replace(/\\\\/g, '/'))\n    : watchIgnored;\n\n  // TODO: For network disks, we would need to add {poll: true}.\n  const watcher = ignored ?\n    new Watchpack({ignored}) :\n    new Watchpack();\n\n  // Allow multiple files to be changed before reloading the extension\n  const executeImmediately = false;\n  onChange = debounce(onChange, debounceTime, executeImmediately);\n\n  watcher.on('change', (filePath) => {\n    proxyFileChanges({artifactsDir, onChange, filePath, shouldWatchFile});\n  });\n\n  log.debug(\n    `Watching ${watchFile ? watchFile.join(',') : sourceDir} for changes`\n  );\n\n  const watchedDirs = [];\n  const watchedFiles = [];\n\n  if (watchFile) {\n    for (const filePath of watchFile) {\n      if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isFile()) {\n        throw new UsageError('Invalid --watch-file value: ' +\n          `\"${filePath}\" is not a file.`);\n      }\n\n      watchedFiles.push(filePath);\n    }\n  } else {\n    watchedDirs.push(sourceDir);\n  }\n\n  watcher.watch({\n    files: watchedFiles,\n    directories: watchedDirs,\n    missing: [],\n    startTime: Date.now(),\n  });\n\n  // TODO: support interrupting the watcher on Windows.\n  // https://github.com/mozilla/web-ext/issues/225\n  process.on('SIGINT', () => watcher.close());\n  return watcher;\n}\n\n\n// proxyFileChanges types and implementation.\n\nexport type ProxyFileChangesParams = {|\n  artifactsDir: string,\n  onChange: OnChangeFn,\n  filePath: string,\n  shouldWatchFile: ShouldWatchFn,\n|};\n\nexport function proxyFileChanges(\n  {artifactsDir, onChange, filePath, shouldWatchFile}: ProxyFileChangesParams\n): void {\n  if (filePath.indexOf(artifactsDir) === 0 || !shouldWatchFile(filePath)) {\n    log.debug(`Ignoring change to: ${filePath}`);\n  } else {\n    log.debug(`Changed: ${filePath}`);\n    log.debug(`Last change detection: ${(new Date()).toTimeString()}`);\n    onChange();\n  }\n}\n"],"mappings":"AACA,SAAQA,EAAR,QAAiB,IAAjB;AACA,OAAOC,SAAP,MAAsB,WAAtB;AACA,OAAOC,QAAP,MAAqB,UAArB;AAEA,SAASC,UAAT,QAA2B,aAA3B;AACA,SAAQC,YAAR,QAA2B,kBAA3B;AAEA,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAP,CAAYC,GAAb,CAAxB,C,CAGA;;AAkBA,eAAe,SAASC,cAAT,CACb;EACEC,SADF;EAEEC,SAFF;EAGEC,YAHF;EAIEC,YAJF;EAKEC,QALF;EAMEC,eANF;EAOEC,YAAY,GAAG;AAPjB,CADa,EAUF;EACX;EACA;EACA;EACA,MAAMC,OAAO,GAAIL,YAAY,IAAIM,OAAO,CAACC,QAAR,KAAqB,OAAtC,GACZP,YAAY,CAACQ,GAAb,CAAkBC,EAAD,IAAQA,EAAE,CAACC,OAAH,CAAW,KAAX,EAAkB,GAAlB,CAAzB,CADY,GAEZV,YAFJ,CAJW,CAQX;;EACA,MAAMW,OAAO,GAAGN,OAAO,GACrB,IAAIhB,SAAJ,CAAc;IAACgB;EAAD,CAAd,CADqB,GAErB,IAAIhB,SAAJ,EAFF,CATW,CAaX;;EACA,MAAMuB,kBAAkB,GAAG,KAA3B;EACAV,QAAQ,GAAGZ,QAAQ,CAACY,QAAD,EAAWE,YAAX,EAAyBQ,kBAAzB,CAAnB;EAEAD,OAAO,CAACE,EAAR,CAAW,QAAX,EAAsBC,QAAD,IAAc;IACjCC,gBAAgB,CAAC;MAACd,YAAD;MAAeC,QAAf;MAAyBY,QAAzB;MAAmCX;IAAnC,CAAD,CAAhB;EACD,CAFD;EAIAV,GAAG,CAACuB,KAAJ,CACG,YAAWjB,SAAS,GAAGA,SAAS,CAACkB,IAAV,CAAe,GAAf,CAAH,GAAyBnB,SAAU,cAD1D;EAIA,MAAMoB,WAAW,GAAG,EAApB;EACA,MAAMC,YAAY,GAAG,EAArB;;EAEA,IAAIpB,SAAJ,EAAe;IACb,KAAK,MAAMe,QAAX,IAAuBf,SAAvB,EAAkC;MAChC,IAAIX,EAAE,CAACgC,UAAH,CAAcN,QAAd,KAA2B,CAAC1B,EAAE,CAACiC,SAAH,CAAaP,QAAb,EAAuBQ,MAAvB,EAAhC,EAAiE;QAC/D,MAAM,IAAI/B,UAAJ,CAAe,iCAClB,IAAGuB,QAAS,kBADT,CAAN;MAED;;MAEDK,YAAY,CAACI,IAAb,CAAkBT,QAAlB;IACD;EACF,CATD,MASO;IACLI,WAAW,CAACK,IAAZ,CAAiBzB,SAAjB;EACD;;EAEDa,OAAO,CAACa,KAAR,CAAc;IACZC,KAAK,EAAEN,YADK;IAEZO,WAAW,EAAER,WAFD;IAGZS,OAAO,EAAE,EAHG;IAIZC,SAAS,EAAEC,IAAI,CAACC,GAAL;EAJC,CAAd,EAzCW,CAgDX;EACA;;EACAxB,OAAO,CAACO,EAAR,CAAW,QAAX,EAAqB,MAAMF,OAAO,CAACoB,KAAR,EAA3B;EACA,OAAOpB,OAAP;AACD,C,CAGD;;AASA,OAAO,SAASI,gBAAT,CACL;EAACd,YAAD;EAAeC,QAAf;EAAyBY,QAAzB;EAAmCX;AAAnC,CADK,EAEC;EACN,IAAIW,QAAQ,CAACkB,OAAT,CAAiB/B,YAAjB,MAAmC,CAAnC,IAAwC,CAACE,eAAe,CAACW,QAAD,CAA5D,EAAwE;IACtErB,GAAG,CAACuB,KAAJ,CAAW,uBAAsBF,QAAS,EAA1C;EACD,CAFD,MAEO;IACLrB,GAAG,CAACuB,KAAJ,CAAW,YAAWF,QAAS,EAA/B;IACArB,GAAG,CAACuB,KAAJ,CAAW,0BAA0B,IAAIa,IAAJ,EAAD,CAAaI,YAAb,EAA4B,EAAhE;IACA/B,QAAQ;EACT;AACF"}
+{"version":3,"file":"watcher.js","names":["fs","Watchpack","debounce","UsageError","createLogger","log","import","meta","url","onSourceChange","sourceDir","watchFile","watchIgnored","artifactsDir","onChange","shouldWatchFile","debounceTime","ignored","process","platform","map","it","replace","watcher","executeImmediately","on","filePath","proxyFileChanges","debug","join","watchedDirs","watchedFiles","existsSync","lstatSync","isFile","push","watch","files","directories","missing","startTime","Date","now","close","indexOf","toTimeString"],"sources":["../src/watcher.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\nimport Watchpack from 'watchpack';\nimport debounce from 'debounce';\n\nimport { UsageError } from './errors.js';\nimport {createLogger} from './util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\n\n// onSourceChange types and implementation\n\nexport type ShouldWatchFn = (filePath: string) => boolean;\n\nexport type OnChangeFn = () => any;\n\nexport type OnSourceChangeParams = {|\n  sourceDir: string,\n  watchFile?: Array<string>,\n  watchIgnored?: Array<string>,\n  artifactsDir: string,\n  onChange: OnChangeFn,\n  shouldWatchFile: ShouldWatchFn,\n  debounceTime?: number,\n|};\n\nexport type OnSourceChangeFn = (params: OnSourceChangeParams) => Watchpack;\n\nexport default function onSourceChange(\n  {\n    sourceDir,\n    watchFile,\n    watchIgnored,\n    artifactsDir,\n    onChange,\n    shouldWatchFile,\n    debounceTime = 500,\n  }: OnSourceChangeParams\n): Watchpack {\n  // When running on Windows, transform the ignored paths and globs\n  // as Watchpack does translate the changed files path internally\n  // (See https://github.com/webpack/watchpack/blob/v2.1.1/lib/DirectoryWatcher.js#L99-L103).\n  const ignored = (watchIgnored && process.platform === 'win32')\n    ? watchIgnored.map((it) => it.replace(/\\\\/g, '/'))\n    : watchIgnored;\n\n  // TODO: For network disks, we would need to add {poll: true}.\n  const watcher = ignored ?\n    new Watchpack({ignored}) :\n    new Watchpack();\n\n  // Allow multiple files to be changed before reloading the extension\n  const executeImmediately = false;\n  onChange = debounce(onChange, debounceTime, executeImmediately);\n\n  watcher.on('change', (filePath) => {\n    proxyFileChanges({artifactsDir, onChange, filePath, shouldWatchFile});\n  });\n\n  log.debug(\n    `Watching ${watchFile ? watchFile.join(',') : sourceDir} for changes`\n  );\n\n  const watchedDirs = [];\n  const watchedFiles = [];\n\n  if (watchFile) {\n    for (const filePath of watchFile) {\n      if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isFile()) {\n        throw new UsageError('Invalid --watch-file value: ' +\n          `\"${filePath}\" is not a file.`);\n      }\n\n      watchedFiles.push(filePath);\n    }\n  } else {\n    watchedDirs.push(sourceDir);\n  }\n\n  watcher.watch({\n    files: watchedFiles,\n    directories: watchedDirs,\n    missing: [],\n    startTime: Date.now(),\n  });\n\n  // TODO: support interrupting the watcher on Windows.\n  // https://github.com/mozilla/web-ext/issues/225\n  process.on('SIGINT', () => watcher.close());\n  return watcher;\n}\n\n\n// proxyFileChanges types and implementation.\n\nexport type ProxyFileChangesParams = {|\n  artifactsDir: string,\n  onChange: OnChangeFn,\n  filePath: string,\n  shouldWatchFile: ShouldWatchFn,\n|};\n\nexport function proxyFileChanges(\n  {artifactsDir, onChange, filePath, shouldWatchFile}: ProxyFileChangesParams\n): void {\n  if (filePath.indexOf(artifactsDir) === 0 || !shouldWatchFile(filePath)) {\n    log.debug(`Ignoring change to: ${filePath}`);\n  } else {\n    log.debug(`Changed: ${filePath}`);\n    log.debug(`Last change detection: ${(new Date()).toTimeString()}`);\n    onChange();\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-ext",
-  "version": "7.1.1",
+  "version": "7.3.0",
   "description": "A command line tool to help build, run, and test web extensions",
   "type": "module",
   "main": "index.js",
@@ -55,9 +55,9 @@
     "opera"
   ],
   "dependencies": {
-    "@babel/runtime": "7.18.6",
+    "@babel/runtime": "7.19.4",
     "@devicefarmer/adbkit": "3.2.3",
-    "addons-linter": "5.10.0",
+    "addons-linter": "5.18.0",
     "bunyan": "1.8.15",
     "camelcase": "7.0.0",
     "chrome-launcher": "0.15.1",
@@ -66,36 +66,37 @@
     "es6-error": "4.1.1",
     "firefox-profile": "4.2.2",
     "fs-extra": "10.1.0",
-    "fx-runner": "1.2.0",
+    "fx-runner": "1.3.0",
     "import-fresh": "3.3.0",
+    "jose": "4.10.0",
     "mkdirp": "1.0.4",
     "multimatch": "6.0.0",
     "mz": "2.7.0",
+    "node-fetch": "3.2.10",
     "node-notifier": "10.0.1",
     "open": "8.4.0",
     "parse-json": "6.0.2",
     "promise-toolbox": "0.21.0",
-    "sign-addon": "5.0.0",
+    "sign-addon": "5.1.0",
     "source-map-support": "0.5.21",
     "strip-bom": "5.0.0",
-    "strip-json-comments": "4.0.0",
+    "strip-json-comments": "5.0.0",
     "tmp": "0.2.1",
     "update-notifier": "6.0.2",
     "watchpack": "2.4.0",
-    "ws": "8.8.0",
-    "yargs": "17.5.1",
+    "ws": "8.9.0",
+    "yargs": "17.6.0",
     "zip-dir": "2.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.18.6",
-    "@babel/core": "7.18.6",
-    "@babel/eslint-parser": "7.18.2",
-    "@babel/preset-env": "7.18.6",
+    "@babel/cli": "7.19.3",
+    "@babel/core": "7.19.3",
+    "@babel/eslint-parser": "7.19.1",
+    "@babel/preset-env": "7.19.4",
     "@babel/preset-flow": "7.18.6",
-    "@babel/register": "7.18.6",
-    "@commitlint/cli": "17.0.3",
-    "@commitlint/config-conventional": "17.0.3",
-    "babel-loader": "8.2.5",
+    "@babel/register": "7.18.9",
+    "@commitlint/cli": "17.1.2",
+    "@commitlint/config-conventional": "17.1.0",
     "babel-plugin-istanbul": "6.1.1",
     "babel-plugin-transform-inline-environment-variables": "0.4.4",
     "chai": "4.3.6",
@@ -103,7 +104,7 @@
     "copy-dir": "1.3.0",
     "cross-env": "7.0.3",
     "deepcopy": "2.1.0",
-    "eslint": "8.19.0",
+    "eslint": "8.25.0",
     "eslint-plugin-async-await": "0.0.0",
     "eslint-plugin-ft-flow": "2.0.1",
     "eslint-plugin-import": "2.26.0",
@@ -114,7 +115,7 @@
     "nyc": "15.1.0",
     "prettyjson": "1.2.5",
     "shelljs": "0.8.5",
-    "sinon": "14.0.0",
+    "sinon": "14.0.1",
     "testdouble": "3.16.6",
     "yauzl": "2.10.0"
   },