Added Hexo and NexT environment variables. (#240)

ivan-nginx · web-flow · commit 1f9ef9c2a9ea · 2018-04-17T22:59:01.000+03:00
* Added Hexo and NexT environment variables. 1. Replaced Hexo version by full `env` variable. Here is values: https://github.com/hexojs/hexo/blob/373b9c745cb5dfe25e942e720aca2cdac78e1874/lib/hexo/index.js#L47-L55 2. From this moment version of NexT will be readed from `package.json` file. So, no need to set version in NexT `_config.yml` file anymore. Also, all other values from `package.json` can be readed with `next_env('value')` function in template. 3. Edited `package.json` and `bower.json` (correct author values, some tags). * Added `require` and `hexo` to excludes.
diff --git a/.jshintrc b/.jshintrc
@@ -16,7 +16,9 @@
     "$",
     "jQuery",
     "NexT",
-    "CONFIG"
+    "CONFIG",
+    "require",
+    "hexo"
   ],
   "quotmark": true,
   "trailing": true,
diff --git a/_config.yml b/_config.yml
@@ -960,7 +960,3 @@ vendors:
 css: css
 js: js
 images: images
-
-# Theme version
-version: 6.2.0
-
diff --git a/bower.json b/bower.json
@@ -3,15 +3,14 @@
   "version": "6.2.0",
   "homepage": "https://theme-next.org",
   "authors": [
-    "iissnan <iissnan@gmail.com>",
-    "Ivan Nginx <ivan.nginx@gmail.com> (https://almostover.ru)"
+    "NexT <support@theme-next.org> (https://theme-next.org)"
   ],
   "description": "Elegant theme for Hexo",
   "repository": "https://github.com/theme-next/hexo-theme-next",
   "keywords": [
     "hexo",
     "theme",
-    "NexT"
+    "next"
   ],
   "license": "AGPL",
   "ignore": [
diff --git a/layout/_layout.swig b/layout/_layout.swig
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 
+{# NexT version #}
+{% set version = next_env('version') %}
+
 {% set html_class = 'theme-next ' + theme.scheme %}
 {% if theme.motion.enable %}
   {% set html_class = html_class + ' use-motion' %}
diff --git a/layout/_partials/footer.swig b/layout/_partials/footer.swig
@@ -40,7 +40,7 @@
 
 {% if theme.footer.powered.enable %}
   <div class="powered-by">{#
-  #}{{ __('footer.powered', '<a class="theme-link" target="_blank"' + nofollow + ' href="https://hexo.io">Hexo</a>') }}{% if theme.footer.powered.version %} v{{ hexo_version() }}{% endif %}{#
+  #}{{ __('footer.powered', '<a class="theme-link" target="_blank"' + nofollow + ' href="https://hexo.io">Hexo</a>') }}{% if theme.footer.powered.version %} v{{ hexo_env('version') }}{% endif %}{#
 #}</div>
 {% endif %}
 
@@ -53,7 +53,7 @@
   #}{{ __('footer.theme') }} &mdash; {#
   #}<a class="theme-link" target="_blank"{{ nofollow }} href="https://github.com/theme-next/hexo-theme-next">{#
     #}NexT.{{ theme.scheme }}{#
-  #}</a>{% if theme.footer.theme.version %} v{{ theme.version }}{% endif %}{#
+  #}</a>{% if theme.footer.theme.version %} v{{ version }}{% endif %}{#
 #}</div>
 {% endif %}
 
diff --git a/layout/_partials/head/head.swig b/layout/_partials/head/head.swig
@@ -80,19 +80,19 @@
 {% endif %}
 <link href="{{ font_awesome_uri }}" rel="stylesheet" type="text/css" />
 
-<link href="{{ url_for(theme.css) }}/main.css?v={{ theme.version }}" rel="stylesheet" type="text/css" />
+<link href="{{ url_for(theme.css) }}/main.css?v={{ version }}" rel="stylesheet" type="text/css" />
 
 {% if theme.favicon.apple_touch_icon %}
-  <link rel="apple-touch-icon" sizes="180x180" href="{{ url_for(theme.favicon.apple_touch_icon) }}?v={{ theme.version }}">
+  <link rel="apple-touch-icon" sizes="180x180" href="{{ url_for(theme.favicon.apple_touch_icon) }}?v={{ version }}">
 {% endif %}
 {% if theme.favicon.medium %}
-  <link rel="icon" type="image/png" sizes="32x32" href="{{ url_for(theme.favicon.medium) }}?v={{ theme.version }}">
+  <link rel="icon" type="image/png" sizes="32x32" href="{{ url_for(theme.favicon.medium) }}?v={{ version }}">
 {% endif %}
 {% if theme.favicon.small %}
-  <link rel="icon" type="image/png" sizes="16x16" href="{{ url_for(theme.favicon.small) }}?v={{ theme.version }}">
+  <link rel="icon" type="image/png" sizes="16x16" href="{{ url_for(theme.favicon.small) }}?v={{ version }}">
 {% endif %}
 {% if theme.favicon.safari_pinned_tab %}
-  <link rel="mask-icon" href="{{ url_for(theme.favicon.safari_pinned_tab) }}?v={{ theme.version }}" color="{{ theme.android_chrome_color }}">
+  <link rel="mask-icon" href="{{ url_for(theme.favicon.safari_pinned_tab) }}?v={{ version }}" color="{{ theme.android_chrome_color }}">
 {% endif %}
 {% if theme.favicon.android_manifest %}
   <link rel="manifest" href="{{ url_for(theme.favicon.android_manifest) }}">
@@ -114,7 +114,7 @@
   var CONFIG = {
     root: '{{ theme.root }}',
     scheme: '{{ theme.scheme }}',
-    version: '{{ theme.version }}',
+    version: '{{ version }}',
     sidebar: {{ theme.sidebar | json_encode }},
     fancybox: {{ theme.fancybox }},
     fastclick: {{ theme.fastclick }},
diff --git a/layout/_scripts/boostrap.swig b/layout/_scripts/boostrap.swig
@@ -5,5 +5,5 @@
 %}
 
 {% for bs in boot_scripts %}
-  <script type="text/javascript" src="{{ url_for(theme.js) }}/{{ bs }}?v={{ theme.version }}"></script>
+  <script type="text/javascript" src="{{ url_for(theme.js) }}/{{ bs }}?v={{ version }}"></script>
 {% endfor %}
diff --git a/layout/_scripts/commons.swig b/layout/_scripts/commons.swig
@@ -6,5 +6,5 @@
 %}
 
 {% for common in js_commons %}
-  <script type="text/javascript" src="{{ url_for(theme.js) }}/{{ common }}?v={{ theme.version }}"></script>
+  <script type="text/javascript" src="{{ url_for(theme.js) }}/{{ common }}?v={{ version }}"></script>
 {% endfor %}
diff --git a/layout/_scripts/pages/post-details.swig b/layout/_scripts/pages/post-details.swig
@@ -1,2 +1,2 @@
-<script type="text/javascript" src="{{ url_for(theme.js) }}/src/scrollspy.js?v={{ theme.version }}"></script>
-<script type="text/javascript" src="{{ url_for(theme.js) }}/src/post-details.js?v={{ theme.version }}"></script>
+<script type="text/javascript" src="{{ url_for(theme.js) }}/src/scrollspy.js?v={{ version }}"></script>
+<script type="text/javascript" src="{{ url_for(theme.js) }}/src/post-details.js?v={{ version }}"></script>
diff --git a/layout/_scripts/schemes/gemini.swig b/layout/_scripts/schemes/gemini.swig
@@ -6,5 +6,5 @@
 %}
 
 {% for script in scripts %}
-  <script type="text/javascript" src="{{ url_for(theme.js) }}/{{ script }}?v={{ theme.version }}"></script>
+  <script type="text/javascript" src="{{ url_for(theme.js) }}/{{ script }}?v={{ version }}"></script>
 {% endfor %}
diff --git a/layout/_scripts/schemes/pisces.swig b/layout/_scripts/schemes/pisces.swig
@@ -6,5 +6,5 @@
 %}
 
 {% for script in scripts %}
-  <script type="text/javascript" src="{{ url_for(theme.js) }}/{{ script }}?v={{ theme.version }}"></script>
+  <script type="text/javascript" src="{{ url_for(theme.js) }}/{{ script }}?v={{ version }}"></script>
 {% endfor %}
diff --git a/layout/_third-party/exturl.swig b/layout/_third-party/exturl.swig
@@ -1,3 +1,3 @@
 {% if theme.exturl %}
-  <script type="text/javascript" src="{{ url_for(theme.js) }}/src/exturl.js?v={{ theme.version }}"></script>
+  <script type="text/javascript" src="{{ url_for(theme.js) }}/src/exturl.js?v={{ version }}"></script>
 {% endif %}
diff --git a/layout/_third-party/scroll-cookie.swig b/layout/_third-party/scroll-cookie.swig
@@ -1,4 +1,4 @@
 {% if theme.save_scroll %}
-  <script type="text/javascript" src="{{ url_for(theme.js) }}/src/js.cookie.js?v={{ theme.version }}"></script>
-  <script type="text/javascript" src="{{ url_for(theme.js) }}/src/scroll-cookie.js?v={{ theme.version }}"></script>
+  <script type="text/javascript" src="{{ url_for(theme.js) }}/src/js.cookie.js?v={{ version }}"></script>
+  <script type="text/javascript" src="{{ url_for(theme.js) }}/src/scroll-cookie.js?v={{ version }}"></script>
 {% endif %}
diff --git a/layout/_third-party/search/algolia-search/assets.swig b/layout/_third-party/search/algolia-search/assets.swig
@@ -14,5 +14,5 @@
   <script src="{{ algolia_instant_js }}"></script>
   {# E: Include Algolia instantsearch.js library #}
 
-  <script src="{{ url_for(theme.js) }}/src/algolia-search.js?v={{ theme.version }}"></script>
+  <script src="{{ url_for(theme.js) }}/src/algolia-search.js?v={{ version }}"></script>
 {% endif %}
diff --git a/package.json b/package.json
@@ -14,13 +14,11 @@
     "url": "git+https://github.com/theme-next/hexo-theme-next.git"
   },
   "keywords": [
-    "NexT",
-    "Hexo"
+    "hexo",
+    "theme",
+    "next"
   ],
-  "author": "iissnan <iissnan@gmail.com>",
-  "maintainers": [
-    "Ivan Nginx <ivan.nginx@gmail.com> (https://almostover.ru)"
-    ],
+  "author": "NexT <support@theme-next.org> (https://theme-next.org)",
   "license": "AGPL",
   "bugs": {
     "url": "https://github.com/theme-next/hexo-theme-next/issues"
diff --git a/scripts/helpers.js b/scripts/helpers.js
@@ -1,5 +1,14 @@
 'use strict';
 
+hexo.extend.helper.register('hexo_env', function(type) {
+  return this.env[type];
+});
+
+hexo.extend.helper.register('next_env', function(type) {
+  var env = require('../package.json');
+  return env[type];
+});
+
 hexo.extend.helper.register('item_active', function(path, className) {
   var canonical = this.page.canonical_path;
   var current = this.url_for(canonical).replace('index.html', '', 'g');
@@ -12,7 +21,3 @@ hexo.extend.helper.register('item_active', function(path, className) {
   }
   return result;
 });
-
-hexo.extend.helper.register('hexo_version', function() {
-  return this.env.version;
-});
