Обновил зависимости

modules/jenkins-reporter/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "diff": "^4.0.1",
-    "mkdirp": "^1.0.3",
+    "mkdirp": "^1.0.4",
     "xml": "^1.0.1"
   },
   "repository": {

modules/nightwatch-image-comparison/package.json

@@ -9,7 +9,7 @@
     "access": "public"
   },
   "dependencies": {
-    "webdriver-image-comparison": "^0.13.2"
+    "webdriver-image-comparison": "^0.14.4"
   },
   "optionalDependencies": {
     "mocha": "^6",

modules/nightwatch-local-file-upload/package.json

@@ -9,7 +9,7 @@
     "access": "public"
   },
   "dependencies": {
-    "archiver": "^4.0.1"
+    "archiver": "^5.0.0"
   },
   "repository": {
     "type": "git",

modules/nightwatch/package.json

@@ -22,18 +22,18 @@
     "@csssr/mocha-testrail-ui": "^0.4.3",
     "@csssr/nightwatch-image-comparison": "^0.3.3",
     "@csssr/nightwatch-local-file-upload": "^0.2.1",
-    "@types/mocha": "^7.0.2",
-    "@types/nightwatch": "^1.1.1",
-    "@types/node": "^13.9.1",
-    "axios": "^0.19.2",
-    "chalk": "^3.0.0",
+    "@types/mocha": "^8.0.3",
+    "@types/nightwatch": "^1.3.0",
+    "@types/node": "^14.6.4",
+    "axios": "^0.20.0",
+    "chalk": "^4.1.0",
     "chromedriver": "*",
     "ci-info": "^2.0.0",
     "geckodriver": "*",
     "is-ci": "^2.0.0",
     "mocha": "^6",
-    "mochawesome": "^4.1.0",
-    "nightwatch": "~1.3.4",
+    "mochawesome": "^4",
+    "nightwatch": "~1.4.1",
     "rimraf": "^3.0.0"
   },
   "repository": {

modules/nightwatch/src/commands/add-browser.js

@@ -23,7 +23,7 @@ async function getConfigByUrl(url) {
 
     if (typeof res.data === 'string') {
       try {
-        const parsed = JSONWithComments.parse(res.data)
+        const parsed = JSONWithComments.parse(res.data, null, true)
 
         if (isValidBrowserConfig(parsed)) {
           return parsed

modules/tests/integration/add-nightwatch.test.js

@@ -7,7 +7,7 @@ const { setupEnvironment } = require('./helpers')
 
 function checks({ readFile, rootDir }) {
   it('should add nightwatch with default config to e2e-tools.json', async () => {
-    const configFile = JSONWithComments.parse(readFile('e2e-tests/e2e-tools.json'))
+    const configFile = JSONWithComments.parse(readFile('e2e-tests/e2e-tools.json'), null, true)
     expect(configFile.tools).toEqual({
       '@csssr/e2e-tools-nightwatch': {
         browsers: {
@@ -26,8 +26,10 @@ function checks({ readFile, rootDir }) {
           },
           remote_chrome: {
             type: 'selenium',
-            host: 'chromedriver.csssr.ru',
+            host: 'selenium-linux.csssr.ru',
+            remote: true,
             basicAuth: {
+              credentialsId: 'chromedriver',
               username_env: 'CHROMEDRIVER_USERNAME',
               password_env: 'CHROMEDRIVER_PASSWORD',
             },
@@ -36,7 +38,7 @@ function checks({ readFile, rootDir }) {
               browserName: 'chrome',
               'goog:chromeOptions': {
                 w3c: false,
-                args: ['--headless', '--disable-gpu', '--window-size=1200,800'],
+                args: ['--headless', '--no-sandbox', '--disable-gpu', '--window-size=1200,800'],
               },
             },
             globals: {
@@ -101,7 +103,7 @@ function checks({ readFile, rootDir }) {
   })
 
   it('should add tasks', async () => {
-    const vscodeTasks = JSONWithComments.parse(readFile('e2e-tests/.vscode/tasks.json'))
+    const vscodeTasks = JSONWithComments.parse(readFile('e2e-tests/.vscode/tasks.json'), null, true)
 
     expect(vscodeTasks.tasks).toContainEqual({
       type: 'shell',

modules/tools/package.json

@@ -17,20 +17,20 @@
     "access": "public"
   },
   "dependencies": {
-    "comment-json": "3.0.2",
-    "cross-spawn": "^7.0.1",
+    "comment-json": "4.0.4",
+    "cross-spawn": "^7.0.3",
     "dotenv": "^8.1.0",
-    "eslint": "^6.8.0",
-    "fast-glob": "^3.0.4",
+    "eslint": "^7.8.1",
+    "fast-glob": "^3.2.4",
     "find-root": "^1.1.0",
-    "handlebars": "^4.1.2",
-    "inquirer": "^7.1.0",
-    "lodash": "^4.17.15",
+    "handlebars": "^4.7.6",
+    "inquirer": "^7.3.3",
+    "lodash": "^4.17.20",
     "package-json": "^6.5.0",
-    "prettier": "1.19.1",
+    "prettier": "2.1.1",
     "readline-sync": "^1.4.10",
     "validate-npm-package-name": "^3.0.0",
-    "yargs": "^15.3.1"
+    "yargs": "^15.4.1"
   },
   "repository": {
     "type": "git",

modules/tools/src/utils/index.js

@@ -40,7 +40,7 @@ function getConfig() {
       encoding: 'utf-8',
     })
 
-    return JSONWithComments.parse(configFile)
+    return JSONWithComments.parse(configFile, null, true)
   } catch (err) {
     if (err && err.code === 'ENOENT') {
       throw new Error(`Config file ${err.path} was not found`)
@@ -92,7 +92,7 @@ function formatFile(filePath) {
 
 function updateJsonFile({ filePath, update }) {
   const file = fs.readFileSync(filePath, { encoding: 'utf-8' })
-  const fileContent = JSONWithComments.parse(file)
+  const fileContent = JSONWithComments.parse(file, null, true)
   createJsonFile({ filePath, fileContent: update(fileContent) })
 }
 

package.json

@@ -9,11 +9,11 @@
     "modules/*"
   ],
   "devDependencies": {
-    "@types/jest": "^25.1.4",
-    "@types/node": "^13.9.1",
-    "jest": "^25.1.0",
-    "lerna": "^3.16.4",
-    "lodash": "^4.17.15",
-    "prettier": "1.19.1"
+    "@types/jest": "^26.0.13",
+    "@types/node": "^14.6.4",
+    "jest": "^26.4.2",
+    "lerna": "^3.22.1",
+    "lodash": "^4.17.20",
+    "prettier": "2.1.1"
   }
 }