You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/06/14 01:46:17 UTC
[1/9] git commit: adding and freezing cordova-js
Repository: cordova-lib
Updated Branches:
refs/heads/master 5c88df091 -> da884bf14
adding and freezing cordova-js
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c2a2e84a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c2a2e84a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c2a2e84a
Branch: refs/heads/master
Commit: c2a2e84a781ed5b8e4438e08bc3820803185ab34
Parents: 3caefb7
Author: Anis Kadri <an...@apache.org>
Authored: Tue Jun 10 16:05:50 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Jun 10 16:05:50 2014 -0700
----------------------------------------------------------------------
cordova-lib/npm-shrinkwrap.json | 762 ++++++++++++++++++++++++++++++++---
cordova-lib/package.json | 3 +-
2 files changed, 697 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c2a2e84a/cordova-lib/npm-shrinkwrap.json
----------------------------------------------------------------------
diff --git a/cordova-lib/npm-shrinkwrap.json b/cordova-lib/npm-shrinkwrap.json
index 836207c..2ece826 100644
--- a/cordova-lib/npm-shrinkwrap.json
+++ b/cordova-lib/npm-shrinkwrap.json
@@ -1,19 +1,595 @@
{
"name": "cordova-lib",
- "version": "0.21.3",
+ "version": "0.21.4-dev",
"dependencies": {
"bplist-parser": {
"version": "0.0.5",
- "from": "bplist-parser@0.0.x"
+ "from": "bplist-parser@0.0.5",
+ "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.5.tgz"
+ },
+ "cordova-js": {
+ "version": "3.6.2",
+ "from": "cordova-js@",
+ "dependencies": {
+ "uglify-js": {
+ "version": "2.4.13",
+ "from": "uglify-js@2.4.x",
+ "dependencies": {
+ "async": {
+ "version": "0.2.10",
+ "from": "async@~0.2.6",
+ "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+ },
+ "source-map": {
+ "version": "0.1.34",
+ "from": "source-map@~0.1.33",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+ "dependencies": {
+ "amdefine": {
+ "version": "0.1.0",
+ "from": "amdefine@>=0.0.4"
+ }
+ }
+ },
+ "optimist": {
+ "version": "0.3.7",
+ "from": "optimist@~0.3.5",
+ "dependencies": {
+ "wordwrap": {
+ "version": "0.0.2",
+ "from": "wordwrap@~0.0.2"
+ }
+ }
+ },
+ "uglify-to-browserify": {
+ "version": "1.0.2",
+ "from": "uglify-to-browserify@~1.0.0"
+ }
+ }
+ },
+ "browserify": {
+ "version": "3.46.0",
+ "from": "browserify@3.46.0",
+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-3.46.0.tgz",
+ "dependencies": {
+ "JSONStream": {
+ "version": "0.7.4",
+ "from": "JSONStream@~0.7.1",
+ "dependencies": {
+ "jsonparse": {
+ "version": "0.0.5",
+ "from": "jsonparse@0.0.5",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+ }
+ }
+ },
+ "assert": {
+ "version": "1.1.1",
+ "from": "assert@~1.1.0",
+ "dependencies": {
+ "util": {
+ "version": "0.10.2",
+ "from": "util@0.10.2"
+ }
+ }
+ },
+ "browser-pack": {
+ "version": "2.0.1",
+ "from": "browser-pack@~2.0.0",
+ "dependencies": {
+ "JSONStream": {
+ "version": "0.6.4",
+ "from": "JSONStream@~0.6.4",
+ "dependencies": {
+ "jsonparse": {
+ "version": "0.0.5",
+ "from": "jsonparse@0.0.5",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+ },
+ "through": {
+ "version": "2.2.7",
+ "from": "through@~2.2.7"
+ }
+ }
+ },
+ "combine-source-map": {
+ "version": "0.3.0",
+ "from": "combine-source-map@~0.3.0",
+ "dependencies": {
+ "inline-source-map": {
+ "version": "0.3.0",
+ "from": "inline-source-map@~0.3.0"
+ },
+ "convert-source-map": {
+ "version": "0.3.4",
+ "from": "convert-source-map@~0.3.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.4.tgz"
+ },
+ "source-map": {
+ "version": "0.1.34",
+ "from": "source-map@~0.1.31",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+ "dependencies": {
+ "amdefine": {
+ "version": "0.1.0",
+ "from": "amdefine@>=0.0.4"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "browser-resolve": {
+ "version": "1.2.4",
+ "from": "browser-resolve@~1.2.1"
+ },
+ "browserify-zlib": {
+ "version": "0.1.4",
+ "from": "browserify-zlib@~0.1.2",
+ "dependencies": {
+ "pako": {
+ "version": "0.2.3",
+ "from": "pako@~0.2.0",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.3.tgz"
+ }
+ }
+ },
+ "buffer": {
+ "version": "2.1.13",
+ "from": "buffer@~2.1.4",
+ "dependencies": {
+ "base64-js": {
+ "version": "0.0.7",
+ "from": "base64-js@~0.0.4",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"
+ },
+ "ieee754": {
+ "version": "1.1.3",
+ "from": "ieee754@~1.1.1"
+ }
+ }
+ },
+ "builtins": {
+ "version": "0.0.4",
+ "from": "builtins@~0.0.3"
+ },
+ "commondir": {
+ "version": "0.0.1",
+ "from": "commondir@0.0.1",
+ "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
+ },
+ "concat-stream": {
+ "version": "1.4.6",
+ "from": "concat-stream@~1.4.1",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.6.tgz",
+ "dependencies": {
+ "typedarray": {
+ "version": "0.0.6",
+ "from": "typedarray@~0.0.5",
+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+ },
+ "readable-stream": {
+ "version": "1.1.13-1",
+ "from": "readable-stream@~1.1.9",
+ "dependencies": {
+ "core-util-is": {
+ "version": "1.0.1",
+ "from": "core-util-is@~1.0.0"
+ },
+ "isarray": {
+ "version": "0.0.1",
+ "from": "isarray@0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+ },
+ "string_decoder": {
+ "version": "0.10.25-1",
+ "from": "string_decoder@~0.10.x"
+ }
+ }
+ }
+ }
+ },
+ "console-browserify": {
+ "version": "1.0.3",
+ "from": "console-browserify@~1.0.1"
+ },
+ "constants-browserify": {
+ "version": "0.0.1",
+ "from": "constants-browserify@~0.0.1"
+ },
+ "crypto-browserify": {
+ "version": "1.0.9",
+ "from": "crypto-browserify@~1.0.9"
+ },
+ "deep-equal": {
+ "version": "0.1.2",
+ "from": "deep-equal@~0.1.0"
+ },
+ "defined": {
+ "version": "0.0.0",
+ "from": "defined@~0.0.0"
+ },
+ "deps-sort": {
+ "version": "0.1.2",
+ "from": "deps-sort@~0.1.1",
+ "dependencies": {
+ "JSONStream": {
+ "version": "0.6.4",
+ "from": "JSONStream@~0.6.4",
+ "dependencies": {
+ "jsonparse": {
+ "version": "0.0.5",
+ "from": "jsonparse@0.0.5",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+ },
+ "through": {
+ "version": "2.2.7",
+ "from": "through@~2.2.7"
+ }
+ }
+ },
+ "minimist": {
+ "version": "0.0.10",
+ "from": "minimist@~0.0.1"
+ }
+ }
+ },
+ "derequire": {
+ "version": "0.8.0",
+ "from": "derequire@~0.8.0",
+ "dependencies": {
+ "estraverse": {
+ "version": "1.5.0",
+ "from": "estraverse@~1.5.0"
+ },
+ "esrefactor": {
+ "version": "0.1.0",
+ "from": "esrefactor@~0.1.0",
+ "dependencies": {
+ "esprima": {
+ "version": "1.0.4",
+ "from": "esprima@~1.0.4"
+ },
+ "estraverse": {
+ "version": "0.0.4",
+ "from": "estraverse@~0.0.4"
+ },
+ "escope": {
+ "version": "0.0.16",
+ "from": "escope@~0.0.13"
+ }
+ }
+ },
+ "esprima-fb": {
+ "version": "3001.1.0-dev-harmony-fb",
+ "from": "esprima-fb@^3001.1.0-dev-harmony-fb",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz"
+ }
+ }
+ },
+ "domain-browser": {
+ "version": "1.1.2",
+ "from": "domain-browser@~1.1.0",
+ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz"
+ },
+ "duplexer": {
+ "version": "0.1.1",
+ "from": "duplexer@~0.1.1"
+ },
+ "events": {
+ "version": "1.0.1",
+ "from": "events@~1.0.0"
+ },
+ "http-browserify": {
+ "version": "1.3.2",
+ "from": "http-browserify@~1.3.1",
+ "dependencies": {
+ "Base64": {
+ "version": "0.2.1",
+ "from": "Base64@~0.2.0"
+ }
+ }
+ },
+ "https-browserify": {
+ "version": "0.0.0",
+ "from": "https-browserify@~0.0.0"
+ },
+ "inherits": {
+ "version": "2.0.1",
+ "from": "inherits@~2.0.1",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+ },
+ "insert-module-globals": {
+ "version": "5.0.1",
+ "from": "insert-module-globals@~5.0.1",
+ "dependencies": {
+ "lexical-scope": {
+ "version": "1.1.0",
+ "from": "lexical-scope@~1.1.0",
+ "dependencies": {
+ "astw": {
+ "version": "1.1.0",
+ "from": "astw@~1.1.0",
+ "dependencies": {
+ "esprima-fb": {
+ "version": "3001.1.0-dev-harmony-fb",
+ "from": "esprima-fb@^3001.1.0-dev-harmony-fb",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz"
+ }
+ }
+ }
+ }
+ },
+ "process": {
+ "version": "0.6.0",
+ "from": "process@~0.6.0"
+ }
+ }
+ },
+ "module-deps": {
+ "version": "1.10.0",
+ "from": "module-deps@~1.10.0",
+ "dependencies": {
+ "detective": {
+ "version": "3.1.0",
+ "from": "detective@~3.1.0",
+ "dependencies": {
+ "escodegen": {
+ "version": "1.1.0",
+ "from": "escodegen@~1.1.0",
+ "dependencies": {
+ "esprima": {
+ "version": "1.0.4",
+ "from": "esprima@~1.0.4"
+ },
+ "estraverse": {
+ "version": "1.5.0",
+ "from": "estraverse@~1.5.0"
+ },
+ "esutils": {
+ "version": "1.0.0",
+ "from": "esutils@~1.0.0"
+ },
+ "source-map": {
+ "version": "0.1.34",
+ "from": "source-map@~0.1.30",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+ "dependencies": {
+ "amdefine": {
+ "version": "0.1.0",
+ "from": "amdefine@>=0.0.4"
+ }
+ }
+ }
+ }
+ },
+ "esprima-fb": {
+ "version": "3001.1.0-dev-harmony-fb",
+ "from": "esprima-fb@^3001.1.0-dev-harmony-fb",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz"
+ }
+ }
+ },
+ "minimist": {
+ "version": "0.0.10",
+ "from": "minimist@~0.0.5"
+ }
+ }
+ },
+ "os-browserify": {
+ "version": "0.1.2",
+ "from": "os-browserify@~0.1.1"
+ },
+ "parents": {
+ "version": "0.0.2",
+ "from": "parents@~0.0.1"
+ },
+ "path-browserify": {
+ "version": "0.0.0",
+ "from": "path-browserify@~0.0.0"
+ },
+ "punycode": {
+ "version": "1.2.4",
+ "from": "punycode@~1.2.3"
+ },
+ "querystring-es3": {
+ "version": "0.2.0",
+ "from": "querystring-es3@0.2.0",
+ "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.0.tgz"
+ },
+ "resolve": {
+ "version": "0.6.3",
+ "from": "resolve@~0.6.1"
+ },
+ "shallow-copy": {
+ "version": "0.0.1",
+ "from": "shallow-copy@0.0.1",
+ "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
+ },
+ "shell-quote": {
+ "version": "0.0.1",
+ "from": "shell-quote@~0.0.1"
+ },
+ "stream-browserify": {
+ "version": "0.1.3",
+ "from": "stream-browserify@~0.1.0",
+ "dependencies": {
+ "process": {
+ "version": "0.5.2",
+ "from": "process@~0.5.1"
+ }
+ }
+ },
+ "stream-combiner": {
+ "version": "0.0.4",
+ "from": "stream-combiner@~0.0.2"
+ },
+ "string_decoder": {
+ "version": "0.0.1",
+ "from": "string_decoder@~0.0.0"
+ },
+ "subarg": {
+ "version": "0.0.1",
+ "from": "subarg@0.0.1",
+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz",
+ "dependencies": {
+ "minimist": {
+ "version": "0.0.10",
+ "from": "minimist@~0.0.7"
+ }
+ }
+ },
+ "syntax-error": {
+ "version": "1.1.0",
+ "from": "syntax-error@~1.1.0",
+ "dependencies": {
+ "esprima-fb": {
+ "version": "3001.1.0-dev-harmony-fb",
+ "from": "esprima-fb@^3001.1.0-dev-harmony-fb",
+ "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz"
+ }
+ }
+ },
+ "through2": {
+ "version": "0.4.2",
+ "from": "through2@~0.4.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+ "dependencies": {
+ "readable-stream": {
+ "version": "1.0.27-1",
+ "from": "readable-stream@~1.0.17",
+ "dependencies": {
+ "core-util-is": {
+ "version": "1.0.1",
+ "from": "core-util-is@~1.0.0"
+ },
+ "isarray": {
+ "version": "0.0.1",
+ "from": "isarray@0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+ },
+ "string_decoder": {
+ "version": "0.10.25-1",
+ "from": "string_decoder@~0.10.x"
+ }
+ }
+ },
+ "xtend": {
+ "version": "2.1.2",
+ "from": "xtend@~2.1.1",
+ "dependencies": {
+ "object-keys": {
+ "version": "0.4.0",
+ "from": "object-keys@~0.4.0"
+ }
+ }
+ }
+ }
+ },
+ "timers-browserify": {
+ "version": "1.0.1",
+ "from": "timers-browserify@~1.0.1",
+ "dependencies": {
+ "process": {
+ "version": "0.5.2",
+ "from": "process@~0.5.1"
+ }
+ }
+ },
+ "tty-browserify": {
+ "version": "0.0.0",
+ "from": "tty-browserify@~0.0.0"
+ },
+ "umd": {
+ "version": "2.0.0",
+ "from": "umd@~2.0.0",
+ "dependencies": {
+ "rfile": {
+ "version": "1.0.0",
+ "from": "rfile@~1.0.0",
+ "dependencies": {
+ "callsite": {
+ "version": "1.0.0",
+ "from": "callsite@~1.0.0"
+ },
+ "resolve": {
+ "version": "0.3.1",
+ "from": "resolve@~0.3.0"
+ }
+ }
+ },
+ "ruglify": {
+ "version": "1.0.0",
+ "from": "ruglify@~1.0.0",
+ "dependencies": {
+ "uglify-js": {
+ "version": "2.2.5",
+ "from": "uglify-js@~2.2",
+ "dependencies": {
+ "source-map": {
+ "version": "0.1.34",
+ "from": "source-map@~0.1.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+ "dependencies": {
+ "amdefine": {
+ "version": "0.1.0",
+ "from": "amdefine@>=0.0.4"
+ }
+ }
+ },
+ "optimist": {
+ "version": "0.3.7",
+ "from": "optimist@~0.3.5",
+ "dependencies": {
+ "wordwrap": {
+ "version": "0.0.2",
+ "from": "wordwrap@~0.0.2"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "url": {
+ "version": "0.10.1",
+ "from": "url@~0.10.1"
+ },
+ "util": {
+ "version": "0.10.3",
+ "from": "util@~0.10.1"
+ },
+ "vm-browserify": {
+ "version": "0.0.4",
+ "from": "vm-browserify@~0.0.1",
+ "dependencies": {
+ "indexof": {
+ "version": "0.0.1",
+ "from": "indexof@0.0.1",
+ "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+ }
+ }
+ }
+ }
+ },
+ "through": {
+ "version": "2.3.4",
+ "from": "through@2.3.4",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
+ }
+ }
},
"dep-graph": {
"version": "1.1.0",
- "from": "dep-graph@1.1.0",
+ "from": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
"resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
"dependencies": {
"underscore": {
"version": "1.2.1",
- "from": "underscore@1.2.1",
+ "from": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
}
}
@@ -21,40 +597,46 @@
"elementtree": {
"version": "0.1.5",
"from": "elementtree@0.1.5",
+ "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz",
"dependencies": {
"sax": {
"version": "0.3.5",
- "from": "sax@0.3.5"
+ "from": "sax@0.3.5",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"
}
}
},
"glob": {
"version": "3.2.9",
- "from": "glob@3.2.x",
+ "from": "glob@3.2.9",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.9.tgz",
"dependencies": {
"minimatch": {
"version": "0.2.14",
- "from": "minimatch@~0.2.11",
+ "from": "minimatch@0.2.14",
"dependencies": {
"lru-cache": {
"version": "2.5.0",
- "from": "lru-cache@2"
+ "from": "lru-cache@2.5.0"
},
"sigmund": {
"version": "1.0.0",
- "from": "sigmund@~1.0.0"
+ "from": "sigmund@1.0.0",
+ "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
}
}
},
"inherits": {
"version": "2.0.1",
- "from": "inherits@2"
+ "from": "inherits@2.0.1",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
},
"mime": {
"version": "1.2.11",
- "from": "mime@~1.2.11"
+ "from": "mime@1.2.11",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
},
"npm": {
"version": "1.3.4",
@@ -405,165 +987,194 @@
},
"npmconf": {
"version": "0.1.16",
- "from": "npmconf@0.1.x",
+ "from": "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz",
"resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz",
"dependencies": {
"config-chain": {
"version": "1.1.8",
- "from": "config-chain@~1.1.8",
+ "from": "config-chain@1.1.8",
+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
"dependencies": {
"proto-list": {
"version": "1.2.2",
- "from": "proto-list@~1.2.1"
+ "from": "proto-list@1.2.2",
+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz"
}
}
},
"inherits": {
"version": "2.0.1",
- "from": "inherits@2"
+ "from": "inherits@2.0.1",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"once": {
"version": "1.3.0",
- "from": "once@~1.3.0"
+ "from": "once@1.3.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.3.0.tgz"
},
"mkdirp": {
"version": "0.3.5",
- "from": "mkdirp@~0.3.3"
+ "from": "mkdirp@0.3.5",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"nopt": {
"version": "2.2.1",
- "from": "nopt@2",
+ "from": "nopt@2.2.1",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
"dependencies": {
"abbrev": {
"version": "1.0.5",
- "from": "abbrev@1"
+ "from": "abbrev@1.0.5"
}
}
},
"ini": {
"version": "1.1.0",
- "from": "ini@~1.1.0"
+ "from": "ini@1.1.0",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
}
}
},
"osenv": {
"version": "0.0.3",
- "from": "osenv@0.0.x"
+ "from": "osenv@0.0.3",
+ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"
},
"plist-with-patches": {
"version": "0.5.1",
- "from": "plist-with-patches@0.5.x",
+ "from": "plist-with-patches@0.5.1",
+ "resolved": "https://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz",
"dependencies": {
"xmlbuilder": {
"version": "0.4.3",
- "from": "xmlbuilder@0.4.x"
+ "from": "xmlbuilder@0.4.3",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"
},
"xmldom": {
"version": "0.1.19",
- "from": "xmldom@0.1.x"
+ "from": "xmldom@0.1.19",
+ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
}
}
},
"properties-parser": {
- "version": "~0.2.2",
- "from": "properties-parser@0.2.2"
+ "version": "0.2.2",
+ "from": "properties-parser@~0.2.2",
+ "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.2.tgz"
},
"q": {
"version": "0.9.7",
- "from": "q@~0.9"
+ "from": "q@0.9.7",
+ "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz"
},
"rc": {
"version": "0.3.0",
- "from": "rc@0.3.0",
+ "from": "https://registry.npmjs.org/rc/-/rc-0.3.0.tgz",
"resolved": "https://registry.npmjs.org/rc/-/rc-0.3.0.tgz",
"dependencies": {
"optimist": {
"version": "0.3.7",
- "from": "optimist@~0.3.4",
+ "from": "optimist@0.3.7",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
- "from": "wordwrap@~0.0.2"
+ "from": "wordwrap@0.0.2"
}
}
},
"deep-extend": {
"version": "0.2.8",
- "from": "deep-extend@~0.2.5"
+ "from": "deep-extend@0.2.8",
+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz"
},
"ini": {
"version": "1.1.0",
- "from": "ini@~1.1.0"
+ "from": "ini@1.1.0",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
}
}
},
"request": {
"version": "2.22.0",
"from": "request@2.22.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.22.0.tgz",
"dependencies": {
"qs": {
"version": "0.6.6",
- "from": "qs@~0.6.0"
+ "from": "qs@0.6.6",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
},
"json-stringify-safe": {
"version": "4.0.0",
- "from": "json-stringify-safe@~4.0.0"
+ "from": "json-stringify-safe@4.0.0",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz"
},
"forever-agent": {
"version": "0.5.2",
- "from": "forever-agent@~0.5.0"
+ "from": "forever-agent@0.5.2",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"tunnel-agent": {
"version": "0.3.0",
- "from": "tunnel-agent@~0.3.0"
+ "from": "tunnel-agent@0.3.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
},
"http-signature": {
"version": "0.10.0",
- "from": "http-signature@~0.10.0",
+ "from": "http-signature@0.10.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
"dependencies": {
"assert-plus": {
"version": "0.1.2",
- "from": "assert-plus@0.1.2"
+ "from": "assert-plus@0.1.2",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
},
"asn1": {
"version": "0.1.11",
- "from": "asn1@0.1.11"
+ "from": "asn1@0.1.11",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
},
"ctype": {
"version": "0.5.2",
- "from": "ctype@0.5.2"
+ "from": "ctype@0.5.2",
+ "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
}
}
},
"hawk": {
"version": "0.13.1",
- "from": "hawk@~0.13.0",
+ "from": "hawk@0.13.1",
+ "resolved": "https://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz",
"dependencies": {
"hoek": {
"version": "0.8.5",
- "from": "hoek@0.8.x"
+ "from": "hoek@0.8.5",
+ "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz"
},
"boom": {
"version": "0.4.2",
- "from": "boom@0.4.x",
+ "from": "boom@0.4.2",
+ "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
"dependencies": {
"hoek": {
"version": "0.9.1",
- "from": "hoek@0.9.x"
+ "from": "hoek@0.9.1"
}
}
},
"cryptiles": {
"version": "0.2.2",
- "from": "cryptiles@0.2.x"
+ "from": "cryptiles@0.2.2",
+ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
},
"sntp": {
"version": "0.2.4",
- "from": "sntp@0.2.x",
+ "from": "sntp@0.2.4",
+ "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
"dependencies": {
"hoek": {
"version": "0.9.1",
- "from": "hoek@0.9.x"
+ "from": "hoek@0.9.1"
}
}
}
@@ -571,37 +1182,45 @@
},
"aws-sign": {
"version": "0.3.0",
- "from": "aws-sign@~0.3.0"
+ "from": "aws-sign@0.3.0",
+ "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
},
"oauth-sign": {
"version": "0.3.0",
- "from": "oauth-sign@~0.3.0"
+ "from": "oauth-sign@0.3.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
},
"cookie-jar": {
"version": "0.3.0",
- "from": "cookie-jar@~0.3.0"
+ "from": "cookie-jar@0.3.0",
+ "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
},
"node-uuid": {
"version": "1.4.1",
- "from": "node-uuid@~1.4.0"
+ "from": "node-uuid@1.4.1",
+ "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
},
"form-data": {
"version": "0.0.8",
"from": "form-data@0.0.8",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz",
"dependencies": {
"combined-stream": {
"version": "0.0.4",
- "from": "combined-stream@~0.0.4",
+ "from": "combined-stream@0.0.4",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
- "from": "delayed-stream@0.0.5"
+ "from": "delayed-stream@0.0.5",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
}
}
},
"async": {
"version": "0.2.10",
- "from": "async@~0.2.7"
+ "from": "async@0.2.10",
+ "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
}
}
}
@@ -609,40 +1228,48 @@
},
"semver": {
"version": "2.0.11",
- "from": "semver@2.0.x"
+ "from": "semver@2.0.11",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"
},
"shelljs": {
"version": "0.1.4",
- "from": "shelljs@0.1.x"
+ "from": "shelljs@0.1.4",
+ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"
},
"tar": {
"version": "0.1.19",
- "from": "tar@0.1.x",
+ "from": "tar@0.1.19",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.19.tgz",
"dependencies": {
"inherits": {
"version": "2.0.1",
- "from": "inherits@2"
+ "from": "inherits@2.0.1",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"block-stream": {
"version": "0.0.7",
- "from": "block-stream@*"
+ "from": "block-stream@0.0.7",
+ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
},
"fstream": {
"version": "0.1.25",
- "from": "fstream@~0.1.8",
+ "from": "fstream@0.1.25",
+ "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
"dependencies": {
"rimraf": {
"version": "2.2.8",
- "from": "rimraf@2",
+ "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
},
"mkdirp": {
"version": "0.3.5",
- "from": "mkdirp@0.3"
+ "from": "mkdirp@0.3.5",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"graceful-fs": {
"version": "2.0.3",
- "from": "graceful-fs@~2.0.0"
+ "from": "graceful-fs@2.0.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
}
}
}
@@ -650,21 +1277,22 @@
},
"underscore": {
"version": "1.4.4",
- "from": "underscore@1.4.4"
+ "from": "underscore@1.4.4",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
},
"xcode": {
"version": "0.6.6",
- "from": "xcode@0.6.6",
+ "from": "https://registry.npmjs.org/xcode/-/xcode-0.6.6.tgz",
"resolved": "https://registry.npmjs.org/xcode/-/xcode-0.6.6.tgz",
"dependencies": {
"pegjs": {
"version": "0.6.2",
- "from": "pegjs@0.6.2",
+ "from": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz",
"resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"
},
"node-uuid": {
"version": "1.3.3",
- "from": "node-uuid@1.3.3",
+ "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"
}
}
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c2a2e84a/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 5a6548b..329a63a 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -34,7 +34,8 @@
"shelljs": "0.1.x",
"tar": "0.1.x",
"underscore": "1.4.4",
- "xcode": "0.6.6"
+ "xcode": "0.6.6",
+ "cordova-js": "3.x.x"
},
"devDependencies": {
"temp": "0.6.x",
[9/9] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-lib
Posted by an...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-lib
Conflicts:
cordova-lib/npm-shrinkwrap.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/da884bf1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/da884bf1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/da884bf1
Branch: refs/heads/master
Commit: da884bf14e526c9ea71c4e1b588783a8892b67c6
Parents: 4f18510 5c88df0
Author: Anis Kadri <an...@apache.org>
Authored: Fri Jun 13 16:44:56 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Jun 13 16:44:56 2014 -0700
----------------------------------------------------------------------
cordova-lib/npm-shrinkwrap.json | 5 +-
cordova-lib/package.json | 2 +-
cordova-lib/spec-cordova/helpers.js | 18 ++
cordova-lib/spec-cordova/platform.spec.js | 18 ++
cordova-lib/spec-cordova/plugin.spec.js | 18 ++
cordova-lib/spec-cordova/wrappers.spec.js | 18 ++
cordova-lib/spec-plugman/add_platform.spec.js | 18 ++
cordova-lib/spec-plugman/adduser.spec.js | 18 ++
cordova-lib/spec-plugman/common.js | 18 ++
cordova-lib/spec-plugman/config.spec.js | 18 ++
cordova-lib/spec-plugman/create.spec.js | 18 ++
cordova-lib/spec-plugman/fetch.spec.js | 18 ++
cordova-lib/spec-plugman/info.spec.js | 18 ++
cordova-lib/spec-plugman/install.spec.js | 18 ++
cordova-lib/spec-plugman/owner.spec.js | 18 ++
cordova-lib/spec-plugman/platform.spec.js | 18 ++
.../platforms/amazon-fireos.spec.js | 18 ++
.../spec-plugman/platforms/android.spec.js | 18 ++
.../spec-plugman/platforms/blackberry10.spec.js | 18 ++
cordova-lib/spec-plugman/platforms/ios.spec.js | 18 ++
.../spec-plugman/platforms/windows8.spec.js | 18 ++
cordova-lib/spec-plugman/platforms/wp8.spec.js | 18 ++
cordova-lib/spec-plugman/prepare.spec.js | 18 ++
cordova-lib/spec-plugman/publish.spec.js | 18 ++
.../spec-plugman/registry/registry.spec.js | 18 ++
cordova-lib/spec-plugman/search.spec.js | 18 ++
cordova-lib/spec-plugman/uninstall.spec.js | 18 ++
cordova-lib/spec-plugman/unpublish.spec.js | 18 ++
.../spec-plugman/util/action-stack.spec.js | 18 ++
.../spec-plugman/util/config-changes.spec.js | 18 ++
cordova-lib/spec-plugman/util/csproj.spec.js | 18 ++
.../spec-plugman/util/dependencies.spec.js | 18 ++
cordova-lib/spec-plugman/wrappers.spec.js | 18 ++
cordova-lib/src/cordova/hooker.js | 2 +-
cordova-lib/src/cordova/lazy_load.js | 282 +++++++++---------
.../src/cordova/metadata/firefoxos_parser.js | 101 ++++---
cordova-lib/src/cordova/platform.js | 211 +++++++++-----
cordova-lib/src/cordova/util.js | 286 +++++++++++--------
cordova-lib/src/plugman/adduser.js | 18 ++
cordova-lib/src/plugman/config.js | 18 ++
cordova-lib/src/plugman/events.js | 18 ++
cordova-lib/src/plugman/fetch.js | 18 ++
cordova-lib/src/plugman/info.js | 18 ++
cordova-lib/src/plugman/install.js | 18 ++
cordova-lib/src/plugman/owner.js | 18 ++
cordova-lib/src/plugman/platform.js | 18 ++
cordova-lib/src/plugman/platform_operation.js | 18 ++
cordova-lib/src/plugman/platforms.js | 18 ++
cordova-lib/src/plugman/platforms/common.js | 18 ++
cordova-lib/src/plugman/platforms/firefoxos.js | 18 ++
cordova-lib/src/plugman/platforms/tizen.js | 18 ++
cordova-lib/src/plugman/publish.js | 18 ++
cordova-lib/src/plugman/registry/manifest.js | 18 ++
cordova-lib/src/plugman/registry/registry.js | 18 ++
cordova-lib/src/plugman/registry/whitelist.js | 18 ++
cordova-lib/src/plugman/search.js | 18 ++
cordova-lib/src/plugman/uninstall.js | 18 ++
cordova-lib/src/plugman/unpublish.js | 18 ++
cordova-lib/src/plugman/util/action-stack.js | 18 ++
cordova-lib/src/plugman/util/android-project.js | 20 +-
cordova-lib/src/plugman/util/csproj.js | 18 ++
cordova-lib/src/plugman/util/default-engines.js | 18 ++
cordova-lib/src/plugman/util/dependencies.js | 18 ++
cordova-lib/src/plugman/util/metadata.js | 18 ++
cordova-lib/src/plugman/util/w8jsproj.js | 18 ++
cordova-lib/templates/hooks-README.md | 5 +-
66 files changed, 1557 insertions(+), 383 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da884bf1/cordova-lib/npm-shrinkwrap.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da884bf1/cordova-lib/package.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da884bf1/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da884bf1/cordova-lib/src/plugman/uninstall.js
----------------------------------------------------------------------
[6/9] git commit: cleaning up plugman.js for uninstall
Posted by an...@apache.org.
cleaning up plugman.js for uninstall
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/523392fa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/523392fa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/523392fa
Branch: refs/heads/master
Commit: 523392fa5b14470fd702f23664b28f505ac324bd
Parents: b1e5576
Author: Anis Kadri <an...@apache.org>
Authored: Tue Jun 10 16:23:24 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Jun 10 16:23:24 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/plugman/plugman.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/523392fa/cordova-lib/src/plugman/plugman.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/plugman.js b/cordova-lib/src/plugman/plugman.js
index 83cfef8..9b8fdad 100644
--- a/cordova-lib/src/plugman/plugman.js
+++ b/cordova-lib/src/plugman/plugman.js
@@ -63,7 +63,6 @@ plugman = {
addProperty(plugman, 'install', './install', true);
addProperty(plugman, 'uninstall', './uninstall', true);
addProperty(plugman, 'fetch', './fetch', true);
-//addProperty(plugman, 'prepare', './prepare');
addProperty(plugman, 'config', './config', true);
addProperty(plugman, 'owner', './owner', true);
addProperty(plugman, 'adduser', './adduser', true);
@@ -120,8 +119,8 @@ plugman.commands = {
return console.log(plugman.help());
}
- cli_opts.browserify === true ? addProperty(plugman, 'prepare', './src/prepare-browserify') :
- addProperty(plugman, 'prepare', './src/prepare');
+ cli_opts.browserify === true ? addProperty(plugman, 'prepare', './prepare-browserify') :
+ addProperty(plugman, 'prepare', './prepare');
var p = Q();
cli_opts.plugin.forEach(function (pluginSrc) {
[4/9] git commit: adding support for prepare flag
Posted by an...@apache.org.
adding support for prepare flag
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e0915551
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e0915551
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e0915551
Branch: refs/heads/master
Commit: e09155511617d81d3dbf42f7ab7a2dab16716fa8
Parents: 171c981
Author: Anis Kadri <an...@apache.org>
Authored: Tue Jun 10 16:07:10 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Jun 10 16:07:10 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/plugman/plugman.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e0915551/cordova-lib/src/plugman/plugman.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/plugman.js b/cordova-lib/src/plugman/plugman.js
index 6a54ff5..83cfef8 100644
--- a/cordova-lib/src/plugman/plugman.js
+++ b/cordova-lib/src/plugman/plugman.js
@@ -63,7 +63,7 @@ plugman = {
addProperty(plugman, 'install', './install', true);
addProperty(plugman, 'uninstall', './uninstall', true);
addProperty(plugman, 'fetch', './fetch', true);
-addProperty(plugman, 'prepare', './prepare');
+//addProperty(plugman, 'prepare', './prepare');
addProperty(plugman, 'config', './config', true);
addProperty(plugman, 'owner', './owner', true);
addProperty(plugman, 'adduser', './adduser', true);
@@ -89,6 +89,8 @@ plugman.commands = {
if(!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
return console.log(plugman.help());
}
+ cli_opts.browserify === true ? addProperty(plugman, 'prepare', './prepare-browserify') :
+ addProperty(plugman, 'prepare', './prepare');
var cli_variables = {}
if (cli_opts.variable) {
cli_opts.variable.forEach(function (variable) {
@@ -110,13 +112,16 @@ plugman.commands = {
return plugman.raw.install(cli_opts.platform, cli_opts.project, pluginSrc, cli_opts.plugins_dir, opts);
})
});
-
+
return p;
},
'uninstall': function(cli_opts) {
if(!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
return console.log(plugman.help());
}
+
+ cli_opts.browserify === true ? addProperty(plugman, 'prepare', './src/prepare-browserify') :
+ addProperty(plugman, 'prepare', './src/prepare');
var p = Q();
cli_opts.plugin.forEach(function (pluginSrc) {
[5/9] git commit: adding param to uninstall
Posted by an...@apache.org.
adding param to uninstall
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b1e55767
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b1e55767
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b1e55767
Branch: refs/heads/master
Commit: b1e55767dbb448cf426305eb0e6086c88519f277
Parents: e091555
Author: Anis Kadri <an...@apache.org>
Authored: Tue Jun 10 16:12:02 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Jun 10 16:12:02 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/plugman/uninstall.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b1e55767/cordova-lib/src/plugman/uninstall.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/uninstall.js b/cordova-lib/src/plugman/uninstall.js
index 07b62a7..1c2e78b 100644
--- a/cordova-lib/src/plugman/uninstall.js
+++ b/cordova-lib/src/plugman/uninstall.js
@@ -284,6 +284,6 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
// queue up the plugin so prepare can remove the config changes
config_changes.add_uninstalled_plugin_to_prepare_queue(plugins_dir, plugin_id, platform, is_top_level);
// call prepare after a successful uninstall
- plugman.prepare(project_dir, platform, plugins_dir, www_dir);
+ plugman.prepare(project_dir, platform, plugins_dir, www_dir, is_top_level);
});
}
[8/9] git commit: removing doWrap from prepare
Posted by an...@apache.org.
removing doWrap from prepare
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/4f185107
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/4f185107
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/4f185107
Branch: refs/heads/master
Commit: 4f1851075917a06502a3047ddf8cf1857c1d262e
Parents: c0eee27
Author: Anis Kadri <an...@apache.org>
Authored: Fri Jun 13 16:43:25 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Jun 13 16:43:25 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/plugman/plugman.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4f185107/cordova-lib/src/plugman/plugman.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/plugman.js b/cordova-lib/src/plugman/plugman.js
index 8ff8c82..0c0a629 100644
--- a/cordova-lib/src/plugman/plugman.js
+++ b/cordova-lib/src/plugman/plugman.js
@@ -65,7 +65,7 @@ plugman = {
addProperty(plugman, 'install', './install', true);
addProperty(plugman, 'uninstall', './uninstall', true);
addProperty(plugman, 'fetch', './fetch', true);
-addProperty(plugman, 'prepare', './prepare', true);
+addProperty(plugman, 'prepare', './prepare');
addProperty(plugman, 'config', './config', true);
addProperty(plugman, 'owner', './owner', true);
addProperty(plugman, 'adduser', './adduser', true);
@@ -91,8 +91,9 @@ plugman.commands = {
if(!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
return console.log(plugman.help());
}
- cli_opts.browserify === true ? addProperty(plugman, 'prepare', './prepare-browserify') :
- addProperty(plugman, 'prepare', './prepare');
+ if(cli_opts.browserify === true) {
+ plugman.prepare = require('./prepare-browserify');
+ }
var cli_variables = {}
if (cli_opts.variable) {
cli_opts.variable.forEach(function (variable) {
@@ -122,8 +123,9 @@ plugman.commands = {
return console.log(plugman.help());
}
- cli_opts.browserify === true ? addProperty(plugman, 'prepare', './prepare-browserify') :
- addProperty(plugman, 'prepare', './prepare');
+ if(cli_opts.browserify === true) {
+ plugman.prepare = require('./prepare-browserify');
+ }
var p = Q();
cli_opts.plugin.forEach(function (pluginSrc) {
[7/9] git commit: adding configurable attribute
Posted by an...@apache.org.
adding configurable attribute
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c0eee276
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c0eee276
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c0eee276
Branch: refs/heads/master
Commit: c0eee276599251a0a003c5df0159fbea47d52ea4
Parents: 523392f
Author: Anis Kadri <an...@apache.org>
Authored: Tue Jun 10 17:20:37 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Jun 10 17:20:37 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/plugman/plugman.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c0eee276/cordova-lib/src/plugman/plugman.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/plugman.js b/cordova-lib/src/plugman/plugman.js
index 9b8fdad..8ff8c82 100644
--- a/cordova-lib/src/plugman/plugman.js
+++ b/cordova-lib/src/plugman/plugman.js
@@ -40,6 +40,7 @@ function addProperty(o, symbol, modulePath, doWrap) {
} else {
// The top-level plugman.foo
Object.defineProperty(o, symbol, {
+ configurable: true,
get : function() { return val = val || require(modulePath); },
set : function(v) { val = v; }
});
@@ -47,6 +48,7 @@ function addProperty(o, symbol, modulePath, doWrap) {
// The plugman.raw.foo
Object.defineProperty(o.raw, symbol, {
+ configurable: true,
get : function() { return val = val || require(modulePath); },
set : function(v) { val = v; }
});
@@ -63,6 +65,7 @@ plugman = {
addProperty(plugman, 'install', './install', true);
addProperty(plugman, 'uninstall', './uninstall', true);
addProperty(plugman, 'fetch', './fetch', true);
+addProperty(plugman, 'prepare', './prepare', true);
addProperty(plugman, 'config', './config', true);
addProperty(plugman, 'owner', './owner', true);
addProperty(plugman, 'adduser', './adduser', true);
[3/9] git commit: adding prepare-browserify
Posted by an...@apache.org.
adding prepare-browserify
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/171c9811
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/171c9811
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/171c9811
Branch: refs/heads/master
Commit: 171c9811d3e914a02585894707ccf412668c4040
Parents: 24e861c
Author: Anis Kadri <an...@apache.org>
Authored: Tue Jun 10 16:06:46 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Jun 10 16:06:46 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/plugman/prepare-browserify.js | 194 +++++++++++++++++++
.../src/plugman/util/prepare-namespace.js | 40 ++++
2 files changed, 234 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/171c9811/cordova-lib/src/plugman/prepare-browserify.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/prepare-browserify.js b/cordova-lib/src/plugman/prepare-browserify.js
new file mode 100644
index 0000000..d5c003d
--- /dev/null
+++ b/cordova-lib/src/plugman/prepare-browserify.js
@@ -0,0 +1,194 @@
+/**
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+
+/* jshint node:true */
+
+var platform_modules = require('./platforms'),
+ path = require('path'),
+ config_changes = require('./util/config-changes'),
+ xml_helpers = require('../util/xml-helpers'),
+ wp8 = require('./platforms/wp8'),
+ windows8 = require('./platforms/windows8'),
+ common = require('./platforms/common');
+ fs = require('fs'),
+ shell = require('shelljs'),
+ util = require('util'),
+ events = require('./events'),
+ plugman = require('./plugman'),
+ et = require('elementtree'),
+ prepareNamespace = require('./util/prepare-namespace'),
+ bundle = require('cordova-js/tasks/lib/bundle-browserify'),
+ requireTr = require('cordova-js/tasks/lib/require-tr'),
+ writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
+
+function uninstallQueuedPlugins(platform_json, wwwDir) {
+ // Check if there are any plugins queued for uninstallation, and if so, remove any of their plugin web assets loaded in
+ // via <js-module> elements
+ var plugins_to_uninstall = platform_json.prepare_queue.uninstalled;
+ if (plugins_to_uninstall && plugins_to_uninstall.length) {
+ var plugins_www = path.join(wwwDir, 'plugins');
+ if (fs.existsSync(plugins_www)) {
+ plugins_to_uninstall.forEach(function(plug) {
+ var id = plug.id;
+ var plugin_modules = path.join(plugins_www, id);
+ if (fs.existsSync(plugin_modules)) {
+ events.emit('verbose', 'Removing plugins directory from www "'+plugin_modules+'"');
+ shell.rm('-rf', plugin_modules);
+ }
+ });
+ }
+ }
+}
+
+function generateFinalBundle(platform, libraryRelease, outReleaseFile) {
+
+ var outReleaseFileStream = fs.createWriteStream(outReleaseFile);
+ var commitId = 'N/A';
+ var time = new Date().valueOf();
+
+ writeLicenseHeader(outReleaseFileStream, platform, commitId);
+
+ releaseBundle = libraryRelease.bundle();
+
+ releaseBundle.pipe(outReleaseFileStream);
+
+ outReleaseFileStream.on('finish', function() {
+ var newtime = new Date().valueOf() - time;
+ plugman.emit('verbose', 'generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
+ // TODO clean up all the *.browserify files
+ });
+
+ outReleaseFileStream.on('error', function(err) {
+ var newtime = new Date().valueOf() - time;
+ console.log('error while generating cordova_b.js');
+ plugman.emit('verbose', 'error while generating cordova.js');
+ });
+
+}
+
+// Called on --prepare.
+// Sets up each plugin's Javascript code to be loaded properly.
+// Expects a path to the project (platforms/android in CLI, . in plugman-only),
+// a path to where the plugins are downloaded, the www dir, and the platform ('android', 'ios', etc.).
+module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_dir, is_top_level) {
+ // Process:
+ // - Do config munging by calling into config-changes module
+ // - List all plugins in plugins_dir
+ // - Load and parse their plugin.xml files.
+ // - Skip those without support for this platform. (No <platform> tags means JS-only!)
+ // - Build a list of all their js-modules, including platform-specific js-modules.
+ // - For each js-module (general first, then platform) build up an object storing the path and any clobbers, merges and runs for it.
+ events.emit('verbose', 'Preparing ' + platform + ' browserify project');
+ var platform_json = config_changes.get_platform_json(plugins_dir, platform);
+ var wwwDir = www_dir || platform_modules[platform].www_dir(project_dir);
+ var scripts = [];
+
+ uninstallQueuedPlugins(platform_json, www_dir);
+
+ events.emit('verbose', 'Processing configuration changes for plugins.');
+ config_changes.process(plugins_dir, project_dir, platform);
+
+ if(!is_top_level) return;
+
+ requireTr.platform = platform;
+ var libraryRelease = bundle(platform, false, 'N/A');
+
+ platform_json = config_changes.get_platform_json(plugins_dir, platform);
+ var plugins = Object.keys(platform_json.installed_plugins).concat(Object.keys(platform_json.dependent_plugins));
+ events.emit('verbose', 'Iterating over installed plugins:', plugins);
+
+ plugins && plugins.forEach(function(plugin) {
+ var pluginDir = path.join(plugins_dir, plugin),
+ pluginXML = path.join(pluginDir, 'plugin.xml');
+ if (!fs.existsSync(pluginXML)) {
+ plugman.emit('warn', 'Missing file: ' + pluginXML);
+ return;
+ }
+ var xml = xml_helpers.parseElementtreeSync(pluginXML);
+
+ var plugin_id = xml.getroot().attrib.id;
+
+ // add the plugins dir to the platform's www.
+ var platformPluginsDir = path.join(wwwDir, 'plugins');
+ // XXX this should not be here if there are no js-module. It leaves an empty plugins/ directory
+ shell.mkdir('-p', platformPluginsDir);
+
+ var jsModules = xml.findall('./js-module');
+ var assets = xml.findall('asset');
+ var platformTag = xml.find(util.format('./platform[@name="%s"]', platform));
+
+ if (platformTag) {
+ assets = assets.concat(platformTag.findall('./asset'));
+ jsModules = jsModules.concat(platformTag.findall('./js-module'));
+ }
+
+ // Copy www assets described in <asset> tags.
+ assets = assets || [];
+ assets.forEach(function(asset) {
+ common.asset.install(asset, pluginDir, wwwDir);
+ });
+ jsModules.forEach(function(module) {
+ // Copy the plugin's files into the www directory.
+ // NB: We can't always use path.* functions here, because they will use platform slashes.
+ // But the path in the plugin.xml and in the cordova_plugins.js should be always forward slashes.
+ var pathParts = module.attrib.src.split('/');
+
+ var fsDirname = path.join.apply(path, pathParts.slice(0, -1));
+ var fsDir = path.join(platformPluginsDir, plugin_id, fsDirname);
+ shell.mkdir('-p', fsDir);
+
+ // Read in the file, prepend the cordova.define, and write it back out.
+ var moduleName = plugin_id + '.';
+ if (module.attrib.name) {
+ moduleName += module.attrib.name;
+ } else {
+ moduleName += path.basename(module.attrib.src, '.js');
+ }
+
+ var fsPath = path.join.apply(path, pathParts);
+ var scriptPath = path.join(pluginDir, fsPath);
+
+ requireTr.addModule({symbol: moduleName, path: scriptPath});
+
+ module.getchildren().forEach(function(child) {
+ if (child.tag.toLowerCase() == 'clobbers') {
+ fs.appendFileSync(scriptPath,
+ prepareNamespace(child.attrib.target, 'c'),
+ 'utf-8');
+ } else if (child.tag.toLowerCase() == 'merges') {
+ fs.appendFileSync(scriptPath,
+ prepareNamespace(child.attrib.target, 'm'),
+ 'utf-8');
+ }
+ });
+ scripts.push(scriptPath);
+ });
+ });
+
+ libraryRelease.transform(requireTr.transform);
+
+ scripts.forEach(function(script) {
+ libraryRelease.add(script);
+ });
+
+ var outReleaseFile = path.join(wwwDir, 'cordova.js');
+
+ generateFinalBundle(platform, libraryRelease, outReleaseFile);
+
+};
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/171c9811/cordova-lib/src/plugman/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/prepare-namespace.js b/cordova-lib/src/plugman/util/prepare-namespace.js
new file mode 100644
index 0000000..eac973e
--- /dev/null
+++ b/cordova-lib/src/plugman/util/prepare-namespace.js
@@ -0,0 +1,40 @@
+var util = require('util');
+
+// FIXME this is extremely guettho
+module.exports = function(target, method) {
+ var old = target;
+ var target = target.replace(/^window(\.)?/, '');
+
+ var lastDot = target.lastIndexOf('.');
+ var namespace = target.substr(0, lastDot);
+ var lastName = target.substr(lastDot + 1);
+ var props = target.split(".");
+ var code = "";
+
+ if(target !== "") {
+ for(var i = 1, len = props.length ; i <= len ; i++) {
+ var sub = props.slice(0, i).join(".");
+ code += util.format("window.%s = window.%s || {};\n", sub, sub);
+ }
+ }
+
+ props.unshift('window');
+ var object = props.slice(0, props.length - 1).join('.');
+ // code = "\n";
+ if(method === "c") {
+ return util.format(
+ "%s\nrequire('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
+ code,
+ object,
+ lastName
+ );
+ } else if(method === "m" && old !== "") {
+ return util.format(
+ "%s\n;require('cordova/builder').recursiveMerge(%s, module.exports);",
+ code,
+ old
+ );
+ } else {
+ return "// no clobber or merges";
+ }
+}
[2/9] git commit: adding options to prepare
Posted by an...@apache.org.
adding options to prepare
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/24e861c3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/24e861c3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/24e861c3
Branch: refs/heads/master
Commit: 24e861c33d25fcb3630702bbf999849cc3517b00
Parents: c2a2e84
Author: Anis Kadri <an...@apache.org>
Authored: Tue Jun 10 16:06:15 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Tue Jun 10 16:06:15 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/plugman/install.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/24e861c3/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index 2fbbe50..2a80abd 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -295,7 +295,7 @@ var runInstall = module.exports.runInstall = function runInstall(actions, platfo
copyPlugin(plugin_dir, plugins_dir, options.link);
}
- return handleInstall(actions, pluginInfo, platform, project_dir, plugins_dir, install_plugin_dir, filtered_variables, options.www_dir, options.is_top_level);
+ return handleInstall(actions, pluginInfo, platform, project_dir, plugins_dir, install_plugin_dir, filtered_variables, options);
}
).fail(
function (error) {
@@ -480,13 +480,13 @@ function installDependency(dep, install, options) {
}
}
-function handleInstall(actions, pluginInfo, platform, project_dir, plugins_dir, plugin_dir, filtered_variables, www_dir, is_top_level) {
+function handleInstall(actions, pluginInfo, platform, project_dir, plugins_dir, plugin_dir, filtered_variables, options) {
// @tests - important this event is checked spec/install.spec.js
events.emit('verbose', 'Install start for "' + pluginInfo.id + '" on ' + platform + '.');
var handler = platform_modules[platform];
- www_dir = www_dir || handler.www_dir(project_dir);
+ www_dir = options.www_dir || handler.www_dir(project_dir);
var platformTag = pluginInfo._et.find('./platform[@name="'+platform+'"]');
if ( pluginInfo.hasPlatformSection(platform) ) {
@@ -539,9 +539,9 @@ function handleInstall(actions, pluginInfo, platform, project_dir, plugins_dir,
return actions.process(platform, project_dir)
.then(function(err) {
// queue up the plugin so prepare knows what to do.
- config_changes.add_installed_plugin_to_prepare_queue(plugins_dir, pluginInfo.id, platform, filtered_variables, is_top_level);
+ config_changes.add_installed_plugin_to_prepare_queue(plugins_dir, pluginInfo.id, platform, filtered_variables, options.is_top_level);
// call prepare after a successful install
- plugman.prepare(project_dir, platform, plugins_dir, www_dir);
+ plugman.prepare(project_dir, platform, plugins_dir, options.www_dir, options.is_top_level);
events.emit('verbose', 'Install complete for ' + pluginInfo.id + ' on ' + platform + '.');
// WIN!