Commit 1f518394 authored by Tom Marble's avatar Tom Marble
Browse files

Bug 1847580 - Update ESLint to read .toml as well as .ini for test manifests r=Standard8 

Differential Revision: https://phabricator.services.mozilla.com/D191230
parent 21d4aba6

package-lock.json

+593 −492

File changed.

Preview size limit exceeded, changes collapsed.

tools/lint/eslint/eslint-plugin-mozilla/lib/helpers.js

+40 −12
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ const estraverse = require("estraverse"); 
const path = require("path");

const fs = require("fs");

const ini = require("multi-ini");

const toml = require("toml-eslint-parser");

const recommendedConfig = require("./configs/recommended");



var gRootDir = null;
@@ -516,10 +517,7 @@ module.exports = { 
    }



    for (let name of names) {

      if (!name.endsWith(".ini")) {

        continue;

      }



      if (name.endsWith(".ini")) {

        try {

          let manifest = this.iniParser.parse(

            fs.readFileSync(path.join(dir, name), "utf8").split("\n")
@@ -529,6 +527,36 @@ module.exports = { 
            manifest,

          });

        } catch (e) {}

      } else if (name.endsWith(".toml")) {

        try {

          const ast = toml.parseTOML(

            fs.readFileSync(path.join(dir, name), "utf8")

          );

          var manifest = {};

          ast.body.forEach(top => {

            if (top.type == "TOMLTopLevelTable") {

              top.body.forEach(obj => {

                if (obj.type == "TOMLTable") {

                  manifest[obj.resolvedKey] = {};

                }

              });

            }

          });

          manifests.push({

            file: path.join(dir, name),

            manifest,

          });

        } catch (e) {

          console.log(

            "TOML ERROR: " +

              e.message +

              " @line: " +

              e.lineNumber +

              ", column: " +

              e.column

          );

        }

      }

    }



    directoryManifests.set(dir, manifests);

tools/lint/eslint/eslint-plugin-mozilla/manifest.tt

+2 −2
Original line number Diff line number Diff line 
[

  {

    "filename": "eslint-plugin-mozilla.tar.gz",

    "size": 9738275,

    "size": 9793999,

    "algorithm": "sha512",

    "digest": "846b618f1408b833c75c16cc62da559a751b12615d5c165a349868af315cdae7b67e54fd32b91010341c1a781c948c7c16f54a5f9ab571b71f1b015aa3523e46",

    "digest": "0ed240f69a57b9cc4964871435b2f5eadf1f366170f2015053151b3f1b05c010deae350aedd15af23fd8e2a33186d250f5025368b26289a7add212a917eb1947",

    "unpack": true,

    "visibility": "public"

  }

tools/lint/eslint/eslint-plugin-mozilla/package-lock.json

+505 −429

File changed.

Preview size limit exceeded, changes collapsed.

tools/lint/eslint/eslint-plugin-mozilla/package.json

+3 −2
Original line number Diff line number Diff line 
{

  "name": "eslint-plugin-mozilla",

  "version": "3.3.0",

  "version": "3.3.1",

  "description": "A collection of rules that help enforce JavaScript coding standard in the Mozilla project.",

  "keywords": [

    "eslint",
@@ -26,7 +26,8 @@ 
    "eslint-visitor-keys": "^3.3.0",

    "estraverse": "^5.3.0",

    "htmlparser2": "^8.0.1",

    "multi-ini": "^2.3.2"

    "multi-ini": "^2.3.2",

    "toml-eslint-parser": "0.6.0"

  },

  "devDependencies": {

    "eslint": "8.38.0",