mirror of
https://github.com/LBRYFoundation/lbry.com.git
synced 2025-08-23 09:37:26 +00:00
update old dependencies
update composer
This commit is contained in:
parent
94477a6719
commit
c26e1e2142
5 changed files with 145 additions and 103 deletions
|
@ -8,10 +8,10 @@
|
||||||
"ext-pdo": "*",
|
"ext-pdo": "*",
|
||||||
"ext-pdo_mysql": "*",
|
"ext-pdo_mysql": "*",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"leafo/scssphp": "0.7.6",
|
"scssphp/scssphp": "^1.0",
|
||||||
"erusev/parsedown": "^1.6",
|
"erusev/parsedown": "^1.6",
|
||||||
"erusev/parsedown-extra": "^0.7.1",
|
"erusev/parsedown-extra": "^0.7.1",
|
||||||
"pelago/emogrifier": "^2.0",
|
"pelago/emogrifier": "^3.0",
|
||||||
"mustangostang/spyc": "^0.6.2",
|
"mustangostang/spyc": "^0.6.2",
|
||||||
"masterminds/html5": "^2.7"
|
"masterminds/html5": "^2.7"
|
||||||
}
|
}
|
||||||
|
|
234
composer.lock
generated
234
composer.lock
generated
|
@ -4,20 +4,20 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "f19fda681ea968799f6370f24cf03aa9",
|
"content-hash": "86b4f7d1686ff529a0aa31efc0821d05",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "erusev/parsedown",
|
"name": "erusev/parsedown",
|
||||||
"version": "1.7.3",
|
"version": "1.7.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/erusev/parsedown.git",
|
"url": "https://github.com/erusev/parsedown.git",
|
||||||
"reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7"
|
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
|
"url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
|
||||||
"reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
|
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -50,7 +50,11 @@
|
||||||
"markdown",
|
"markdown",
|
||||||
"parser"
|
"parser"
|
||||||
],
|
],
|
||||||
"time": "2019-03-17T18:48:37+00:00"
|
"support": {
|
||||||
|
"issues": "https://github.com/erusev/parsedown/issues",
|
||||||
|
"source": "https://github.com/erusev/parsedown/tree/1.7.x"
|
||||||
|
},
|
||||||
|
"time": "2019-12-30T22:54:17+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "erusev/parsedown-extra",
|
"name": "erusev/parsedown-extra",
|
||||||
|
@ -94,72 +98,24 @@
|
||||||
"parsedown",
|
"parsedown",
|
||||||
"parser"
|
"parser"
|
||||||
],
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/erusev/parsedown-extra/issues",
|
||||||
|
"source": "https://github.com/erusev/parsedown-extra/tree/master"
|
||||||
|
},
|
||||||
"time": "2015-11-01T10:19:22+00:00"
|
"time": "2015-11-01T10:19:22+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "leafo/scssphp",
|
|
||||||
"version": "v0.7.6",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/leafo/scssphp.git",
|
|
||||||
"reference": "585f6ae84de62ffecf69c23805f25d78d7e4b794"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/leafo/scssphp/zipball/585f6ae84de62ffecf69c23805f25d78d7e4b794",
|
|
||||||
"reference": "585f6ae84de62ffecf69c23805f25d78d7e4b794",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.4.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "~4.6",
|
|
||||||
"squizlabs/php_codesniffer": "~2.5"
|
|
||||||
},
|
|
||||||
"bin": [
|
|
||||||
"bin/pscss"
|
|
||||||
],
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Leafo\\ScssPhp\\": "src/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Leaf Corcoran",
|
|
||||||
"email": "leafot@gmail.com",
|
|
||||||
"homepage": "http://leafo.net"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "scssphp is a compiler for SCSS written in PHP.",
|
|
||||||
"homepage": "http://leafo.github.io/scssphp/",
|
|
||||||
"keywords": [
|
|
||||||
"css",
|
|
||||||
"less",
|
|
||||||
"sass",
|
|
||||||
"scss",
|
|
||||||
"stylesheet"
|
|
||||||
],
|
|
||||||
"time": "2018-05-24T02:18:53+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "masterminds/html5",
|
"name": "masterminds/html5",
|
||||||
"version": "2.7.0",
|
"version": "2.7.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Masterminds/html5-php.git",
|
"url": "https://github.com/Masterminds/html5-php.git",
|
||||||
"reference": "104443ad663d15981225f99532ba73c2f1d6b6f2"
|
"reference": "9227822783c75406cfe400984b2f095cdf03d417"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/104443ad663d15981225f99532ba73c2f1d6b6f2",
|
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/9227822783c75406cfe400984b2f095cdf03d417",
|
||||||
"reference": "104443ad663d15981225f99532ba73c2f1d6b6f2",
|
"reference": "9227822783c75406cfe400984b2f095cdf03d417",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -169,9 +125,7 @@
|
||||||
"php": ">=5.3.0"
|
"php": ">=5.3.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^4.8.35",
|
"phpunit/phpunit": "^4.8.35"
|
||||||
"sami/sami": "~2.0",
|
|
||||||
"satooshi/php-coveralls": "1.0.*"
|
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
|
@ -213,20 +167,24 @@
|
||||||
"serializer",
|
"serializer",
|
||||||
"xml"
|
"xml"
|
||||||
],
|
],
|
||||||
"time": "2019-07-25T07:03:26+00:00"
|
"support": {
|
||||||
|
"issues": "https://github.com/Masterminds/html5-php/issues",
|
||||||
|
"source": "https://github.com/Masterminds/html5-php/tree/2.7.4"
|
||||||
|
},
|
||||||
|
"time": "2020-10-01T13:52:52+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mustangostang/spyc",
|
"name": "mustangostang/spyc",
|
||||||
"version": "0.6.2",
|
"version": "0.6.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/mustangostang/spyc.git",
|
"url": "git@github.com:mustangostang/spyc.git",
|
||||||
"reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d"
|
"reference": "4627c838b16550b666d15aeae1e5289dd5b77da0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/mustangostang/spyc/zipball/23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
|
"url": "https://api.github.com/repos/mustangostang/spyc/zipball/4627c838b16550b666d15aeae1e5289dd5b77da0",
|
||||||
"reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
|
"reference": "4627c838b16550b666d15aeae1e5289dd5b77da0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -263,38 +221,38 @@
|
||||||
"yaml",
|
"yaml",
|
||||||
"yml"
|
"yml"
|
||||||
],
|
],
|
||||||
"time": "2017-02-24T16:06:33+00:00"
|
"time": "2019-09-10T13:16:29+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "pelago/emogrifier",
|
"name": "pelago/emogrifier",
|
||||||
"version": "v2.2.0",
|
"version": "v3.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/MyIntervals/emogrifier.git",
|
"url": "https://github.com/MyIntervals/emogrifier.git",
|
||||||
"reference": "2472bc1c3a2dee8915ecc2256139c6100024332f"
|
"reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/2472bc1c3a2dee8915ecc2256139c6100024332f",
|
"url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
|
||||||
"reference": "2472bc1c3a2dee8915ecc2256139c6100024332f",
|
"reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-dom": "*",
|
"ext-dom": "*",
|
||||||
"ext-libxml": "*",
|
"ext-libxml": "*",
|
||||||
"php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
|
"php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
|
||||||
"symfony/css-selector": "^3.4.0 || ^4.0.0"
|
"symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"friendsofphp/php-cs-fixer": "^2.2.0",
|
"friendsofphp/php-cs-fixer": "^2.15.3",
|
||||||
"phpmd/phpmd": "^2.6.0",
|
"phpmd/phpmd": "^2.7.0",
|
||||||
"phpunit/phpunit": "^4.8.0",
|
"phpunit/phpunit": "^5.7.27",
|
||||||
"squizlabs/php_codesniffer": "^3.3.2"
|
"squizlabs/php_codesniffer": "^3.5.0"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.0.x-dev"
|
"dev-master": "4.0.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -337,31 +295,97 @@
|
||||||
"email",
|
"email",
|
||||||
"pre-processing"
|
"pre-processing"
|
||||||
],
|
],
|
||||||
"time": "2019-09-04T16:07:59+00:00"
|
"support": {
|
||||||
|
"issues": "https://github.com/MyIntervals/emogrifier/issues",
|
||||||
|
"source": "https://github.com/MyIntervals/emogrifier"
|
||||||
|
},
|
||||||
|
"time": "2019-12-26T19:37:31+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/css-selector",
|
"name": "scssphp/scssphp",
|
||||||
"version": "v4.3.4",
|
"version": "v1.4.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/css-selector.git",
|
"url": "https://github.com/scssphp/scssphp.git",
|
||||||
"reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03"
|
"reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
|
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/ba86c963b94ec7ebd6e19d90cdab90d89667dbf7",
|
||||||
"reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
|
"reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1.3"
|
"ext-ctype": "*",
|
||||||
|
"ext-json": "*",
|
||||||
|
"php": ">=5.6.0"
|
||||||
},
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
|
||||||
|
"sass/sass-spec": "2020.12.29",
|
||||||
|
"squizlabs/php_codesniffer": "~3.5",
|
||||||
|
"symfony/phpunit-bridge": "^5.1",
|
||||||
|
"twbs/bootstrap": "~4.3",
|
||||||
|
"zurb/foundation": "~6.5"
|
||||||
|
},
|
||||||
|
"bin": [
|
||||||
|
"bin/pscss"
|
||||||
|
],
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"autoload": {
|
||||||
"branch-alias": {
|
"psr-4": {
|
||||||
"dev-master": "4.3-dev"
|
"ScssPhp\\ScssPhp\\": "src/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Anthon Pang",
|
||||||
|
"email": "apang@softwaredevelopment.ca",
|
||||||
|
"homepage": "https://github.com/robocoder"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Cédric Morin",
|
||||||
|
"email": "cedric@yterium.com",
|
||||||
|
"homepage": "https://github.com/Cerdic"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "scssphp is a compiler for SCSS written in PHP.",
|
||||||
|
"homepage": "http://scssphp.github.io/scssphp/",
|
||||||
|
"keywords": [
|
||||||
|
"css",
|
||||||
|
"less",
|
||||||
|
"sass",
|
||||||
|
"scss",
|
||||||
|
"stylesheet"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/scssphp/scssphp/issues",
|
||||||
|
"source": "https://github.com/scssphp/scssphp/tree/v1.4.1"
|
||||||
|
},
|
||||||
|
"time": "2021-01-04T13:23:23+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "symfony/css-selector",
|
||||||
|
"version": "v5.2.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/symfony/css-selector.git",
|
||||||
|
"reference": "f789e7ead4c79e04ca9a6d6162fc629c89bd8054"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f789e7ead4c79e04ca9a6d6162fc629c89bd8054",
|
||||||
|
"reference": "f789e7ead4c79e04ca9a6d6162fc629c89bd8054",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=7.2.5"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Symfony\\Component\\CssSelector\\": ""
|
"Symfony\\Component\\CssSelector\\": ""
|
||||||
|
@ -390,7 +414,24 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony CssSelector Component",
|
"description": "Symfony CssSelector Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2019-08-20T14:07:54+00:00"
|
"support": {
|
||||||
|
"source": "https://github.com/symfony/css-selector/tree/v5.2.1"
|
||||||
|
},
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://symfony.com/sponsor",
|
||||||
|
"type": "custom"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/fabpot",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
|
||||||
|
"type": "tidelift"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2020-12-08T17:02:38+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [],
|
"packages-dev": [],
|
||||||
|
@ -408,5 +449,6 @@
|
||||||
"ext-pdo_mysql": "*",
|
"ext-pdo_mysql": "*",
|
||||||
"ext-json": "*"
|
"ext-json": "*"
|
||||||
},
|
},
|
||||||
"platform-dev": []
|
"platform-dev": [],
|
||||||
|
"plugin-api-version": "2.0.0"
|
||||||
}
|
}
|
||||||
|
|
BIN
composer.phar
BIN
composer.phar
Binary file not shown.
2
dev.sh
2
dev.sh
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
PHPBIN=php7.3
|
PHPBIN=php7.4
|
||||||
|
|
||||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
|
|
@ -117,16 +117,16 @@ class View
|
||||||
|
|
||||||
public static function compileCss()
|
public static function compileCss()
|
||||||
{
|
{
|
||||||
$scssCompiler = new \Leafo\ScssPhp\Compiler();
|
$scssCompiler = new \scssphp\ScssPhp\Compiler();
|
||||||
|
|
||||||
$scssCompiler->setImportPaths([self::COMPONENTS_DIR, self::COLORS_DIR, self::SCSS_DIR]);
|
$scssCompiler->setImportPaths([self::COMPONENTS_DIR, self::COLORS_DIR, self::SCSS_DIR]);
|
||||||
|
|
||||||
$compress = true;
|
$compress = true;
|
||||||
if ($compress) {
|
if ($compress) {
|
||||||
$scssCompiler->setFormatter('Leafo\ScssPhp\Formatter\Crunched');
|
$scssCompiler->setFormatter('scssphp\ScssPhp\Formatter\Crunched');
|
||||||
} else {
|
} else {
|
||||||
$scssCompiler->setFormatter('Leafo\ScssPhp\Formatter\Expanded');
|
$scssCompiler->setFormatter('scssphp\ScssPhp\Formatter\Expanded');
|
||||||
$scssCompiler->setLineNumberStyle(Leafo\ScssPhp\Compiler::LINE_COMMENTS);
|
$scssCompiler->setLineNumberStyle(scssphp\ScssPhp\Compiler::LINE_COMMENTS);
|
||||||
}
|
}
|
||||||
|
|
||||||
$all_css = $scssCompiler->compile(file_get_contents(self::SCSS_DIR . '/all.scss'));
|
$all_css = $scssCompiler->compile(file_get_contents(self::SCSS_DIR . '/all.scss'));
|
||||||
|
|
Loading…
Add table
Reference in a new issue