Merge pull request ElektraInitiative#3622 from mpranj/deps

website: update dependencies
tucek · Mar 27, 2021 · ebc9d20 · ebc9d20
2 parents 662b5fc + febf6cd
commit ebc9d20
Show file tree

Hide file tree

Showing 10 changed files with 1,217 additions and 714 deletions.
diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md
@@ -183,7 +183,7 @@ _(@tucek)_
 
 - <<TODO>>
 - <<TODO>>
-- <<TODO>>
+- `webd`: update `ini` and `elliptic` dependencies. _(Dependa Bot)_
 - Make search for providers not skip rest of plugins on exceptions. _(Markus Raab)_
 
 ## Scripts
@@ -275,6 +275,8 @@ plugins, bindings and tools are always up to date. Furthermore, we changed:
 
 - It is now possible to have two links on the same line of a markdown file rendered on the website. _(Klemens Böswirth)_
 - The file [doc/KEYNAMES.md](../KEYNAMES.md) is now rendered on the website. _(Klemens Böswirth)_
+- Update `ini` dependency. _(Dependa Bot)_
+- Update many dependencies (Node 14.x LTS, angular, bootstrap, ..) and fix broken RSS feed permalinks. _(Mihael Pranjić)_
 - <<TODO>>
 
 ## Outlook

diff --git a/scripts/docker/website/Dockerfile b/scripts/docker/website/Dockerfile
@@ -7,7 +7,7 @@ ENV LC_ALL C.UTF-8
 RUN apt-get update && apt-get -y install \
         cmake git build-essential curl \
         libyajl-dev \
-    && curl -sL https://deb.nodesource.com/setup_13.x | bash - \
+    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
     && apt-get install -y nodejs \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/src/tools/webd/package-lock.json b/src/tools/webd/package-lock.json
diff --git a/src/tools/website/Gruntfile.js b/src/tools/website/Gruntfile.js
@@ -49,7 +49,7 @@ module.exports = function(grunt) {
           description: "News around Elektra",
           feed_url:
             "<%= app.website.url %>news/<%= grunt.config('create-website-news-rss.build.output.feed') %>",
-          post_url: "<%= app.website.url &>news/",
+          post_url: "<%= app.website.url %>news/",
           site_url: "<%= app.website.url %>",
           language: "en",
           pubDate: new Date().toUTCString(),