web-ext 6.7.0 → 7.1.0

package/{src → lib}/util/file-filter.js

@@ -1,92 +1,65 @@
-/* @flow */
 import path from 'path';
-
 import multimatch from 'multimatch';
+import { createLogger } from './logger.js';
+const log = createLogger(import.meta.url); // check if target is a sub directory of src
 
-import {createLogger} from './logger';
-
-const log = createLogger(__filename);
+export const isSubPath = (src, target) => {
+  const relate = path.relative(src, target); // same dir
 
-// check if target is a sub directory of src
-export const isSubPath = (src: string, target: string): boolean => {
-  const relate = path.relative(src, target);
-  // same dir
   if (!relate) {
     return false;
   }
+
   if (relate === '..') {
     return false;
   }
-  return !relate.startsWith(`..${path.sep}`);
-};
-
-// FileFilter types and implementation.
 
-export type FileFilterOptions = {|
-  baseIgnoredPatterns?: Array<string>,
-  ignoreFiles?: Array<string>,
-  sourceDir: string,
-  artifactsDir?: string,
-|};
+  return !relate.startsWith(`..${path.sep}`);
+}; // FileFilter types and implementation.
 
 /*
  * Allows or ignores files.
  */
 export class FileFilter {
-  filesToIgnore: Array<string>;
-  sourceDir: string;
-
   constructor({
-    baseIgnoredPatterns = [
-      '**/*.xpi',
-      '**/*.zip',
-      '**/.*', // any hidden file and folder
-      '**/.*/**/*', // and the content inside hidden folder
-      '**/node_modules',
-      '**/node_modules/**/*',
-    ],
+    baseIgnoredPatterns = ['**/*.xpi', '**/*.zip', '**/.*', // any hidden file and folder
+    '**/.*/**/*', // and the content inside hidden folder
+    '**/node_modules', '**/node_modules/**/*'],
     ignoreFiles = [],
     sourceDir,
-    artifactsDir,
-  }: FileFilterOptions = {}) {
+    artifactsDir
+  } = {}) {
     sourceDir = path.resolve(sourceDir);
-
     this.filesToIgnore = [];
     this.sourceDir = sourceDir;
-
     this.addToIgnoreList(baseIgnoredPatterns);
+
     if (ignoreFiles) {
       this.addToIgnoreList(ignoreFiles);
     }
+
     if (artifactsDir && isSubPath(sourceDir, artifactsDir)) {
       artifactsDir = path.resolve(artifactsDir);
-      log.debug(
-        `Ignoring artifacts directory "${artifactsDir}" ` +
-        'and all its subdirectories'
-      );
-      this.addToIgnoreList([
-        artifactsDir,
-        path.join(artifactsDir, '**', '*'),
-      ]);
+      log.debug(`Ignoring artifacts directory "${artifactsDir}" ` + 'and all its subdirectories');
+      this.addToIgnoreList([artifactsDir, path.join(artifactsDir, '**', '*')]);
     }
   }
-
   /**
    *  Resolve relative path to absolute path with sourceDir.
    */
-  resolveWithSourceDir(file: string): string {
+
+
+  resolveWithSourceDir(file) {
     const resolvedPath = path.resolve(this.sourceDir, file);
-    log.debug(
-      `Resolved path ${file} with sourceDir ${this.sourceDir} ` +
-      `to ${resolvedPath}`
-    );
+    log.debug(`Resolved path ${file} with sourceDir ${this.sourceDir} ` + `to ${resolvedPath}`);
     return resolvedPath;
   }
-
   /**
    *  Insert more files into filesToIgnore array.
    */
-  addToIgnoreList(files: Array<string>) {
+
+
+  addToIgnoreList(files) {
     for (const file of files) {
       if (file.charAt(0) === '!') {
         const resolvedFile = this.resolveWithSourceDir(file.substr(1));
@@ -96,7 +69,6 @@ export class FileFilter {
       }
     }
   }
-
   /*
    * Returns true if the file is wanted.
    *
@@ -107,21 +79,21 @@ export class FileFilter {
    * Example: this is called by zipdir as wantFile(filePath) for each
    * file in the folder that is being archived.
    */
-  wantFile(filePath: string): boolean {
+
+
+  wantFile(filePath) {
     const resolvedPath = this.resolveWithSourceDir(filePath);
     const matches = multimatch(resolvedPath, this.filesToIgnore);
+
     if (matches.length > 0) {
       log.debug(`FileFilter: ignoring file ${resolvedPath}`);
       return false;
     }
+
     return true;
   }
-}
-
-// a helper function to make mocking easier
 
-export const createFileFilter = (
-  (params: FileFilterOptions): FileFilter => new FileFilter(params)
-);
+} // a helper function to make mocking easier
 
-export type FileFilterCreatorFn = typeof createFileFilter;
+export const createFileFilter = params => new FileFilter(params);
+//# sourceMappingURL=file-filter.js.map

package/lib/util/file-filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-filter.js","names":["path","multimatch","createLogger","log","import","meta","url","isSubPath","src","target","relate","relative","startsWith","sep","FileFilter","constructor","baseIgnoredPatterns","ignoreFiles","sourceDir","artifactsDir","resolve","filesToIgnore","addToIgnoreList","debug","join","resolveWithSourceDir","file","resolvedPath","files","charAt","resolvedFile","substr","push","wantFile","filePath","matches","length","createFileFilter","params"],"sources":["../../src/util/file-filter.js"],"sourcesContent":["/* @flow */\nimport path from 'path';\n\nimport multimatch from 'multimatch';\n\nimport {createLogger} from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// check if target is a sub directory of src\nexport const isSubPath = (src: string, target: string): boolean => {\n  const relate = path.relative(src, target);\n  // same dir\n  if (!relate) {\n    return false;\n  }\n  if (relate === '..') {\n    return false;\n  }\n  return !relate.startsWith(`..${path.sep}`);\n};\n\n// FileFilter types and implementation.\n\nexport type FileFilterOptions = {\n  baseIgnoredPatterns?: Array<string>,\n  ignoreFiles?: Array<string>,\n  sourceDir: string,\n  artifactsDir?: string,\n};\n\n/*\n * Allows or ignores files.\n */\nexport class FileFilter {\n  filesToIgnore: Array<string>;\n  sourceDir: string;\n\n  constructor({\n    baseIgnoredPatterns = [\n      '**/*.xpi',\n      '**/*.zip',\n      '**/.*', // any hidden file and folder\n      '**/.*/**/*', // and the content inside hidden folder\n      '**/node_modules',\n      '**/node_modules/**/*',\n    ],\n    ignoreFiles = [],\n    sourceDir,\n    artifactsDir,\n  }: FileFilterOptions = {}) {\n    sourceDir = path.resolve(sourceDir);\n\n    this.filesToIgnore = [];\n    this.sourceDir = sourceDir;\n\n    this.addToIgnoreList(baseIgnoredPatterns);\n    if (ignoreFiles) {\n      this.addToIgnoreList(ignoreFiles);\n    }\n    if (artifactsDir && isSubPath(sourceDir, artifactsDir)) {\n      artifactsDir = path.resolve(artifactsDir);\n      log.debug(\n        `Ignoring artifacts directory \"${artifactsDir}\" ` +\n        'and all its subdirectories'\n      );\n      this.addToIgnoreList([\n        artifactsDir,\n        path.join(artifactsDir, '**', '*'),\n      ]);\n    }\n  }\n\n  /**\n   *  Resolve relative path to absolute path with sourceDir.\n   */\n  resolveWithSourceDir(file: string): string {\n    const resolvedPath = path.resolve(this.sourceDir, file);\n    log.debug(\n      `Resolved path ${file} with sourceDir ${this.sourceDir} ` +\n      `to ${resolvedPath}`\n    );\n    return resolvedPath;\n  }\n\n  /**\n   *  Insert more files into filesToIgnore array.\n   */\n  addToIgnoreList(files: Array<string>) {\n    for (const file of files) {\n      if (file.charAt(0) === '!') {\n        const resolvedFile = this.resolveWithSourceDir(file.substr(1));\n        this.filesToIgnore.push(`!${resolvedFile}`);\n      } else {\n        this.filesToIgnore.push(this.resolveWithSourceDir(file));\n      }\n    }\n  }\n\n  /*\n   * Returns true if the file is wanted.\n   *\n   * If filePath does not start with a slash, it will be treated as a path\n   * relative to sourceDir when matching it against all configured\n   * ignore-patterns.\n   *\n   * Example: this is called by zipdir as wantFile(filePath) for each\n   * file in the folder that is being archived.\n   */\n  wantFile(filePath: string): boolean {\n    const resolvedPath = this.resolveWithSourceDir(filePath);\n    const matches = multimatch(resolvedPath, this.filesToIgnore);\n    if (matches.length > 0) {\n      log.debug(`FileFilter: ignoring file ${resolvedPath}`);\n      return false;\n    }\n    return true;\n  }\n}\n\n// a helper function to make mocking easier\n\nexport const createFileFilter = (\n  (params: FileFilterOptions): FileFilter => new FileFilter(params)\n);\n\nexport type FileFilterCreatorFn = typeof createFileFilter;\n"],"mappings":"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"}

package/lib/util/is-directory.js

@@ -0,0 +1,20 @@
+import { fs } from 'mz';
+import { onlyErrorsWithCode } from '../errors.js';
+/*
+ * Resolves true if the path is a readable directory.
+ *
+ * Usage:
+ *
+ * isDirectory('/some/path')
+ *  .then((dirExists) => {
+ *    // dirExists will be true or false.
+ *  });
+ *
+ * */
+
+export default function isDirectory(path) {
+  return fs.stat(path).then(stats => stats.isDirectory()).catch(onlyErrorsWithCode(['ENOENT', 'ENOTDIR'], () => {
+    return false;
+  }));
+}
+//# sourceMappingURL=is-directory.js.map

package/lib/util/is-directory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-directory.js","names":["fs","onlyErrorsWithCode","isDirectory","path","stat","then","stats","catch"],"sources":["../../src/util/is-directory.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\n\nimport {onlyErrorsWithCode} from '../errors.js';\n\n/*\n * Resolves true if the path is a readable directory.\n *\n * Usage:\n *\n * isDirectory('/some/path')\n *  .then((dirExists) => {\n *    // dirExists will be true or false.\n *  });\n *\n * */\nexport default function isDirectory(path: string): Promise<boolean> {\n  return fs.stat(path)\n    .then((stats) => stats.isDirectory())\n    .catch(onlyErrorsWithCode(['ENOENT', 'ENOTDIR'], () => {\n      return false;\n    }));\n}\n"],"mappings":"AACA,SAAQA,EAAR,QAAiB,IAAjB;AAEA,SAAQC,kBAAR,QAAiC,cAAjC;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,eAAe,SAASC,WAAT,CAAqBC,IAArB,EAAqD;EAClE,OAAOH,EAAE,CAACI,IAAH,CAAQD,IAAR,EACJE,IADI,CACEC,KAAD,IAAWA,KAAK,CAACJ,WAAN,EADZ,EAEJK,KAFI,CAEEN,kBAAkB,CAAC,CAAC,QAAD,EAAW,SAAX,CAAD,EAAwB,MAAM;IACrD,OAAO,KAAP;EACD,CAFwB,CAFpB,CAAP;AAKD"}

package/lib/util/logger.js

@@ -0,0 +1,79 @@
+import { fileURLToPath } from 'url';
+import bunyan, { nameFromLevel, createLogger as defaultLogCreator } from 'bunyan'; // Bunyan-related Flow types
+
+export class ConsoleStream {
+  constructor({
+    verbose = false
+  } = {}) {
+    this.verbose = verbose;
+    this.isCapturing = false;
+    this.capturedMessages = [];
+  }
+
+  format({
+    name,
+    msg,
+    level
+  }) {
+    const prefix = this.verbose ? `[${name}][${nameFromLevel[level]}] ` : '';
+    return `${prefix}${msg}\n`;
+  }
+
+  makeVerbose() {
+    this.verbose = true;
+  }
+
+  write(packet, {
+    localProcess = process
+  } = {}) {
+    const thisLevel = this.verbose ? bunyan.TRACE : bunyan.INFO;
+
+    if (packet.level >= thisLevel) {
+      const msg = this.format(packet);
+
+      if (this.isCapturing) {
+        this.capturedMessages.push(msg);
+      } else {
+        localProcess.stdout.write(msg);
+      }
+    }
+  }
+
+  startCapturing() {
+    this.isCapturing = true;
+  }
+
+  stopCapturing() {
+    this.isCapturing = false;
+    this.capturedMessages = [];
+  }
+
+  flushCapturedLogs({
+    localProcess = process
+  } = {}) {
+    for (const msg of this.capturedMessages) {
+      localProcess.stdout.write(msg);
+    }
+
+    this.capturedMessages = [];
+  }
+
+}
+export const consoleStream = new ConsoleStream(); // createLogger types and implementation.
+
+export function createLogger(moduleURL, {
+  createBunyanLog = defaultLogCreator
+} = {}) {
+  return createBunyanLog({
+    // Strip the leading src/ from file names (which is in all file names) to
+    // make the name less redundant.
+    name: moduleURL ? fileURLToPath(moduleURL).replace(/^src\//, '') : 'unknown-module',
+    // Capture all log levels and let the stream filter them.
+    level: bunyan.TRACE,
+    streams: [{
+      type: 'raw',
+      stream: consoleStream
+    }]
+  });
+}
+//# sourceMappingURL=logger.js.map

package/lib/util/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","names":["fileURLToPath","bunyan","nameFromLevel","createLogger","defaultLogCreator","ConsoleStream","constructor","verbose","isCapturing","capturedMessages","format","name","msg","level","prefix","makeVerbose","write","packet","localProcess","process","thisLevel","TRACE","INFO","push","stdout","startCapturing","stopCapturing","flushCapturedLogs","consoleStream","moduleURL","createBunyanLog","replace","streams","type","stream"],"sources":["../../src/util/logger.js"],"sourcesContent":["/* @flow */\nimport { fileURLToPath } from 'url';\n\nimport bunyan, {nameFromLevel, createLogger as defaultLogCreator}\n  from 'bunyan';\n\n// Bunyan-related Flow types\n\nexport type TRACE = 10;\nexport type DEBUG = 20;\nexport type INFO = 30;\nexport type WARN = 40;\nexport type ERROR = 50;\nexport type FATAL = 60;\n\nexport type BunyanLogLevel =\n  TRACE | DEBUG | INFO | WARN | ERROR | FATAL;\n\nexport type BunyanLogEntry = {|\n  name: string,\n  msg: string,\n  level: BunyanLogLevel,\n|};\n\nexport type Logger = {\n  debug: (msg: string, ...args: any) => void,\n  error: (msg: string, ...args: any) => void,\n  info: (msg: string, ...args: any) => void,\n  warn: (msg: string, ...args: any) => void,\n};\n\n\n// ConsoleStream types and implementation.\n\nexport type ConsoleStreamParams = {\n  verbose?: boolean,\n};\n\nexport type ConsoleOptions = {\n  localProcess?: typeof process,\n};\n\nexport class ConsoleStream {\n  verbose: boolean;\n  isCapturing: boolean;\n  capturedMessages: Array<string>;\n\n  constructor({verbose = false}: ConsoleStreamParams = {}) {\n    this.verbose = verbose;\n    this.isCapturing = false;\n    this.capturedMessages = [];\n  }\n\n  format({name, msg, level}: BunyanLogEntry): string {\n    const prefix = this.verbose ? `[${name}][${nameFromLevel[level]}] ` : '';\n    return `${prefix}${msg}\\n`;\n  }\n\n  makeVerbose() {\n    this.verbose = true;\n  }\n\n  write(\n    packet: BunyanLogEntry,\n    {localProcess = process}: ConsoleOptions = {}\n  ): void {\n    const thisLevel: BunyanLogLevel = this.verbose ? bunyan.TRACE : bunyan.INFO;\n    if (packet.level >= thisLevel) {\n      const msg = this.format(packet);\n      if (this.isCapturing) {\n        this.capturedMessages.push(msg);\n      } else {\n        localProcess.stdout.write(msg);\n      }\n    }\n  }\n\n  startCapturing() {\n    this.isCapturing = true;\n  }\n\n  stopCapturing() {\n    this.isCapturing = false;\n    this.capturedMessages = [];\n  }\n\n  flushCapturedLogs({localProcess = process}: ConsoleOptions = {}) {\n    for (const msg of this.capturedMessages) {\n      localProcess.stdout.write(msg);\n    }\n    this.capturedMessages = [];\n  }\n}\n\nexport const consoleStream: ConsoleStream = new ConsoleStream();\n\n\n// createLogger types and implementation.\n\nexport type BunyanStreamConfig = {\n  type: string,\n  stream: ConsoleStream,\n};\n\nexport type CreateBunyanLogParams = {\n  name: string,\n  level: BunyanLogLevel,\n  streams: Array<BunyanStreamConfig>,\n};\n\nexport type CreateBunyanLogFn = (params: CreateBunyanLogParams) => Logger;\n\nexport type CreateLoggerOptions = {\n  createBunyanLog: CreateBunyanLogFn,\n};\n\nexport function createLogger(\n  moduleURL?: string,\n  {createBunyanLog = defaultLogCreator}: CreateLoggerOptions = {}\n): Logger {\n  return createBunyanLog({\n    // Strip the leading src/ from file names (which is in all file names) to\n    // make the name less redundant.\n    name: moduleURL\n      ? fileURLToPath(moduleURL).replace(/^src\\//, '')\n      : 'unknown-module',\n    // Capture all log levels and let the stream filter them.\n    level: bunyan.TRACE,\n    streams: [{\n      type: 'raw',\n      stream: consoleStream,\n    }],\n  });\n}\n"],"mappings":"AACA,SAASA,aAAT,QAA8B,KAA9B;AAEA,OAAOC,MAAP,IAAgBC,aAAhB,EAA+BC,YAAY,IAAIC,iBAA/C,QACO,QADP,C,CAGA;;AAoCA,OAAO,MAAMC,aAAN,CAAoB;EAKzBC,WAAW,CAAC;IAACC,OAAO,GAAG;EAAX,IAAyC,EAA1C,EAA8C;IACvD,KAAKA,OAAL,GAAeA,OAAf;IACA,KAAKC,WAAL,GAAmB,KAAnB;IACA,KAAKC,gBAAL,GAAwB,EAAxB;EACD;;EAEDC,MAAM,CAAC;IAACC,IAAD;IAAOC,GAAP;IAAYC;EAAZ,CAAD,EAA6C;IACjD,MAAMC,MAAM,GAAG,KAAKP,OAAL,GAAgB,IAAGI,IAAK,KAAIT,aAAa,CAACW,KAAD,CAAQ,IAAjD,GAAuD,EAAtE;IACA,OAAQ,GAAEC,MAAO,GAAEF,GAAI,IAAvB;EACD;;EAEDG,WAAW,GAAG;IACZ,KAAKR,OAAL,GAAe,IAAf;EACD;;EAEDS,KAAK,CACHC,MADG,EAEH;IAACC,YAAY,GAAGC;EAAhB,IAA2C,EAFxC,EAGG;IACN,MAAMC,SAAyB,GAAG,KAAKb,OAAL,GAAeN,MAAM,CAACoB,KAAtB,GAA8BpB,MAAM,CAACqB,IAAvE;;IACA,IAAIL,MAAM,CAACJ,KAAP,IAAgBO,SAApB,EAA+B;MAC7B,MAAMR,GAAG,GAAG,KAAKF,MAAL,CAAYO,MAAZ,CAAZ;;MACA,IAAI,KAAKT,WAAT,EAAsB;QACpB,KAAKC,gBAAL,CAAsBc,IAAtB,CAA2BX,GAA3B;MACD,CAFD,MAEO;QACLM,YAAY,CAACM,MAAb,CAAoBR,KAApB,CAA0BJ,GAA1B;MACD;IACF;EACF;;EAEDa,cAAc,GAAG;IACf,KAAKjB,WAAL,GAAmB,IAAnB;EACD;;EAEDkB,aAAa,GAAG;IACd,KAAKlB,WAAL,GAAmB,KAAnB;IACA,KAAKC,gBAAL,GAAwB,EAAxB;EACD;;EAEDkB,iBAAiB,CAAC;IAACT,YAAY,GAAGC;EAAhB,IAA2C,EAA5C,EAAgD;IAC/D,KAAK,MAAMP,GAAX,IAAkB,KAAKH,gBAAvB,EAAyC;MACvCS,YAAY,CAACM,MAAb,CAAoBR,KAApB,CAA0BJ,GAA1B;IACD;;IACD,KAAKH,gBAAL,GAAwB,EAAxB;EACD;;AAjDwB;AAoD3B,OAAO,MAAMmB,aAA4B,GAAG,IAAIvB,aAAJ,EAArC,C,CAGP;;AAmBA,OAAO,SAASF,YAAT,CACL0B,SADK,EAEL;EAACC,eAAe,GAAG1B;AAAnB,IAA6D,EAFxD,EAGG;EACR,OAAO0B,eAAe,CAAC;IACrB;IACA;IACAnB,IAAI,EAAEkB,SAAS,GACX7B,aAAa,CAAC6B,SAAD,CAAb,CAAyBE,OAAzB,CAAiC,QAAjC,EAA2C,EAA3C,CADW,GAEX,gBALiB;IAMrB;IACAlB,KAAK,EAAEZ,MAAM,CAACoB,KAPO;IAQrBW,OAAO,EAAE,CAAC;MACRC,IAAI,EAAE,KADE;MAERC,MAAM,EAAEN;IAFA,CAAD;EARY,CAAD,CAAtB;AAaD"}

package/{src → lib}/util/manifest.js

@@ -1,70 +1,42 @@
-/* @flow */
 import path from 'path';
-
-import {fs} from 'mz';
+import { fs } from 'mz';
 import parseJSON from 'parse-json';
 import stripBom from 'strip-bom';
 import stripJsonComments from 'strip-json-comments';
+import { InvalidManifest } from '../errors.js';
+import { createLogger } from './logger.js';
+const log = createLogger(import.meta.url); // getValidatedManifest helper types and implementation
 
-import {InvalidManifest} from '../errors';
-import {createLogger} from './logger';
-
-const log = createLogger(__filename);
-
-
-// getValidatedManifest helper types and implementation
-
-export type ExtensionManifestApplications = {|
-  gecko?: {|
-    id?: string,
-    strict_min_version?: string,
-    strict_max_version?: string,
-    update_url?: string,
-  |},
-|};
-
-export type ExtensionManifest = {|
-  name: string,
-  version: string,
-  default_locale?: string,
-  applications?: ExtensionManifestApplications,
-  browser_specific_settings?: ExtensionManifestApplications,
-  permissions?: Array<string>,
-|};
-
-export default async function getValidatedManifest(
-  sourceDir: string
-): Promise<ExtensionManifest> {
+export default async function getValidatedManifest(sourceDir) {
   const manifestFile = path.join(sourceDir, 'manifest.json');
   log.debug(`Validating manifest at ${manifestFile}`);
-
   let manifestContents;
 
   try {
-    manifestContents = await fs.readFile(manifestFile, {encoding: 'utf-8'});
+    manifestContents = await fs.readFile(manifestFile, {
+      encoding: 'utf-8'
+    });
   } catch (error) {
-    throw new InvalidManifest(
-      `Could not read manifest.json file at ${manifestFile}: ${error}`);
+    throw new InvalidManifest(`Could not read manifest.json file at ${manifestFile}: ${error}`);
   }
 
   manifestContents = stripBom(manifestContents);
-
   let manifestData;
 
   try {
     manifestData = parseJSON(stripJsonComments(manifestContents));
   } catch (error) {
-    throw new InvalidManifest(
-      `Error parsing manifest.json file at ${manifestFile}: ${error}`);
+    throw new InvalidManifest(`Error parsing manifest.json file at ${manifestFile}: ${error}`);
   }
 
-  const errors = [];
-  // This is just some basic validation of what web-ext needs, not
+  const errors = []; // This is just some basic validation of what web-ext needs, not
   // what Firefox will need to run the extension.
   // TODO: integrate with the addons-linter for actual validation.
+
   if (!manifestData.name) {
     errors.push('missing "name" property');
   }
+
   if (!manifestData.version) {
     errors.push('missing "version" property');
   }
@@ -77,28 +49,24 @@ export default async function getValidatedManifest(
   }
 
   if (errors.length) {
-    throw new InvalidManifest(
-      `Manifest at ${manifestFile} is invalid: ${errors.join('; ')}`);
+    throw new InvalidManifest(`Manifest at ${manifestFile} is invalid: ${errors.join('; ')}`);
   }
 
   return manifestData;
 }
+export function getManifestId(manifestData) {
+  const manifestApps = [manifestData.browser_specific_settings, manifestData.applications];
 
-
-export function getManifestId(manifestData: ExtensionManifest): string | void {
-  const manifestApps = [
-    manifestData.browser_specific_settings,
-    manifestData.applications,
-  ];
   for (const apps of manifestApps) {
     // If both bss and applicants contains a defined gecko property,
     // we prefer bss even if the id property isn't available.
     // This match what Firefox does in this particular scenario, see
     // https://searchfox.org/mozilla-central/rev/828f2319c0195d7f561ed35533aef6fe183e68e3/toolkit/mozapps/extensions/internal/XPIInstall.jsm#470-474,488
-    if (apps?.gecko) {
+    if (apps !== null && apps !== void 0 && apps.gecko) {
       return apps.gecko.id;
     }
   }
 
   return undefined;
 }
+//# sourceMappingURL=manifest.js.map

package/lib/util/manifest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"manifest.js","names":["path","fs","parseJSON","stripBom","stripJsonComments","InvalidManifest","createLogger","log","import","meta","url","getValidatedManifest","sourceDir","manifestFile","join","debug","manifestContents","readFile","encoding","error","manifestData","errors","name","push","version","applications","gecko","length","getManifestId","manifestApps","browser_specific_settings","apps","id","undefined"],"sources":["../../src/util/manifest.js"],"sourcesContent":["/* @flow */\nimport path from 'path';\n\nimport {fs} from 'mz';\nimport parseJSON from 'parse-json';\nimport stripBom from 'strip-bom';\nimport stripJsonComments from 'strip-json-comments';\n\nimport {InvalidManifest} from '../errors.js';\nimport {createLogger} from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n\n// getValidatedManifest helper types and implementation\n\nexport type ExtensionManifestApplications = {|\n  gecko?: {|\n    id?: string,\n    strict_min_version?: string,\n    strict_max_version?: string,\n    update_url?: string,\n  |},\n|};\n\nexport type ExtensionManifest = {|\n  name: string,\n  version: string,\n  default_locale?: string,\n  applications?: ExtensionManifestApplications,\n  browser_specific_settings?: ExtensionManifestApplications,\n  permissions?: Array<string>,\n|};\n\nexport default async function getValidatedManifest(\n  sourceDir: string\n): Promise<ExtensionManifest> {\n  const manifestFile = path.join(sourceDir, 'manifest.json');\n  log.debug(`Validating manifest at ${manifestFile}`);\n\n  let manifestContents;\n\n  try {\n    manifestContents = await fs.readFile(manifestFile, {encoding: 'utf-8'});\n  } catch (error) {\n    throw new InvalidManifest(\n      `Could not read manifest.json file at ${manifestFile}: ${error}`);\n  }\n\n  manifestContents = stripBom(manifestContents);\n\n  let manifestData;\n\n  try {\n    manifestData = parseJSON(stripJsonComments(manifestContents));\n  } catch (error) {\n    throw new InvalidManifest(\n      `Error parsing manifest.json file at ${manifestFile}: ${error}`);\n  }\n\n  const errors = [];\n  // This is just some basic validation of what web-ext needs, not\n  // what Firefox will need to run the extension.\n  // TODO: integrate with the addons-linter for actual validation.\n  if (!manifestData.name) {\n    errors.push('missing \"name\" property');\n  }\n  if (!manifestData.version) {\n    errors.push('missing \"version\" property');\n  }\n\n  if (manifestData.applications && !manifestData.applications.gecko) {\n    // Since the applications property only applies to gecko, make\n    // sure 'gecko' exists when 'applications' is defined. This should\n    // make introspection of gecko properties easier.\n    errors.push('missing \"applications.gecko\" property');\n  }\n\n  if (errors.length) {\n    throw new InvalidManifest(\n      `Manifest at ${manifestFile} is invalid: ${errors.join('; ')}`);\n  }\n\n  return manifestData;\n}\n\n\nexport function getManifestId(manifestData: ExtensionManifest): string | void {\n  const manifestApps = [\n    manifestData.browser_specific_settings,\n    manifestData.applications,\n  ];\n  for (const apps of manifestApps) {\n    // If both bss and applicants contains a defined gecko property,\n    // we prefer bss even if the id property isn't available.\n    // This match what Firefox does in this particular scenario, see\n    // https://searchfox.org/mozilla-central/rev/828f2319c0195d7f561ed35533aef6fe183e68e3/toolkit/mozapps/extensions/internal/XPIInstall.jsm#470-474,488\n    if (apps?.gecko) {\n      return apps.gecko.id;\n    }\n  }\n\n  return undefined;\n}\n"],"mappings":"AACA,OAAOA,IAAP,MAAiB,MAAjB;AAEA,SAAQC,EAAR,QAAiB,IAAjB;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,OAAOC,QAAP,MAAqB,WAArB;AACA,OAAOC,iBAAP,MAA8B,qBAA9B;AAEA,SAAQC,eAAR,QAA8B,cAA9B;AACA,SAAQC,YAAR,QAA2B,aAA3B;AAEA,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAP,CAAYC,GAAb,CAAxB,C,CAGA;;AAoBA,eAAe,eAAeC,oBAAf,CACbC,SADa,EAEe;EAC5B,MAAMC,YAAY,GAAGb,IAAI,CAACc,IAAL,CAAUF,SAAV,EAAqB,eAArB,CAArB;EACAL,GAAG,CAACQ,KAAJ,CAAW,0BAAyBF,YAAa,EAAjD;EAEA,IAAIG,gBAAJ;;EAEA,IAAI;IACFA,gBAAgB,GAAG,MAAMf,EAAE,CAACgB,QAAH,CAAYJ,YAAZ,EAA0B;MAACK,QAAQ,EAAE;IAAX,CAA1B,CAAzB;EACD,CAFD,CAEE,OAAOC,KAAP,EAAc;IACd,MAAM,IAAId,eAAJ,CACH,wCAAuCQ,YAAa,KAAIM,KAAM,EAD3D,CAAN;EAED;;EAEDH,gBAAgB,GAAGb,QAAQ,CAACa,gBAAD,CAA3B;EAEA,IAAII,YAAJ;;EAEA,IAAI;IACFA,YAAY,GAAGlB,SAAS,CAACE,iBAAiB,CAACY,gBAAD,CAAlB,CAAxB;EACD,CAFD,CAEE,OAAOG,KAAP,EAAc;IACd,MAAM,IAAId,eAAJ,CACH,uCAAsCQ,YAAa,KAAIM,KAAM,EAD1D,CAAN;EAED;;EAED,MAAME,MAAM,GAAG,EAAf,CAxB4B,CAyB5B;EACA;EACA;;EACA,IAAI,CAACD,YAAY,CAACE,IAAlB,EAAwB;IACtBD,MAAM,CAACE,IAAP,CAAY,yBAAZ;EACD;;EACD,IAAI,CAACH,YAAY,CAACI,OAAlB,EAA2B;IACzBH,MAAM,CAACE,IAAP,CAAY,4BAAZ;EACD;;EAED,IAAIH,YAAY,CAACK,YAAb,IAA6B,CAACL,YAAY,CAACK,YAAb,CAA0BC,KAA5D,EAAmE;IACjE;IACA;IACA;IACAL,MAAM,CAACE,IAAP,CAAY,uCAAZ;EACD;;EAED,IAAIF,MAAM,CAACM,MAAX,EAAmB;IACjB,MAAM,IAAItB,eAAJ,CACH,eAAcQ,YAAa,gBAAeQ,MAAM,CAACP,IAAP,CAAY,IAAZ,CAAkB,EADzD,CAAN;EAED;;EAED,OAAOM,YAAP;AACD;AAGD,OAAO,SAASQ,aAAT,CAAuBR,YAAvB,EAAuE;EAC5E,MAAMS,YAAY,GAAG,CACnBT,YAAY,CAACU,yBADM,EAEnBV,YAAY,CAACK,YAFM,CAArB;;EAIA,KAAK,MAAMM,IAAX,IAAmBF,YAAnB,EAAiC;IAC/B;IACA;IACA;IACA;IACA,IAAIE,IAAJ,aAAIA,IAAJ,eAAIA,IAAI,CAAEL,KAAV,EAAiB;MACf,OAAOK,IAAI,CAACL,KAAL,CAAWM,EAAlB;IACD;EACF;;EAED,OAAOC,SAAP;AACD"}

package/{src → lib}/util/promisify.js

@@ -1,15 +1,10 @@
-/* @flow */
-
-import {promisify} from 'util';
-
-// promisify.custom is missing from the node types know to flow,
+import { promisify } from 'util'; // promisify.custom is missing from the node types know to flow,
 // and it triggers flow-check errors if used directly.
 // By using the value exported here, flow-check passes successfully
 // using a single FLOW_IGNORE suppress comment.
-
 // $FlowIgnore: promisify.custom is missing in flow type signatures.
-export const promisifyCustom = promisify.custom;
 
+export const promisifyCustom = promisify.custom;
 /*
  * A small promisify helper to make it easier to customize a
  * function promisified (using the 'util' module available in
@@ -21,8 +16,9 @@ export const promisifyCustom = promisify.custom;
  *    aCallbackBasedFn[promisify.custom] = multiArgsPromisedFn(tmp.dir);
  *    ...
  */
-export function multiArgsPromisedFn(fn: Function): Function {
-  return (...callerArgs: Array<any>): Promise<any> => {
+
+export function multiArgsPromisedFn(fn) {
+  return (...callerArgs) => {
     return new Promise((resolve, reject) => {
       fn(...callerArgs, (err, ...rest) => {
         if (err) {
@@ -34,3 +30,4 @@ export function multiArgsPromisedFn(fn: Function): Function {
     });
   };
 }
+//# sourceMappingURL=promisify.js.map

package/lib/util/promisify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"promisify.js","names":["promisify","promisifyCustom","custom","multiArgsPromisedFn","fn","callerArgs","Promise","resolve","reject","err","rest"],"sources":["../../src/util/promisify.js"],"sourcesContent":["/* @flow */\n\nimport {promisify} from 'util';\n\n// promisify.custom is missing from the node types know to flow,\n// and it triggers flow-check errors if used directly.\n// By using the value exported here, flow-check passes successfully\n// using a single FLOW_IGNORE suppress comment.\n\n// $FlowIgnore: promisify.custom is missing in flow type signatures.\nexport const promisifyCustom = promisify.custom;\n\n/*\n * A small promisify helper to make it easier to customize a\n * function promisified (using the 'util' module available in\n * nodejs >= 8) to resolve to an array of results:\n *\n *    import {promisify} from 'util';\n *    import {multiArgsPromisedFn} from '../util/promisify';\n *\n *    aCallbackBasedFn[promisify.custom] = multiArgsPromisedFn(tmp.dir);\n *    ...\n */\nexport function multiArgsPromisedFn(fn: Function): Function {\n  return (...callerArgs: Array<any>): Promise<any> => {\n    return new Promise((resolve, reject) => {\n      fn(...callerArgs, (err, ...rest) => {\n        if (err) {\n          reject(err);\n        } else {\n          resolve(rest);\n        }\n      });\n    });\n  };\n}\n"],"mappings":"AAEA,SAAQA,SAAR,QAAwB,MAAxB,C,CAEA;AACA;AACA;AACA;AAEA;;AACA,OAAO,MAAMC,eAAe,GAAGD,SAAS,CAACE,MAAlC;AAEP;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASC,mBAAT,CAA6BC,EAA7B,EAAqD;EAC1D,OAAO,CAAC,GAAGC,UAAJ,KAA6C;IAClD,OAAO,IAAIC,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;MACtCJ,EAAE,CAAC,GAAGC,UAAJ,EAAgB,CAACI,GAAD,EAAM,GAAGC,IAAT,KAAkB;QAClC,IAAID,GAAJ,EAAS;UACPD,MAAM,CAACC,GAAD,CAAN;QACD,CAFD,MAEO;UACLF,OAAO,CAACG,IAAD,CAAP;QACD;MACF,CANC,CAAF;IAOD,CARM,CAAP;EASD,CAVD;AAWD"}

package/{src → lib}/util/stdin.js

@@ -1,13 +1,9 @@
-/* @flow */
-
-import type {Readable} from 'stream';
-
-export function isTTY(stream: Readable): boolean {
+export function isTTY(stream) {
   // $FlowFixMe: flow complains that stream may not provide isTTY as a property.
   return stream.isTTY;
 }
-
-export function setRawMode(stream: Readable, rawMode: boolean) {
+export function setRawMode(stream, rawMode) {
   // $FlowFixMe: flow complains that stdin may not provide setRawMode.
   stream.setRawMode(rawMode);
 }
+//# sourceMappingURL=stdin.js.map

package/lib/util/stdin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stdin.js","names":["isTTY","stream","setRawMode","rawMode"],"sources":["../../src/util/stdin.js"],"sourcesContent":["/* @flow */\n\nimport type {Readable} from 'stream';\n\nexport function isTTY(stream: Readable): boolean {\n  // $FlowFixMe: flow complains that stream may not provide isTTY as a property.\n  return stream.isTTY;\n}\n\nexport function setRawMode(stream: Readable, rawMode: boolean) {\n  // $FlowFixMe: flow complains that stdin may not provide setRawMode.\n  stream.setRawMode(rawMode);\n}\n"],"mappings":"AAIA,OAAO,SAASA,KAAT,CAAeC,MAAf,EAA0C;EAC/C;EACA,OAAOA,MAAM,CAACD,KAAd;AACD;AAED,OAAO,SAASE,UAAT,CAAoBD,MAApB,EAAsCE,OAAtC,EAAwD;EAC7D;EACAF,MAAM,CAACC,UAAP,CAAkBC,OAAlB;AACD"}

package/{src → lib}/util/temp-dir.js

@@ -1,19 +1,10 @@
-/* @flow */
-import {promisify} from 'util';
-
+import { promisify } from 'util';
 import tmp from 'tmp';
-
-import {createLogger} from './logger';
-import {multiArgsPromisedFn, promisifyCustom} from './promisify';
-
-const log = createLogger(__filename);
-
-export type MakePromiseCallback = (tmpDir: TempDir) => any;
-
+import { createLogger } from './logger.js';
+import { multiArgsPromisedFn, promisifyCustom } from './promisify.js';
+const log = createLogger(import.meta.url);
 tmp.dir[promisifyCustom] = multiArgsPromisedFn(tmp.dir);
-
 const createTempDir = promisify(tmp.dir);
-
 /*
  * Work with a self-destructing temporary directory in a promise chain.
  *
@@ -29,16 +20,13 @@ const createTempDir = promisify(tmp.dir);
  * );
  *
  */
-export function withTempDir(makePromise: MakePromiseCallback): Promise<any> {
+
+export function withTempDir(makePromise) {
   const tmpDir = new TempDir();
-  return tmpDir.create()
-    .then(() => {
-      return makePromise(tmpDir);
-    })
-    .catch(tmpDir.errorHandler())
-    .then(tmpDir.successHandler());
+  return tmpDir.create().then(() => {
+    return makePromise(tmpDir);
+  }).catch(tmpDir.errorHandler()).then(tmpDir.successHandler());
 }
-
 /*
  * Work with a self-destructing temporary directory object.
  *
@@ -54,49 +42,50 @@ export function withTempDir(makePromise: MakePromiseCallback): Promise<any> {
  *   .then(tmpDir.successHandler());
  *
  */
-export class TempDir {
-  _path: string | void;
-  _removeTempDir: Function | void;
 
+export class TempDir {
   constructor() {
     this._path = undefined;
     this._removeTempDir = undefined;
   }
-
   /*
    * Returns a promise that is fulfilled when the temp directory has
    * been created.
    */
-  create(): Promise<TempDir> {
-    return createTempDir(
-      {
-        prefix: 'tmp-web-ext-',
-        // This allows us to remove a non-empty tmp dir.
-        unsafeCleanup: true,
-      })
-      .then(([tmpPath, removeTempDir]) => {
-        this._path = tmpPath;
-        this._removeTempDir = () => new Promise((resolve, reject) => {
-          // `removeTempDir` parameter is a `next` callback which
-          // is called once the dir has been removed.
-          const next = (err) => err ? reject(err) : resolve();
-          removeTempDir(next);
-        });
-        log.debug(`Created temporary directory: ${this.path()}`);
-        return this;
+
+
+  create() {
+    return createTempDir({
+      prefix: 'tmp-web-ext-',
+      // This allows us to remove a non-empty tmp dir.
+      unsafeCleanup: true
+    }).then(([tmpPath, removeTempDir]) => {
+      this._path = tmpPath;
+
+      this._removeTempDir = () => new Promise((resolve, reject) => {
+        // `removeTempDir` parameter is a `next` callback which
+        // is called once the dir has been removed.
+        const next = err => err ? reject(err) : resolve();
+
+        removeTempDir(next);
       });
-  }
 
+      log.debug(`Created temporary directory: ${this.path()}`);
+      return this;
+    });
+  }
   /*
    * Get the absolute path of the temp directory.
    */
-  path(): string {
+
+
+  path() {
     if (!this._path) {
       throw new Error('You cannot access path() before calling create()');
     }
+
     return this._path;
   }
-
   /*
    * Returns a callback that will catch an error, remove
    * the temporary directory, and throw the error.
@@ -104,35 +93,41 @@ export class TempDir {
    * This is intended for use in a promise like
    * Promise().catch(tmp.errorHandler())
    */
-  errorHandler(): Function {
-    return async (error) => {
+
+
+  errorHandler() {
+    return async error => {
       await this.remove();
       throw error;
     };
   }
-
   /*
    * Returns a callback that will remove the temporary direcotry.
    *
    * This is intended for use in a promise like
    * Promise().then(tmp.successHandler())
    */
-  successHandler(): Function {
-    return async (promiseResult) => {
+
+
+  successHandler() {
+    return async promiseResult => {
       await this.remove();
       return promiseResult;
     };
   }
-
   /*
    * Remove the temp directory.
    */
-  remove(): Promise<void> | void {
+
+
+  remove() {
     if (!this._removeTempDir) {
       return;
     }
+
     log.debug(`Removing temporary directory: ${this.path()}`);
     return this._removeTempDir && this._removeTempDir();
   }
 
 }
+//# sourceMappingURL=temp-dir.js.map