Add support for UglifyJS 'unsafe' option

Closes js-cookiegh-207. Closes js-cookiegh-206.
mspreij · Jun 19, 2016 · 79037c2 · 79037c2
1 parent d430a73
commit 79037c2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -70,10 +70,14 @@ module.exports = function (grunt) {
 		},
 		uglify: {
 			options: {
+				compress: {
+					unsafe: true
+				},
 				banner: '/*! <%= pkg.name %> v<%= pkg.version %> | <%= pkg.license %> */\n'
 			},
 			build: {
 				files: {
+					'build/js.cookie.min.js': 'src/js.cookie.js',
 					'build/js.cookie-<%= pkg.version %>.min.js': 'src/js.cookie.js'
 				}
 			}
@@ -234,9 +238,9 @@ module.exports = function (grunt) {
 	}
 
 	grunt.registerTask('saucelabs', ['connect:build-sauce', 'saucelabs-qunit']);
-	grunt.registerTask('test', ['jshint', 'jscs', 'connect:build-qunit', 'qunit', 'nodeunit']);
+	grunt.registerTask('test', ['uglify', 'jshint', 'jscs', 'connect:build-qunit', 'qunit', 'nodeunit']);
 
-	grunt.registerTask('dev', ['test', 'uglify', 'compare_size']);
+	grunt.registerTask('dev', ['test', 'compare_size']);
 	grunt.registerTask('ci', ['test', 'saucelabs']);
 
 	grunt.registerTask('default', 'dev');

diff --git a/src/js.cookie.js b/src/js.cookie.js
@@ -71,10 +71,10 @@
 
 				return (document.cookie = [
 					key, '=', value,
-					attributes.expires && '; expires=' + attributes.expires.toUTCString(), // use expires attribute, max-age is not supported by IE
-					attributes.path    && '; path=' + attributes.path,
-					attributes.domain  && '; domain=' + attributes.domain,
-					attributes.secure ? '; secure' : ''
+					attributes.expires ? '; expires=' + attributes.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
+					attributes.path    ? '; path=' + attributes.path : '',
+					attributes.domain  ? '; domain=' + attributes.domain : '',
+					attributes.secure  ? '; secure' : ''
 				].join(''));
 			}
 

diff --git a/test/index.html b/test/index.html
@@ -6,7 +6,7 @@
 		<link href="../node_modules/qunitjs/qunit/qunit.css" rel="stylesheet">
 		<script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 		<script>Cookies = 'existent global'</script>
-		<script src="../src/js.cookie.js"></script>
+		<script src="../build/js.cookie.min.js"></script>
 		<script src="polyfill.js"></script>
 		<script src="utils.js"></script>
 		<script src="tests.js"></script>

diff --git a/test/malformed_cookie.html b/test/malformed_cookie.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<title></title>
-		<script src="../src/js.cookie.js"></script>
+		<script src="../build/js.cookie.min.js"></script>
 		<script>
 			try {
 				Object.defineProperty(document, "cookie", { get: function() { return "first=one; ; second=two"; } });

diff --git a/test/missing_semicolon.html b/test/missing_semicolon.html
@@ -8,7 +8,7 @@
     <script src="utils.js"></script>
     <script>
         (function() {
-            var contents = window.loadFileSync('../src/js.cookie.js');
+            var contents = window.loadFileSync('../build/js.cookie.min.js');
 
             if (contents !== null) {
                 var script = document.createElement('script');