Merge branch 'release/0.16.6'

This commit is contained in:
Jonny Barnes 2018-04-22 20:41:11 +01:00
commit 3cb6b256f9
105 changed files with 238 additions and 218 deletions

View file

@ -6,6 +6,7 @@ namespace App\Http\Controllers;
use Monolog\Logger;
use Ramsey\Uuid\Uuid;
use Illuminate\Http\File;
use App\Jobs\ProcessMedia;
use App\Services\TokenService;
use Illuminate\Http\JsonResponse;
@ -203,6 +204,13 @@ class MicropubController extends Controller
'image_widths' => $width,
]);
// put the file on S3 initially, the ProcessMedia job may edit this
Storage::disk('s3')->putFileAs(
'media',
new File(storage_path('app') . '/' . $filename),
$filename
);
ProcessMedia::dispatch($filename);
return response()->json([

View file

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace App\Jobs;
use Illuminate\Http\File;
use Illuminate\Bus\Queueable;
use Intervention\Image\ImageManager;
use Illuminate\Queue\SerializesModels;
@ -37,11 +36,6 @@ class ProcessMedia implements ShouldQueue
*/
public function handle(ImageManager $manager)
{
Storage::disk('s3')->putFileAs(
'media',
new File(storage_path('app') . '/' . $this->filename),
$this->filename
);
//open file
try {
$image = $manager->make(storage_path('app') . '/' . $this->filename);

View file

@ -1,5 +1,8 @@
# Changelog
## Version 0.16.6
- Improve micropub media endpoint by inlining the initial upload to S3 so the returned URL will never 404
## Version 0.16.5
- Hotfix: adding a new note meant some tests were running against the wrong note

View file

@ -34,7 +34,7 @@
},
"require-dev": {
"barryvdh/laravel-debugbar": "~3.0",
"codedungeon/phpunit-result-printer": "^0.14.0",
"codedungeon/phpunit-result-printer": "^0.16.0",
"filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4",
"jakub-onderka/php-parallel-lint": "^1.0.0",

161
composer.lock generated
View file

@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "5e37bcec0043b7e6fe14b16f9602255f",
"content-hash": "7a39e15548614aa7cc1cb7effe899077",
"packages": [
{
"name": "aws/aws-sdk-php",
"version": "3.54.4",
"version": "3.54.6",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "6642a13df7ddcccf19e66c744c5bfae5b61e9e85"
"reference": "ea86c808c9c8a1cd39dab2baa1b9dd38e03323ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6642a13df7ddcccf19e66c744c5bfae5b61e9e85",
"reference": "6642a13df7ddcccf19e66c744c5bfae5b61e9e85",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ea86c808c9c8a1cd39dab2baa1b9dd38e03323ec",
"reference": "ea86c808c9c8a1cd39dab2baa1b9dd38e03323ec",
"shasum": ""
},
"require": {
@ -84,7 +84,7 @@
"s3",
"sdk"
],
"time": "2018-04-10T22:11:31+00:00"
"time": "2018-04-20T18:14:14+00:00"
},
{
"name": "bosnadev/database",
@ -1240,16 +1240,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.3.2",
"version": "6.3.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90"
"reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/68d0ea14d5a3f42a20e87632a5f84931e2709c90",
"reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"shasum": ""
},
"require": {
@ -1259,7 +1259,7 @@
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
"psr/log": "^1.0"
},
"suggest": {
@ -1301,7 +1301,7 @@
"rest",
"web service"
],
"time": "2018-03-26T16:33:04+00:00"
"time": "2018-04-22T15:46:56+00:00"
},
{
"name": "guzzlehttp/promises",
@ -1945,16 +1945,16 @@
},
{
"name": "laravel/framework",
"version": "v5.6.16",
"version": "v5.6.17",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "fcdbc791bc3e113ada38ab0a1147141fb9ec2b16"
"reference": "0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/fcdbc791bc3e113ada38ab0a1147141fb9ec2b16",
"reference": "fcdbc791bc3e113ada38ab0a1147141fb9ec2b16",
"url": "https://api.github.com/repos/laravel/framework/zipball/0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d",
"reference": "0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d",
"shasum": ""
},
"require": {
@ -1965,7 +1965,7 @@
"ext-openssl": "*",
"league/flysystem": "^1.0.8",
"monolog/monolog": "~1.12",
"nesbot/carbon": "^1.24.1",
"nesbot/carbon": "1.25.*",
"php": "^7.1.3",
"psr/container": "~1.0",
"psr/simple-cache": "^1.0",
@ -2080,7 +2080,7 @@
"framework",
"laravel"
],
"time": "2018-04-09T16:07:04+00:00"
"time": "2018-04-17T12:51:04+00:00"
},
{
"name": "laravel/horizon",
@ -2217,16 +2217,16 @@
},
{
"name": "laravel/tinker",
"version": "v1.0.5",
"version": "v1.0.6",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
"reference": "94f6daf2131508cebd11cd6f8632ba586d7ecc41"
"reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/94f6daf2131508cebd11cd6f8632ba586d7ecc41",
"reference": "94f6daf2131508cebd11cd6f8632ba586d7ecc41",
"url": "https://api.github.com/repos/laravel/tinker/zipball/b22fe905fcefdffae76b011e27c7ac09e07e052b",
"reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b",
"shasum": ""
},
"require": {
@ -2234,7 +2234,7 @@
"illuminate/contracts": "~5.1",
"illuminate/support": "~5.1",
"php": ">=5.5.9",
"psy/psysh": "0.7.*|0.8.*",
"psy/psysh": "0.7.*|0.8.*|0.9.*",
"symfony/var-dumper": "~3.0|~4.0"
},
"require-dev": {
@ -2276,7 +2276,7 @@
"laravel",
"psysh"
],
"time": "2018-03-06T17:34:36+00:00"
"time": "2018-04-16T12:10:37+00:00"
},
{
"name": "lcobucci/jwt",
@ -2841,24 +2841,24 @@
},
{
"name": "nikic/php-parser",
"version": "v3.1.5",
"version": "v4.0.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
"reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
"reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
"reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
"php": ">=5.5"
"php": ">=7.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0|~5.0"
"phpunit/phpunit": "^6.5 || ^7.0"
},
"bin": [
"bin/php-parse"
@ -2866,7 +2866,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
"dev-master": "4.0-dev"
}
},
"autoload": {
@ -2888,7 +2888,7 @@
"parser",
"php"
],
"time": "2018-02-28T20:30:58+00:00"
"time": "2018-03-25T17:35:16+00:00"
},
{
"name": "p3k/http",
@ -3341,29 +3341,29 @@
},
{
"name": "psy/psysh",
"version": "v0.8.18",
"version": "v0.9.3",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834"
"reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
"reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
"reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
"shasum": ""
},
"require": {
"dnoegel/php-xdg-base-dir": "0.1",
"jakub-onderka/php-console-highlighter": "0.3.*",
"nikic/php-parser": "~1.3|~2.0|~3.0",
"php": ">=5.3.9",
"nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
"php": ">=5.4.0",
"symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
"symfony/var-dumper": "~2.7|~3.0|~4.0"
},
"require-dev": {
"hoa/console": "~3.16|~1.14",
"phpunit/phpunit": "^4.8.35|^5.4.3",
"hoa/console": "~2.15|~3.16",
"phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
"symfony/finder": "~2.1|~3.0|~4.0"
},
"suggest": {
@ -3379,15 +3379,15 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-develop": "0.8.x-dev"
"dev-develop": "0.9.x-dev"
}
},
"autoload": {
"files": [
"src/Psy/functions.php"
"src/functions.php"
],
"psr-4": {
"Psy\\": "src/Psy/"
"Psy\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -3409,7 +3409,7 @@
"interactive",
"shell"
],
"time": "2018-04-02T05:41:44+00:00"
"time": "2018-04-18T12:32:50+00:00"
},
{
"name": "ramsey/uuid",
@ -3538,16 +3538,16 @@
},
{
"name": "spatie/browsershot",
"version": "3.20.1",
"version": "3.22.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/browsershot.git",
"reference": "d5abc3b88c1a3ff0f45dc09eb15681b132b7e971"
"reference": "1f4ff79f3674919d676e34d672e4e5ae1d4ba010"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/browsershot/zipball/d5abc3b88c1a3ff0f45dc09eb15681b132b7e971",
"reference": "d5abc3b88c1a3ff0f45dc09eb15681b132b7e971",
"url": "https://api.github.com/repos/spatie/browsershot/zipball/1f4ff79f3674919d676e34d672e4e5ae1d4ba010",
"reference": "1f4ff79f3674919d676e34d672e4e5ae1d4ba010",
"shasum": ""
},
"require": {
@ -3590,20 +3590,20 @@
"screenshot",
"webpage"
],
"time": "2018-04-12T11:13:06+00:00"
"time": "2018-04-20T10:24:16+00:00"
},
{
"name": "spatie/image",
"version": "1.5.0",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/image.git",
"reference": "2ff09d9eafbeccc71f29ee7a9eb6169a856df75e"
"reference": "eb0fc87c76af43bbe11382e96ff904084be466be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/image/zipball/2ff09d9eafbeccc71f29ee7a9eb6169a856df75e",
"reference": "2ff09d9eafbeccc71f29ee7a9eb6169a856df75e",
"url": "https://api.github.com/repos/spatie/image/zipball/eb0fc87c76af43bbe11382e96ff904084be466be",
"reference": "eb0fc87c76af43bbe11382e96ff904084be466be",
"shasum": ""
},
"require": {
@ -3642,7 +3642,7 @@
"image",
"spatie"
],
"time": "2018-04-13T11:53:18+00:00"
"time": "2018-04-18T14:09:25+00:00"
},
{
"name": "spatie/image-optimizer",
@ -4899,16 +4899,16 @@
},
{
"name": "codedungeon/phpunit-result-printer",
"version": "0.14.0",
"version": "0.16.1",
"source": {
"type": "git",
"url": "https://github.com/mikeerickson/phpunit-pretty-result-printer.git",
"reference": "fe0624ebe81a6dcc4441ace455b419b590cbb51e"
"reference": "f591cffbe6d1bfc87dfc3c90e5f97c42fbc1f907"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/fe0624ebe81a6dcc4441ace455b419b590cbb51e",
"reference": "fe0624ebe81a6dcc4441ace455b419b590cbb51e",
"url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/f591cffbe6d1bfc87dfc3c90e5f97c42fbc1f907",
"reference": "f591cffbe6d1bfc87dfc3c90e5f97c42fbc1f907",
"shasum": ""
},
"require": {
@ -4939,6 +4939,7 @@
],
"description": "PHPUnit Pretty Result Printer",
"keywords": [
"TDD",
"composer",
"package",
"phpunit",
@ -4946,7 +4947,7 @@
"result-printer",
"testing"
],
"time": "2018-04-08T17:45:48+00:00"
"time": "2018-04-17T18:14:34+00:00"
},
{
"name": "doctrine/instantiator",
@ -5871,23 +5872,23 @@
},
{
"name": "phpspec/prophecy",
"version": "1.7.5",
"version": "1.7.6",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
"sebastian/comparator": "^1.1|^2.0",
"sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
@ -5930,7 +5931,7 @@
"spy",
"stub"
],
"time": "2018-02-19T10:16:54+00:00"
"time": "2018-04-18T13:57:24+00:00"
},
{
"name": "phpunit/php-code-coverage",
@ -6183,16 +6184,16 @@
},
{
"name": "phpunit/phpunit",
"version": "7.1.3",
"version": "7.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9"
"reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9",
"reference": "a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6d51299e307dc510149e0b7cd1931dd11770e1cb",
"reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb",
"shasum": ""
},
"require": {
@ -6211,7 +6212,7 @@
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.0",
"phpunit/phpunit-mock-objects": "^6.1.1",
"sebastian/comparator": "^2.1",
"sebastian/comparator": "^2.1 || ^3.0",
"sebastian/diff": "^3.0",
"sebastian/environment": "^3.1",
"sebastian/exporter": "^3.1",
@ -6259,7 +6260,7 @@
"testing",
"xunit"
],
"time": "2018-04-13T02:28:50+00:00"
"time": "2018-04-18T13:41:53+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -6364,30 +6365,30 @@
},
{
"name": "sebastian/comparator",
"version": "2.1.3",
"version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
"reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
"reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
"reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
"shasum": ""
},
"require": {
"php": "^7.0",
"sebastian/diff": "^2.0 || ^3.0",
"php": "^7.1",
"sebastian/diff": "^3.0",
"sebastian/exporter": "^3.1"
},
"require-dev": {
"phpunit/phpunit": "^6.4"
"phpunit/phpunit": "^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-master": "3.0-dev"
}
},
"autoload": {
@ -6424,7 +6425,7 @@
"compare",
"equality"
],
"time": "2018-02-01T13:46:46+00:00"
"time": "2018-04-18T13:33:00+00:00"
},
{
"name": "sebastian/diff",

213
package-lock.json generated
View file

@ -1365,9 +1365,9 @@
"dev": true
},
"autoprefixer": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.2.0.tgz",
"integrity": "sha512-xBVQpGAcSNNS1PBnEfT+F9VF8ZJeoKZ121I3OVQ0n1F0SqVuj4oLI6yFeEviPV8Z/GjoqBRXcYis0oSS8zjNEg==",
"version": "8.3.0",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.3.0.tgz",
"integrity": "sha512-HY2K4efAvC97v6j83pgV97Lieal51xhIV8EitvS4SrWcI+IGVZgjpihvXImsmIUzA6kb/tglPKzERG1oRFOvRA==",
"dev": true,
"requires": {
"browserslist": "3.2.4",
@ -1404,14 +1404,14 @@
"dev": true
},
"chalk": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
"integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
"integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"dev": true,
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
"supports-color": "5.3.0"
"supports-color": "5.4.0"
}
},
"electron-to-chromium": {
@ -1432,15 +1432,15 @@
"integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
"dev": true,
"requires": {
"chalk": "2.3.2",
"chalk": "2.4.0",
"source-map": "0.6.1",
"supports-color": "5.3.0"
"supports-color": "5.4.0"
}
},
"supports-color": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
"integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
"has-flag": "3.0.0"
@ -2514,9 +2514,9 @@
}
},
"base64-js": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
"integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==",
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
"dev": true
},
"bcrypt-pbkdf": {
@ -2773,7 +2773,7 @@
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"dev": true,
"requires": {
"base64-js": "1.2.3",
"base64-js": "1.3.0",
"ieee754": "1.1.11",
"isarray": "1.0.0"
}
@ -3629,7 +3629,7 @@
"cipher-base": "1.0.4",
"inherits": "2.0.3",
"md5.js": "1.3.4",
"ripemd160": "2.0.1",
"ripemd160": "2.0.2",
"sha.js": "2.4.11"
}
},
@ -3642,7 +3642,7 @@
"cipher-base": "1.0.4",
"create-hash": "1.2.0",
"inherits": "2.0.3",
"ripemd160": "2.0.1",
"ripemd160": "2.0.2",
"safe-buffer": "5.1.0",
"sha.js": "2.4.11"
}
@ -3679,7 +3679,7 @@
"create-hmac": "1.1.7",
"diffie-hellman": "5.0.3",
"inherits": "2.0.3",
"pbkdf2": "3.0.14",
"pbkdf2": "3.0.16",
"public-encrypt": "4.0.2",
"randombytes": "2.0.6",
"randomfill": "1.0.4"
@ -4077,9 +4077,9 @@
"dev": true
},
"ejs": {
"version": "2.5.8",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.8.tgz",
"integrity": "sha512-QIDZL54fyV8MDcAsO91BMH1ft2qGGaHIJsJIA/+t+7uvXol1dm413fPcUgUb4k8F/9457rx4/KFE4XfDifrQxQ==",
"version": "2.5.9",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.9.tgz",
"integrity": "sha512-GJCAeDBKfREgkBtgrYSf9hQy9kTb3helv0zGdzqhM7iAkW8FA/ZF97VQDbwFiwIT8MQLLOe5VlPZOEvZAqtUAQ==",
"dev": true
},
"electron-to-chromium": {
@ -6990,9 +6990,9 @@
"dev": true
},
"husky": {
"version": "0.15.0-rc.13",
"resolved": "https://registry.npmjs.org/husky/-/husky-0.15.0-rc.13.tgz",
"integrity": "sha512-J9bDyA3vllcIDPmYquNMuklEWKoHEhjqA3YG23Pic130ZueTks23JcjlVwMxWnf4dOjqEadwYFxG3svLFXZhYA==",
"version": "1.0.0-rc.2",
"resolved": "https://registry.npmjs.org/husky/-/husky-1.0.0-rc.2.tgz",
"integrity": "sha512-7EJxPoYsRKZKYCLC80vdIA+lM8a/Pzi6Wkd/uh8BR/NeMhOz5GaLQBQNR93nE6+wo2kj3jLU9hZFJC2fY8manQ==",
"dev": true,
"requires": {
"cosmiconfig": "4.0.0",
@ -7001,8 +7001,8 @@
"pkg-dir": "2.0.0",
"pupa": "1.0.0",
"read-pkg": "3.0.0",
"run-node": "0.2.0",
"slash": "1.0.0"
"run-node": "1.0.0",
"slash": "2.0.0"
},
"dependencies": {
"load-json-file": {
@ -7053,6 +7053,12 @@
"path-type": "3.0.0"
}
},
"slash": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
"dev": true
},
"strip-bom": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@ -9433,7 +9439,7 @@
"supercluster": "2.3.0",
"through2": "2.0.3",
"tinyqueue": "1.2.3",
"unassertify": "2.1.0",
"unassertify": "2.1.1",
"unflowify": "1.0.1",
"vt-pbf": "3.1.0",
"webworkify": "1.5.0"
@ -9510,7 +9516,7 @@
"requires": {
"commondir": "1.0.1",
"deep-extend": "0.4.2",
"ejs": "2.5.8",
"ejs": "2.5.9",
"glob": "7.1.2",
"globby": "6.1.0",
"mkdirp": "0.5.1",
@ -10021,7 +10027,7 @@
"stream-browserify": "2.0.1",
"stream-http": "2.8.1",
"string_decoder": "1.0.2",
"timers-browserify": "2.0.6",
"timers-browserify": "2.0.10",
"tty-browserify": "0.0.0",
"url": "0.11.0",
"util": "0.10.3",
@ -10568,7 +10574,7 @@
"browserify-aes": "1.2.0",
"create-hash": "1.2.0",
"evp_bytestokey": "1.0.3",
"pbkdf2": "3.0.14"
"pbkdf2": "3.0.16"
}
},
"parse-entities": {
@ -10685,14 +10691,14 @@
}
},
"pbkdf2": {
"version": "3.0.14",
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
"integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
"version": "3.0.16",
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
"integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
"dev": true,
"requires": {
"create-hash": "1.2.0",
"create-hmac": "1.1.7",
"ripemd160": "2.0.1",
"ripemd160": "2.0.2",
"safe-buffer": "5.1.0",
"sha.js": "2.4.11"
}
@ -11678,9 +11684,9 @@
"dev": true
},
"prettier": {
"version": "1.12.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.12.0.tgz",
"integrity": "sha512-Wz0SMncgaglBzDcohH3ZIAi4nVpzOIEweFzCOmgVEoRSeO72b4dcKGfgxoRGVMaFlh1r7dlVaJ+f3CIHfeH6xg==",
"version": "1.12.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz",
"integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=",
"dev": true
},
"pretty-bytes": {
@ -12524,24 +12530,13 @@
}
},
"ripemd160": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
"integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
"dev": true,
"requires": {
"hash-base": "2.0.2",
"hash-base": "3.0.4",
"inherits": "2.0.3"
},
"dependencies": {
"hash-base": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
"integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
"dev": true,
"requires": {
"inherits": "2.0.3"
}
}
}
},
"run-async": {
@ -12553,9 +12548,9 @@
}
},
"run-node": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/run-node/-/run-node-0.2.0.tgz",
"integrity": "sha512-Zsnxrr+CMGfm7VFuCj96E8tOpFHTEuZS9EvlXcKapVr2RUvr+fxTMxNgK5fXi3TprSgWoxobtR/3TXZT4na/Ng==",
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz",
"integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==",
"dev": true
},
"run-queue": {
@ -12670,9 +12665,9 @@
}
},
"serialize-javascript": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz",
"integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=",
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz",
"integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==",
"dev": true
},
"set-blocking": {
@ -13717,7 +13712,7 @@
"integrity": "sha512-aBlnuLyTvyNfIVoc+reaqx88aW41Awc9Ccu7ZXrO2fnSvv0MVSQeyL3ci/nD1H1eYvH3X+MXTwMYC3Mf5+2Ckw==",
"dev": true,
"requires": {
"autoprefixer": "8.2.0",
"autoprefixer": "8.3.0",
"balanced-match": "1.0.0",
"chalk": "2.3.2",
"cosmiconfig": "4.0.0",
@ -14164,9 +14159,9 @@
"integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc="
},
"timers-browserify": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz",
"integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==",
"version": "2.0.10",
"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
"dev": true,
"requires": {
"setimmediate": "1.0.5"
@ -14396,9 +14391,9 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"uglify-js": {
"version": "3.3.21",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.21.tgz",
"integrity": "sha512-uy82472lH8tshK3jS3c5IFb5MmNKd/5qyBd0ih8sM42L3jWvxnE339U9gZU1zufnLVs98Stib9twq8dLm2XYCA==",
"version": "3.3.22",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.22.tgz",
"integrity": "sha512-tqw96rL6/BG+7LM5VItdhDjTQmL5zG/I0b2RqWytlgeHe2eydZHuBHdA9vuGpCDhH/ZskNGcqDhivoR2xt8RIw==",
"dev": true,
"requires": {
"commander": "2.15.1",
@ -14414,15 +14409,15 @@
}
},
"uglifyjs-webpack-plugin": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz",
"integrity": "sha512-z0IbjpW8b3O/OVn+TTZN4pI29RN1zktFBXLIzzfZ+++cUtZ1ERSlLWgpE/5OERuEUs1ijVQnpYAkSlpoVmQmSQ==",
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz",
"integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==",
"dev": true,
"requires": {
"cacache": "10.0.4",
"find-cache-dir": "1.0.0",
"schema-utils": "0.4.5",
"serialize-javascript": "1.4.0",
"serialize-javascript": "1.5.0",
"source-map": "0.6.1",
"uglify-es": "3.3.9",
"webpack-sources": "1.1.0",
@ -14469,9 +14464,9 @@
}
},
"unassertify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/unassertify/-/unassertify-2.1.0.tgz",
"integrity": "sha512-CB3C3vbOwrZydRuGdU8H421r4/qhM8RLuEOo3G+wEFf7kDP4TR+7oDuj1yOik5pUzXMaJmzxICM7akupP1AlJw==",
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/unassertify/-/unassertify-2.1.1.tgz",
"integrity": "sha512-YIAaIlc6/KC9Oib8cVZLlpDDhK1UTEuaDyx9BwD97xqxDZC0cJOqwFcs/Y6K3m73B5VzHsRTBLXNO0dxS/GkTw==",
"requires": {
"acorn": "5.5.3",
"convert-source-map": "1.5.0",
@ -15528,9 +15523,9 @@
"dev": true
},
"webpack": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz",
"integrity": "sha512-6GrZsvQJnG7o7mjbfjp6s5CyMfdopjt1A/X8LcYwceis9ySjqBX6Lusso2wNZ06utHj2ZvfL6L3f7hfgVeJP6g==",
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.6.0.tgz",
"integrity": "sha512-Fu/k/3fZeGtIhuFkiYpIy1UDHhMiGKjG4FFPVuvG+5Os2lWA1ttWpmi9Qnn6AgfZqj9MvhZW/rmj/ip+nHr06g==",
"dev": true,
"requires": {
"acorn": "5.5.3",
@ -15549,7 +15544,7 @@
"node-libs-browser": "2.1.0",
"schema-utils": "0.4.5",
"tapable": "1.0.0",
"uglifyjs-webpack-plugin": "1.2.4",
"uglifyjs-webpack-plugin": "1.2.5",
"watchpack": "1.5.0",
"webpack-sources": "1.1.0"
},
@ -15959,12 +15954,12 @@
}
},
"webpack-cli": {
"version": "2.0.14",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-2.0.14.tgz",
"integrity": "sha512-gRoWaxSi2JWiYsn1QgOTb6ENwIeSvN1YExZ+kJ0STsTZK7bWPElW+BBBv1UnTbvcPC3v7E17mK8hlFX8DOYSGw==",
"version": "2.0.15",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-2.0.15.tgz",
"integrity": "sha512-bjNeIUO51D4OsmZ5ufzcpzVoacjxfWNfeBZKYL3jc+EMfCME3TyfdCPSUoKiOnebQChfupQuIRpAnx7L4l3Hew==",
"dev": true,
"requires": {
"chalk": "2.3.2",
"chalk": "2.4.0",
"cross-spawn": "6.0.5",
"diff": "3.5.0",
"enhanced-resolve": "4.0.0",
@ -15983,8 +15978,8 @@
"mkdirp": "0.5.1",
"p-each-series": "1.0.0",
"p-lazy": "1.0.0",
"prettier": "1.12.0",
"supports-color": "5.3.0",
"prettier": "1.12.1",
"supports-color": "5.4.0",
"v8-compile-cache": "1.1.2",
"webpack-addons": "1.1.5",
"yargs": "11.1.0",
@ -16020,14 +16015,14 @@
"dev": true
},
"chalk": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
"integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
"integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"dev": true,
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
"supports-color": "5.3.0"
"supports-color": "5.4.0"
}
},
"cli-cursor": {
@ -16147,7 +16142,7 @@
"dev": true,
"requires": {
"ansi-escapes": "3.1.0",
"chalk": "2.3.2",
"chalk": "2.4.0",
"cli-cursor": "2.1.0",
"cli-width": "2.1.0",
"external-editor": "2.2.0",
@ -16179,7 +16174,7 @@
"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
"dev": true,
"requires": {
"chalk": "2.3.2"
"chalk": "2.4.0"
}
},
"mute-stream": {
@ -16262,9 +16257,9 @@
}
},
"supports-color": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
"integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
"has-flag": "3.0.0"
@ -16542,7 +16537,7 @@
"integrity": "sha512-jzHBTTy8EPI4ImV8dpUMt+Q5zELkSU5xvGpndHcHudQ4tqN6YgIWaCGmRFl+HDchwRUkcgyjQ+n6/w5zlJBCPg==",
"dev": true,
"requires": {
"chalk": "2.3.2",
"chalk": "2.4.0",
"debug": "3.1.0",
"diff": "3.5.0",
"escape-string-regexp": "1.0.5",
@ -16579,14 +16574,14 @@
}
},
"chalk": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
"integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
"integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"dev": true,
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
"supports-color": "5.3.0"
"supports-color": "5.4.0"
}
},
"cli-cursor": {
@ -16642,7 +16637,7 @@
"dev": true,
"requires": {
"ansi-escapes": "3.1.0",
"chalk": "2.3.2",
"chalk": "2.4.0",
"cli-cursor": "2.1.0",
"cli-width": "2.1.0",
"external-editor": "2.2.0",
@ -16708,9 +16703,9 @@
}
},
"supports-color": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
"integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
"has-flag": "3.0.0"
@ -16725,7 +16720,7 @@
"dev": true,
"requires": {
"async": "2.6.0",
"chalk": "2.3.2",
"chalk": "2.4.0",
"cli-table": "0.3.1",
"cross-spawn": "5.1.0",
"dargs": "5.1.0",
@ -16770,14 +16765,14 @@
}
},
"chalk": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
"integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
"integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"dev": true,
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
"supports-color": "5.3.0"
"supports-color": "5.4.0"
}
},
"debug": {
@ -16875,9 +16870,9 @@
"dev": true
},
"supports-color": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
"integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
"has-flag": "3.0.0"

View file

@ -16,7 +16,7 @@
"@babel/preset-env": "^7.0.0-beta.44",
"ajv": "^6.4.0",
"ajv-keywords": "^3.1.0",
"autoprefixer": "^8.2.0",
"autoprefixer": "^8.3.0",
"babel-cli": "^6.26.0",
"babel-loader": "^8.0.0-beta.2",
"babel-preset-env": "^1.6.1",
@ -28,7 +28,7 @@
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.7.0",
"eslint-plugin-standard": "^3.0.1",
"husky": "^0.15.0-rc.13",
"husky": "^1.0.0-rc.2",
"lint-staged": "^7.0.4",
"postcss-cli": "^5.0.0",
"postcss-sass": "^0.3.0",
@ -36,9 +36,9 @@
"source-list-map": "^2.0.0",
"stylelint": "^9.2.0",
"stylelint-config-standard": "^18.2.0",
"uglify-js": "^3.3.21",
"webpack": "^4.5.0",
"webpack-cli": "^2.0.14",
"uglify-js": "^3.3.22",
"webpack": "^4.6.0",
"webpack-cli": "^2.0.15",
"webpack-sources": "^1.1.0"
},
"scripts": {

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more