diff --git a/assets/typescript/UrlRegistry.ts b/assets/typescript/UrlRegistry.ts index 95696c06..341dc880 100644 --- a/assets/typescript/UrlRegistry.ts +++ b/assets/typescript/UrlRegistry.ts @@ -1,6 +1,6 @@ interface UrlRegistryVariable { name: string; - value: string; + value: string | number; } interface UrlRegistryEntryQuery { @@ -76,7 +76,7 @@ function urlVariable(value: string, vars: UrlRegistryVariable[]): string { if (value[0] === '<' && value.slice(-1) === '>') { const urvar: UrlRegistryVariable = vars.find(x => x.name == value.slice(1, -1)); - return urvar ? urvar.value : ''; + return urvar ? urvar.value.toString() : ''; } if (value[0] === '[' && value.slice(-1) === ']') { diff --git a/composer.json b/composer.json index a98ba489..20bffd0f 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "php": "^7.2", "ext-bcmath": "*", "ext-mbstring": "*", - "twig/twig": "~2.4", + "twig/twig": "^2.0", "swiftmailer/swiftmailer": "~6.0", "erusev/parsedown": "~1.6", "geoip2/geoip2": "~2.0", diff --git a/composer.lock b/composer.lock index 63e8dc3a..aa112765 100644 --- a/composer.lock +++ b/composer.lock @@ -397,16 +397,16 @@ }, { "name": "erusev/parsedown", - "version": "v1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "d60bcdc46978357759ecb13cb4b078da783f8faf" + "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/d60bcdc46978357759ecb13cb4b078da783f8faf", - "reference": "d60bcdc46978357759ecb13cb4b078da783f8faf", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7", + "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7", "shasum": "" }, "require": { @@ -439,7 +439,7 @@ "markdown", "parser" ], - "time": "2019-03-17T17:19:46+00:00" + "time": "2019-03-17T18:48:37+00:00" }, { "name": "filp/whoops", diff --git a/package.json b/package.json index 65c762f7..5f8e8f29 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,6 @@ "dependencies": { "@fortawesome/fontawesome-free": "^5.3.1", "highlightjs": "^9.10.0", - "timeago.js": "^3.0.2" + "timeago.js": "^4.0.0-beta.2" } } diff --git a/yarn.lock b/yarn.lock index d47dba12..29487c00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,19 +7,12 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b" integrity sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA== -"@types/jquery@^2.0.40": - version "2.0.53" - resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.53.tgz#89c53bc83d820e50c3b667ae2fdf4276df8b3aba" - integrity sha512-MZKPWUhp5TKkoJ/58NSq6io+CSUCOHm2b3Z6U4+r9v70kktB0JM+eRjdp6YmDHtw0kK2XB7L2K7/FMIoziHjUA== - highlightjs@^9.10.0: version "9.12.0" resolved "https://registry.yarnpkg.com/highlightjs/-/highlightjs-9.12.0.tgz#9b84eb42a7aa8488eb69ac79fec44cf495bf72a1" integrity sha512-eAhWMtDZaOZIQdxIP4UEB1vNp/CVXQPdMSihTSuaExhFIRC0BVpXbtP3mTP1hDoGOyh7nbB3cuC3sOPhG5wGDA== -timeago.js@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-3.0.2.tgz#32a67e7c0d887ea42ca588d3aae26f77de5e76cc" - integrity sha1-MqZ+fA2IfqQspYjTquJvd95edsw= - dependencies: - "@types/jquery" "^2.0.40" +timeago.js@^4.0.0-beta.2: + version "4.0.0-beta.2" + resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.0-beta.2.tgz#4e50a7250626b67e168a934d5e15052119366db1" + integrity sha512-MQkHiYGoB6qZC4DNWsLc9bav+L9hpdulL6sL7okzKR8r1Ipask/tXKAio8T+4jeby8FbpbDvbnCKGrh1bLop3g==