composer update && npm update

This commit is contained in:
Jonny Barnes 2018-01-12 10:41:59 +00:00
parent 8ad0769f2d
commit 12a6b8f6b3
3 changed files with 35 additions and 35 deletions

62
composer.lock generated
View file

@ -8,16 +8,16 @@
"packages": [
{
"name": "aws/aws-sdk-php",
"version": "3.48.11",
"version": "3.48.12",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "4159562ee5c2b2d322cfcccd2401d90bfaceaf1d"
"reference": "c7f3148d537db877e9b4b63308d61f52eaa253bc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4159562ee5c2b2d322cfcccd2401d90bfaceaf1d",
"reference": "4159562ee5c2b2d322cfcccd2401d90bfaceaf1d",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c7f3148d537db877e9b4b63308d61f52eaa253bc",
"reference": "c7f3148d537db877e9b4b63308d61f52eaa253bc",
"shasum": ""
},
"require": {
@ -84,7 +84,7 @@
"s3",
"sdk"
],
"time": "2018-01-09T22:01:13+00:00"
"time": "2018-01-11T20:40:29+00:00"
},
{
"name": "barnabywalters/mf-cleaner",
@ -3811,25 +3811,25 @@
},
{
"name": "symfony/css-selector",
"version": "v3.4.3",
"version": "v4.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556"
"reference": "f97600434e3141ef3cbb9ea42cf500fba88022b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/e66394bc7610e69279bfdb3ab11b4fe65403f556",
"reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f97600434e3141ef3cbb9ea42cf500fba88022b7",
"reference": "f97600434e3141ef3cbb9ea42cf500fba88022b7",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8"
"php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
"dev-master": "4.0-dev"
}
},
"autoload": {
@ -3860,7 +3860,7 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2018-01-03T07:37:34+00:00"
"time": "2018-01-03T07:38:00+00:00"
},
{
"name": "symfony/debug",
@ -4642,29 +4642,29 @@
},
{
"name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.0",
"version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
"reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b"
"reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b",
"reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
"reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
"shasum": ""
},
"require": {
"php": "^5.5 || ^7",
"symfony/css-selector": "^2.7|~3.0"
"php": "^5.5 || ^7.0",
"symfony/css-selector": "^2.7 || ^3.0 || ^4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8|5.1.*"
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
"dev-master": "2.2.x-dev"
}
},
"autoload": {
@ -4685,7 +4685,7 @@
],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"time": "2016-09-20T12:50:39+00:00"
"time": "2017-11-27T11:13:29+00:00"
},
{
"name": "vlucas/phpdotenv",
@ -4872,16 +4872,16 @@
},
{
"name": "codedungeon/phpunit-result-printer",
"version": "0.5.1",
"version": "0.5.3",
"source": {
"type": "git",
"url": "https://github.com/mikeerickson/phpunit-pretty-result-printer.git",
"reference": "2dcf5f220f1019ddb2a85995828f513205416e0d"
"reference": "f20153a255dcf444a8abe4ac3051aa35ef865b90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/2dcf5f220f1019ddb2a85995828f513205416e0d",
"reference": "2dcf5f220f1019ddb2a85995828f513205416e0d",
"url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/f20153a255dcf444a8abe4ac3051aa35ef865b90",
"reference": "f20153a255dcf444a8abe4ac3051aa35ef865b90",
"shasum": ""
},
"require": {
@ -4916,7 +4916,7 @@
"printer",
"result-printer"
],
"time": "2018-01-09T21:42:36+00:00"
"time": "2018-01-11T17:18:07+00:00"
},
{
"name": "container-interop/container-interop",
@ -6510,16 +6510,16 @@
},
{
"name": "sebastian/comparator",
"version": "2.1.1",
"version": "2.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "b11c729f95109b56a0fe9650c6a63a0fcd8c439f"
"reference": "11c07feade1d65453e06df3b3b90171d6d982087"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/b11c729f95109b56a0fe9650c6a63a0fcd8c439f",
"reference": "b11c729f95109b56a0fe9650c6a63a0fcd8c439f",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/11c07feade1d65453e06df3b3b90171d6d982087",
"reference": "11c07feade1d65453e06df3b3b90171d6d982087",
"shasum": ""
},
"require": {
@ -6570,7 +6570,7 @@
"compare",
"equality"
],
"time": "2017-12-22T14:50:35+00:00"
"time": "2018-01-12T06:34:42+00:00"
},
{
"name": "sebastian/diff",

6
package-lock.json generated
View file

@ -5835,9 +5835,9 @@
"dev": true
},
"marked": {
"version": "0.3.9",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz",
"integrity": "sha512-nW5u0dxpXxHfkHzzrveY45gCbi+R4PaO4WRZYqZNl+vB0hVGeqlFn0aOg1c8AKL63TrNFn9Bm2UP4AdiZ9TPLw=="
"version": "0.3.12",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz",
"integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA=="
},
"mathml-tag-names": {
"version": "2.0.1",

View file

@ -7,7 +7,7 @@
"dependencies": {
"alertify.js": "^1.0.12",
"mapbox-gl": "^0.42.2",
"marked": "^0.3.9",
"marked": "^0.3.12",
"normalize.css": "^7.0.0"
},
"devDependencies": {