prepare 1.11.1 (#621)

* prepare version 1.11.1 * fixed schema in zip file * use Haxe 4.1.4 for makeReleaseZip
HaxeCheckstyle · Nov 3, 2020 · e13a1f7 · e13a1f7
1 parent d1f6938
commit e13a1f7
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.11.1 (2020-11-03)
+
 - Fixed whitespace for negative const values ([#600](https://github.com/HaxeCheckstyle/haxe-formatter/issues/600))
 - Fixed multiline comments with vars, fixes [#598](https://github.com/HaxeCheckstyle/haxe-formatter/issues/598) ([#600](https://github.com/HaxeCheckstyle/haxe-formatter/issues/600))
 - Fixed whitespace for null safe navigation operator, fixes [#599](https://github.com/HaxeCheckstyle/haxe-formatter/issues/599) ([#600](https://github.com/HaxeCheckstyle/haxe-formatter/issues/600))

diff --git a/buildJsNode.hxml b/buildJsNode.hxml
@@ -2,5 +2,3 @@ buildCommon.hxml
 -lib hxnodejs
 -js run.js
 -main formatter.Cli
-
--cmd mkdir -p bin && echo "#\!/usr/bin/env node" | cat - run.js > bin/formatter.js
diff --git a/makeReleaseZip.sh b/makeReleaseZip.sh
@@ -4,17 +4,19 @@
 
 npm install
 npx lix download
-npx lix use haxe 4.0.5
+npx lix use haxe 4.1.4
 
 npx haxe buildJsNode.hxml
 npx haxe buildJsBrowser.hxml
 npx haxe buildNeko.hxml
 npx haxe buildJava.hxml
 npx haxe buildSchema.hxml
 
+./uglifyFormatter.sh
+
 neko run --default-config resources/default-hxformat.json
 
 npx haxe test.hxml
 
 rm -f formatter.zip
-zip -9 -r -q formatter.zip src run.n run.js resources/default-hxformat.json resources/formatter-schema.json haxelib.json README.md CHANGELOG.md LICENSE.md
+zip -9 -r -q formatter.zip src run.n run.js resources/default-hxformat.json resources/hxformat-schema.json haxelib.json README.md CHANGELOG.md LICENSE.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,8 @@
 	"license": "MIT",
 	"homepage": "https://github.com/HaxeCheckstyle/haxe-formatter#readme",
 	"devDependencies": {
-		"lix": "^15.10.1"
+		"lix": "^15.10.1",
+		"uglify-js-es6": "^2.8.9"
 	},
 	"bin": {
 		"haxe-formatter": "bin/formatter.js"
@@ -30,6 +31,6 @@
 		"registry": "https://npm.pkg.github.com/"
 	},
 	"scripts": {
-		"build": "haxe buildAll.hxml"
+		"build": "haxe buildAll.hxml && ./uglifyFormatter.sh"
 	}
 }
diff --git a/uglifyFormatter.sh b/uglifyFormatter.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+mkdir -p bin
+
+npx uglify-js-es6 run.js -o bin/formatter.uglify.js
+
+echo '#!/usr/bin/env node' > bin/formatter.js
+echo "" >> bin/formatter.js
+cat bin/formatter.uglify.js >> bin/formatter.js
+chmod 755 bin/formatter.js
+
+rm bin/formatter.uglify.js