From d7a17ee43874f4f0b2f72aad4e65ab7dd036feda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 05:05:34 +0000 Subject: [PATCH 1/2] build(deps-dev): bump prettier from 2.2.1 to 2.3.0 Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.2.1...2.3.0) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d3e5ce2cb..b66919b56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1993,9 +1993,9 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", + "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", "dev": true }, "process-nextick-args": { diff --git a/package.json b/package.json index 356606e26..a01391fd0 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "eslint-plugin-node": "^11.1.0", "glob": "^7.1.6", "mockery": "^2.0.0", - "prettier": "2.2.1", + "prettier": "2.3.0", "vows": "^0.8.3" }, "scripts": { From 52044592f7523e9cf8d1a66d19724108c06bb361 Mon Sep 17 00:00:00 2001 From: macbre Date: Tue, 11 May 2021 17:11:48 +0200 Subject: [PATCH 2/2] npm run prettier --- lib/metadata/generate.js | 3 ++- modules/staticAssets/staticAssets.js | 3 ++- test/integration-test.js | 31 +++++++++++++++++----------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/lib/metadata/generate.js b/lib/metadata/generate.js index 0d6b25e3e..14da112f6 100755 --- a/lib/metadata/generate.js +++ b/lib/metadata/generate.js @@ -66,7 +66,8 @@ function getModuleMetadata(moduleFile) { }, matches, moduleName, - metricRegEx = /(setMetric|setMetricEvaluate|incrMetric)\(['"]([^'"]+)['"](\)|,)(.*@desc.*$)?/gm, + metricRegEx = + /(setMetric|setMetricEvaluate|incrMetric)\(['"]([^'"]+)['"](\)|,)(.*@desc.*$)?/gm, eventsRegEx = /emit\(['"]([^'"]+)['"]([^)]+).*@desc(.*)$/gm; data.name = moduleName = moduleFile.split("/").pop().replace(/\.js$/, ""); diff --git a/modules/staticAssets/staticAssets.js b/modules/staticAssets/staticAssets.js index 4d20be0ea..6b67a649f 100644 --- a/modules/staticAssets/staticAssets.js +++ b/modules/staticAssets/staticAssets.js @@ -11,7 +11,8 @@ module.exports = function (phantomas) { assetsReqCounter = new Collection(), cookieDomains = new Collection(), // TODO: use 3pc database with tracking services - trackingUrls = /google-analytics.com\/__utm.gif|pixel.quantserve.com\/pixel/; + trackingUrls = + /google-analytics.com\/__utm.gif|pixel.quantserve.com\/pixel/; phantomas.setMetric("assetsNotGzipped"); // @desc number of static assets that were not gzipped phantomas.setMetric("assetsWithQueryString"); // @desc number of static assets requested with query string (e.g. ?foo) in URL diff --git a/test/integration-test.js b/test/integration-test.js index 8ab6d35a9..4a7c06393 100644 --- a/test/integration-test.js +++ b/test/integration-test.js @@ -92,22 +92,29 @@ spec.forEach(function (test) { // check metrics Object.keys(test.metrics || {}).forEach(function (name) { - batch[batchName][ - 'should have "' + name + '" metric properly set' - ] = function (err, results) { - assert.ok(!(err instanceof Error), "Error should not be thrown: " + err); - assert.strictEqual(results.getMetric(name), test.metrics[name]); - }; + batch[batchName]['should have "' + name + '" metric properly set'] = + function (err, results) { + assert.ok( + !(err instanceof Error), + "Error should not be thrown: " + err + ); + assert.strictEqual(results.getMetric(name), test.metrics[name]); + }; }); // check offenders Object.keys(test.offenders || {}).forEach(function (name) { - batch[batchName][ - 'should have "' + name + '" offender(s) properly set' - ] = function (err, results) { - assert.ok(!(err instanceof Error), "Error should not be thrown: " + err); - assert.deepStrictEqual(results.getOffenders(name), test.offenders[name]); - }; + batch[batchName]['should have "' + name + '" offender(s) properly set'] = + function (err, results) { + assert.ok( + !(err instanceof Error), + "Error should not be thrown: " + err + ); + assert.deepStrictEqual( + results.getOffenders(name), + test.offenders[name] + ); + }; }); suite.addBatch(batch);