🎉 Update to Hexo 6 and remove swig templates

Author: dumindu

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "hexo": {
-    "version": "4.2.0"
+    "version": "6.0.0"
   },
   "scripts": {
     "build": "hexo generate",
@@ -13,38 +13,34 @@
   "dependencies": {
     "cheerio": "^0.22.0",
     "hexo": "hexojs/hexo",
-    "hexo-clean-css": "^1.0.0",
-    "hexo-deployer-git": "^2.1.0",
+    "hexo-clean-css": "^2.0.0",
+    "hexo-deployer-git": "3.0.0",
     "hexo-filter-nofollow": "^2.0.2",
+    "hexo-fs": "^3.1.0",
     "hexo-generator-sitemap": "^2.0.0",
-    "hexo-renderer-marked": "^2.0.0",
-    "hexo-renderer-pug": "^1.0.0",
-    "hexo-renderer-stylus": "^1.0.0",
-    "hexo-renderer-swig": "^1.1.0",
-    "hexo-server": "^1.0.0",
-    "hexo-uglify": "^1.0.0",
-    "lunr": "2.3.8",
-    "sharp": "^0.25.2"
+    "hexo-renderer-marked": "^5.0.0",
+    "hexo-renderer-pug": "^3.0.0",
+    "hexo-renderer-stylus": "^2.0.0",
+    "hexo-server": "^3.0.0",
+    "hexo-uglify": "^2.0.0",
+    "lunr": "2.3.9",
+    "sharp": "^0.30.2"
   },
   "devDependencies": {
-    "eslint": "^6.0.1",
-    "eslint-config-hexo": "^4.0.0",
-    "husky": "^4.0.7",
+    "eslint": "^8.0.1",
+    "eslint-config-hexo": "^5.0.0",
+    "husky": "^7.0.2",
     "imagemin-lint-staged": "^0.4.0",
-    "lint-staged": "^10.2.2"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+    "lint-staged": "^11.0.0"
   },
   "lint-staged": {
     "*.{png,jpeg,jpg,gif,svg}": [
       "imagemin-lint-staged",
       "git add"
-    ]
+    ],
+    "*.js": "eslint --fix"
   },
   "engines": {
-    "node": ">=8.10.0"
+    "node": ">=12.9.0"
   }
 }

source/docs/a3.hello_world.md

@@ -21,7 +21,7 @@ fn main() {
 
 [Rust Playground](https://play.rust-lang.org/) is a web interface for running Rust code.
 
-[![Rust Playground](images/rust_playground.png)](https://play.rust-lang.org/)
+[![Rust Playground](docs/images/rust_playground.png)](https://play.rust-lang.org/)
 
 ## Before going to the next...
 

source/docs/index.md

@@ -3,6 +3,6 @@ title: Overview
 
 This is based on the posts I wrote on **Medium**, https://medium.com/learning-rust
 
-[![Rust Playground](images/learning_rust_medium.png)](https://medium.com/learning-rust)
+[![Rust Playground](docs/images/learning_rust_medium.png)](https://medium.com/learning-rust)
 
 > 🐣 I am a **Sri Lankan** 🇱🇰 Web Developer who lives in **Vietnam** 🇻🇳. So I am not a native English speaker and just learning Rust, If you found any mistake or something need to be changed, even a spelling or a grammar mistake, feel free to create a pull request. Thanks.

themes/navy/layout/index.swig renamed to themes/navy/layout/index.njk

@@ -6,8 +6,8 @@
 <!-- Algolia -->
 {% if config.algolia[page.lang] %}
 <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
-<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.1/build/highlight.min.js"></script>
-<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.1/build/languages/rust.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/highlight.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/languages/rust.min.js"></script>
 <script type="text/javascript">
 document.getElementById('search-input-wrap').classList.add('on');
 docsearch({
@@ -16,6 +16,6 @@ docsearch({
   inputSelector: '#search-input'
 });
 
-hljs.initHighlightingOnLoad();
+hljs.highlightAll();
 </script>
 {% endif %}

themes/navy/layout/layout.swig renamed to themes/navy/layout/layout.njk

@@ -2,7 +2,7 @@
   <footer id="footer" class="wrapper">
     <div class="inner">
       <div id="footer-copyright">
-        &copy; {{ moment(Date.now()).year() }} <a href="https://github.com/dumindu" target="_blank">{{ config.author }}</a><br>
+        &copy; {{ moment().year() }} <a href="https://github.com/dumindu" target="_blank">{{ config.author }}</a><br>
         Powered by <a href="http://hexo.io/" target="_blank">Hexo</a> &amp; <a href="https://github.com/hexojs/site/tree/master/themes/navy" target="_blank">Navy</a> theme.
       </div>
       <div id="footer-links">

themes/navy/layout/page.swig renamed to themes/navy/layout/page.njk

@@ -1,15 +1,15 @@
 <head prefix="og: http://ogp.me/ns#">
   <meta charset="utf-8">
-  <meta http-equiv="x-ua-compatible" content="ie=edge">
   <title>{% if page.title %}{{ page.title }} | {% endif %}{{ config.title }}</title>
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
   <meta name="description" content="Rust Programming Language Tutorials">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <!-- Canonical links -->
   <link rel="canonical" href="{{ url }}">
   <!-- Alternative links -->
   {% if page.layout == 'page' or page.layout == 'index' %}
-    {% for lang in site.data.languages %}
-      <link rel="alternative" hreflang="{{ loop.key }}" href="{{ canonical_url(loop.key) }}">
+    {% for lang, value in site.data.languages %}
+      <link rel="alternative" hreflang="{{ lang }}" href="{{ canonical_url(lang) }}">
     {% endfor %}
   {% endif %}
   <!-- Icon -->
@@ -18,7 +18,7 @@
   <!-- build:css build/css/navy.css -->
   {{ css('css/navy') }}
   <!-- endbuild -->
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.1/build/styles/tomorrow.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/styles/base16/tomorrow.min.css">
   <link href="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet" type="text/css">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css">

themes/navy/layout/partial/after_footer.swig renamed to themes/navy/layout/partial/after_footer.njk

@@ -17,8 +17,8 @@
       <div id="lang-select-wrap">
         <label id="lang-select-label"><i class="fa fa-language"></i><span>{{ lang_name(page.lang) }}</span></label>
         <select id="lang-select" data-canonical="{{ canonical_path_for_nav() }}">
-          {% for lang in site.data.languages %}
-            <option value="{{ loop.key }}"{% if page.lang === loop.key %} selected{% endif %}>{{ lang_name(loop.key) }}</option>
+          {% for lang, value in site.data.languages %}
+            <option value="{{ lang }}"{% if page.lang === lang %} selected{% endif %}>{{ lang_name(lang) }}</option>
           {% endfor %}
         </select>
       </div>

themes/navy/layout/partial/footer.swig renamed to themes/navy/layout/partial/footer.njk

@@ -13,8 +13,8 @@
   <div id="mobile-lang-select-wrap">
     <span id="mobile-lang-select-label"><i class="fa fa-language"></i><span>{{ lang_name(page.lang) }}</span></span>
     <select id="mobile-lang-select" data-canonical="{{ canonical_path_for_nav() }}">
-      {% for lang in site.data.languages %}
-        <option value="{{ loop.key }}"{% if page.lang === loop.key %} selected{% endif %}>{{ lang_name(loop.key) }}</option>
+      {% for lang, value in site.data.languages %}
+        <option value="{{ lang }}"{% if page.lang === lang %} selected{% endif %}>{{ lang_name(lang) }}</option>
       {% endfor %}
     </select>
   </div>