diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 295b9f79..8c13710a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,8 +32,9 @@ jobs:
- uses: ./
with:
- servers: '[{"id": "serverId", "username": "username", "password": "password"}]'
+ servers: '[{"id": "serverId", "username": "username", "password": "password"}]'
properties: '[{"prop1": "value1"}, {"prop2": "value2"}]'
+ mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]'
sonatypeSnapshots: true
- run: cat ~/.m2/settings.xml
diff --git a/.gitignore b/.gitignore
index 414c03d7..894ec64d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
# Editors
.vscode
+.idea
# Logs
logs
diff --git a/README.md b/README.md
index db1f9cd5..e79c2c9f 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ steps:
- uses: s4u/maven-settings-action@v2
```
-Create ```settings.xml``` with server section:
+Create ```settings.xml``` with servers section:
```yml
steps:
- uses: s4u/maven-settings-action@v2
@@ -39,6 +39,14 @@ steps:
servers: '[{"id": "serverId", "username": "username", "password": "password"}]'
```
+Create ```settings.xml``` with mirrors section:
+```yml
+steps:
+- uses: s4u/maven-settings-action@v2
+ with:
+ mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]'
+```
+
Create ```settings.xml``` with maven properties:
```yml
steps:
diff --git a/action.yml b/action.yml
index 62556e63..aac3959c 100644
--- a/action.yml
+++ b/action.yml
@@ -9,6 +9,9 @@ inputs:
servers:
description: 'servers definition in joson array, eg: [{"id": "serverId", "username": "username", "password": "password"}]'
required: false
+ mirrors:
+ description: 'mirrors definition in json array, eg: [{"id": "id", "name": "name", "mirrorOf": "mirrorOf", "url": "url"}]'
+ required: false
properties:
description: 'json array with properties, eg [{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
required: false
diff --git a/package-lock.json b/package-lock.json
index 2fab922d..015ebd46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,22 +19,23 @@
}
},
"@babel/core": {
- "version": "7.8.7",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz",
- "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==",
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
+ "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.8.3",
- "@babel/generator": "^7.8.7",
- "@babel/helpers": "^7.8.4",
- "@babel/parser": "^7.8.7",
+ "@babel/generator": "^7.9.0",
+ "@babel/helper-module-transforms": "^7.9.0",
+ "@babel/helpers": "^7.9.0",
+ "@babel/parser": "^7.9.0",
"@babel/template": "^7.8.6",
- "@babel/traverse": "^7.8.6",
- "@babel/types": "^7.8.7",
+ "@babel/traverse": "^7.9.0",
+ "@babel/types": "^7.9.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.1",
- "json5": "^2.1.0",
+ "json5": "^2.1.2",
"lodash": "^4.17.13",
"resolve": "^1.3.2",
"semver": "^5.4.1",
@@ -56,12 +57,12 @@
}
},
"@babel/generator": {
- "version": "7.8.8",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz",
- "integrity": "sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==",
+ "version": "7.9.4",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz",
+ "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==",
"dev": true,
"requires": {
- "@babel/types": "^7.8.7",
+ "@babel/types": "^7.9.0",
"jsesc": "^2.5.1",
"lodash": "^4.17.13",
"source-map": "^0.5.0"
@@ -95,12 +96,76 @@
"@babel/types": "^7.8.3"
}
},
+ "@babel/helper-member-expression-to-functions": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
+ "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.8.3"
+ }
+ },
+ "@babel/helper-module-imports": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
+ "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.8.3"
+ }
+ },
+ "@babel/helper-module-transforms": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
+ "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-module-imports": "^7.8.3",
+ "@babel/helper-replace-supers": "^7.8.6",
+ "@babel/helper-simple-access": "^7.8.3",
+ "@babel/helper-split-export-declaration": "^7.8.3",
+ "@babel/template": "^7.8.6",
+ "@babel/types": "^7.9.0",
+ "lodash": "^4.17.13"
+ }
+ },
+ "@babel/helper-optimise-call-expression": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
+ "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.8.3"
+ }
+ },
"@babel/helper-plugin-utils": {
"version": "7.8.3",
"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
"integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
"dev": true
},
+ "@babel/helper-replace-supers": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
+ "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-member-expression-to-functions": "^7.8.3",
+ "@babel/helper-optimise-call-expression": "^7.8.3",
+ "@babel/traverse": "^7.8.6",
+ "@babel/types": "^7.8.6"
+ }
+ },
+ "@babel/helper-simple-access": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
+ "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+ "dev": true,
+ "requires": {
+ "@babel/template": "^7.8.3",
+ "@babel/types": "^7.8.3"
+ }
+ },
"@babel/helper-split-export-declaration": {
"version": "7.8.3",
"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
@@ -110,15 +175,21 @@
"@babel/types": "^7.8.3"
}
},
+ "@babel/helper-validator-identifier": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
+ "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==",
+ "dev": true
+ },
"@babel/helpers": {
- "version": "7.8.4",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz",
- "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==",
+ "version": "7.9.2",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
+ "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
"dev": true,
"requires": {
"@babel/template": "^7.8.3",
- "@babel/traverse": "^7.8.4",
- "@babel/types": "^7.8.3"
+ "@babel/traverse": "^7.9.0",
+ "@babel/types": "^7.9.0"
}
},
"@babel/highlight": {
@@ -133,9 +204,9 @@
}
},
"@babel/parser": {
- "version": "7.8.8",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz",
- "integrity": "sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==",
+ "version": "7.9.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+ "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
"dev": true
},
"@babel/plugin-syntax-bigint": {
@@ -168,17 +239,17 @@
}
},
"@babel/traverse": {
- "version": "7.8.6",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz",
- "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==",
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz",
+ "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.8.3",
- "@babel/generator": "^7.8.6",
+ "@babel/generator": "^7.9.0",
"@babel/helper-function-name": "^7.8.3",
"@babel/helper-split-export-declaration": "^7.8.3",
- "@babel/parser": "^7.8.6",
- "@babel/types": "^7.8.6",
+ "@babel/parser": "^7.9.0",
+ "@babel/types": "^7.9.0",
"debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.13"
@@ -193,12 +264,12 @@
}
},
"@babel/types": {
- "version": "7.8.7",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz",
- "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==",
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
+ "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
+ "@babel/helper-validator-identifier": "^7.9.0",
"lodash": "^4.17.13",
"to-fast-properties": "^2.0.0"
}
@@ -246,14 +317,14 @@
"dev": true
},
"@jest/console": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.1.0.tgz",
- "integrity": "sha512-3P1DpqAMK/L07ag/Y9/Jup5iDEG9P4pRAuZiMQnU0JB3UOvCyYCjCoxr7sIA80SeyUCUKrr24fKAxVpmBgQonA==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.2.6.tgz",
+ "integrity": "sha512-bGp+0PicZVCEhb+ifnW9wpKWONNdkhtJsRE7ap729hiAfTvCN6VhGx0s/l/V/skA2pnyqq+N/7xl9ZWfykDpsg==",
"dev": true,
"requires": {
- "@jest/source-map": "^25.1.0",
+ "@jest/source-map": "^25.2.6",
"chalk": "^3.0.0",
- "jest-util": "^25.1.0",
+ "jest-util": "^25.2.6",
"slash": "^3.0.0"
},
"dependencies": {
@@ -310,36 +381,36 @@
}
},
"@jest/core": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.1.0.tgz",
- "integrity": "sha512-iz05+NmwCmZRzMXvMo6KFipW7nzhbpEawrKrkkdJzgytavPse0biEnCNr2wRlyCsp3SmKaEY+SGv7YWYQnIdig==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.2.7.tgz",
+ "integrity": "sha512-Nd6ELJyR+j0zlwhzkfzY70m04hAur0VnMwJXVe4VmmD/SaQ6DEyal++ERQ1sgyKIKKEqRuui6k/R0wHLez4P+g==",
"dev": true,
"requires": {
- "@jest/console": "^25.1.0",
- "@jest/reporters": "^25.1.0",
- "@jest/test-result": "^25.1.0",
- "@jest/transform": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/console": "^25.2.6",
+ "@jest/reporters": "^25.2.6",
+ "@jest/test-result": "^25.2.6",
+ "@jest/transform": "^25.2.6",
+ "@jest/types": "^25.2.6",
"ansi-escapes": "^4.2.1",
"chalk": "^3.0.0",
"exit": "^0.1.2",
"graceful-fs": "^4.2.3",
- "jest-changed-files": "^25.1.0",
- "jest-config": "^25.1.0",
- "jest-haste-map": "^25.1.0",
- "jest-message-util": "^25.1.0",
- "jest-regex-util": "^25.1.0",
- "jest-resolve": "^25.1.0",
- "jest-resolve-dependencies": "^25.1.0",
- "jest-runner": "^25.1.0",
- "jest-runtime": "^25.1.0",
- "jest-snapshot": "^25.1.0",
- "jest-util": "^25.1.0",
- "jest-validate": "^25.1.0",
- "jest-watcher": "^25.1.0",
+ "jest-changed-files": "^25.2.6",
+ "jest-config": "^25.2.7",
+ "jest-haste-map": "^25.2.6",
+ "jest-message-util": "^25.2.6",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.2.6",
+ "jest-resolve-dependencies": "^25.2.7",
+ "jest-runner": "^25.2.7",
+ "jest-runtime": "^25.2.7",
+ "jest-snapshot": "^25.2.7",
+ "jest-util": "^25.2.6",
+ "jest-validate": "^25.2.6",
+ "jest-watcher": "^25.2.7",
"micromatch": "^4.0.2",
"p-each-series": "^2.1.0",
- "realpath-native": "^1.1.0",
+ "realpath-native": "^2.0.0",
"rimraf": "^3.0.0",
"slash": "^3.0.0",
"strip-ansi": "^6.0.0"
@@ -416,41 +487,40 @@
}
},
"@jest/environment": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.1.0.tgz",
- "integrity": "sha512-cTpUtsjU4cum53VqBDlcW0E4KbQF03Cn0jckGPW/5rrE9tb+porD3+hhLtHAwhthsqfyF+bizyodTlsRA++sHg==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.2.6.tgz",
+ "integrity": "sha512-17WIw+wCb9drRNFw1hi8CHah38dXVdOk7ga9exThhGtXlZ9mK8xH4DjSB9uGDGXIWYSHmrxoyS6KJ7ywGr7bzg==",
"dev": true,
"requires": {
- "@jest/fake-timers": "^25.1.0",
- "@jest/types": "^25.1.0",
- "jest-mock": "^25.1.0"
+ "@jest/fake-timers": "^25.2.6",
+ "@jest/types": "^25.2.6",
+ "jest-mock": "^25.2.6"
}
},
"@jest/fake-timers": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.1.0.tgz",
- "integrity": "sha512-Eu3dysBzSAO1lD7cylZd/CVKdZZ1/43SF35iYBNV1Lvvn2Undp3Grwsv8PrzvbLhqwRzDd4zxrY4gsiHc+wygQ==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.2.6.tgz",
+ "integrity": "sha512-A6qtDIA2zg/hVgUJJYzQSHFBIp25vHdSxW/s4XmTJAYxER6eL0NQdQhe4+232uUSviKitubHGXXirt5M7blPiA==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
- "jest-message-util": "^25.1.0",
- "jest-mock": "^25.1.0",
- "jest-util": "^25.1.0",
+ "@jest/types": "^25.2.6",
+ "jest-message-util": "^25.2.6",
+ "jest-mock": "^25.2.6",
+ "jest-util": "^25.2.6",
"lolex": "^5.0.0"
}
},
"@jest/reporters": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.1.0.tgz",
- "integrity": "sha512-ORLT7hq2acJQa8N+NKfs68ZtHFnJPxsGqmofxW7v7urVhzJvpKZG9M7FAcgh9Ee1ZbCteMrirHA3m5JfBtAaDg==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.2.6.tgz",
+ "integrity": "sha512-DRMyjaxcd6ZKctiXNcuVObnPwB1eUs7xrUVu0J2V0p5/aZJei5UM9GL3s/bmN4hRV8Mt3zXh+/9X2o0Q4ClZIA==",
"dev": true,
"requires": {
"@bcoe/v8-coverage": "^0.2.3",
- "@jest/console": "^25.1.0",
- "@jest/environment": "^25.1.0",
- "@jest/test-result": "^25.1.0",
- "@jest/transform": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/console": "^25.2.6",
+ "@jest/test-result": "^25.2.6",
+ "@jest/transform": "^25.2.6",
+ "@jest/types": "^25.2.6",
"chalk": "^3.0.0",
"collect-v8-coverage": "^1.0.0",
"exit": "^0.1.2",
@@ -460,11 +530,10 @@
"istanbul-lib-report": "^3.0.0",
"istanbul-lib-source-maps": "^4.0.0",
"istanbul-reports": "^3.0.0",
- "jest-haste-map": "^25.1.0",
- "jest-resolve": "^25.1.0",
- "jest-runtime": "^25.1.0",
- "jest-util": "^25.1.0",
- "jest-worker": "^25.1.0",
+ "jest-haste-map": "^25.2.6",
+ "jest-resolve": "^25.2.6",
+ "jest-util": "^25.2.6",
+ "jest-worker": "^25.2.6",
"node-notifier": "^6.0.0",
"slash": "^3.0.0",
"source-map": "^0.6.0",
@@ -526,9 +595,9 @@
}
},
"@jest/source-map": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.1.0.tgz",
- "integrity": "sha512-ohf2iKT0xnLWcIUhL6U6QN+CwFWf9XnrM2a6ybL9NXxJjgYijjLSitkYHIdzkd8wFliH73qj/+epIpTiWjRtAA==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz",
+ "integrity": "sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ==",
"dev": true,
"requires": {
"callsites": "^3.0.0",
@@ -537,49 +606,48 @@
}
},
"@jest/test-result": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.1.0.tgz",
- "integrity": "sha512-FZzSo36h++U93vNWZ0KgvlNuZ9pnDnztvaM7P/UcTx87aPDotG18bXifkf1Ji44B7k/eIatmMzkBapnAzjkJkg==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.2.6.tgz",
+ "integrity": "sha512-gmGgcF4qz/pkBzyfJuVHo2DA24kIgVQ5Pf/VpW4QbyMLSegi8z+9foSZABfIt5se6k0fFj/3p/vrQXdaOgit0w==",
"dev": true,
"requires": {
- "@jest/console": "^25.1.0",
- "@jest/transform": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/console": "^25.2.6",
+ "@jest/types": "^25.2.6",
"@types/istanbul-lib-coverage": "^2.0.0",
"collect-v8-coverage": "^1.0.0"
}
},
"@jest/test-sequencer": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.1.0.tgz",
- "integrity": "sha512-WgZLRgVr2b4l/7ED1J1RJQBOharxS11EFhmwDqknpknE0Pm87HLZVS2Asuuw+HQdfQvm2aXL2FvvBLxOD1D0iw==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.2.7.tgz",
+ "integrity": "sha512-s2uYGOXONDSTJQcZJ9A3Zkg3hwe53RlX1HjUNqjUy3HIqwgwCKJbnAKYsORPbhxXi3ARMKA7JNBi9arsTxXoYw==",
"dev": true,
"requires": {
- "@jest/test-result": "^25.1.0",
- "jest-haste-map": "^25.1.0",
- "jest-runner": "^25.1.0",
- "jest-runtime": "^25.1.0"
+ "@jest/test-result": "^25.2.6",
+ "jest-haste-map": "^25.2.6",
+ "jest-runner": "^25.2.7",
+ "jest-runtime": "^25.2.7"
}
},
"@jest/transform": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.1.0.tgz",
- "integrity": "sha512-4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.2.6.tgz",
+ "integrity": "sha512-rZnjCjZf9avPOf9q/w9RUZ9Uc29JmB53uIXNJmNz04QbDMD5cR/VjfikiMKajBsXe2vnFl5sJ4RTt+9HPicauQ==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"babel-plugin-istanbul": "^6.0.0",
"chalk": "^3.0.0",
"convert-source-map": "^1.4.0",
"fast-json-stable-stringify": "^2.0.0",
"graceful-fs": "^4.2.3",
- "jest-haste-map": "^25.1.0",
- "jest-regex-util": "^25.1.0",
- "jest-util": "^25.1.0",
+ "jest-haste-map": "^25.2.6",
+ "jest-regex-util": "^25.2.6",
+ "jest-util": "^25.2.6",
"micromatch": "^4.0.2",
"pirates": "^4.0.1",
- "realpath-native": "^1.1.0",
+ "realpath-native": "^2.0.0",
"slash": "^3.0.0",
"source-map": "^0.6.1",
"write-file-atomic": "^3.0.0"
@@ -638,9 +706,9 @@
}
},
"@jest/types": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
- "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.6.tgz",
+ "integrity": "sha512-myJTTV37bxK7+3NgKc4Y/DlQ5q92/NOwZsZ+Uch7OXdElxOg61QYc72fPYNAjlvbnJ2YvbXLamIsa9tj48BmyQ==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
@@ -711,9 +779,9 @@
}
},
"@types/babel__core": {
- "version": "7.1.6",
- "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz",
- "integrity": "sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==",
+ "version": "7.1.7",
+ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz",
+ "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==",
"dev": true,
"requires": {
"@babel/parser": "^7.1.0",
@@ -782,6 +850,12 @@
"@types/istanbul-lib-report": "*"
}
},
+ "@types/prettier": {
+ "version": "1.19.1",
+ "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz",
+ "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==",
+ "dev": true
+ },
"@types/stack-utils": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -990,16 +1064,16 @@
"dev": true
},
"babel-jest": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.1.0.tgz",
- "integrity": "sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.2.6.tgz",
+ "integrity": "sha512-MDJOAlwtIeIQiGshyX0d2PxTbV73xZMpNji40ivVTPQOm59OdRR9nYCkffqI7ugtsK4JR98HgNKbDbuVf4k5QQ==",
"dev": true,
"requires": {
- "@jest/transform": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/transform": "^25.2.6",
+ "@jest/types": "^25.2.6",
"@types/babel__core": "^7.1.0",
"babel-plugin-istanbul": "^6.0.0",
- "babel-preset-jest": "^25.1.0",
+ "babel-preset-jest": "^25.2.6",
"chalk": "^3.0.0",
"slash": "^3.0.0"
},
@@ -1070,23 +1144,23 @@
}
},
"babel-plugin-jest-hoist": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz",
- "integrity": "sha512-oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.6.tgz",
+ "integrity": "sha512-qE2xjMathybYxjiGFJg0mLFrz0qNp83aNZycWDY/SuHiZNq+vQfRQtuINqyXyue1ELd8Rd+1OhFSLjms8msMbw==",
"dev": true,
"requires": {
"@types/babel__traverse": "^7.0.6"
}
},
"babel-preset-jest": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz",
- "integrity": "sha512-eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.2.6.tgz",
+ "integrity": "sha512-Xh2eEAwaLY9+SyMt/xmGZDnXTW/7pSaBPG0EMo7EuhvosFKVWYB6CqwYD31DaEQuoTL090oDZ0FEqygffGRaSQ==",
"dev": true,
"requires": {
"@babel/plugin-syntax-bigint": "^7.0.0",
"@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "babel-plugin-jest-hoist": "^25.1.0"
+ "babel-plugin-jest-hoist": "^25.2.6"
}
},
"balanced-match": {
@@ -1350,9 +1424,9 @@
"dev": true
},
"collect-v8-coverage": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.0.tgz",
- "integrity": "sha512-VKIhJgvk8E1W28m5avZ2Gv2Ruv5YiF56ug2oclvaG9md69BuZImMG2sk9g7QNKLUbtYAKQjXjYxbYZVUlMMKmQ==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+ "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
"dev": true
},
"collection-visit": {
@@ -1513,14 +1587,11 @@
"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
"dev": true
},
- "define-properties": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
- "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
- "dev": true,
- "requires": {
- "object-keys": "^1.0.12"
- }
+ "deepmerge": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+ "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+ "dev": true
},
"define-property": {
"version": "2.0.2",
@@ -1576,9 +1647,9 @@
"dev": true
},
"diff-sequences": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.1.0.tgz",
- "integrity": "sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
+ "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
"dev": true
},
"doctrine": {
@@ -1624,36 +1695,6 @@
"once": "^1.4.0"
}
},
- "es-abstract": {
- "version": "1.17.4",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
- "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
- "dev": true,
- "requires": {
- "es-to-primitive": "^1.2.1",
- "function-bind": "^1.1.1",
- "has": "^1.0.3",
- "has-symbols": "^1.0.1",
- "is-callable": "^1.1.5",
- "is-regex": "^1.0.5",
- "object-inspect": "^1.7.0",
- "object-keys": "^1.1.1",
- "object.assign": "^4.1.0",
- "string.prototype.trimleft": "^2.1.1",
- "string.prototype.trimright": "^2.1.1"
- }
- },
- "es-to-primitive": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
- "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
- "dev": true,
- "requires": {
- "is-callable": "^1.1.4",
- "is-date-object": "^1.0.1",
- "is-symbol": "^1.0.2"
- }
- },
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -1868,17 +1909,17 @@
}
},
"expect": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-25.1.0.tgz",
- "integrity": "sha512-wqHzuoapQkhc3OKPlrpetsfueuEiMf3iWh0R8+duCu9PIjXoP7HgD5aeypwTnXUAjC8aMsiVDaWwlbJ1RlQ38g==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-25.2.7.tgz",
+ "integrity": "sha512-yA+U2Ph0MkMsJ9N8q5hs9WgWI6oJYfecdXta6LkP/alY/jZZL1MHlJ2wbLh60Ucqf3G+51ytbqV3mlGfmxkpNw==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"ansi-styles": "^4.0.0",
- "jest-get-type": "^25.1.0",
- "jest-matcher-utils": "^25.1.0",
- "jest-message-util": "^25.1.0",
- "jest-regex-util": "^25.1.0"
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.2.7",
+ "jest-message-util": "^25.2.6",
+ "jest-regex-util": "^25.2.6"
},
"dependencies": {
"ansi-styles": {
@@ -2143,12 +2184,6 @@
"dev": true,
"optional": true
},
- "function-bind": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
- "dev": true
- },
"functional-red-black-tree": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
@@ -2252,27 +2287,12 @@
"har-schema": "^2.0.0"
}
},
- "has": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "dev": true,
- "requires": {
- "function-bind": "^1.1.1"
- }
- },
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
- "has-symbols": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
- "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
- "dev": true
- },
"has-value": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -2335,9 +2355,9 @@
}
},
"html-escaper": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
- "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
"dev": true
},
"http-signature": {
@@ -2528,12 +2548,6 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
"dev": true
},
- "is-callable": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
- "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
- "dev": true
- },
"is-ci": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -2563,12 +2577,6 @@
}
}
},
- "is-date-object": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
- "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
- "dev": true
- },
"is-descriptor": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -2642,30 +2650,12 @@
"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
},
- "is-regex": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
- "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
- "dev": true,
- "requires": {
- "has": "^1.0.3"
- }
- },
"is-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
"dev": true
},
- "is-symbol": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
- "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
- "dev": true,
- "requires": {
- "has-symbols": "^1.0.1"
- }
- },
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -2770,9 +2760,9 @@
}
},
"istanbul-reports": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
- "integrity": "sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+ "integrity": "sha512-Vm9xwCiQ8t2cNNnckyeAV0UdxKpcQUz4nMxsBvIu8n2kmPSiyb5uaF/8LpmKr+yqL/MdOXaX2Nmdo4Qyxium9Q==",
"dev": true,
"requires": {
"html-escaper": "^2.0.0",
@@ -2780,14 +2770,14 @@
}
},
"jest": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest/-/jest-25.1.0.tgz",
- "integrity": "sha512-FV6jEruneBhokkt9MQk0WUFoNTwnF76CLXtwNMfsc0um0TlB/LG2yxUd0KqaFjEJ9laQmVWQWS0sG/t2GsuI0w==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-25.2.7.tgz",
+ "integrity": "sha512-XV1n/CE2McCikl4tfpCY950RytHYvxdo/wvtgmn/qwA8z1s16fuvgFL/KoPrrmkqJTaPMUlLVE58pwiaTX5TdA==",
"dev": true,
"requires": {
- "@jest/core": "^25.1.0",
+ "@jest/core": "^25.2.7",
"import-local": "^3.0.2",
- "jest-cli": "^25.1.0"
+ "jest-cli": "^25.2.7"
},
"dependencies": {
"ansi-styles": {
@@ -2832,24 +2822,24 @@
"dev": true
},
"jest-cli": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.1.0.tgz",
- "integrity": "sha512-p+aOfczzzKdo3AsLJlhs8J5EW6ffVidfSZZxXedJ0mHPBOln1DccqFmGCoO8JWd4xRycfmwy1eoQkMsF8oekPg==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.2.7.tgz",
+ "integrity": "sha512-OOAZwY4Jkd3r5WhVM5L3JeLNFaylvHUczMLxQDVLrrVyb1Cy+DNJ6MVsb5TLh6iBklB42m5TOP+IbOgKGGOtMw==",
"dev": true,
"requires": {
- "@jest/core": "^25.1.0",
- "@jest/test-result": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/core": "^25.2.7",
+ "@jest/test-result": "^25.2.6",
+ "@jest/types": "^25.2.6",
"chalk": "^3.0.0",
"exit": "^0.1.2",
"import-local": "^3.0.2",
"is-ci": "^2.0.0",
- "jest-config": "^25.1.0",
- "jest-util": "^25.1.0",
- "jest-validate": "^25.1.0",
+ "jest-config": "^25.2.7",
+ "jest-util": "^25.2.6",
+ "jest-validate": "^25.2.6",
"prompts": "^2.0.1",
- "realpath-native": "^1.1.0",
- "yargs": "^15.0.0"
+ "realpath-native": "^2.0.0",
+ "yargs": "^15.3.1"
}
},
"supports-color": {
@@ -2864,12 +2854,12 @@
}
},
"jest-changed-files": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.1.0.tgz",
- "integrity": "sha512-bdL1aHjIVy3HaBO3eEQeemGttsq1BDlHgWcOjEOIAcga7OOEGWHD2WSu8HhL7I1F0mFFyci8VKU4tRNk+qtwDA==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.2.6.tgz",
+ "integrity": "sha512-F7l2m5n55jFnJj4ItB9XbAlgO+6umgvz/mdK76BfTd2NGkvGf9x96hUXP/15a1K0k14QtVOoutwpRKl360msvg==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"execa": "^3.2.0",
"throat": "^5.0.0"
},
@@ -2966,28 +2956,29 @@
}
},
"jest-config": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.1.0.tgz",
- "integrity": "sha512-tLmsg4SZ5H7tuhBC5bOja0HEblM0coS3Wy5LTCb2C8ZV6eWLewHyK+3qSq9Bi29zmWQ7ojdCd3pxpx4l4d2uGw==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.2.7.tgz",
+ "integrity": "sha512-rIdPPXR6XUxi+7xO4CbmXXkE6YWprvlKc4kg1SrkCL2YV5m/8MkHstq9gBZJ19Qoa3iz/GP+0sTG/PcIwkFojg==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^25.1.0",
- "@jest/types": "^25.1.0",
- "babel-jest": "^25.1.0",
+ "@jest/test-sequencer": "^25.2.7",
+ "@jest/types": "^25.2.6",
+ "babel-jest": "^25.2.6",
"chalk": "^3.0.0",
+ "deepmerge": "^4.2.2",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^25.1.0",
- "jest-environment-node": "^25.1.0",
- "jest-get-type": "^25.1.0",
- "jest-jasmine2": "^25.1.0",
- "jest-regex-util": "^25.1.0",
- "jest-resolve": "^25.1.0",
- "jest-util": "^25.1.0",
- "jest-validate": "^25.1.0",
+ "jest-environment-jsdom": "^25.2.6",
+ "jest-environment-node": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "jest-jasmine2": "^25.2.7",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.2.6",
+ "jest-util": "^25.2.6",
+ "jest-validate": "^25.2.6",
"micromatch": "^4.0.2",
- "pretty-format": "^25.1.0",
- "realpath-native": "^1.1.0"
+ "pretty-format": "^25.2.6",
+ "realpath-native": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
@@ -3043,15 +3034,15 @@
}
},
"jest-diff": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.1.0.tgz",
- "integrity": "sha512-nepXgajT+h017APJTreSieh4zCqnSHEJ1iT8HDlewu630lSJ4Kjjr9KNzm+kzGwwcpsDE6Snx1GJGzzsefaEHw==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.2.6.tgz",
+ "integrity": "sha512-KuadXImtRghTFga+/adnNrv9s61HudRMR7gVSbP35UKZdn4IK2/0N0PpGZIqtmllK9aUyye54I3nu28OYSnqOg==",
"dev": true,
"requires": {
"chalk": "^3.0.0",
- "diff-sequences": "^25.1.0",
- "jest-get-type": "^25.1.0",
- "pretty-format": "^25.1.0"
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.2.6"
},
"dependencies": {
"ansi-styles": {
@@ -3107,25 +3098,25 @@
}
},
"jest-docblock": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.1.0.tgz",
- "integrity": "sha512-370P/mh1wzoef6hUKiaMcsPtIapY25suP6JqM70V9RJvdKLrV4GaGbfUseUVk4FZJw4oTZ1qSCJNdrClKt5JQA==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.2.6.tgz",
+ "integrity": "sha512-VAYrljEq0upq0oERfIaaNf28gC6p9gORndhHstCYF8NWGNQJnzoaU//S475IxfWMk4UjjVmS9rJKLe5Jjjbixw==",
"dev": true,
"requires": {
"detect-newline": "^3.0.0"
}
},
"jest-each": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.1.0.tgz",
- "integrity": "sha512-R9EL8xWzoPySJ5wa0DXFTj7NrzKpRD40Jy+zQDp3Qr/2QmevJgkN9GqioCGtAJ2bW9P/MQRznQHQQhoeAyra7A==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.2.6.tgz",
+ "integrity": "sha512-OgQ01VINaRD6idWJOhCYwUc5EcgHBiFlJuw+ON2VgYr7HLtMFyCcuo+3mmBvuLUH4QudREZN7cDCZviknzsaJQ==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"chalk": "^3.0.0",
- "jest-get-type": "^25.1.0",
- "jest-util": "^25.1.0",
- "pretty-format": "^25.1.0"
+ "jest-get-type": "^25.2.6",
+ "jest-util": "^25.2.6",
+ "pretty-format": "^25.2.6"
},
"dependencies": {
"ansi-styles": {
@@ -3181,79 +3172,92 @@
}
},
"jest-environment-jsdom": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.1.0.tgz",
- "integrity": "sha512-ILb4wdrwPAOHX6W82GGDUiaXSSOE274ciuov0lztOIymTChKFtC02ddyicRRCdZlB5YSrv3vzr1Z5xjpEe1OHQ==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.2.6.tgz",
+ "integrity": "sha512-/o7MZIhGmLGIEG5j7r5B5Az0umWLCHU+F5crwfbm0BzC4ybHTJZOQTFQWhohBg+kbTCNOuftMcqHlVkVduJCQQ==",
"dev": true,
"requires": {
- "@jest/environment": "^25.1.0",
- "@jest/fake-timers": "^25.1.0",
- "@jest/types": "^25.1.0",
- "jest-mock": "^25.1.0",
- "jest-util": "^25.1.0",
- "jsdom": "^15.1.1"
+ "@jest/environment": "^25.2.6",
+ "@jest/fake-timers": "^25.2.6",
+ "@jest/types": "^25.2.6",
+ "jest-mock": "^25.2.6",
+ "jest-util": "^25.2.6",
+ "jsdom": "^15.2.1"
}
},
"jest-environment-node": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.1.0.tgz",
- "integrity": "sha512-U9kFWTtAPvhgYY5upnH9rq8qZkj6mYLup5l1caAjjx9uNnkLHN2xgZy5mo4SyLdmrh/EtB9UPpKFShvfQHD0Iw==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.2.6.tgz",
+ "integrity": "sha512-D1Ihj14fxZiMHGeTtU/LunhzSI+UeBvlr/rcXMTNyRMUMSz2PEhuqGbB78brBY6Dk3FhJDk7Ta+8reVaGjLWhA==",
"dev": true,
"requires": {
- "@jest/environment": "^25.1.0",
- "@jest/fake-timers": "^25.1.0",
- "@jest/types": "^25.1.0",
- "jest-mock": "^25.1.0",
- "jest-util": "^25.1.0"
+ "@jest/environment": "^25.2.6",
+ "@jest/fake-timers": "^25.2.6",
+ "@jest/types": "^25.2.6",
+ "jest-mock": "^25.2.6",
+ "jest-util": "^25.2.6",
+ "semver": "^6.3.0"
}
},
"jest-get-type": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.1.0.tgz",
- "integrity": "sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-haste-map": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.1.0.tgz",
- "integrity": "sha512-/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.2.6.tgz",
+ "integrity": "sha512-nom0+fnY8jwzelSDQnrqaKAcDZczYQvMEwcBjeL3PQ4MlcsqeB7dmrsAniUw/9eLkngT5DE6FhnenypilQFsgA==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"anymatch": "^3.0.3",
"fb-watchman": "^2.0.0",
"fsevents": "^2.1.2",
"graceful-fs": "^4.2.3",
- "jest-serializer": "^25.1.0",
- "jest-util": "^25.1.0",
- "jest-worker": "^25.1.0",
+ "jest-serializer": "^25.2.6",
+ "jest-util": "^25.2.6",
+ "jest-worker": "^25.2.6",
"micromatch": "^4.0.2",
"sane": "^4.0.3",
- "walker": "^1.0.7"
+ "walker": "^1.0.7",
+ "which": "^2.0.2"
+ },
+ "dependencies": {
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ }
}
},
"jest-jasmine2": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.1.0.tgz",
- "integrity": "sha512-GdncRq7jJ7sNIQ+dnXvpKO2MyP6j3naNK41DTTjEAhLEdpImaDA9zSAZwDhijjSF/D7cf4O5fdyUApGBZleaEg==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.2.7.tgz",
+ "integrity": "sha512-HeQxEbonp8fUvik9jF0lkU9ab1u5TQdIb7YSU9Fj7SxWtqHNDGyCpF6ZZ3r/5yuertxi+R95Ba9eA91GMQ38eA==",
"dev": true,
"requires": {
"@babel/traverse": "^7.1.0",
- "@jest/environment": "^25.1.0",
- "@jest/source-map": "^25.1.0",
- "@jest/test-result": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/environment": "^25.2.6",
+ "@jest/source-map": "^25.2.6",
+ "@jest/test-result": "^25.2.6",
+ "@jest/types": "^25.2.6",
"chalk": "^3.0.0",
"co": "^4.6.0",
- "expect": "^25.1.0",
+ "expect": "^25.2.7",
"is-generator-fn": "^2.0.0",
- "jest-each": "^25.1.0",
- "jest-matcher-utils": "^25.1.0",
- "jest-message-util": "^25.1.0",
- "jest-runtime": "^25.1.0",
- "jest-snapshot": "^25.1.0",
- "jest-util": "^25.1.0",
- "pretty-format": "^25.1.0",
+ "jest-each": "^25.2.6",
+ "jest-matcher-utils": "^25.2.7",
+ "jest-message-util": "^25.2.6",
+ "jest-runtime": "^25.2.7",
+ "jest-snapshot": "^25.2.7",
+ "jest-util": "^25.2.6",
+ "pretty-format": "^25.2.6",
"throat": "^5.0.0"
},
"dependencies": {
@@ -3310,25 +3314,25 @@
}
},
"jest-leak-detector": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.1.0.tgz",
- "integrity": "sha512-3xRI264dnhGaMHRvkFyEKpDeaRzcEBhyNrOG5oT8xPxOyUAblIAQnpiR3QXu4wDor47MDTiHbiFcbypdLcLW5w==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.2.6.tgz",
+ "integrity": "sha512-n+aJUM+j/x1kIaPVxzerMqhAUuqTU1PL5kup46rXh+l9SP8H6LqECT/qD1GrnylE1L463/0StSPkH4fUpkuEjA==",
"dev": true,
"requires": {
- "jest-get-type": "^25.1.0",
- "pretty-format": "^25.1.0"
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.2.6"
}
},
"jest-matcher-utils": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz",
- "integrity": "sha512-KGOAFcSFbclXIFE7bS4C53iYobKI20ZWleAdAFun4W1Wz1Kkej8Ng6RRbhL8leaEvIOjGXhGf/a1JjO8bkxIWQ==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.2.7.tgz",
+ "integrity": "sha512-jNYmKQPRyPO3ny0KY1I4f0XW4XnpJ3Nx5ovT4ik0TYDOYzuXJW40axqOyS61l/voWbVT9y9nZ1THL1DlpaBVpA==",
"dev": true,
"requires": {
"chalk": "^3.0.0",
- "jest-diff": "^25.1.0",
- "jest-get-type": "^25.1.0",
- "pretty-format": "^25.1.0"
+ "jest-diff": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.2.6"
},
"dependencies": {
"ansi-styles": {
@@ -3384,14 +3388,13 @@
}
},
"jest-message-util": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.1.0.tgz",
- "integrity": "sha512-Nr/Iwar2COfN22aCqX0kCVbXgn8IBm9nWf4xwGr5Olv/KZh0CZ32RKgZWMVDXGdOahicM10/fgjdimGNX/ttCQ==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.2.6.tgz",
+ "integrity": "sha512-Hgg5HbOssSqOuj+xU1mi7m3Ti2nwSQJQf/kxEkrz2r2rp2ZLO1pMeKkz2WiDUWgSR+APstqz0uMFcE5yc0qdcg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@jest/test-result": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"@types/stack-utils": "^1.0.1",
"chalk": "^3.0.0",
"micromatch": "^4.0.2",
@@ -3452,12 +3455,12 @@
}
},
"jest-mock": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.1.0.tgz",
- "integrity": "sha512-28/u0sqS+42vIfcd1mlcg4ZVDmSUYuNvImP4X2lX5hRMLW+CN0BeiKVD4p+ujKKbSPKd3rg/zuhCF+QBLJ4vag==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.2.6.tgz",
+ "integrity": "sha512-vc4nibavi2RGPdj/MyZy/azuDjZhpYZLvpfgq1fxkhbyTpKVdG7CgmRVKJ7zgLpY5kuMjTzDYA6QnRwhsCU+tA==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0"
+ "@jest/types": "^25.2.6"
}
},
"jest-pnp-resolver": {
@@ -3467,22 +3470,23 @@
"dev": true
},
"jest-regex-util": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.1.0.tgz",
- "integrity": "sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz",
+ "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==",
"dev": true
},
"jest-resolve": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.1.0.tgz",
- "integrity": "sha512-XkBQaU1SRCHj2Evz2Lu4Czs+uIgJXWypfO57L7JYccmAXv4slXA6hzNblmcRmf7P3cQ1mE7fL3ABV6jAwk4foQ==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.2.6.tgz",
+ "integrity": "sha512-7O61GVdcAXkLz/vNGKdF+00A80/fKEAA47AEXVNcZwj75vEjPfZbXDaWFmAQCyXj4oo9y9dC9D+CLA11t8ieGw==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"browser-resolve": "^1.11.3",
"chalk": "^3.0.0",
"jest-pnp-resolver": "^1.2.1",
- "realpath-native": "^1.1.0"
+ "realpath-native": "^2.0.0",
+ "resolve": "^1.15.1"
},
"dependencies": {
"ansi-styles": {
@@ -3538,39 +3542,39 @@
}
},
"jest-resolve-dependencies": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.1.0.tgz",
- "integrity": "sha512-Cu/Je38GSsccNy4I2vL12ZnBlD170x2Oh1devzuM9TLH5rrnLW1x51lN8kpZLYTvzx9j+77Y5pqBaTqfdzVzrw==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.7.tgz",
+ "integrity": "sha512-IrnMzCAh11Xd2gAOJL+ThEW6QO8DyqNdvNkQcaCticDrOAr9wtKT7yT6QBFFjqKFgjjvaVKDs59WdgUhgYnHnQ==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
- "jest-regex-util": "^25.1.0",
- "jest-snapshot": "^25.1.0"
+ "@jest/types": "^25.2.6",
+ "jest-regex-util": "^25.2.6",
+ "jest-snapshot": "^25.2.7"
}
},
"jest-runner": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.1.0.tgz",
- "integrity": "sha512-su3O5fy0ehwgt+e8Wy7A8CaxxAOCMzL4gUBftSs0Ip32S0epxyZPDov9Znvkl1nhVOJNf4UwAsnqfc3plfQH9w==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.2.7.tgz",
+ "integrity": "sha512-RFEr71nMrtNwcpoHzie5+fe1w3JQCGMyT2xzNwKe3f88+bK+frM2o1v24gEcPxQ2QqB3COMCe2+1EkElP+qqqQ==",
"dev": true,
"requires": {
- "@jest/console": "^25.1.0",
- "@jest/environment": "^25.1.0",
- "@jest/test-result": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/console": "^25.2.6",
+ "@jest/environment": "^25.2.6",
+ "@jest/test-result": "^25.2.6",
+ "@jest/types": "^25.2.6",
"chalk": "^3.0.0",
"exit": "^0.1.2",
"graceful-fs": "^4.2.3",
- "jest-config": "^25.1.0",
- "jest-docblock": "^25.1.0",
- "jest-haste-map": "^25.1.0",
- "jest-jasmine2": "^25.1.0",
- "jest-leak-detector": "^25.1.0",
- "jest-message-util": "^25.1.0",
- "jest-resolve": "^25.1.0",
- "jest-runtime": "^25.1.0",
- "jest-util": "^25.1.0",
- "jest-worker": "^25.1.0",
+ "jest-config": "^25.2.7",
+ "jest-docblock": "^25.2.6",
+ "jest-haste-map": "^25.2.6",
+ "jest-jasmine2": "^25.2.7",
+ "jest-leak-detector": "^25.2.6",
+ "jest-message-util": "^25.2.6",
+ "jest-resolve": "^25.2.6",
+ "jest-runtime": "^25.2.7",
+ "jest-util": "^25.2.6",
+ "jest-worker": "^25.2.6",
"source-map-support": "^0.5.6",
"throat": "^5.0.0"
},
@@ -3628,36 +3632,36 @@
}
},
"jest-runtime": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.1.0.tgz",
- "integrity": "sha512-mpPYYEdbExKBIBB16ryF6FLZTc1Rbk9Nx0ryIpIMiDDkOeGa0jQOKVI/QeGvVGlunKKm62ywcioeFVzIbK03bA==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.2.7.tgz",
+ "integrity": "sha512-Gw3X8KxTTFylu2T/iDSNKRUQXQiPIYUY0b66GwVYa7W8wySkUljKhibQHSq0VhmCAN7vRBEQjlVQ+NFGNmQeBw==",
"dev": true,
"requires": {
- "@jest/console": "^25.1.0",
- "@jest/environment": "^25.1.0",
- "@jest/source-map": "^25.1.0",
- "@jest/test-result": "^25.1.0",
- "@jest/transform": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/console": "^25.2.6",
+ "@jest/environment": "^25.2.6",
+ "@jest/source-map": "^25.2.6",
+ "@jest/test-result": "^25.2.6",
+ "@jest/transform": "^25.2.6",
+ "@jest/types": "^25.2.6",
"@types/yargs": "^15.0.0",
"chalk": "^3.0.0",
"collect-v8-coverage": "^1.0.0",
"exit": "^0.1.2",
"glob": "^7.1.3",
"graceful-fs": "^4.2.3",
- "jest-config": "^25.1.0",
- "jest-haste-map": "^25.1.0",
- "jest-message-util": "^25.1.0",
- "jest-mock": "^25.1.0",
- "jest-regex-util": "^25.1.0",
- "jest-resolve": "^25.1.0",
- "jest-snapshot": "^25.1.0",
- "jest-util": "^25.1.0",
- "jest-validate": "^25.1.0",
- "realpath-native": "^1.1.0",
+ "jest-config": "^25.2.7",
+ "jest-haste-map": "^25.2.6",
+ "jest-message-util": "^25.2.6",
+ "jest-mock": "^25.2.6",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.2.6",
+ "jest-snapshot": "^25.2.7",
+ "jest-util": "^25.2.6",
+ "jest-validate": "^25.2.6",
+ "realpath-native": "^2.0.0",
"slash": "^3.0.0",
"strip-bom": "^4.0.0",
- "yargs": "^15.0.0"
+ "yargs": "^15.3.1"
},
"dependencies": {
"ansi-styles": {
@@ -3713,30 +3717,31 @@
}
},
"jest-serializer": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.1.0.tgz",
- "integrity": "sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz",
+ "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==",
"dev": true
},
"jest-snapshot": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.1.0.tgz",
- "integrity": "sha512-xZ73dFYN8b/+X2hKLXz4VpBZGIAn7muD/DAg+pXtDzDGw3iIV10jM7WiHqhCcpDZfGiKEj7/2HXAEPtHTj0P2A==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.2.7.tgz",
+ "integrity": "sha512-Rm8k7xpGM4tzmYhB6IeRjsOMkXaU8/FOz5XlU6oYwhy53mq6txVNqIKqN1VSiexzpC80oWVxVDfUDt71M6XPOA==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0",
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
+ "@types/prettier": "^1.19.0",
"chalk": "^3.0.0",
- "expect": "^25.1.0",
- "jest-diff": "^25.1.0",
- "jest-get-type": "^25.1.0",
- "jest-matcher-utils": "^25.1.0",
- "jest-message-util": "^25.1.0",
- "jest-resolve": "^25.1.0",
- "mkdirp": "^0.5.1",
+ "expect": "^25.2.7",
+ "jest-diff": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.2.7",
+ "jest-message-util": "^25.2.6",
+ "jest-resolve": "^25.2.6",
+ "make-dir": "^3.0.0",
"natural-compare": "^1.4.0",
- "pretty-format": "^25.1.0",
- "semver": "^7.1.1"
+ "pretty-format": "^25.2.6",
+ "semver": "^6.3.0"
},
"dependencies": {
"ansi-styles": {
@@ -3780,12 +3785,6 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
- "semver": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
- "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
- "dev": true
- },
"supports-color": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -3798,15 +3797,15 @@
}
},
"jest-util": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.1.0.tgz",
- "integrity": "sha512-7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.2.6.tgz",
+ "integrity": "sha512-gpXy0H5ymuQ0x2qgl1zzHg7LYHZYUmDEq6F7lhHA8M0eIwDB2WteOcCnQsohl9c/vBKZ3JF2r4EseipCZz3s4Q==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"chalk": "^3.0.0",
"is-ci": "^2.0.0",
- "mkdirp": "^0.5.1"
+ "make-dir": "^3.0.0"
},
"dependencies": {
"ansi-styles": {
@@ -3862,17 +3861,17 @@
}
},
"jest-validate": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.1.0.tgz",
- "integrity": "sha512-kGbZq1f02/zVO2+t1KQGSVoCTERc5XeObLwITqC6BTRH3Adv7NZdYqCpKIZLUgpLXf2yISzQ465qOZpul8abXA==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.2.6.tgz",
+ "integrity": "sha512-a4GN7hYbqQ3Rt9iHsNLFqQz7HDV7KiRPCwPgo5nqtTIWNZw7gnT8KchG+Riwh+UTSn8REjFCodGp50KX/fRNgQ==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"camelcase": "^5.3.1",
"chalk": "^3.0.0",
- "jest-get-type": "^25.1.0",
+ "jest-get-type": "^25.2.6",
"leven": "^3.1.0",
- "pretty-format": "^25.1.0"
+ "pretty-format": "^25.2.6"
},
"dependencies": {
"ansi-styles": {
@@ -3928,16 +3927,16 @@
}
},
"jest-watcher": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.1.0.tgz",
- "integrity": "sha512-Q9eZ7pyaIr6xfU24OeTg4z1fUqBF/4MP6J801lyQfg7CsnZ/TCzAPvCfckKdL5dlBBEKBeHV0AdyjFZ5eWj4ig==",
+ "version": "25.2.7",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.2.7.tgz",
+ "integrity": "sha512-RdHuW+f49tahWtluTnUdZ2iPliebleROI2L/J5phYrUS6DPC9RB3SuUtqYyYhGZJsbvRSuLMIlY/cICJ+PIecw==",
"dev": true,
"requires": {
- "@jest/test-result": "^25.1.0",
- "@jest/types": "^25.1.0",
+ "@jest/test-result": "^25.2.6",
+ "@jest/types": "^25.2.6",
"ansi-escapes": "^4.2.1",
"chalk": "^3.0.0",
- "jest-util": "^25.1.0",
+ "jest-util": "^25.2.6",
"string-length": "^3.1.0"
},
"dependencies": {
@@ -3994,9 +3993,9 @@
}
},
"jest-worker": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz",
- "integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.2.6.tgz",
+ "integrity": "sha512-FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA==",
"dev": true,
"requires": {
"merge-stream": "^2.0.0",
@@ -4427,18 +4426,6 @@
}
}
},
- "object-inspect": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
- "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
- "dev": true
- },
- "object-keys": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
- "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
- "dev": true
- },
"object-visit": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -4448,28 +4435,6 @@
"isobject": "^3.0.0"
}
},
- "object.assign": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
- "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
- "dev": true,
- "requires": {
- "define-properties": "^1.1.2",
- "function-bind": "^1.1.1",
- "has-symbols": "^1.0.0",
- "object-keys": "^1.0.11"
- }
- },
- "object.getownpropertydescriptors": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
- "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
- "dev": true,
- "requires": {
- "define-properties": "^1.1.3",
- "es-abstract": "^1.17.0-next.1"
- }
- },
"object.pick": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -4605,9 +4570,9 @@
"dev": true
},
"picomatch": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
- "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+ "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
"dev": true
},
"pirates": {
@@ -4647,12 +4612,12 @@
"dev": true
},
"pretty-format": {
- "version": "25.1.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.1.0.tgz",
- "integrity": "sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.6.tgz",
+ "integrity": "sha512-DEiWxLBaCHneffrIT4B+TpMvkV9RNvvJrd3lY9ew1CEQobDzEXmYT1mg0hJhljZty7kCc10z13ohOFAE8jrUDg==",
"dev": true,
"requires": {
- "@jest/types": "^25.1.0",
+ "@jest/types": "^25.2.6",
"ansi-regex": "^5.0.0",
"ansi-styles": "^4.0.0",
"react-is": "^16.12.0"
@@ -4702,9 +4667,9 @@
}
},
"psl": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
- "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+ "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
"dev": true
},
"pump": {
@@ -4730,19 +4695,16 @@
"dev": true
},
"react-is": {
- "version": "16.13.0",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz",
- "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==",
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
"dev": true
},
"realpath-native": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
- "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
- "dev": true,
- "requires": {
- "util.promisify": "^1.0.0"
- }
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz",
+ "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==",
+ "dev": true
},
"regex-not": {
"version": "1.0.2",
@@ -5474,26 +5436,6 @@
}
}
},
- "string.prototype.trimleft": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
- "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
- "dev": true,
- "requires": {
- "define-properties": "^1.1.3",
- "function-bind": "^1.1.1"
- }
- },
- "string.prototype.trimright": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
- "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
- "dev": true,
- "requires": {
- "define-properties": "^1.1.3",
- "function-bind": "^1.1.1"
- }
- },
"strip-ansi": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -5859,18 +5801,6 @@
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
"dev": true
},
- "util.promisify": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
- "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
- "dev": true,
- "requires": {
- "define-properties": "^1.1.3",
- "es-abstract": "^1.17.2",
- "has-symbols": "^1.0.1",
- "object.getownpropertydescriptors": "^2.1.0"
- }
- },
"uuid": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -5884,9 +5814,9 @@
"dev": true
},
"v8-to-istanbul": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.2.tgz",
- "integrity": "sha512-G9R+Hpw0ITAmPSr47lSlc5A1uekSYzXxTMlFxso2xoffwo4jQnzbv1p9yXIinO8UMZKfAFewaCHwWvnH4Jb4Ug==",
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz",
+ "integrity": "sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.1",
@@ -6123,9 +6053,9 @@
}
},
"yargs-parser": {
- "version": "18.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz",
- "integrity": "sha512-KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA==",
+ "version": "18.1.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+ "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
diff --git a/package.json b/package.json
index 7325ad1e..310e1629 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,6 @@
},
"devDependencies": {
"eslint": "^6.8.0",
- "jest": "^25.1.0"
+ "jest": "^25.2.7"
}
}
diff --git a/settings.js b/settings.js
index f6d9e0a8..26ef882c 100644
--- a/settings.js
+++ b/settings.js
@@ -91,6 +91,42 @@ function fillServers(template) {
JSON.parse(servers).forEach((server) => fillServer(template, server.id, server.username, server.password));
}
+function fillMirror(template, id, name, mirrorOf, url) {
+
+ const mirrorXml = template.createElement('mirror');
+
+ if (!id || !name || !mirrorOf || !url) {
+ core.setFailed('mirrors must contain id, name, mirrorOf and url');
+ return;
+ }
+
+ const idXml = createElementWithText(template, 'id', id);
+ mirrorXml.appendChild(idXml);
+
+ const nameXml = createElementWithText(template, 'name', name);
+ mirrorXml.appendChild(nameXml);
+
+ const mirrorOfXml = createElementWithText(template, 'mirrorOf', mirrorOf);
+ mirrorXml.appendChild(mirrorOfXml);
+
+ const urlXml = createElementWithText(template, 'url', url);
+ mirrorXml.appendChild(urlXml);
+
+ const mirrorsXml = template.getElementsByTagName('mirrors')[0];
+ mirrorsXml.appendChild(mirrorXml);
+}
+
+function fillMirrors(template) {
+
+ const mirrors = core.getInput('mirrors');
+
+ if (!mirrors) {
+ return;
+ }
+
+ JSON.parse(mirrors).forEach((mirror) => fillMirror(template, mirror.id, mirror.name, mirror.mirrorOf, mirror.url));
+}
+
function isInputTrue(inputName) {
const val = core.getInput(inputName);
return val && val.toLocaleLowerCase() == 'true';
@@ -157,6 +193,7 @@ function generate() {
}
const templateXml = getSettingsTemplate();
+ fillMirrors(templateXml);
fillServers(templateXml);
fillServerForGithub(templateXml);
fillProperties(templateXml);
@@ -184,6 +221,7 @@ function cleanup() {
module.exports = {
getSettingsTemplate,
writeSettings,
+ fillMirrors,
fillServers,
fillServerForGithub,
fillProperties,
diff --git a/settings.test.js b/settings.test.js
index d9eb8c53..968dc10f 100644
--- a/settings.test.js
+++ b/settings.test.js
@@ -99,7 +99,6 @@ afterEach(() => {
});
test('template should be read', () => {
-
const template = settings.getSettingsTemplate();
expect(template).toBeDefined();
@@ -133,7 +132,6 @@ test('fillServers one server', () => {
const xml = new DOMParser().parseFromString("");
-
process.env['INPUT_SERVERS'] = '[{"id": "id1", "username": "username1", "password":"password1"}]';
settings.fillServers(xml);
@@ -194,6 +192,65 @@ test('fillServers github', () => {
expect(consoleOutput).toEqual([]);
});
+test('fillMirrors do nothing if no params', () => {
+
+ const xml = new DOMParser().parseFromString("");
+
+ settings.fillMirrors(xml);
+
+ const xmlStr = new XMLSerializer().serializeToString(xml);
+
+ expect(xmlStr).toBe("");
+});
+
+test('fillMirrors one mirror', () => {
+
+ const xml = new DOMParser().parseFromString("");
+
+ process.env['INPUT_MIRRORS'] = '[{"id": "id1", "name": "name", "mirrorOf":"mirrorOf", "url":"url"}]';
+
+ settings.fillMirrors(xml);
+
+ const xmlStr = new XMLSerializer().serializeToString(xml);
+
+ expect(xmlStr).toBe("" +
+ "id1namemirrorOfurl" +
+ "");
+});
+
+test('fillMirrors two mirrors', () => {
+
+ const xml = new DOMParser().parseFromString("");
+
+ process.env['INPUT_MIRRORS'] = '[{"id": "id1", "name": "name1", "mirrorOf":"mirrorOf1", "url":"url1"},{"id": "id2", "name": "name2", "mirrorOf":"mirrorOf2", "url":"url2"}]';
+
+ settings.fillMirrors(xml);
+
+ const xmlStr = new XMLSerializer().serializeToString(xml);
+
+ expect(xmlStr).toBe("" +
+ "id1name1mirrorOf1url1id2name2mirrorOf2url2" +
+ "");
+});
+
+test('fillMirrors incorrect fields', () => {
+
+ const xml = new DOMParser().parseFromString("");
+
+ process.env['INPUT_MIRRORS'] = '[{"idx": "id1"}]';
+
+ settings.fillMirrors(xml);
+
+ const xmlStr = new XMLSerializer().serializeToString(xml);
+
+ expect(xmlStr).toBe('');
+ expect(consoleOutput).toEqual(
+ expect.arrayContaining([
+ expect.stringMatching(/::error::mirrors must contain id, name, mirrorOf and url/)
+ ])
+ );
+});
+
test('addSonatypeSnapshots activate', () => {
process.env['INPUT_SONATYPESNAPSHOTS'] = "true";
diff --git a/templates/settings.xml b/templates/settings.xml
index 0ac93007..fe88380a 100644
--- a/templates/settings.xml
+++ b/templates/settings.xml
@@ -1,48 +1,46 @@
-
- false
-
-
-
- _properties_
-
- false
-
-
-
-
-
- _sonatype-snapshots_
-
- false
-
-
-
- sonatype-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
-
- false
-
-
- true
-
-
-
-
-
- sonatype-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
-
- false
-
-
- true
-
-
-
-
-
-
-
-
+ false
+
+
+
+ _properties_
+
+ false
+
+
+
+
+
+ _sonatype-snapshots_
+
+ false
+
+
+
+ sonatype-snapshots
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ false
+
+
+ true
+
+
+
+
+
+ sonatype-snapshots
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ false
+
+
+ true
+
+
+
+
+
+
+