]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Backport #32737
authorXhmikosR <xhmikosr@gmail.com>
Sun, 10 Jan 2021 06:19:00 +0000 (08:19 +0200)
committerXhmikosR <xhmikosr@gmail.com>
Wed, 13 Jan 2021 09:03:32 +0000 (11:03 +0200)
package.json: move `version_short` variable under the `config` object

This is so that it works on npm 7.x too.

build/generate-sri.js
build/zip-examples.js
package.json

index a326f67761fa1dd7f253c6c8b83a04653b28bf8f..f0aa7340b4de0621b3fc01a2a8d49fe074424fbc 100644 (file)
@@ -40,7 +40,7 @@ const files = [
     configPropertyName: 'js_bundle_hash'
   },
   {
-    file: `site/static/docs/${pkg.version_short}/assets/js/vendor/jquery.slim.min.js`,
+    file: `site/static/docs/${pkg.config.version_short}/assets/js/vendor/jquery.slim.min.js`,
     configPropertyName: 'jquery_hash'
   },
   {
index 002f7fb2ff886d4a53ea6ccd0970a8d6ed928035..4039021a31256cef3615ae4a788538b69ec5145e 100644 (file)
 const path = require('path')
 const sh = require('shelljs')
 
-const {
-  version, version_short: versionShort
-} = require('../package.json')
+const pkg = require('../package.json')
 
-const folderName = `bootstrap-${version}-examples`
+const versionShort = pkg.config.version_short
+const folderName = `bootstrap-${pkg.version}-examples`
 
 sh.config.fatal = true
 
index 56e39b0dde22ef0ca1b8473d289ee0588eceff2a..f2d7f7569f95ff84d5386ac9183f0a445e37194d 100644 (file)
@@ -2,7 +2,9 @@
   "name": "bootstrap",
   "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
   "version": "4.5.3",
-  "version_short": "4.5",
+  "config": {
+    "version_short": "4.5"
+  },
   "keywords": [
     "css",
     "sass",