From a074cb66d74b0ad696d3ab74d2d23b78a141cf2c Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Thu, 13 Dec 2018 13:14:49 +0200
Subject: [PATCH] Make use of the package.json `version_short` property more.

---
 .gitignore             | 2 +-
 build/banner.js        | 5 ++---
 build/generate-sri.js  | 4 +++-
 js/tests/karma.conf.js | 6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 356db705d8..6b43877361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # Ignore docs files
 _gh_pages
 _site
-site/docs/4.1/dist/
+site/docs/**/dist/
 
 # Ignore ruby files
 .ruby-version
diff --git a/build/banner.js b/build/banner.js
index 9151178378..453fc3b6e0 100644
--- a/build/banner.js
+++ b/build/banner.js
@@ -1,8 +1,7 @@
 'use strict'
 
-const path  = require('path')
-const pkg   = require(path.resolve(__dirname, '../package.json'))
-const year  = new Date().getFullYear()
+const pkg = require('../package.json')
+const year = new Date().getFullYear()
 
 function getBanner(pluginFilename) {
   return `/*!
diff --git a/build/generate-sri.js b/build/generate-sri.js
index cd80ce7199..309f29bd28 100644
--- a/build/generate-sri.js
+++ b/build/generate-sri.js
@@ -17,6 +17,8 @@ const fs = require('fs')
 const path = require('path')
 const sh = require('shelljs')
 
+const pkg = require('../package.json')
+
 sh.config.fatal = true
 
 const configFile = path.join(__dirname, '../_config.yml')
@@ -34,7 +36,7 @@ const files = [
     configPropertyName: 'js_hash'
   },
   {
-    file: 'site/docs/4.1/assets/js/vendor/jquery-slim.min.js',
+    file: `site/docs/${pkg.version_short}/assets/js/vendor/jquery-slim.min.js`,
     configPropertyName: 'jquery_hash'
   },
   {
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index a8f81cbb4f..06046ca8e4 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -1,6 +1,8 @@
 /* eslint-env node */
 /* eslint no-process-env: 0 */
+
 const ip = require('ip')
+const pkg = require('../../package.json')
 const {
   browsers,
   browsersKeys
@@ -8,7 +10,7 @@ const {
 const path = require('path')
 const jsCoveragePath = path.resolve(__dirname, '../coverage')
 
-const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : 'site/docs/4.1/assets/js/vendor/jquery-slim.min.js'
+const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : `site/docs/${pkg.version_short}/assets/js/vendor/jquery-slim.min.js`
 const bundle = process.env.BUNDLE === 'true'
 const browserStack = process.env.BROWSER === 'true'
 
@@ -92,7 +94,7 @@ if (bundle) {
   conf.browsers = browsersKeys
   reporters.push('BrowserStack')
   files = files.concat([
-    'site/docs/4.1/assets/js/vendor/jquery-slim.min.js',
+    `site/docs/${pkg.version_short}/assets/js/vendor/jquery-slim.min.js`,
     'js/dist/util.js',
     'js/dist/tooltip.js',
     'js/dist/!(util|index|tooltip).js' // include all of our js/dist files except util.js, index.js and tooltip.js