Merge pull request flickr#31 from jeremyruppel/scripts

Use package.json scripts
vulppine · Aug 19, 2016 · cf6238d · cf6238d
2 parents 3b9a706 + 5ef2ac8
commit cf6238d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 35 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,5 +4,8 @@ module.exports = {
 
 	env: {
 		node: true
-	}
+	},
+
+	rules: {}
+
 };
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,6 @@ before_script:
 - npm run lint
 script:
 - npm run build
-- npm test
+- npm test --coverage
 after_script:
 - npm run coverage
diff --git a/lib/index.js b/lib/index.js
@@ -1,5 +1,8 @@
-// Copyright 2016 Yahoo Inc.
-// Licensed under the terms of the MIT license. Please see LICENSE file in the project root for terms.
+/*!
+ * Copyright 2016 Yahoo Inc.
+ * Licensed under the terms of the MIT license. Please see LICENSE file in the project root for terms.
+ * @license
+ */
 
 'use strict';
 

diff --git a/lib/row.js b/lib/row.js
@@ -1,5 +1,8 @@
-// Copyright 2016 Yahoo Inc.
-// Licensed under the terms of the MIT license. Please see LICENSE file in the project root for terms.
+/*!
+ * Copyright 2016 Yahoo Inc.
+ * Licensed under the terms of the MIT license. Please see LICENSE file in the project root for terms.
+ * @license
+ */
 
 var merge = require('merge');
 

diff --git a/package.json b/package.json
@@ -21,9 +21,11 @@
   "main": "./lib/index.js",
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha",
-    "coverage": "./script/coverage.sh",
-    "build": "./script/build.sh",
+    "test": "istanbul test _mocha",
+    "build": "npm run build-dist && npm run build-min",
+    "build-dist": "mkdir -p dist && browserify -r $npm_package_main:justified-layout > dist/justified-layout.js",
+    "build-min": "uglifyjs dist/justified-layout.js --comments -o dist/justified-layout.min.js",
+    "coverage": "cat ./coverage/lcov.info | coveralls",
     "prepublish": "npm run build"
   },
   "repository": {
@@ -36,7 +38,7 @@
     "browserify": "~11.1.0",
     "coveralls": "^2.11.9",
     "eslint": "^2.13.1",
-    "eslint-config-flickr": "^1.1.7",
+    "eslint-config-flickr": "~1.1.8",
     "expect": "1.14.0",
     "istanbul": "^0.4.2",
     "mocha": "2.4.5",

diff --git a/script/build.sh b/script/build.sh
diff --git a/script/coverage.sh b/script/coverage.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,5 +4,8 @@ module.exports = { @@
     	env: {
     		node: true
-    	}
+    	},
+    	rules: {}
     };