package.json is not used any more for version detection. fix #114

ekalinin · Jun 14, 2017 · 322029b · 322029b
1 parent 5afe6cf
commit 322029b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 .PHONY: deploy deploy-github deploy-npm test env
 
+VERSIONS_COUNT=`grep 'version' package.json bower.json index.js | grep -o -E '[0-9]\.[0-9]{1,2}\.[0-9]{1,2}' | sort | uniq | wc -l`
 
 env:
 	@rm -rf env 			&& \
@@ -22,4 +23,10 @@ deploy-github:
 deploy-npm:
 	npm publish
 
-deploy: test deploy-npm deploy-github
+check-versions:
+	@if [ "$(VERSIONS_COUNT)" != "1" ]; then\
+		echo "\n\tVersions in *.js and *.json are different!\n";\
+		exit 1; fi
+
+
+deploy: test check-versions deploy-npm deploy-github
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "sitemap.js",
   "main": "index.js",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "dependencies": {
     "url-join": "^1.1.0",
     "underscore": "1.7.0"

diff --git a/index.js b/index.js
@@ -11,9 +11,6 @@ module.exports.errors = require('./lib/errors');
 /**
  * Framework version.
  */
-var fs = require('fs');
-
 if (!module.exports.version) {
-  module.exports.version = JSON.parse(
-    fs.readFileSync(__dirname + "/package.json", 'utf8')).version;
+  module.exports.version = "1.12.1"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sitemap",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Sitemap-generating framework",
   "keywords": [
     "sitemap",