From 6931caa7192883eea85a0c1bd11efcf59257802d Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Wed, 17 Mar 2021 00:46:07 -0400 Subject: [PATCH] update tildewiki --- composer.json | 13 +-- composer.lock | 221 ++++++++++++++++++++++++++++++++++------------ entries/index.php | 2 +- 3 files changed, 167 insertions(+), 69 deletions(-) diff --git a/composer.json b/composer.json index e31566b..5e035ff 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,5 @@ { - "require": { - "tildeverse/wiki": "dev-master" - }, - "repositories": [ - { - "type": "vcs", - "url": "https://tildegit.org/ben/tildewiki" - } - ] + "require": { + "tildeteam/wiki": "^0.1.0" + } } - diff --git a/composer.lock b/composer.lock index a1b5554..9cceb5c 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "3ab3df15c4e40417f427b37691e83088", + "content-hash": "3779848aa146daecd3839d2d90aab35b", "packages": [ { "name": "erusev/parsedown", - "version": "1.7.3", + "version": "1.7.4", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7" + "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7", - "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3", + "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3", "shasum": "" }, "require": { @@ -50,24 +50,27 @@ "markdown", "parser" ], - "time": "2019-03-17T18:48:37+00:00" + "time": "2019-12-30T22:54:17+00:00" }, { "name": "erusev/parsedown-extra", - "version": "0.7.1", + "version": "0.8.1", "source": { "type": "git", "url": "https://github.com/erusev/parsedown-extra.git", - "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c" + "reference": "91ac3ff98f0cea243bdccc688df43810f044dcef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/0db5cce7354e4b76f155d092ab5eb3981c21258c", - "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c", + "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/91ac3ff98f0cea243bdccc688df43810f044dcef", + "reference": "91ac3ff98f0cea243bdccc688df43810f044dcef", "shasum": "" }, "require": { - "erusev/parsedown": "~1.4" + "erusev/parsedown": "^1.7.4" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" }, "type": "library", "autoload": { @@ -94,30 +97,30 @@ "parsedown", "parser" ], - "time": "2015-11-01T10:19:22+00:00" + "time": "2019-12-30T23:20:37+00:00" }, { "name": "mnapoli/front-yaml", - "version": "1.6.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/mnapoli/FrontYAML.git", - "reference": "24070ace8b741247bb3161cbb38ecc541268b296" + "reference": "76baa8ca538e111bfe53ac49c6a512ec5ea2bf54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/24070ace8b741247bb3161cbb38ecc541268b296", - "reference": "24070ace8b741247bb3161cbb38ecc541268b296", + "url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/76baa8ca538e111bfe53ac49c6a512ec5ea2bf54", + "reference": "76baa8ca538e111bfe53ac49c6a512ec5ea2bf54", "shasum": "" }, "require": { "erusev/parsedown": "~1.0", - "php": ">=5.4.0", - "symfony/yaml": "~2.1|^3.0|^4.0" + "php": ">=7.3", + "symfony/yaml": "~2.1|^3.0|^4.0|^5.0" }, "require-dev": { - "league/commonmark": "~0.7", - "phpunit/phpunit": "~4.5" + "league/commonmark": "~1.4", + "phpunit/phpunit": "^9.4" }, "type": "library", "autoload": { @@ -129,24 +132,88 @@ "license": [ "MIT" ], - "time": "2017-10-29T19:29:55+00:00" + "time": "2020-12-04T10:52:19+00:00" }, { - "name": "symfony/polyfill-ctype", - "version": "v1.12.0", + "name": "symfony/deprecation-contracts", + "version": "v2.2.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665", + "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "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-09-07T11:33:47+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.22.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "shasum": "" + }, + "require": { + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" @@ -154,7 +221,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -187,41 +258,54 @@ "polyfill", "portable" ], - "time": "2019-08-06T08:03:45+00:00" + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/yaml", - "version": "v4.3.4", + "version": "v5.2.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686" + "reference": "298a08ddda623485208506fcee08817807a251dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686", - "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686", + "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd", + "reference": "298a08ddda623485208506fcee08817807a251dd", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/console": "<3.4" + "symfony/console": "<4.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^4.4|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" }, + "bin": [ + "Resources/bin/yaml-lint" + ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.3-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -244,49 +328,70 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", - "time": "2019-08-20T14:27:59+00:00" + "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": "2021-03-06T07:59:01+00:00" }, { - "name": "tildeverse/wiki", - "version": "dev-master", + "name": "tildeteam/wiki", + "version": "0.1.0", "source": { "type": "git", - "url": "https://tildegit.org/ben/tildewiki", - "reference": "751eb64c383cb7c6ec643eaf683b88aa1de351ea" + "url": "https://tildegit.org/team/tildewiki", + "reference": "accb34f9648c7137a605df77b66d2dab570d81ca" }, "require": { - "erusev/parsedown-extra": "^0.7.1", - "mnapoli/front-yaml": "^1.6" + "erusev/parsedown-extra": "^0.8.1", + "mnapoli/front-yaml": "^1.8.0" }, "type": "library", "autoload": { "psr-4": { - "Tildeverse\\Wiki\\": "src/" + "tildeteam\\wiki\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ - "GPLv3" + "GPL-3.0-or-later" ], "authors": [ { "name": "Ben Harris", - "email": "ben@tilde.team" + "email": "ben@tilde.team", + "homepage": "https://tilde.team/~ben/", + "role": "Developer" } ], "description": "parsedown extensions for tilde wikis", - "time": "2019-07-03T05:06:34+00:00" + "homepage": "https://tildegit.org/team/tildewiki", + "keywords": [ + "markdown", + "wiki" + ], + "time": "2021-03-17T04:21:38+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "tildeverse/wiki": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/entries/index.php b/entries/index.php index 3b52e96..883248d 100644 --- a/entries/index.php +++ b/entries/index.php @@ -1,7 +1,7 @@