You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2017/05/25 20:38:41 UTC
[21/25] cordova-browser git commit: cleaned up merge
cleaned up merge
Project: http://git-wip-us.apache.org/repos/asf/cordova-browser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-browser/commit/9a341aa3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-browser/tree/9a341aa3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-browser/diff/9a341aa3
Branch: refs/heads/master
Commit: 9a341aa3bb6dc221bd5f86321de0ba3f3a972a23
Parents: d5fcd3f 84dbb72
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu May 25 12:56:15 2017 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu May 25 12:56:15 2017 -0700
----------------------------------------------------------------------
package.json | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-browser/blob/9a341aa3/package.json
----------------------------------------------------------------------
diff --cc package.json
index 26fbc59,5af61de..a7ce43c
--- a/package.json
+++ b/package.json
@@@ -1,57 -1,54 +1,60 @@@
{
- "name": "cordova-browser",
- "version": "4.2.0-dev",
- "description": "cordova-browser release",
- "main": "bin/create",
- "repository": {
- "type": "git",
- "url": "https://git-wip-us.apache.org/repos/asf/cordova-browser.git"
+ "name": "cordova-browser",
+ "version": "4.2.0-dev",
+ "description": "cordova-browser release",
+ "main": "bin/template/cordova/Api.js",
+ "bin": "bin/create",
+ "repository": {
+ "type": "git",
+ "url": "https://git-wip-us.apache.org/repos/asf/cordova-browser.git"
+ },
++ "bugs": {
++ "url": "https://issues.apache.org/jira/browse/CB"
++ },
+ "keywords": [
+ "cordova",
+ "browser",
+ "apache"
+ ],
+ "scripts": {
+ "jshint": "jshint bin && jshint spec",
+ "jasmine": "jasmine --captureExceptions --color",
+ "test": "npm run jshint && npm run jasmine"
+ },
+ "dependencies": {
+ "adm-zip": "^0.4.7",
+ "cordova-common": "^2.0.1",
+ "cordova-serve": "^1.0.0",
+ "nopt": "^3.0.6",
+ "q": "^1.4.1",
+ "shelljs": "^0.5.3"
+ },
+ "devDependencies": {
+ "jasmine": "^2.5.3",
+ "jshint": "^2.6.0",
+ "tmp": "^0.0.26"
+ },
+ "bundledDependencies": [
+ "adm-zip",
+ "cordova-serve",
+ "nopt",
+ "q",
+ "shelljs"
+ ],
+ "author": "Apache Software Foundation",
+ "contributors": [
+ {
+ "name": "Steve Gill",
+ "email": "steveng@adobe.com"
},
- "bugs": {
- "url": "https://issues.apache.org/jira/browse/CB"
+ {
+ "name": "Suraj Pindoria",
+ "email": "spindori@adobe.com"
},
- "keywords": [
- "cordova",
- "browser",
- "apache"
- ],
- "scripts": {
- "test": "npm run jshint && npm run test-unit",
- "test-unit": "node node_modules/jasmine-node/lib/jasmine-node/cli.js --captureExceptions tests/spec/",
- "jshint": "node node_modules/jshint/bin/jshint bin && node node_modules/jshint/bin/jshint tests"
- },
- "dependencies": {
- "adm-zip": "^0.4.7",
- "cordova-serve": "^1.0.0",
- "nopt": "^3.0.6",
- "q": "^1.4.1",
- "shelljs": "^0.6.0"
- },
- "devDependencies": {
- "jasmine-node": "~1",
- "jshint": "^2.6.0",
- "tmp": "^0.0.26"
- },
- "bundledDependencies": [
- "adm-zip",
- "cordova-serve",
- "nopt",
- "q",
- "shelljs"
- ],
- "author": "Apache Software Foundation",
- "contributors": [
- {
- "name": "Steve Gill",
- "email": "steveng@adobe.com"
- },
- {
- "name": "Suraj Pindoria",
- "email": "spindori@adobe.com"
- }
- ],
- "license": "Apache-2.0"
+ {
+ "name": "Jesse MacFadyen",
+ "email": "purplecabbage@apache.org"
+ }
+ ],
+ "license": "Apache-2.0"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org