From fcc4efb8dbbb1ad133ef353e264a5b612661c509 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 9 Feb 2021 19:04:17 +0000 Subject: Update dependency ejs to v3 Signed-off-by: Renovate Bot --- package.json | 2 +- yarn.lock | 32 ++++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e797d40c..d5cc5355 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "cookie-parser": "^1.4.3", "deep-freeze": "^0.0.1", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", - "ejs": "^2.5.5", + "ejs": "^3.0.0", "emojify.js": "^1.1.0", "escape-html": "^1.0.3", "express": ">=4.14", diff --git a/yarn.lock b/yarn.lock index 60943331..0be0f208 100644 --- a/yarn.lock +++ b/yarn.lock @@ -850,6 +850,11 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== +async@0.9.x: + version "0.9.2" + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= + async@>=0.6.0, async@^3.0.0, async@^3.1.0, async@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" @@ -3565,10 +3570,12 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^2.5.5: - version "2.7.4" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" - integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== +ejs@^3.0.0: + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== + dependencies: + jake "^10.6.1" electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.634: version "1.3.639" @@ -4361,6 +4368,13 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== +filelist@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + dependencies: + minimatch "^3.0.4" + filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" @@ -5853,6 +5867,16 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +jake@^10.6.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" + integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + dependencies: + async "0.9.x" + chalk "^2.4.2" + filelist "^1.0.1" + minimatch "^3.0.4" + jmespath@0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" -- cgit v1.2.3 From b468fb623b055ea6f105b40289d708023e59a07e Mon Sep 17 00:00:00 2001 From: David Mehren Date: Tue, 9 Feb 2021 20:27:29 +0100 Subject: Switch to ejs 3 compliant imports Signed-off-by: David Mehren --- public/views/error.ejs | 4 ++-- public/views/hedgedoc.ejs | 10 +++++----- public/views/hedgedoc/body.ejs | 8 ++++---- public/views/hedgedoc/footer.ejs | 4 ++-- public/views/hedgedoc/head.ejs | 8 ++++---- public/views/index.ejs | 8 ++++---- public/views/index/body.ejs | 2 +- public/views/index/footer.ejs | 6 +++--- public/views/index/head.ejs | 8 ++++---- public/views/pretty.ejs | 16 ++++++++-------- public/views/slide.ejs | 16 ++++++++-------- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/public/views/error.ejs b/public/views/error.ejs index df951d4a..1768adea 100644 --- a/public/views/error.ejs +++ b/public/views/error.ejs @@ -2,12 +2,12 @@ - <%- include hedgedoc/head %> + <%- include('hedgedoc/head') %> - <%- include hedgedoc/header %> + <%- include('hedgedoc/header') %>

<%- code %> <%- detail %> <%- msg %>

diff --git a/public/views/hedgedoc.ejs b/public/views/hedgedoc.ejs index f17150c4..b4bf816e 100644 --- a/public/views/hedgedoc.ejs +++ b/public/views/hedgedoc.ejs @@ -1,14 +1,14 @@ - + - <%- include hedgedoc/head %> + <%- include('hedgedoc/head') %> - <%- include hedgedoc/header %> - <%- include hedgedoc/body %> - <%- include hedgedoc/footer %> + <%- include('hedgedoc/header') %> + <%- include('hedgedoc/body') %> + <%- include('hedgedoc/footer') %> diff --git a/public/views/hedgedoc/body.ejs b/public/views/hedgedoc/body.ejs index 96cb8f95..af7b9465 100644 --- a/public/views/hedgedoc/body.ejs +++ b/public/views/hedgedoc/body.ejs @@ -247,7 +247,7 @@
-<%- include ../shared/refresh-modal %> -<%- include ../shared/signin-modal %> -<%- include ../shared/help-modal %> -<%- include ../shared/revision-modal %> +<%- include('../shared/refresh-modal') %> +<%- include('../shared/signin-modal') %> +<%- include('../shared/help-modal') %> +<%- include('../shared/revision-modal') %> diff --git a/public/views/hedgedoc/footer.ejs b/public/views/hedgedoc/footer.ejs index 9d620e29..51d47221 100644 --- a/public/views/hedgedoc/footer.ejs +++ b/public/views/hedgedoc/footer.ejs @@ -20,10 +20,10 @@ -<%- include ../build/index-scripts %> +<%- include('../build/index-scripts') %> <% } else { %> -<%- include ../build/index-pack-scripts %> +<%- include('../build/index-pack-scripts') %> <% } %> diff --git a/public/views/hedgedoc/head.ejs b/public/views/hedgedoc/head.ejs index f7e4c8fd..44668795 100644 --- a/public/views/hedgedoc/head.ejs +++ b/public/views/hedgedoc/head.ejs @@ -4,7 +4,7 @@ -<%- include ../includes/favicon %> +<%- include('../includes/favicon') %> <% for (var og in opengraph) { %> <% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> @@ -21,9 +21,9 @@ -<%- include ../build/index-header %> -<%- include ../shared/polyfill %> +<%- include('../build/index-header') %> +<%- include('../shared/polyfill') %> <% } else { %> -<%- include ../build/index-pack-header %> +<%- include('../build/index-pack-header') %> <% } %> diff --git a/public/views/index.ejs b/public/views/index.ejs index 0da58bcd..bd2c4fe6 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -2,13 +2,13 @@ - <%- include index/head %> + <%- include('index/head') %> - <%- include index/header %> - <%- include index/body %> - <%- include index/footer %> + <%- include('index/header') %> + <%- include('index/body') %> + <%- include('index/footer') %> diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index d3552c75..5ae462d9 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -209,4 +209,4 @@ -<%- include ../shared/signin-modal %> +<%- include('../shared/signin-modal') %> diff --git a/public/views/index/footer.ejs b/public/views/index/footer.ejs index 638f4930..c9532f6d 100644 --- a/public/views/index/footer.ejs +++ b/public/views/index/footer.ejs @@ -6,7 +6,7 @@ -<%- include ../build/cover-scripts %> +<%- include('../build/cover-scripts') %> <% } else { %> -<%- include ../build/cover-pack-scripts %> -<% } %> \ No newline at end of file +<%- include('../build/cover-pack-scripts') %> +<% } %> diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs index 900d6324..a6e79e35 100644 --- a/public/views/index/head.ejs +++ b/public/views/index/head.ejs @@ -6,7 +6,7 @@ -<%- include ../includes/favicon %> +<%- include('../includes/favicon') %> @@ -22,8 +22,8 @@ -<%- include ../build/cover-header %> -<%- include ../shared/polyfill %> +<%- include('../build/cover-header') %> +<%- include('../shared/polyfill') %> <% } else { %> -<%- include ../build/cover-pack-header %> +<%- include('../build/cover-pack-header') %> <% } %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 074b181b..78795211 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -24,17 +24,17 @@ <% } %> <%= title %> - <%- include includes/favicon.ejs %> + <%- include('includes/favicon.ejs') %> <% if(useCDN) { %> - <%- include build/pretty-header %> - <%- include shared/polyfill %> + <%- include('build/pretty-header') %> + <%- include('shared/polyfill') %> <% } else { %> - <%- include build/pretty-pack-header %> + <%- include('build/pretty-pack-header') %> <% } %> @@ -73,7 +73,7 @@ <% if(typeof disqus !== 'undefined' && disqus && !dnt) { %>
- <%- include shared/disqus %> + <%- include('shared/disqus') %>
<% } %> @@ -97,11 +97,11 @@ -<%- include build/pretty-scripts %> +<%- include('build/pretty-scripts') %> <% } else { %> -<%- include build/pretty-pack-scripts %> +<%- include('build/pretty-pack-scripts') %> <% } %> -<%- include shared/ga %> +<%- include('shared/ga') %> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index b88fe5a2..bec8079a 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -13,19 +13,19 @@ <% } %> <%= title %> - <%- include includes/favicon.ejs %> + <%- include('includes/favicon.ejs') %> <% if(useCDN) { %> - <%- include build/slide-header %> - <%- include shared/polyfill %> + <%- include('build/slide-header') %> + <%- include('shared/polyfill') %> <% } else { %> - <%- include build/slide-pack-header %> + <%- include('build/slide-pack-header') %> <% } %> @@ -80,7 +80,7 @@ <% if(typeof disqus !== 'undefined' && disqus && !dnt) { %>
- <%- include shared/disqus %> + <%- include('shared/disqus') %>
<% } %> @@ -104,14 +104,14 @@ - <%- include build/slide-scripts %> + <%- include('build/slide-scripts') %> <% } else { %> - <%- include build/slide-pack-scripts %> + <%- include('build/slide-pack-scripts') %> <% } %> -<%- include shared/ga %> +<%- include('shared/ga') %> -- cgit v1.2.3