Merge branch 'master' into adan89lion-korean

This commit is contained in:
Chris Kankiewicz
2020-04-30 22:19:45 -07:00
committed by GitHub
3 changed files with 68 additions and 25 deletions

52
composer.lock generated
View File

@@ -2040,16 +2040,16 @@
},
{
"name": "tightenco/collect",
"version": "v7.6.1",
"version": "v7.9.2",
"source": {
"type": "git",
"url": "https://github.com/tightenco/collect.git",
"reference": "4b6a215656eb77bdaa31b0f61aa9e2a3eaf2f7a0"
"reference": "372230e88129364638d2d9809143fafbb993d7d4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tightenco/collect/zipball/4b6a215656eb77bdaa31b0f61aa9e2a3eaf2f7a0",
"reference": "4b6a215656eb77bdaa31b0f61aa9e2a3eaf2f7a0",
"url": "https://api.github.com/repos/tightenco/collect/zipball/372230e88129364638d2d9809143fafbb993d7d4",
"reference": "372230e88129364638d2d9809143fafbb993d7d4",
"shasum": ""
},
"require": {
@@ -2086,7 +2086,7 @@
"collection",
"laravel"
],
"time": "2020-04-08T17:29:27+00:00"
"time": "2020-04-29T16:33:30+00:00"
},
{
"name": "twig/twig",
@@ -2218,16 +2218,16 @@
"packages-dev": [
{
"name": "amphp/amp",
"version": "v2.4.3",
"version": "v2.4.4",
"source": {
"type": "git",
"url": "https://github.com/amphp/amp.git",
"reference": "23ac95fc6d6973231763f5ed7d1309b39429b974"
"reference": "1e58d53e4af390efc7813e36cd215bd82cba4b06"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/amphp/amp/zipball/23ac95fc6d6973231763f5ed7d1309b39429b974",
"reference": "23ac95fc6d6973231763f5ed7d1309b39429b974",
"url": "https://api.github.com/repos/amphp/amp/zipball/1e58d53e4af390efc7813e36cd215bd82cba4b06",
"reference": "1e58d53e4af390efc7813e36cd215bd82cba4b06",
"shasum": ""
},
"require": {
@@ -2292,7 +2292,7 @@
"non-blocking",
"promise"
],
"time": "2020-04-19T15:54:21+00:00"
"time": "2020-04-30T04:54:50+00:00"
},
{
"name": "amphp/byte-stream",
@@ -3837,16 +3837,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.1.3",
"version": "9.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a74780472172957a65cb5999a597e8c0878cf39c"
"reference": "2d7080c622cf7884992e7c3cf87853877bae8ff4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a74780472172957a65cb5999a597e8c0878cf39c",
"reference": "a74780472172957a65cb5999a597e8c0878cf39c",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2d7080c622cf7884992e7c3cf87853877bae8ff4",
"reference": "2d7080c622cf7884992e7c3cf87853877bae8ff4",
"shasum": ""
},
"require": {
@@ -3867,7 +3867,7 @@
"phpunit/php-invoker": "^3.0",
"phpunit/php-text-template": "^2.0",
"phpunit/php-timer": "^3.1.4",
"sebastian/code-unit": "^1.0",
"sebastian/code-unit": "^1.0.2",
"sebastian/comparator": "^4.0",
"sebastian/diff": "^4.0",
"sebastian/environment": "^5.0.1",
@@ -3921,7 +3921,17 @@
"testing",
"xunit"
],
"time": "2020-04-23T04:42:05+00:00"
"funding": [
{
"url": "https://phpunit.de/donate.html",
"type": "custom"
},
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
"time": "2020-04-30T06:32:53+00:00"
},
{
"name": "psr/event-dispatcher",
@@ -4043,16 +4053,16 @@
},
{
"name": "sebastian/code-unit",
"version": "1.0.1",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit.git",
"reference": "00d2094a93573796ec6666401be467fa6efcd86a"
"reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/00d2094a93573796ec6666401be467fa6efcd86a",
"reference": "00d2094a93573796ec6666401be467fa6efcd86a",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
"reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
"shasum": ""
},
"require": {
@@ -4091,7 +4101,7 @@
"type": "github"
}
],
"time": "2020-04-27T06:25:01+00:00"
"time": "2020-04-30T05:58:10+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",

39
package-lock.json generated
View File

@@ -958,6 +958,36 @@
"integrity": "sha512-xKOeQEl5O47GPZYIMToj6uuA2syyFlq9EMSl2ui0uytjY9xbe8XS0pexNWmxrdcCyNGyDmLyYw5FtKsalBUeOg==",
"dev": true
},
"@fullhuman/postcss-purgecss": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/@fullhuman/postcss-purgecss/-/postcss-purgecss-2.1.2.tgz",
"integrity": "sha512-Jf34YVBK9GtXTblpu0svNUJdA7rTQoRMz+yEJe6mwTnXDIGipWLzaX/VgU/x6IPC6WvU5SY/XlawwqhxoyFPTg==",
"dev": true,
"requires": {
"postcss": "7.0.27",
"purgecss": "^2.1.2"
},
"dependencies": {
"commander": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
"integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
"dev": true
},
"purgecss": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/purgecss/-/purgecss-2.1.2.tgz",
"integrity": "sha512-5oDBxiT9VonwKmEMohPFRFZrj8fdSVKxHPwq7G5Rx/2pXicZFJu+D4m5bb3NuV0sSK3ooNxq5jFIwwHzifP5FA==",
"dev": true,
"requires": {
"commander": "^5.0.0",
"glob": "^7.0.0",
"postcss": "7.0.27",
"postcss-selector-parser": "^6.0.2"
}
}
}
},
"@mrmlnc/readdir-enhanced": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
@@ -9457,14 +9487,17 @@
}
},
"tailwindcss": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.3.5.tgz",
"integrity": "sha512-hHGShfHBj7tAQRobnsYckDySPpMDnPF4KejHYYRcZjZQvyRRnCSHi2S905icK24HrYadOq9pZKwENqg2axSviw==",
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.4.1.tgz",
"integrity": "sha512-SbNG8Ca0o3mqtE/iHIP5hkzRVAtqDvKv7bWVZVOYdQq3ysoOrgNaInKSWvlhFrJxWnNAZHt8BAH3hcevcCZdUQ==",
"dev": true,
"requires": {
"@fullhuman/postcss-purgecss": "^2.1.2",
"autoprefixer": "^9.4.5",
"browserslist": "^4.12.0",
"bytes": "^3.0.0",
"chalk": "^4.0.0",
"color": "^3.1.2",
"detective": "^5.2.0",
"fs-extra": "^8.0.0",
"lodash": "^4.17.15",

View File

@@ -22,7 +22,7 @@
"resolve-url-loader": "^3.1.1",
"sass": "^1.26.5",
"sass-loader": "^8.0.2",
"tailwindcss": "^1.3.5",
"tailwindcss": "^1.4.1",
"vue-template-compiler": "^2.6.11"
}
}