Merge pull request #841 from hedgedoc/renovate/master-ejs-3.x

author: Yannick Bungers 2021-02-13 20:03:45 +0100
committer: GitHub 2021-02-13 20:03:45 +0100
commit: b01421c470c729eefaf89e43bae67d54c4b03c6e (patch)
tree: b6d8dd775ad2e4a13504596d11a6d7ff90e72f3b
parent: 7c6abe09b74bd1b6f60c7e042c22b3cb6110813b (diff)
parent: b468fb623b055ea6f105b40289d708023e59a07e (diff)
13 files changed, 74 insertions, 50 deletions
diff --git a/package.json b/package.json
index 97a4f944..7d20355f 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/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 @@
 <html lang="en">
 
 <head>
-    <%- include hedgedoc/head %>
+    <%- include('hedgedoc/head') %>
     <link rel="stylesheet" href="<%- serverURL %>/css/center.css">
 </head>
 
 <body>
-    <%- include hedgedoc/header %>
+    <%- include('hedgedoc/header') %>
     <div class="container-fluid text-center">
         <div class="vertical-center-row">
             <h1><%- code %> <%- detail %> <small><%- msg %></small></h1>
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 @@
-<!DOCTYPE html>
+ <!DOCTYPE html>
 <html lang="en">
 
 <head>
-    <%- include hedgedoc/head %>
+    <%- include('hedgedoc/head') %>
 </head>
 
 <body>
-    <%- include hedgedoc/header %>
-    <%- include hedgedoc/body %>
-    <%- include hedgedoc/footer %>
+    <%- include('hedgedoc/header') %>
+    <%- include('hedgedoc/body') %>
+    <%- include('hedgedoc/footer') %>
 </body>
 
 </html>
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 @@
         </div>
     </div>
 </div>
-<%- 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 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.8/validator.min.js" integrity="sha256-LHeY7YoYJ0SSXbCx7sR14Pqna+52moaH3bhv0Mjzd/M=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous"></script>
-<%- include ../build/index-scripts %>
+<%- include('../build/index-scripts') %>
 <% } else { %>
 <script src="<%- serverURL %>/build/MathJax/MathJax.js" defer></script>
 <script src="<%- serverURL %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
 <script src="<%- serverURL %>/build/MathJax/config/Safe.js" defer></script>
-<%- 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 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 <meta name="mobile-web-app-capable" content="yes">
-<%- include ../includes/favicon %>
+<%- include('../includes/favicon') %>
 <% for (var og in opengraph) { %>
 <% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %>
 <meta property="og:<%- og %>" content="<%- opengraph[og] %>">
@@ -21,9 +21,9 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css" integrity="sha256-02JtFTurpwBjQJ6q13iJe82/NF0RbZlJroDegK5g87Y=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
-<%- include ../build/index-header %>
-<%- include ../shared/polyfill %>
+<%- include('../build/index-header') %>
+<%- include('../shared/polyfill') %>
 <% } else { %>
 <link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
-<%- 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 @@
 <html lang="en">
 
 <head>
-    <%- include index/head %>
+    <%- include('index/head') %>
 </head>
 
 <body>
-    <%- include index/header %>
-    <%- include index/body %>
-    <%- include index/footer %>
+    <%- include('index/header') %>
+    <%- include('index/body') %>
+    <%- include('index/footer') %>
 </body>
 
 </html>
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 @@
         </div>
     </div>
 </div>
-<%- 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 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" integrity="sha256-HzzZFiY4t0PIv02Tm8/R3CVvLpcjHhO1z/YAUCp4oQ4=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment-with-locales.min.js" integrity="sha256-vvT7Ok9u6GbfnBPXnbM6FVDEO8E1kTdgHOFZOAXrktA=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.8/validator.min.js" integrity="sha256-LHeY7YoYJ0SSXbCx7sR14Pqna+52moaH3bhv0Mjzd/M=" crossorigin="anonymous" defer></script>
-<%- 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 @@
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="description" content="<%= __('Best way to write and share your knowledge in markdown.') %>">
 <meta name="keywords" content="Collaborative, Markdown, Notes">
-<%- include ../includes/favicon %>
+<%- include('../includes/favicon') %>
 <meta property="og:title" content="HedgeDoc - <%= __('Collaborative markdown notes') %>">
 <meta property="og:description" content="<%= __('Best way to write and share your knowledge in markdown.') %>">
 <meta property="og:type" content="website">
@@ -22,8 +22,8 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css" integrity="sha256-02JtFTurpwBjQJ6q13iJe82/NF0RbZlJroDegK5g87Y=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2.min.css" integrity="sha256-ijlUKKj3hJCiiT2HWo1kqkI79NTEYpzOsw5Rs3k42dI=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2-bootstrap.min.css" integrity="sha256-NAWFcNIZdH+TS1xpWujF/EB/Y8gwBbEOCoaK/eqaer8=" crossorigin="anonymous" />
-<%- 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 @@
     <% } %>
     <base href="<%- serverURL %>/">
     <title><%= title %></title>
-    <%- include includes/favicon.ejs %>
+    <%- include('includes/favicon.ejs') %>
   <% if(useCDN) { %>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.0/css/bootstrap.min.css" integrity="sha256-H0KfTigpUV+0/5tn2HXC0CPwhhDhWgSawJdnFd0CGCo=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
-    <%- include build/pretty-header %>
-    <%- include shared/polyfill %>
+    <%- include('build/pretty-header') %>
+    <%- include('shared/polyfill') %>
   <% } else { %>
     <link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
-    <%- include build/pretty-pack-header %>
+    <%- include('build/pretty-pack-header') %>
   <% } %>
 </head>
 
@@ -73,7 +73,7 @@
     <div id="ui-toc-affix" class="ui-affix-toc ui-toc-dropdown unselectable hidden-print" data-spy="affix" style="display:none;"></div>
     <% if(typeof disqus !== 'undefined' && disqus && !dnt) { %>
     <div class="container-fluid" style="max-width: 758px; margin-bottom: 40px;">
-        <%- include shared/disqus %>
+        <%- include('shared/disqus') %>
     </div>
     <% } %>
 </body>
@@ -97,11 +97,11 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous"></script>
-<%- include build/pretty-scripts %>
+<%- include('build/pretty-scripts') %>
 <% } else { %>
 <script src="<%- serverURL %>/build/MathJax/MathJax.js" defer></script>
 <script src="<%- serverURL %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
 <script src="<%- serverURL %>/build/MathJax/config/Safe.js" defer></script>
-<%- 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 @@
         <% } %>
         <base href="<%- serverURL %>/">
         <title><%= title %></title>
-        <%- include includes/favicon.ejs %>
+        <%- include('includes/favicon.ejs') %>
 
         <% if(useCDN) { %>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.7.0/css/reveal.min.css" integrity="sha256-9+Wg2bcNeiOMGXOUNqBdceY2lAH/eCiTDcdzHhHIl48=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
-        <%- include build/slide-header %>
-        <%- include shared/polyfill %>
+        <%- include('build/slide-header') %>
+        <%- include('shared/polyfill') %>
         <% } else { %>
         <link rel="stylesheet" href="<%- serverURL %>/build/reveal.js/css/reveal.css">
         <link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
-        <%- include build/slide-pack-header %>
+        <%- include('build/slide-pack-header') %>
         <% } %>
 
         <!-- For reveal.js theme -->
@@ -80,7 +80,7 @@
                 </div>
                 <% if(typeof disqus !== 'undefined' && disqus && !dnt) { %>
                 <div class="slides-disqus">
-                    <%- include shared/disqus %>
+                    <%- include('shared/disqus') %>
                 </div>
                 <% } %>
             </div>
@@ -104,14 +104,14 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous"></script>
-        <%- include build/slide-scripts %>
+        <%- include('build/slide-scripts') %>
         <% } else { %>
         <script src="<%- serverURL %>/build/MathJax/MathJax.js" defer></script>
         <script src="<%- serverURL %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
         <script src="<%- serverURL %>/build/MathJax/config/Safe.js" defer></script>
-        <%- include build/slide-pack-scripts %>
+        <%- include('build/slide-pack-scripts') %>
         <% } %>
     </body>
 </html>
 
-<%- include shared/ga %>
+<%- include('shared/ga') %>
diff --git a/yarn.lock b/yarn.lock
index e1c37df0..47424f40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -798,6 +798,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"
@@ -3488,10 +3493,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"
@@ -4279,6 +4286,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"
@@ -5707,6 +5721,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"
author	Yannick Bungers	2021-02-13 20:03:45 +0100
committer	GitHub	2021-02-13 20:03:45 +0100
commit	b01421c470c729eefaf89e43bae67d54c4b03c6e (patch)
tree	b6d8dd775ad2e4a13504596d11a6d7ff90e72f3b
parent	7c6abe09b74bd1b6f60c7e042c22b3cb6110813b (diff)
parent	b468fb623b055ea6f105b40289d708023e59a07e (diff)