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 2015/09/17 00:17:03 UTC
[12/12] cordova-browser git commit: fix merge conflict
fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cordova-browser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-browser/commit/d018a685
Tree: http://git-wip-us.apache.org/repos/asf/cordova-browser/tree/d018a685
Diff: http://git-wip-us.apache.org/repos/asf/cordova-browser/diff/d018a685
Branch: refs/heads/master
Commit: d018a68556b0b5866337def34037763cfbfcb23e
Parents: a7a409f e467d6a
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed Sep 16 15:11:59 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed Sep 16 15:11:59 2015 -0700
----------------------------------------------------------------------
bin/templates/project/cordova/run | 12 +-
node_modules/cordova-serve/RELEASENOTES.md | 6 +
.../cordova-serve/node_modules/chalk/index.js | 116 ++++++++++
.../cordova-serve/node_modules/chalk/license | 21 ++
.../chalk/node_modules/ansi-styles/index.js | 65 ++++++
.../chalk/node_modules/ansi-styles/license | 21 ++
.../chalk/node_modules/ansi-styles/package.json | 80 +++++++
.../chalk/node_modules/ansi-styles/readme.md | 86 ++++++++
.../node_modules/escape-string-regexp/index.js | 11 +
.../node_modules/escape-string-regexp/license | 21 ++
.../escape-string-regexp/package.json | 70 ++++++
.../node_modules/escape-string-regexp/readme.md | 27 +++
.../chalk/node_modules/has-ansi/index.js | 4 +
.../chalk/node_modules/has-ansi/license | 21 ++
.../has-ansi/node_modules/ansi-regex/index.js | 4 +
.../has-ansi/node_modules/ansi-regex/license | 21 ++
.../node_modules/ansi-regex/package.json | 86 ++++++++
.../has-ansi/node_modules/ansi-regex/readme.md | 31 +++
.../chalk/node_modules/has-ansi/package.json | 85 ++++++++
.../chalk/node_modules/has-ansi/readme.md | 36 ++++
.../chalk/node_modules/strip-ansi/index.js | 6 +
.../chalk/node_modules/strip-ansi/license | 21 ++
.../strip-ansi/node_modules/ansi-regex/index.js | 4 +
.../strip-ansi/node_modules/ansi-regex/license | 21 ++
.../node_modules/ansi-regex/package.json | 86 ++++++++
.../node_modules/ansi-regex/readme.md | 31 +++
.../chalk/node_modules/strip-ansi/package.json | 85 ++++++++
.../chalk/node_modules/strip-ansi/readme.md | 33 +++
.../chalk/node_modules/supports-color/index.js | 50 +++++
.../chalk/node_modules/supports-color/license | 21 ++
.../node_modules/supports-color/package.json | 79 +++++++
.../chalk/node_modules/supports-color/readme.md | 36 ++++
.../node_modules/chalk/package.json | 103 +++++++++
.../cordova-serve/node_modules/chalk/readme.md | 213 +++++++++++++++++++
.../node_modules/shelljs/README.md | 8 +-
.../node_modules/shelljs/package.json | 16 +-
.../node_modules/shelljs/src/exec.js | 10 +-
node_modules/cordova-serve/package.json | 33 +--
node_modules/cordova-serve/src/browser.js | 20 +-
node_modules/cordova-serve/src/platform.js | 9 +-
node_modules/cordova-serve/src/server.js | 28 ++-
node_modules/cordova-serve/src/stream.js | 15 +-
package.json | 4 +-
43 files changed, 1688 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-browser/blob/d018a685/package.json
----------------------------------------------------------------------
diff --cc package.json
index a017418,475778e..d2e1710
--- a/package.json
+++ b/package.json
@@@ -1,51 -1,39 +1,51 @@@
{
- "name": "cordova-browser",
- "version": "4.1.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.1.0-dev",
+ "description": "cordova-browser release",
+ "main": "bin/create",
+ "repository": {
+ "type": "git",
+ "url": "https://git-wip-us.apache.org/repos/asf/cordova-browser.git"
+ },
+ "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.4",
+ "cordova-serve": "^0.1.2",
+ "nopt": "~3",
+ "q": "^1.4.1",
+ "shelljs": "^0.1.4"
+ },
+ "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"
},
- "keywords": [
- "cordova",
- "browser",
- "apache"
- ],
- "dependencies": {
- "adm-zip": "0.4.4",
- "cordova-serve": "^0.1.3",
- "nopt": "~3",
- "shelljs": "^0.1.4"
- },
- "bundledDependencies": [
- "adm-zip",
- "cordova-serve",
- "nopt",
- "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": "Suraj Pindoria",
- "email": "spindori@adobe.com"
++ "name": "Suraj Pindoria",
++ "email": "spindori@adobe.com"
+ }
+ ],
+ "license": "Apache-2.0"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org