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 2015/10/06 11:27:02 UTC
[3/6] cordova-lib git commit: CB-9598 Switches LIB to use
`cordova-common`
CB-9598 Switches LIB to use `cordova-common`
* Updates requires to point to `cordova-common`
* Adds 'cordova-common' as bundled dependency
* Updates CI configs
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/a50ead83
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/a50ead83
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/a50ead83
Branch: refs/heads/master
Commit: a50ead836fe19533d618e1ae12de1d586eb07cf9
Parents: 7951b28
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Tue Oct 6 12:15:29 2015 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Tue Oct 6 12:15:54 2015 +0300
----------------------------------------------------------------------
.travis.yml | 6 +++++-
appveyor.yml | 6 +++++-
cordova-lib/cordova-lib.js | 14 +++++---------
cordova-lib/package.json | 8 +++++---
cordova-lib/spec-cordova/HooksRunner.spec.js | 4 ++--
cordova-lib/spec-cordova/create.spec.js | 4 ++--
cordova-lib/spec-cordova/helpers.js | 2 +-
.../spec-cordova/metadata/android_parser.spec.js | 6 +++---
.../metadata/blackberry_parser.spec.js | 4 ++--
.../metadata/firefoxos_parser.spec.js | 4 ++--
.../spec-cordova/metadata/ios_parser.spec.js | 2 +-
.../metadata/parserhelper/ParserHelper.spec.js | 2 +-
.../metadata/parserhelper/preferences.spec.js | 4 ++--
.../spec-cordova/metadata/webos_parser.spec.js | 2 +-
.../metadata/windows8_parser.spec.js | 4 ++--
.../spec-cordova/metadata/wp8_parser.spec.js | 6 +++---
cordova-lib/spec-cordova/platform.spec.js | 4 ++--
.../platforms/PlatformApiPoly.spec.js | 11 +++++------
cordova-lib/spec-cordova/plugin.spec.js | 2 +-
cordova-lib/spec-cordova/prepare.spec.js | 6 +++---
cordova-lib/spec-plugman/fetch.spec.js | 2 +-
cordova-lib/spec-plugman/install.spec.js | 10 +++++-----
.../spec-plugman/platforms/android.spec.js | 4 ++--
.../spec-plugman/platforms/blackberry10.spec.js | 4 ++--
.../spec-plugman/platforms/common.spec.js | 2 +-
cordova-lib/spec-plugman/platforms/ios.spec.js | 4 ++--
cordova-lib/spec-plugman/platforms/tizen.spec.js | 2 +-
.../spec-plugman/platforms/windows.spec.js | 4 ++--
cordova-lib/spec-plugman/platforms/wp8.spec.js | 6 +++---
cordova-lib/spec-plugman/uninstall.spec.js | 6 +++---
.../spec-plugman/util/dependencies.spec.js | 6 +++---
cordova-lib/src/cordova/clean.js | 2 +-
cordova-lib/src/cordova/compile.js | 2 +-
cordova-lib/src/cordova/cordova.js | 2 +-
cordova-lib/src/cordova/create.js | 6 +++---
cordova-lib/src/cordova/info.js | 2 +-
cordova-lib/src/cordova/lazy_load.js | 2 +-
.../src/cordova/metadata/amazon_fireos_parser.js | 8 ++++----
.../src/cordova/metadata/android_parser.js | 8 ++++----
.../src/cordova/metadata/blackberry10_parser.js | 6 +++---
.../src/cordova/metadata/firefoxos_parser.js | 4 ++--
cordova-lib/src/cordova/metadata/ios_parser.js | 6 +++---
.../cordova/metadata/parserhelper/preferences.js | 2 +-
.../src/cordova/metadata/ubuntu_parser.js | 2 +-
.../src/cordova/metadata/windows_parser.js | 8 ++++----
cordova-lib/src/cordova/metadata/wp8_parser.js | 8 ++++----
cordova-lib/src/cordova/platform.js | 10 +++++-----
cordova-lib/src/cordova/plugin.js | 8 ++++----
cordova-lib/src/cordova/plugin_parser.js | 2 +-
cordova-lib/src/cordova/prepare.js | 2 +-
cordova-lib/src/cordova/project_metadata.js | 2 +-
cordova-lib/src/cordova/requirements.js | 2 +-
cordova-lib/src/cordova/restore-util.js | 16 +++++++---------
cordova-lib/src/cordova/run.js | 2 +-
cordova-lib/src/cordova/serve.js | 2 +-
cordova-lib/src/cordova/targets.js | 4 ++--
cordova-lib/src/cordova/util.js | 2 +-
cordova-lib/src/gitclone.js | 4 ++--
cordova-lib/src/hooks/HooksRunner.js | 6 +++---
cordova-lib/src/hooks/scriptsFinder.js | 6 +++---
cordova-lib/src/platforms/PlatformApiPoly.js | 19 +++++++++----------
cordova-lib/src/plugman/browserify.js | 6 +++---
cordova-lib/src/plugman/create.js | 2 +-
cordova-lib/src/plugman/createpackagejson.js | 4 ++--
cordova-lib/src/plugman/fetch.js | 6 +++---
cordova-lib/src/plugman/install.js | 14 +++++++-------
.../src/plugman/platforms/amazon-fireos.js | 4 ++--
cordova-lib/src/plugman/platforms/android.js | 6 +++---
.../src/plugman/platforms/blackberry10.js | 4 ++--
cordova-lib/src/plugman/platforms/browser.js | 2 +-
cordova-lib/src/plugman/platforms/firefoxos.js | 2 +-
cordova-lib/src/plugman/platforms/ios.js | 4 ++--
cordova-lib/src/plugman/platforms/tizen.js | 4 ++--
cordova-lib/src/plugman/platforms/ubuntu.js | 2 +-
cordova-lib/src/plugman/platforms/webos.js | 2 +-
cordova-lib/src/plugman/platforms/windows.js | 6 +++---
cordova-lib/src/plugman/platforms/wp8.js | 4 ++--
cordova-lib/src/plugman/plugman.js | 2 +-
cordova-lib/src/plugman/registry/manifest.js | 2 +-
cordova-lib/src/plugman/registry/registry.js | 2 +-
cordova-lib/src/plugman/uninstall.js | 12 ++++++------
cordova-lib/src/plugman/util/dependencies.js | 2 +-
cordova-lib/src/plugman/util/plugins.js | 4 ++--
cordova-lib/src/util/unpack.js | 2 +-
cordova-lib/src/util/windows/csproj.js | 2 +-
cordova-lib/src/util/windows/jsprojManager.js | 4 ++--
86 files changed, 206 insertions(+), 204 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index ea90650..6fb9c03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ install:
- cd cordova-js
- npm install
- npm link
- - cd ../cordova-lib/cordova-lib
+ - cd ../cordova-lib/cordova-common
+ - npm install
+ - npm link
+ - cd ../cordova-lib
- npm link cordova-js
+ - npm link cordova-common
- npm install
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 8a882c9..3f18709 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,8 +7,12 @@ install:
- cd cordova-js
- npm install --msvs_version=2013
- npm link
- - cd ..\cordova-lib\cordova-lib
+ - cd ..\cordova-lib\cordova-common
+ - npm install
+ - npm link
+ - cd ..\cordova-lib
- npm link cordova-js
+ - npm link cordova-common
- npm install
build: off
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/cordova-lib.js
----------------------------------------------------------------------
diff --git a/cordova-lib/cordova-lib.js b/cordova-lib/cordova-lib.js
index a21c189..be57db2 100644
--- a/cordova-lib/cordova-lib.js
+++ b/cordova-lib/cordova-lib.js
@@ -27,14 +27,10 @@ exports = module.exports = {
},
plugman: require('./src/plugman/plugman'),
cordova: require('./src/cordova/cordova'),
- events: require('./src/events'),
- configparser: require('./src/configparser/ConfigParser.js'),
+ events: require('cordova-common').events,
+ configparser: require('cordova-common').ConfigParser,
cordova_platforms: require('./src/platforms/platforms'),
//// MAIN CORDOVA TOOLS API
- PluginInfo: require('./src/PluginInfo'),
- CordovaError: require('./src/CordovaError'),
- CordovaExternalToolErrorContext: require('./src/CordovaExternalToolErrorContext')
-}
-
-
-
+ PluginInfo: require('cordova-common').PluginInfo,
+ CordovaError: require('cordova-common').CordovaError
+};
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 740065b..b16c295 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -18,8 +18,8 @@
"engineStrict": true,
"dependencies": {
"aliasify": "^1.7.2",
- "bplist-parser": "0.0.6",
"cordova-app-hello-world": "3.9.0",
+ "cordova-common": "0.1.x",
"cordova-js": "4.1.1",
"cordova-registry-mapper": "1.x",
"cordova-serve": "^0.1.3",
@@ -29,9 +29,8 @@
"init-package-json": "^1.2.0",
"npm": "^2.10.x",
"npmconf": "^2.1.x",
- "osenv": "0.1.0",
- "plist": "1.1.0",
"properties-parser": "0.2.3",
+ "plist": "1.1.0",
"q": "1.0.1",
"rc": "0.5.2",
"request": "2.47.0",
@@ -43,6 +42,9 @@
"valid-identifier": "0.0.1",
"xcode": "0.8.0"
},
+ "bundledDependencies": [
+ "cordova-common"
+ ],
"devDependencies": {
"istanbul": "^0.3.4",
"jasmine-node": "1.14.5",
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/HooksRunner.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/HooksRunner.spec.js b/cordova-lib/spec-cordova/HooksRunner.spec.js
index 14508ea..14f27b1 100644
--- a/cordova-lib/spec-cordova/HooksRunner.spec.js
+++ b/cordova-lib/spec-cordova/HooksRunner.spec.js
@@ -28,8 +28,8 @@ var cordova = require('../src/cordova/cordova'),
Q = require('q'),
child_process = require('child_process'),
helpers = require('./helpers'),
- PluginInfo = require('../src/PluginInfo'),
- superspawn = require('../src/cordova/superspawn'),
+ PluginInfo = require('cordova-common').PluginInfo,
+ superspawn = require('cordova-common').superspawn,
config = require('../src/cordova/config');
var platform = os.platform();
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/create.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/create.spec.js b/cordova-lib/spec-cordova/create.spec.js
index fd35766..0cbddc8 100644
--- a/cordova-lib/spec-cordova/create.spec.js
+++ b/cordova-lib/spec-cordova/create.spec.js
@@ -22,8 +22,8 @@ var helpers = require('./helpers'),
fs = require('fs'),
shell = require('shelljs'),
Q = require('q'),
- events = require('../src/events'),
- ConfigParser = require('../src/configparser/ConfigParser'),
+ events = require('cordova-common').events,
+ ConfigParser = require('cordova-common').ConfigParser,
cordova = require('../src/cordova/cordova');
var tmpDir = helpers.tmpDir('create_test');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/helpers.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/helpers.js b/cordova-lib/spec-cordova/helpers.js
index 380bdc5..a5d23fd 100644
--- a/cordova-lib/spec-cordova/helpers.js
+++ b/cordova-lib/spec-cordova/helpers.js
@@ -21,7 +21,7 @@ var path = require('path'),
fs = require('fs'),
shell = require('shelljs'),
os = require('os'),
- ConfigParser = require('../src/configparser/ConfigParser');
+ ConfigParser = require('cordova-common').ConfigParser;
// Just use Android everywhere; we're mocking out any calls to the `android` binary.
module.exports.testPlatform = 'android';
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/android_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/android_parser.spec.js b/cordova-lib/spec-cordova/metadata/android_parser.spec.js
index 1f56628..385b143 100644
--- a/cordova-lib/spec-cordova/metadata/android_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/android_parser.spec.js
@@ -25,11 +25,11 @@ var androidParser = require('../../src/cordova/metadata/android_parser'),
shell = require('shelljs'),
fs = require('fs'),
et = require('elementtree'),
- xmlHelpers = require('../../src/util/xml-helpers'),
+ xmlHelpers = require('cordova-common').xmlHelpers,
config = require('../../src/cordova/config'),
Parser = require('../../src/cordova/metadata/parser'),
- ConfigParser = require('../../src/configparser/ConfigParser'),
- CordovaError = require('../../src/CordovaError');
+ ConfigParser = require('cordova-common').ConfigParser,
+ CordovaError = require('cordova-common').CordovaError;
// Create a real config object before mocking out everything.
var cfg = new ConfigParser(path.join(__dirname, '..', 'test-config.xml'));
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/blackberry_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/blackberry_parser.spec.js b/cordova-lib/spec-cordova/metadata/blackberry_parser.spec.js
index 7df3e24..034681a 100644
--- a/cordova-lib/spec-cordova/metadata/blackberry_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/blackberry_parser.spec.js
@@ -23,10 +23,10 @@ var blackberryParser = require('../../src/cordova/metadata/blackberry10_parser')
shell = require('shelljs'),
fs = require('fs'),
et = require('elementtree'),
- xmlHelpers = require('../../src/util/xml-helpers'),
+ xmlHelpers = require('cordova-common').xmlHelpers,
config = require('../../src/cordova/config'),
Parser = require('../../src/cordova/metadata/parser'),
- ConfigParser = require('../../src/configparser/ConfigParser');
+ ConfigParser = require('cordova-common').ConfigParser;
var cfg = new ConfigParser(path.join(__dirname, '..', 'test-config.xml'));
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/firefoxos_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/firefoxos_parser.spec.js b/cordova-lib/spec-cordova/metadata/firefoxos_parser.spec.js
index e4a7eaa..295e54e 100644
--- a/cordova-lib/spec-cordova/metadata/firefoxos_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/firefoxos_parser.spec.js
@@ -27,8 +27,8 @@ var firefoxosParser = require('../../src/cordova/metadata/firefoxos_parser'),
_ = require('underscore'),
config = require('../../src/cordova/config'),
Parser = require('../../src/cordova/metadata/parser'),
- ConfigParser = require('../../src/configparser/ConfigParser'),
- CordovaError = require('../../src/CordovaError');
+ ConfigParser = require('cordova-common').ConfigParser,
+ CordovaError = require('cordova-common').CordovaError;
var cfg = new ConfigParser(path.join(__dirname, '..', 'test-config.xml'));
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/ios_parser.spec.js b/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
index 9962106..5721672 100644
--- a/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/ios_parser.spec.js
@@ -26,7 +26,7 @@ var iosParser = require('../../src/cordova/metadata/ios_parser'),
Q = require('q'),
config = require('../../src/cordova/config'),
Parser = require('../../src/cordova/metadata/parser'),
- ConfigParser = require('../../src/configparser/ConfigParser');
+ ConfigParser = require('cordova-common').ConfigParser;
var iosProjectFixture = path.join(__dirname, '../fixtures/projects/ios');
var proj = path.join(__dirname, 'some/path');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/parserhelper/ParserHelper.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/parserhelper/ParserHelper.spec.js b/cordova-lib/spec-cordova/metadata/parserhelper/ParserHelper.spec.js
index 83ead4d..e62a1f4 100644
--- a/cordova-lib/spec-cordova/metadata/parserhelper/ParserHelper.spec.js
+++ b/cordova-lib/spec-cordova/metadata/parserhelper/ParserHelper.spec.js
@@ -19,7 +19,7 @@
var path = require('path'),
ParserHelper = require('../../../src/cordova/metadata/parserhelper/ParserHelper'),
- ConfigParser = require('../../../src/configparser/ConfigParser');
+ ConfigParser = require('cordova-common').ConfigParser;
// Create a real config object before mocking out everything.
var xml = path.join(__dirname, '..', '..', 'test-config.xml');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/parserhelper/preferences.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/parserhelper/preferences.spec.js b/cordova-lib/spec-cordova/metadata/parserhelper/preferences.spec.js
index e44b0ac..36f2fd0 100644
--- a/cordova-lib/spec-cordova/metadata/parserhelper/preferences.spec.js
+++ b/cordova-lib/spec-cordova/metadata/parserhelper/preferences.spec.js
@@ -19,9 +19,9 @@
var path = require('path'),
fs = require('fs'),
- events = require('../../../src/events'),
+ events = require('cordova-common').events,
preferences = require('../../../src/cordova/metadata/parserhelper/preferences'),
- ConfigParser = require('../../../src/configparser/ConfigParser');
+ ConfigParser = require('cordova-common').ConfigParser;
// Create a real config object before mocking out everything.
var xml = path.join(__dirname, '..', '..', 'test-config.xml');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/webos_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/webos_parser.spec.js b/cordova-lib/spec-cordova/metadata/webos_parser.spec.js
index c8b1b9b..5dad2e9 100755
--- a/cordova-lib/spec-cordova/metadata/webos_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/webos_parser.spec.js
@@ -22,7 +22,7 @@ var webosParser = require('../../src/cordova/metadata/webos_parser'),
shell = require('shelljs'),
fs = require('fs'),
config = require('../../src/cordova/config'),
- ConfigParser = require('../../src/configparser/ConfigParser');
+ ConfigParser = require('cordova-common').ConfigParser;
var cfg = new ConfigParser(path.join(__dirname, '..', 'test-config.xml'));
describe('webos project parser', function() {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js b/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
index d26b5b3..a1ad7ac 100644
--- a/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
@@ -24,13 +24,13 @@ var windowsParser = require('../../src/cordova/metadata/windows_parser'),
path = require('path'),
shell = require('shelljs'),
child_process = require('child_process'),
- xmlHelpers = require('../../src/util/xml-helpers'),
+ xmlHelpers = require('cordova-common').xmlHelpers,
et = require('elementtree'),
Q = require('q'),
fs = require('fs'),
config = require('../../src/cordova/config'),
Parser = require('../../src/cordova/metadata/parser'),
- ConfigParser = require('../../src/configparser/ConfigParser'),
+ ConfigParser = require('cordova-common').ConfigParser,
HooksRunner = require('../../src/hooks/HooksRunner');
// Create a real config object before mocking out everything.
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js b/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
index aae2643..a8059ec 100644
--- a/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
@@ -25,13 +25,13 @@ var wp8Parser = require('../../src/cordova/metadata/wp8_parser'),
shell = require('shelljs'),
fs = require('fs'),
et = require('elementtree'),
- xmlHelpers = require('../../src/util/xml-helpers'),
+ xmlHelpers = require('cordova-common').xmlHelpers,
Q = require('q'),
child_process = require('child_process'),
config = require('../../src/cordova/config'),
Parser = require('../../src/cordova/metadata/parser'),
- ConfigParser = require('../../src/configparser/ConfigParser'),
- CordovaError = require('../../src/CordovaError'),
+ ConfigParser = require('cordova-common').ConfigParser,
+ CordovaError = require('cordova-common').CordovaError,
HooksRunner = require('../../src/hooks/HooksRunner');
// Create a real config object before mocking out everything.
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/platform.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/platform.spec.js b/cordova-lib/spec-cordova/platform.spec.js
index 457355a..fe1fbde 100644
--- a/cordova-lib/spec-cordova/platform.spec.js
+++ b/cordova-lib/spec-cordova/platform.spec.js
@@ -21,10 +21,10 @@ var helpers = require('./helpers'),
path = require('path'),
fs = require('fs'),
shell = require('shelljs'),
- superspawn = require('../src/cordova/superspawn'),
+ superspawn = require('cordova-common').superspawn,
config = require('../src/cordova/config'),
Q = require('q'),
- events = require('../src/events'),
+ events = require('cordova-common').events,
cordova = require('../src/cordova/cordova'),
rewire = require('rewire'),
platform = rewire('../src/cordova/platform.js');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/platforms/PlatformApiPoly.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/platforms/PlatformApiPoly.spec.js b/cordova-lib/spec-cordova/platforms/PlatformApiPoly.spec.js
index 0f60dd8..5a13d63 100644
--- a/cordova-lib/spec-cordova/platforms/PlatformApiPoly.spec.js
+++ b/cordova-lib/spec-cordova/platforms/PlatformApiPoly.spec.js
@@ -18,15 +18,14 @@
*/
var Q = require('q');
-var fs = require('fs');
var et = require('elementtree');
var path = require('path');
var shell = require('shelljs');
-var xmlHelpers = require('../../src/util/xml-helpers');
-var ActionStack = require('../../src/plugman/util/action-stack');
-var superspawn = require('../../src/cordova/superspawn');
-var PluginInfo = require('../../src/PluginInfo');
-var ConfigParser = require('../../src/configparser/ConfigParser');
+var xmlHelpers = require('cordova-common').xmlHelpers;
+var ActionStack = require('cordova-common').ActionStack;
+var superspawn = require('cordova-common').superspawn;
+var PluginInfo = require('cordova-common').PluginInfo;
+var ConfigParser = require('cordova-common').ConfigParser;
var knownPlatforms = require('../../src/platforms/platforms');
var PlatformApiPoly = require('../../src/platforms/PlatformApiPoly');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/plugin.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/plugin.spec.js b/cordova-lib/spec-cordova/plugin.spec.js
index 4593bfd..b09fbff 100644
--- a/cordova-lib/spec-cordova/plugin.spec.js
+++ b/cordova-lib/spec-cordova/plugin.spec.js
@@ -20,7 +20,7 @@
var helpers = require('./helpers'),
path = require('path'),
shell = require('shelljs'),
- events = require('../src/events'),
+ events = require('cordova-common').events,
cordova = require('../src/cordova/cordova');
var tmpDir = helpers.tmpDir('plugin_test');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-cordova/prepare.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/prepare.spec.js b/cordova-lib/spec-cordova/prepare.spec.js
index bf9d31a..e475dce 100644
--- a/cordova-lib/spec-cordova/prepare.spec.js
+++ b/cordova-lib/spec-cordova/prepare.spec.js
@@ -18,15 +18,15 @@
*/
var shell = require('shelljs'),
- PlatformJson = require('../src/plugman/util/PlatformJson'),
+ PlatformJson = require('cordova-common').PlatformJson,
path = require('path'),
util = require('../src/cordova/util'),
prepare = require('../src/cordova/prepare'),
lazy_load = require('../src/cordova/lazy_load'),
- ConfigParser = require('../src/configparser/ConfigParser'),
+ ConfigParser = require('cordova-common').ConfigParser,
platforms = require('../src/platforms/platforms'),
HooksRunner = require('../src/hooks/HooksRunner'),
- xmlHelpers = require('../src/util/xml-helpers'),
+ xmlHelpers = require('cordova-common').xmlHelpers,
et = require('elementtree'),
Q = require('q');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/fetch.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/fetch.spec.js b/cordova-lib/spec-plugman/fetch.spec.js
index 07ef0bd..aa8de0d 100644
--- a/cordova-lib/spec-plugman/fetch.spec.js
+++ b/cordova-lib/spec-plugman/fetch.spec.js
@@ -19,7 +19,7 @@
var rewire = require('rewire'),
fetch = rewire('../src/plugman/fetch'),
fs = require('fs'),
- os = require('osenv'),
+ os = require('os'),
path = require('path'),
shell = require('shelljs'),
realrm = shell.rm,
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/install.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/install.spec.js b/cordova-lib/spec-plugman/install.spec.js
index 6da5767..e8a3cd5 100644
--- a/cordova-lib/spec-plugman/install.spec.js
+++ b/cordova-lib/spec-plugman/install.spec.js
@@ -20,11 +20,11 @@
/* jshint sub:true */
var install = require('../src/plugman/install'),
- actions = require('../src/plugman/util/action-stack'),
- xmlHelpers = require('../src/util/xml-helpers'),
+ actions = require('cordova-common').ActionStack,
+ xmlHelpers = require('cordova-common').xmlHelpers,
et = require('elementtree'),
- PlatformJson = require('../src/plugman/util/PlatformJson'),
- events = require('../src/events'),
+ PlatformJson = require('cordova-common').PlatformJson,
+ events = require('cordova-common').events,
plugman = require('../src/plugman/plugman'),
platforms = require('../src/plugman/platforms/common'),
common = require('./common'),
@@ -57,7 +57,7 @@ var install = require('../src/plugman/install'),
},
promise,
results = {},
- superspawn = require('../src/cordova/superspawn');
+ superspawn = require('cordova-common').superspawn;
// Pre-crete the temp dir, without it the test fails.
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/platforms/android.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/android.spec.js b/cordova-lib/spec-plugman/platforms/android.spec.js
index 2af8fc5..de0ccb3 100644
--- a/cordova-lib/spec-plugman/platforms/android.spec.js
+++ b/cordova-lib/spec-plugman/platforms/android.spec.js
@@ -24,7 +24,7 @@ var android = require('../../src/plugman/platforms/android'),
path = require('path'),
fs = require('fs'),
shell = require('shelljs'),
- os = require('osenv'),
+ os = require('os'),
temp = path.join(os.tmpdir(), 'plugman'),
plugins_dir = path.join(temp, 'cordova', 'plugins'),
dummyplugin = path.join(__dirname, '..', 'plugins', 'org.test.plugins.dummyplugin'),
@@ -32,7 +32,7 @@ var android = require('../../src/plugman/platforms/android'),
android_one_project = path.join(__dirname, '..', 'projects', 'android_one', '*'),
android_two_project = path.join(__dirname, '..', 'projects', 'android_two', '*');
-var PluginInfo = require('../../src/PluginInfo');
+var PluginInfo = require('cordova-common').PluginInfo;
var dummyPluginInfo = new PluginInfo(dummyplugin);
var dummy_id = dummyPluginInfo.id;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/platforms/blackberry10.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/blackberry10.spec.js b/cordova-lib/spec-plugman/platforms/blackberry10.spec.js
index 1e72105..60712aa 100644
--- a/cordova-lib/spec-plugman/platforms/blackberry10.spec.js
+++ b/cordova-lib/spec-plugman/platforms/blackberry10.spec.js
@@ -21,10 +21,10 @@ var blackberry10 = require('../../src/plugman/platforms/blackberry10'),
path = require('path'),
fs = require('fs'),
shell = require('shelljs'),
- os = require('osenv'),
+ os = require('os'),
temp = path.join(os.tmpdir(), 'plugman'),
blackberry10_project = path.join(__dirname, '..', 'projects', 'blackberry10', '*');
-var PluginInfo = require('../../src/PluginInfo');
+var PluginInfo = require('cordova-common').PluginInfo;
var plugins = {
dummy: new PluginInfo(path.join(__dirname, '..', 'plugins', 'org.test.plugins.dummyplugin')),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/platforms/common.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/common.spec.js b/cordova-lib/spec-plugman/platforms/common.spec.js
index 8b8ed18..f591193 100644
--- a/cordova-lib/spec-plugman/platforms/common.spec.js
+++ b/cordova-lib/spec-plugman/platforms/common.spec.js
@@ -21,7 +21,7 @@
var common = require('../../src/plugman/platforms/common')
, path = require('path')
, fs = require('fs')
- , osenv = require('osenv')
+ , osenv = require('os')
, shell = require('shelljs')
, test_dir = path.join(osenv.tmpdir(), 'test_plugman')
, project_dir = path.join(test_dir, 'project')
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/platforms/ios.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/ios.spec.js b/cordova-lib/spec-plugman/platforms/ios.spec.js
index 0f9a18d..5b19559 100644
--- a/cordova-lib/spec-plugman/platforms/ios.spec.js
+++ b/cordova-lib/spec-plugman/platforms/ios.spec.js
@@ -24,7 +24,7 @@ var ios = require('../../src/plugman/platforms/ios'),
path = require('path'),
fs = require('fs'),
shell = require('shelljs'),
- os = require('osenv'),
+ os = require('os'),
temp = path.join(os.tmpdir(), 'plugman'),
plugins_dir = path.join(temp, 'cordova', 'plugins'),
ios_config_xml_project = path.join(__dirname, '..', 'projects', 'ios-config-xml', '*'),
@@ -34,7 +34,7 @@ var ios = require('../../src/plugman/platforms/ios'),
weblessplugin = path.join(__dirname, '..', 'plugins', 'org.test.plugins.weblessplugin'),
done = false;
-var PluginInfo = require('../../src/PluginInfo');
+var PluginInfo = require('cordova-common').PluginInfo;
var dummyPluginInfo = new PluginInfo(dummyplugin);
var dummy_id = dummyPluginInfo.id;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/platforms/tizen.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/tizen.spec.js b/cordova-lib/spec-plugman/platforms/tizen.spec.js
index 69aba24..04d2f0f 100644
--- a/cordova-lib/spec-plugman/platforms/tizen.spec.js
+++ b/cordova-lib/spec-plugman/platforms/tizen.spec.js
@@ -18,7 +18,7 @@
var tizen = require('../../src/plugman/platforms/tizen'),
- os = require('osenv'),
+ os = require('os'),
path = require('path'),
tizen_project = path.join(__dirname, '..', 'projects', 'tizen');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/platforms/windows.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/windows.spec.js b/cordova-lib/spec-plugman/platforms/windows.spec.js
index cf8c32b..03e5602 100644
--- a/cordova-lib/spec-plugman/platforms/windows.spec.js
+++ b/cordova-lib/spec-plugman/platforms/windows.spec.js
@@ -23,14 +23,14 @@ var windows = require('../../src/plugman/platforms/windows'),
fs = require('fs'),
shell = require('shelljs'),
et = require('elementtree'),
- os = require('osenv'),
+ os = require('os'),
cordovaProjectDir = path.join(os.tmpdir(), 'plugman'),
cordovaProjectWindowsPlatformDir = path.join(cordovaProjectDir, 'platforms', 'windows'),
cordovaProjectPluginsDir = path.join(cordovaProjectDir, 'plugins'),
dummyplugin = path.join(__dirname, '..', 'plugins', 'org.test.plugins.dummyplugin'),
faultyplugin = path.join(__dirname, '..', 'plugins', 'org.test.plugins.faultyplugin');
-var PluginInfo = require('../../src/PluginInfo');
+var PluginInfo = require('cordova-common').PluginInfo;
var dummyPluginInfo = new PluginInfo(dummyplugin);
var dummy_id = dummyPluginInfo.id;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/platforms/wp8.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/wp8.spec.js b/cordova-lib/spec-plugman/platforms/wp8.spec.js
index ab791ab..24cd1af 100644
--- a/cordova-lib/spec-plugman/platforms/wp8.spec.js
+++ b/cordova-lib/spec-plugman/platforms/wp8.spec.js
@@ -22,15 +22,15 @@ var wp8 = require('../../src/plugman/platforms/wp8'),
path = require('path'),
fs = require('fs'),
shell = require('shelljs'),
- os = require('osenv'),
+ os = require('os'),
temp = path.join(os.tmpdir(), 'plugman'),
plugins_dir = path.join(temp, 'cordova', 'plugins'),
- xml_helpers = require('../../src/util/xml-helpers'),
+ xml_helpers = require('cordova-common').xmlHelpers,
dummyplugin = path.join(__dirname, '..', 'plugins', 'org.test.plugins.dummyplugin'),
faultyplugin = path.join(__dirname, '..', 'plugins', 'org.test.plugins.faultyplugin'),
wp8_project = path.join(__dirname, '..', 'projects', 'wp8');
-var PluginInfo = require('../../src/PluginInfo');
+var PluginInfo = require('cordova-common').PluginInfo;
var dummyPluginInfo = new PluginInfo(dummyplugin);
var dummy_id = dummyPluginInfo.id;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/uninstall.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/uninstall.spec.js b/cordova-lib/spec-plugman/uninstall.spec.js
index 63f1ff2..b6e2f5c 100644
--- a/cordova-lib/spec-plugman/uninstall.spec.js
+++ b/cordova-lib/spec-plugman/uninstall.spec.js
@@ -21,12 +21,12 @@
var uninstall = require('../src/plugman/uninstall'),
install = require('../src/plugman/install'),
- actions = require('../src/plugman/util/action-stack'),
- events = require('../src/events'),
+ actions = require('cordova-common').ActionStack,
+ events = require('cordova-common').events,
plugman = require('../src/plugman/plugman'),
common = require('./common'),
platforms = require('../src/platforms/platforms'),
- xmlHelpers = require('../src/util/xml-helpers'),
+ xmlHelpers = require('cordova-common').xmlHelpers,
et = require('elementtree'),
fs = require('fs'),
path = require('path'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/spec-plugman/util/dependencies.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/util/dependencies.spec.js b/cordova-lib/spec-plugman/util/dependencies.spec.js
index 5861665..2dd581a 100644
--- a/cordova-lib/spec-plugman/util/dependencies.spec.js
+++ b/cordova-lib/spec-plugman/util/dependencies.spec.js
@@ -17,10 +17,10 @@
under the License.
*/
var dependencies = require('../../src/plugman/util/dependencies'),
- xml_helpers = require('../../src/util/xml-helpers'),
+ xml_helpers = require('cordova-common').xmlHelpers,
path = require('path');
-var PlatformJson = require('../../src/plugman/util/PlatformJson');
-var PluginInfoProvider = require('../../src/PluginInfoProvider');
+var PlatformJson = require('cordova-common').PlatformJson;
+var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
describe('dependency module', function() {
describe('generateDependencyInfo method', function() {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/clean.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/clean.js b/cordova-lib/src/cordova/clean.js
index 59696ed..b91b941 100644
--- a/cordova-lib/src/cordova/clean.js
+++ b/cordova-lib/src/cordova/clean.js
@@ -19,7 +19,7 @@
var cordova_util = require('./util'),
HooksRunner = require('../hooks/HooksRunner'),
- events = require('../events'),
+ events = require('cordova-common').events,
chain = require('../util/promise-util').Q_chainmap,
platform_lib = require('../platforms/platforms');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/compile.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/compile.js b/cordova-lib/src/cordova/compile.js
index dbf69ec..7bdabb4 100644
--- a/cordova-lib/src/cordova/compile.js
+++ b/cordova-lib/src/cordova/compile.js
@@ -19,7 +19,7 @@
var cordova_util = require('./util'),
HooksRunner = require('../hooks/HooksRunner'),
- events = require('../events'),
+ events = require('cordova-common').events,
Q = require('q'),
promiseUtil = require('../util/promise-util'),
platform_lib = require('../platforms/platforms');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/cordova.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/cordova.js b/cordova-lib/src/cordova/cordova.js
index e792d52..99c8078 100644
--- a/cordova-lib/src/cordova/cordova.js
+++ b/cordova-lib/src/cordova/cordova.js
@@ -17,7 +17,7 @@
under the License.
*/
-var cordova_events = require('../events');
+var cordova_events = require('cordova-common').events;
var cordova_util = require('./util');
var off = function() {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/create.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/create.js b/cordova-lib/src/cordova/create.js
index 43ee937..dd55d0c 100644
--- a/cordova-lib/src/cordova/create.js
+++ b/cordova-lib/src/cordova/create.js
@@ -20,12 +20,12 @@
var path = require('path'),
fs = require('fs'),
shell = require('shelljs'),
- events = require('../events'),
+ events = require('cordova-common').events,
config = require('./config'),
lazy_load = require('./lazy_load'),
Q = require('q'),
- CordovaError = require('../CordovaError'),
- ConfigParser = require('../configparser/ConfigParser'),
+ CordovaError = require('cordova-common').CordovaError,
+ ConfigParser = require('cordova-common').ConfigParser,
cordova_util = require('./util'),
validateIdentifier = require('valid-identifier');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/info.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/info.js b/cordova-lib/src/cordova/info.js
index 4c8cf0d..f012638 100644
--- a/cordova-lib/src/cordova/info.js
+++ b/cordova-lib/src/cordova/info.js
@@ -23,7 +23,7 @@ when submitting a help request.
Outputs to a file
*/
var cordova_util = require('./util'),
- superspawn = require('./superspawn'),
+ superspawn = require('cordova-common').superspawn,
package = require('../../package'),
path = require('path'),
fs = require('fs'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/lazy_load.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/lazy_load.js b/cordova-lib/src/cordova/lazy_load.js
index 758ab7d..f980f16 100644
--- a/cordova-lib/src/cordova/lazy_load.js
+++ b/cordova-lib/src/cordova/lazy_load.js
@@ -26,7 +26,7 @@ var path = require('path'),
shell = require('shelljs'),
platforms = require('../platforms/platforms'),
npmconf = require('npmconf'),
- events = require('../events'),
+ events = require('cordova-common').events,
request = require('request'),
config = require('./config'),
HooksRunner = require('../hooks/HooksRunner'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
index be3f422..5e82241 100644
--- a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
+++ b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
@@ -20,14 +20,14 @@
var fs = require('fs'),
path = require('path'),
et = require('elementtree'),
- xml = require('../../util/xml-helpers'),
+ xml = require('cordova-common').xmlHelpers,
util = require('../util'),
- events = require('../../events'),
+ events = require('cordova-common').events,
shell = require('shelljs'),
Q = require('q'),
Parser = require('./parser'),
- ConfigParser = require('../../configparser/ConfigParser'),
- CordovaError = require('../../CordovaError');
+ ConfigParser = require('cordova-common').ConfigParser,
+ CordovaError = require('cordova-common').CordovaError;
function amazon_fireos_parser(project) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js
index c618c0c..6b36a42 100644
--- a/cordova-lib/src/cordova/metadata/android_parser.js
+++ b/cordova-lib/src/cordova/metadata/android_parser.js
@@ -20,14 +20,14 @@
var fs = require('fs'),
path = require('path'),
et = require('elementtree'),
- xml = require('../../util/xml-helpers'),
+ xml = require('cordova-common').xmlHelpers,
util = require('../util'),
- events = require('../../events'),
+ events = require('cordova-common').events,
shell = require('shelljs'),
Q = require('q'),
Parser = require('./parser'),
- ConfigParser = require('../../configparser/ConfigParser'),
- CordovaError = require('../../CordovaError');
+ ConfigParser = require('cordova-common').ConfigParser,
+ CordovaError = require('cordova-common').CordovaError;
function android_parser(project) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/blackberry10_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/blackberry10_parser.js b/cordova-lib/src/cordova/metadata/blackberry10_parser.js
index b1c137f..a29ca76 100644
--- a/cordova-lib/src/cordova/metadata/blackberry10_parser.js
+++ b/cordova-lib/src/cordova/metadata/blackberry10_parser.js
@@ -23,9 +23,9 @@ var fs = require('fs'),
util = require('../util'),
Q = require('q'),
Parser = require('./parser'),
- ConfigParser = require('../../configparser/ConfigParser'),
- CordovaError = require('../../CordovaError'),
- events = require('../../events');
+ ConfigParser = require('cordova-common').ConfigParser,
+ CordovaError = require('cordova-common').CordovaError,
+ events = require('cordova-common').events;
function blackberry_parser(project) {
if (!fs.existsSync(path.join(project, 'www'))) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/firefoxos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/firefoxos_parser.js b/cordova-lib/src/cordova/metadata/firefoxos_parser.js
index 1109958..c71796b 100644
--- a/cordova-lib/src/cordova/metadata/firefoxos_parser.js
+++ b/cordova-lib/src/cordova/metadata/firefoxos_parser.js
@@ -22,11 +22,11 @@
var fs = require('fs'),
path = require('path'),
shell = require('shelljs'),
- events = require('../../events'),
+ events = require('cordova-common').events,
util = require('../util'),
Q = require('q'),
Parser = require('./parser'),
- ConfigParser = require('../../configparser/ConfigParser');
+ ConfigParser = require('cordova-common').ConfigParser;
function firefoxos_parser(project) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ios_parser.js b/cordova-lib/src/cordova/metadata/ios_parser.js
index c5c5e68..3eb4b6b 100644
--- a/cordova-lib/src/cordova/metadata/ios_parser.js
+++ b/cordova-lib/src/cordova/metadata/ios_parser.js
@@ -24,14 +24,14 @@ var fs = require('fs'),
path = require('path'),
xcode = require('xcode'),
util = require('../util'),
- events = require('../../events'),
+ events = require('cordova-common').events,
shell = require('shelljs'),
plist = require('plist'),
Q = require('q'),
Parser = require('./parser'),
- ConfigParser = require('../../configparser/ConfigParser'),
+ ConfigParser = require('cordova-common').ConfigParser,
URL = require('url'),
- CordovaError = require('../../CordovaError');
+ CordovaError = require('cordova-common').CordovaError;
function ios_parser(project) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/parserhelper/preferences.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/parserhelper/preferences.js b/cordova-lib/src/cordova/metadata/parserhelper/preferences.js
index 1906bc6..758e670 100644
--- a/cordova-lib/src/cordova/metadata/parserhelper/preferences.js
+++ b/cordova-lib/src/cordova/metadata/parserhelper/preferences.js
@@ -21,7 +21,7 @@
'use strict';
-var events = require('../../../events');
+var events = require('cordova-common').events;
var _ORIENTATION_DEFAULT = 'default';
var _ORIENTATION_PORTRAIT = 'portrait';
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/ubuntu_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ubuntu_parser.js b/cordova-lib/src/cordova/metadata/ubuntu_parser.js
index 86c19b7..5f7d08f 100644
--- a/cordova-lib/src/cordova/metadata/ubuntu_parser.js
+++ b/cordova-lib/src/cordova/metadata/ubuntu_parser.js
@@ -26,7 +26,7 @@ var fs = require('fs'),
Q = require('q'),
Parser = require('./parser'),
os = require('os'),
- ConfigParser = require('../../configparser/ConfigParser');
+ ConfigParser = require('cordova-common').ConfigParser;
function ubuntu_parser(project) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/windows_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/windows_parser.js b/cordova-lib/src/cordova/metadata/windows_parser.js
index e53ea2d..2301bba 100644
--- a/cordova-lib/src/cordova/metadata/windows_parser.js
+++ b/cordova-lib/src/cordova/metadata/windows_parser.js
@@ -22,13 +22,13 @@
var fs = require('fs'),
path = require('path'),
util = require('../util'),
- events = require('../../events'),
+ events = require('cordova-common').events,
shell = require('shelljs'),
Q = require('q'),
Parser = require('./parser'),
- ConfigParser = require('../../configparser/ConfigParser'),
- CordovaError = require('../../CordovaError'),
- xml = require('../../util/xml-helpers'),
+ ConfigParser = require('cordova-common').ConfigParser,
+ CordovaError = require('cordova-common').CordovaError,
+ xml = require('cordova-common').xmlHelpers,
HooksRunner = require('../../hooks/HooksRunner');
function windows_parser(project) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/wp8_parser.js b/cordova-lib/src/cordova/metadata/wp8_parser.js
index 557c1b7..c9b8d98 100644
--- a/cordova-lib/src/cordova/metadata/wp8_parser.js
+++ b/cordova-lib/src/cordova/metadata/wp8_parser.js
@@ -22,13 +22,13 @@
var fs = require('fs'),
path = require('path'),
util = require('../util'),
- events = require('../../events'),
+ events = require('cordova-common').events,
shell = require('shelljs'),
Q = require('q'),
Parser = require('./parser'),
- ConfigParser = require('../../configparser/ConfigParser'),
- CordovaError = require('../../CordovaError'),
- xml = require('../../util/xml-helpers'),
+ ConfigParser = require('cordova-common').ConfigParser,
+ CordovaError = require('cordova-common').CordovaError,
+ xml = require('cordova-common').xmlHelpers,
HooksRunner = require('../../hooks/HooksRunner');
function wp8_parser(project) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index 3e963b0..ed1862e 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -20,22 +20,22 @@
var config = require('./config'),
cordova = require('./cordova'),
cordova_util = require('./util'),
- ConfigParser = require('../configparser/ConfigParser'),
+ ConfigParser = require('cordova-common').ConfigParser,
fs = require('fs'),
os = require('os'),
path = require('path'),
HooksRunner = require('../hooks/HooksRunner'),
- events = require('../events'),
+ events = require('cordova-common').events,
lazy_load = require('./lazy_load'),
- CordovaError = require('../CordovaError'),
+ CordovaError = require('cordova-common').CordovaError,
Q = require('q'),
platforms = require('../platforms/platforms'),
promiseutil = require('../util/promise-util'),
- superspawn = require('./superspawn'),
+ superspawn = require('cordova-common').superspawn,
semver = require('semver'),
shell = require('shelljs'),
_ = require('underscore'),
- PlatformJson = require('../plugman/util/PlatformJson'),
+ PlatformJson = require('cordova-common').PlatformJson,
platformMetadata = require('./platform_metadata');
// Expose the platform parsers on top of this command
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js
index cc9aafc..3aa639d 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -22,14 +22,14 @@ var cordova_util = require('./util'),
semver = require('semver'),
config = require('./config'),
Q = require('q'),
- CordovaError = require('../CordovaError'),
- ConfigParser = require('../configparser/ConfigParser'),
+ CordovaError = require('cordova-common').CordovaError,
+ ConfigParser = require('cordova-common').ConfigParser,
fs = require('fs'),
shell = require('shelljs'),
- PluginInfoProvider = require('../PluginInfoProvider'),
+ PluginInfoProvider = require('cordova-common').PluginInfoProvider,
plugman = require('../plugman/plugman'),
pluginMapper = require('cordova-registry-mapper').newToOld,
- events = require('../events'),
+ events = require('cordova-common').events,
metadata = require('../plugman/util/metadata'),
chainMap = require('../util/promise-util').Q_chainmap;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/plugin_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/plugin_parser.js b/cordova-lib/src/cordova/plugin_parser.js
index 0ff24fb..4147942 100644
--- a/cordova-lib/src/cordova/plugin_parser.js
+++ b/cordova-lib/src/cordova/plugin_parser.js
@@ -17,7 +17,7 @@
under the License.
*/
-var xml = require('../util/xml-helpers');
+var xml = require('cordova-common').xmlHelpers;
/** Deprecated. Use PluginInfo instead. */
function plugin_parser(xmlPath) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js
index b8a8ad4..c791c9b 100644
--- a/cordova-lib/src/cordova/prepare.js
+++ b/cordova-lib/src/cordova/prepare.js
@@ -18,7 +18,7 @@
*/
var cordova_util = require('./util'),
- ConfigParser = require('../configparser/ConfigParser'),
+ ConfigParser = require('cordova-common').ConfigParser,
platforms = require('../platforms/platforms'),
HooksRunner = require('../hooks/HooksRunner'),
Q = require('q'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/project_metadata.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/project_metadata.js b/cordova-lib/src/cordova/project_metadata.js
index d6c3098..afde4e0 100644
--- a/cordova-lib/src/cordova/project_metadata.js
+++ b/cordova-lib/src/cordova/project_metadata.js
@@ -18,7 +18,7 @@
*/
var cordova_util = require('./util'),
- ConfigParser = require('../configparser/ConfigParser'),
+ ConfigParser = require('cordova-common').ConfigParser,
Q = require('q'),
semver = require('semver');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/requirements.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/requirements.js b/cordova-lib/src/cordova/requirements.js
index a5f8e11..3304636 100644
--- a/cordova-lib/src/cordova/requirements.js
+++ b/cordova-lib/src/cordova/requirements.js
@@ -19,7 +19,7 @@
var cordova_util = require('./util');
var Q = require('q');
-var CordovaError = require('../CordovaError');
+var CordovaError = require('cordova-common').CordovaError;
var knownPlatforms = require('../platforms/platforms');
/**
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/restore-util.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/restore-util.js b/cordova-lib/src/cordova/restore-util.js
index bbcead8..66f25ba 100644
--- a/cordova-lib/src/cordova/restore-util.js
+++ b/cordova-lib/src/cordova/restore-util.js
@@ -18,14 +18,13 @@
*/
var cordova_util = require('./util'),
- ConfigParser = require('../configparser/ConfigParser'),
- path = require('path'),
- Q = require('q'),
- fs = require('fs'),
- plugin = require('./plugin'),
- events = require('../events'),
- cordova = require('./cordova'),
- semver = require('semver'),
+ ConfigParser = require('cordova-common').ConfigParser,
+ path = require('path'),
+ Q = require('q'),
+ fs = require('fs'),
+ plugin = require('./plugin'),
+ events = require('cordova-common').events,
+ cordova = require('./cordova'),
promiseutil = require('../util/promise-util');
exports.installPluginsFromConfigXML = installPluginsFromConfigXML;
@@ -115,4 +114,3 @@ function installPluginsFromConfigXML(args) {
};
return plugin('add', installFrom, options);
});
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/run.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/run.js b/cordova-lib/src/cordova/run.js
index b739580..26e91d7 100644
--- a/cordova-lib/src/cordova/run.js
+++ b/cordova-lib/src/cordova/run.js
@@ -19,7 +19,7 @@
var cordova_util = require('./util'),
HooksRunner = require('../hooks/HooksRunner'),
- events = require('../events'),
+ events = require('cordova-common').events,
Q = require('q'),
platform_lib = require('../platforms/platforms');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/serve.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/serve.js b/cordova-lib/src/cordova/serve.js
index 274f8e0..eae69fb 100644
--- a/cordova-lib/src/cordova/serve.js
+++ b/cordova-lib/src/cordova/serve.js
@@ -22,7 +22,7 @@ var cordova_util = require('./util'),
path = require('path'),
shell = require('shelljs'),
platforms = require('../platforms/platforms'),
- ConfigParser = require('../configparser/ConfigParser'),
+ ConfigParser = require('cordova-common').ConfigParser,
HooksRunner = require('../hooks/HooksRunner'),
Q = require('q'),
fs = require('fs'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/targets.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/targets.js b/cordova-lib/src/cordova/targets.js
index 2f5566e..576931f 100644
--- a/cordova-lib/src/cordova/targets.js
+++ b/cordova-lib/src/cordova/targets.js
@@ -19,9 +19,9 @@
var cordova_util = require('./util'),
Q = require('q'),
- superspawn = require('./superspawn'),
+ superspawn = require('cordova-common').superspawn,
path = require('path'),
- events = require('../events');
+ events = require('cordova-common').events;
function handleError(error) {
if (error.code === 'ENOENT') {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/cordova/util.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/util.js b/cordova-lib/src/cordova/util.js
index c177689..da1d208 100644
--- a/cordova-lib/src/cordova/util.js
+++ b/cordova-lib/src/cordova/util.js
@@ -20,7 +20,7 @@
/* jshint sub:true */
var fs = require('fs'),
path = require('path'),
- CordovaError = require('../CordovaError'),
+ CordovaError = require('cordova-common').CordovaError,
shell = require('shelljs'),
url = require('url'),
npm = require('npm'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/gitclone.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/gitclone.js b/cordova-lib/src/gitclone.js
index 272db59..e398675 100644
--- a/cordova-lib/src/gitclone.js
+++ b/cordova-lib/src/gitclone.js
@@ -19,9 +19,9 @@
var Q = require('q'),
shell = require('shelljs'),
- events = require('./events'),
+ events = require('cordova-common').events,
path = require('path'),
- superspawn = require('./cordova/superspawn'),
+ superspawn = require('cordova-common').superspawn,
os = require('os');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/hooks/HooksRunner.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/hooks/HooksRunner.js b/cordova-lib/src/hooks/HooksRunner.js
index 42129d8..498ee04 100644
--- a/cordova-lib/src/hooks/HooksRunner.js
+++ b/cordova-lib/src/hooks/HooksRunner.js
@@ -17,15 +17,15 @@
under the License.
*/
var cordovaUtil = require('../cordova/util'),
- events = require('../events'),
+ events = require('cordova-common').events,
Q = require('q'),
scriptsFinder = require('./scriptsFinder'),
Context = require('./Context'),
- CordovaError = require('../CordovaError'),
+ CordovaError = require('cordova-common').CordovaError,
path = require('path'),
fs = require('fs'),
os = require('os'),
- superspawn = require('../cordova/superspawn');
+ superspawn = require('cordova-common').superspawn;
var isWindows = os.platform().slice(0, 3) === 'win';
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/hooks/scriptsFinder.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/hooks/scriptsFinder.js b/cordova-lib/src/hooks/scriptsFinder.js
index edaf64c..4fe7f32 100644
--- a/cordova-lib/src/hooks/scriptsFinder.js
+++ b/cordova-lib/src/hooks/scriptsFinder.js
@@ -20,9 +20,9 @@
var path = require('path'),
fs = require('fs'),
cordovaUtil = require('../cordova/util'),
- events = require('../events'),
- PluginInfoProvider = require('../PluginInfoProvider'),
- ConfigParser = require('../configparser/ConfigParser');
+ events = require('cordova-common').events,
+ PluginInfoProvider = require('cordova-common').PluginInfoProvider,
+ ConfigParser = require('cordova-common').ConfigParser;
/**
* Implements logic to retrieve hook script files defined in special folders and configuration
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/platforms/PlatformApiPoly.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/platforms/PlatformApiPoly.js b/cordova-lib/src/platforms/PlatformApiPoly.js
index 6cffb17..aef4aeb 100644
--- a/cordova-lib/src/platforms/PlatformApiPoly.js
+++ b/cordova-lib/src/platforms/PlatformApiPoly.js
@@ -24,17 +24,16 @@ var unorm = require('unorm');
var shell = require('shelljs');
var semver = require('semver');
-var superspawn = require('../cordova/superspawn');
-var xmlHelpers = require('../util/xml-helpers');
-var common = require('../plugman/platforms/common');
+var superspawn = require('cordova-common').superspawn;
+var xmlHelpers = require('cordova-common').xmlHelpers;
var knownPlatforms = require('./platforms');
-var CordovaError = require('../CordovaError');
-var PluginInfo = require('../PluginInfo');
-var ConfigParser = require('../configparser/ConfigParser');
-var PlatformJson = require('../plugman/util/PlatformJson');
-var ActionStack = require('../plugman/util/action-stack');
-var PlatformMunger = require('../plugman/util/config-changes').PlatformMunger;
-var PluginInfoProvider = require('../PluginInfoProvider');
+var CordovaError = require('cordova-common').CordovaError;
+var PluginInfo = require('cordova-common').PluginInfo;
+var ConfigParser = require('cordova-common').ConfigParser;
+var PlatformJson = require('cordova-common').PlatformJson;
+var ActionStack = require('cordova-common').ActionStack;
+var PlatformMunger = require('cordova-common').ConfigChanges.PlatformMunger;
+var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
/**
* Class, that acts as abstraction over particular platform. Encapsulates the
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/browserify.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/browserify.js b/cordova-lib/src/plugman/browserify.js
index 8d5581b..6fa92d9 100644
--- a/cordova-lib/src/plugman/browserify.js
+++ b/cordova-lib/src/plugman/browserify.js
@@ -27,7 +27,7 @@ var platform_modules = require('../platforms/platforms'),
fs = require('fs'),
childProcess = require('child_process'),
util = require('util'),
- events = require('../events'),
+ events = require('cordova-common').events,
plugman = require('./plugman'),
bundle = require('cordova-js/tasks/lib/bundle-browserify'),
writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header'),
@@ -35,8 +35,8 @@ var platform_modules = require('../platforms/platforms'),
computeCommitId = require('cordova-js/tasks/lib/compute-commit-id'),
Readable = require('stream').Readable;
-var PlatformJson = require('./util/PlatformJson');
-var PluginInfoProvider = require('../PluginInfoProvider');
+var PlatformJson = require('cordova-common').PlatformJson;
+var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
function generateFinalBundle(platform, libraryRelease, outReleaseFile, commitId, platformVersion) {
var deferred = Q.defer();
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/create.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/create.js b/cordova-lib/src/plugman/create.js
index fef798e..ada1fb4 100644
--- a/cordova-lib/src/plugman/create.js
+++ b/cordova-lib/src/plugman/create.js
@@ -22,7 +22,7 @@ var Q = require('q'),
path = require('path'),
shell = require('shelljs'),
et = require('elementtree'),
- CordovaError = require('../CordovaError'),
+ CordovaError = require('cordova-common').CordovaError,
stripLicense = require('./util/strip-license');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/createpackagejson.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/createpackagejson.js b/cordova-lib/src/plugman/createpackagejson.js
index a265268..9e61d3c 100644
--- a/cordova-lib/src/plugman/createpackagejson.js
+++ b/cordova-lib/src/plugman/createpackagejson.js
@@ -20,8 +20,8 @@
var Q = require('q'),
fs = require('fs'),
path = require('path'),
- PluginInfo = require('../PluginInfo'),
- events = require('../events'),
+ PluginInfo = require('cordova-common').PluginInfo,
+ events = require('cordova-common').events,
init = require('init-package-json');
//returns a promise
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/fetch.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/fetch.js b/cordova-lib/src/plugman/fetch.js
index 8e15085..ad463d7 100644
--- a/cordova-lib/src/plugman/fetch.js
+++ b/cordova-lib/src/plugman/fetch.js
@@ -22,10 +22,10 @@ var shell = require('shelljs'),
url = require('url'),
underscore = require('underscore'),
semver = require('semver'),
- PluginInfoProvider = require('../PluginInfoProvider'),
+ PluginInfoProvider = require('cordova-common').PluginInfoProvider,
plugins = require('./util/plugins'),
- CordovaError = require('../CordovaError'),
- events = require('../events'),
+ CordovaError = require('cordova-common').CordovaError,
+ events = require('cordova-common').events,
metadata = require('./util/metadata'),
path = require('path'),
Q = require('q'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index f6d39cd..67198e5 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -21,26 +21,26 @@
var path = require('path'),
fs = require('fs'),
- action_stack = require('./util/action-stack'),
+ action_stack = require('cordova-common').ActionStack,
dep_graph = require('dep-graph'),
child_process = require('child_process'),
semver = require('semver'),
- PlatformJson = require('./util/PlatformJson'),
- CordovaError = require('../CordovaError'),
+ PlatformJson = require('cordova-common').PlatformJson,
+ CordovaError = require('cordova-common').CordovaError,
Q = require('q'),
platform_modules = require('../platforms/platforms'),
os = require('os'),
underscore = require('underscore'),
shell = require('shelljs'),
- events = require('../events'),
+ events = require('cordova-common').events,
plugman = require('./plugman'),
HooksRunner = require('../hooks/HooksRunner'),
isWindows = (os.platform().substr(0,3) === 'win'),
cordovaUtil = require('../cordova/util');
-var superspawn = require('../cordova/superspawn');
-var PluginInfo = require('../PluginInfo');
-var PluginInfoProvider = require('../PluginInfoProvider');
+var superspawn = require('cordova-common').superspawn;
+var PluginInfo = require('cordova-common').PluginInfo;
+var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
/* INSTALL FLOW
------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/amazon-fireos.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/amazon-fireos.js b/cordova-lib/src/plugman/platforms/amazon-fireos.js
index bb31e67..a38d087 100644
--- a/cordova-lib/src/plugman/platforms/amazon-fireos.js
+++ b/cordova-lib/src/plugman/platforms/amazon-fireos.js
@@ -21,11 +21,11 @@
var path = require('path')
, common = require('./common')
- , events = require('../../events')
+ , events = require('cordova-common').events
, xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers'))
, properties_parser = require('properties-parser')
, android_project = require('../util/android-project')
- , CordovaError = require('../../CordovaError')
+ , CordovaError = require('cordova-common').CordovaError
;
var projectFileCache = {};
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/android.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/android.js b/cordova-lib/src/plugman/platforms/android.js
index 40fe6ce..0949392 100644
--- a/cordova-lib/src/plugman/platforms/android.js
+++ b/cordova-lib/src/plugman/platforms/android.js
@@ -22,11 +22,11 @@
var fs = require('fs');
var path = require('path')
, common = require('./common')
- , events = require('../../events')
- , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers'))
+ , events = require('cordova-common').events
+ , xml_helpers = require('cordova-common').xmlHelpers
, properties_parser = require('properties-parser')
, android_project = require('../util/android-project')
- , CordovaError = require('../../CordovaError')
+ , CordovaError = require('cordova-common').CordovaError
;
var semver = require('semver');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/blackberry10.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/blackberry10.js b/cordova-lib/src/plugman/platforms/blackberry10.js
index 8d1253b..6156eb6 100644
--- a/cordova-lib/src/plugman/platforms/blackberry10.js
+++ b/cordova-lib/src/plugman/platforms/blackberry10.js
@@ -21,8 +21,8 @@
var path = require('path')
, common = require('./common')
- , events = require('../../events')
- , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers'))
+ , events = require('cordova-common').events
+ , xml_helpers = require('cordova-common').xmlHelpers
;
var TARGETS = ['device', 'simulator'];
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/browser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/browser.js b/cordova-lib/src/plugman/platforms/browser.js
index c24238d..9a7e5e4 100644
--- a/cordova-lib/src/plugman/platforms/browser.js
+++ b/cordova-lib/src/plugman/platforms/browser.js
@@ -22,7 +22,7 @@
var path = require('path')
, fs = require('fs')
, common = require('./common')
- , events = require('../../events')
+ , events = require('cordova-common').events
, xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers'))
;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/firefoxos.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/firefoxos.js b/cordova-lib/src/plugman/platforms/firefoxos.js
index fc4d2cb..c712989 100644
--- a/cordova-lib/src/plugman/platforms/firefoxos.js
+++ b/cordova-lib/src/plugman/platforms/firefoxos.js
@@ -22,7 +22,7 @@
var path = require('path')
, fs = require('fs')
, common = require('./common')
- , events = require('../../events')
+ , events = require('cordova-common').events
, xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers'))
;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/ios.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/ios.js b/cordova-lib/src/plugman/platforms/ios.js
index a6a55cc..bc2aa8f 100644
--- a/cordova-lib/src/plugman/platforms/ios.js
+++ b/cordova-lib/src/plugman/platforms/ios.js
@@ -26,9 +26,9 @@ var path = require('path')
, xcode = require('xcode')
, plist = require('plist')
, shell = require('shelljs')
- , events = require('../../events')
+ , events = require('cordova-common').events
, _ = require('underscore')
- , CordovaError = require('../../CordovaError')
+ , CordovaError = require('cordova-common').CordovaError
, cachedProjectFiles = {}
;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/tizen.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/tizen.js b/cordova-lib/src/plugman/platforms/tizen.js
index ba45caf..7b7cc0f 100644
--- a/cordova-lib/src/plugman/platforms/tizen.js
+++ b/cordova-lib/src/plugman/platforms/tizen.js
@@ -21,8 +21,8 @@
var path = require('path')
, fs = require('fs')
- , events = require('../../events')
- , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers'));
+ , events = require('cordova-common').events
+ , xml_helpers = require('cordova-common').xmlHelpers;
module.exports = {
www_dir: function(project_dir) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/ubuntu.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/ubuntu.js b/cordova-lib/src/plugman/platforms/ubuntu.js
index d79f747..d3db7ae 100644
--- a/cordova-lib/src/plugman/platforms/ubuntu.js
+++ b/cordova-lib/src/plugman/platforms/ubuntu.js
@@ -33,7 +33,7 @@ var shell = require('shelljs')
, fs = require('fs')
, path = require('path')
, common = require('./common')
- , events = require('../../events')
+ , events = require('cordova-common').events
, xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers'));
module.exports = {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/webos.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/webos.js b/cordova-lib/src/plugman/platforms/webos.js
index edcb2d4..2f91a49 100755
--- a/cordova-lib/src/plugman/platforms/webos.js
+++ b/cordova-lib/src/plugman/platforms/webos.js
@@ -25,7 +25,7 @@
var path = require('path')
, fs = require('fs')
, common = require('./common')
- , events = require('../../events')
+ , events = require('cordova-common').events
, xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers'))
;
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/windows.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/windows.js b/cordova-lib/src/plugman/platforms/windows.js
index 7dd6ce8..034b01a 100644
--- a/cordova-lib/src/plugman/platforms/windows.js
+++ b/cordova-lib/src/plugman/platforms/windows.js
@@ -27,8 +27,8 @@ var common = require('./common'),
fs = require('fs'),
glob = require('glob'),
jsprojManager = require('../../util/windows/jsprojManager'),
- events = require('../../events'),
- xml_helpers = require('../../util/xml-helpers');
+ events = require('cordova-common').events,
+ xml_helpers = require('cordova-common').xmlHelpers;
module.exports = {
platformName: 'windows',
@@ -160,4 +160,4 @@ module.exports = {
function getTargetConditions(obj) {
return { versions: obj.versions, deviceTarget: obj.deviceTarget, arch: obj.arch };
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/platforms/wp8.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/wp8.js b/cordova-lib/src/plugman/platforms/wp8.js
index a589957..782b2cd 100644
--- a/cordova-lib/src/plugman/platforms/wp8.js
+++ b/cordova-lib/src/plugman/platforms/wp8.js
@@ -23,8 +23,8 @@ var common = require('./common'),
path = require('path'),
glob = require('glob'),
csproj = require('../../util/windows/csproj'),
- events = require('../../events'),
- xml_helpers = require('../../util/xml-helpers');
+ events = require('cordova-common').events,
+ xml_helpers = require('cordova-common').xmlHelpers;
module.exports = {
www_dir:function(project_dir) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/plugman.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/plugman.js b/cordova-lib/src/plugman/plugman.js
index 67637ed..2627b38 100644
--- a/cordova-lib/src/plugman/plugman.js
+++ b/cordova-lib/src/plugman/plugman.js
@@ -19,7 +19,7 @@
// copyright (c) 2013 Andrew Lunny, Adobe Systems
-var events = require('../events');
+var events = require('cordova-common').events;
var Q = require('q');
function addProperty(o, symbol, modulePath, doWrap) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/registry/manifest.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/registry/manifest.js b/cordova-lib/src/plugman/registry/manifest.js
index 88b131f..5706fb2 100644
--- a/cordova-lib/src/plugman/registry/manifest.js
+++ b/cordova-lib/src/plugman/registry/manifest.js
@@ -22,7 +22,7 @@ var path = require('path'),
fs = require('fs'),
whitelist = require('./whitelist');
-var PluginInfo = require('../../PluginInfo');
+var PluginInfo = require('cordova-common').PluginInfo;
function validateName(name) {
if (!name.match(/^(\S+\.){2,}.*$/)) {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/registry/registry.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/registry/registry.js b/cordova-lib/src/plugman/registry/registry.js
index 0965bd4..cc39f40 100644
--- a/cordova-lib/src/plugman/registry/registry.js
+++ b/cordova-lib/src/plugman/registry/registry.js
@@ -29,7 +29,7 @@ var npm = require('npm'),
pluginMapper = require('cordova-registry-mapper').oldToNew,
npmhelper = require('../../util/npm-helper'),
home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE,
- events = require('../../events'),
+ events = require('cordova-common').events,
unpack = require('../../util/unpack'),
// if PLUGMAN_HOME env var is specified use it as config directory (see CB-8190)
plugmanConfigDir = process.env.PLUGMAN_HOME || path.resolve(home, '.plugman'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/uninstall.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/uninstall.js b/cordova-lib/src/plugman/uninstall.js
index 1bc1e2f..545a336 100644
--- a/cordova-lib/src/plugman/uninstall.js
+++ b/cordova-lib/src/plugman/uninstall.js
@@ -23,20 +23,20 @@ var path = require('path'),
fs = require('fs'),
semver = require('semver'),
shell= require('shelljs'),
- action_stack = require('./util/action-stack'),
+ action_stack = require('cordova-common').ActionStack,
dependencies = require('./util/dependencies'),
- CordovaError = require('../CordovaError'),
+ CordovaError = require('cordova-common').CordovaError,
underscore = require('underscore'),
Q = require('q'),
- events = require('../events'),
+ events = require('cordova-common').events,
platform_modules = require('../platforms/platforms'),
promiseutil = require('../util/promise-util'),
HooksRunner = require('../hooks/HooksRunner'),
cordovaUtil = require('../cordova/util');
-var superspawn = require('../cordova/superspawn');
-var PlatformJson = require('./util/PlatformJson');
-var PluginInfoProvider = require('../PluginInfoProvider');
+var superspawn = require('cordova-common').superspawn;
+var PlatformJson = require('cordova-common').PlatformJson;
+var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
// possible options: cli_variables, www_dir
// Returns a promise.
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/util/dependencies.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/dependencies.js b/cordova-lib/src/plugman/util/dependencies.js
index 4056f0a..8c5d9fe 100644
--- a/cordova-lib/src/plugman/util/dependencies.js
+++ b/cordova-lib/src/plugman/util/dependencies.js
@@ -23,7 +23,7 @@ var dep_graph = require('dep-graph'),
path = require('path'),
fs = require('fs'),
underscore = require('underscore'),
- events = require('../../events'),
+ events = require('cordova-common').events,
package;
module.exports = package = {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/plugman/util/plugins.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/plugins.js b/cordova-lib/src/plugman/util/plugins.js
index 4d3f6f6..8fa8724 100644
--- a/cordova-lib/src/plugman/util/plugins.js
+++ b/cordova-lib/src/plugman/util/plugins.js
@@ -19,11 +19,11 @@
var path = require('path'),
shell = require('shelljs'),
- events = require('../../events'),
+ events = require('cordova-common').events,
gitclone = require('../../gitclone'),
tmp_dir;
-var PluginInfo = require('../../PluginInfo');
+var PluginInfo = require('cordova-common').PluginInfo;
module.exports = {
searchAndReplace:require('./search-and-replace'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/util/unpack.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/util/unpack.js b/cordova-lib/src/util/unpack.js
index aea29cb..637f10b 100644
--- a/cordova-lib/src/util/unpack.js
+++ b/cordova-lib/src/util/unpack.js
@@ -20,7 +20,7 @@
// commands for packing and unpacking tarballs
// this file is used by lib/cache.js
-var events = require('../events'),
+var events = require('cordova-common').events,
fs = require('fs'),
Q = require('q'),
tar = require('tar'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/util/windows/csproj.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/util/windows/csproj.js b/cordova-lib/src/util/windows/csproj.js
index 94933e6..092fba9 100644
--- a/cordova-lib/src/util/windows/csproj.js
+++ b/cordova-lib/src/util/windows/csproj.js
@@ -17,7 +17,7 @@
under the License.
*/
-var xml_helpers = require('../../util/xml-helpers'),
+var xml_helpers = require('cordova-common').xmlHelpers,
et = require('elementtree'),
fs = require('fs'),
path = require('path');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a50ead83/cordova-lib/src/util/windows/jsprojManager.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/util/windows/jsprojManager.js b/cordova-lib/src/util/windows/jsprojManager.js
index e7a68c9..163ac42 100644
--- a/cordova-lib/src/util/windows/jsprojManager.js
+++ b/cordova-lib/src/util/windows/jsprojManager.js
@@ -25,12 +25,12 @@
var util = require('util'),
- xml_helpers = require('../../util/xml-helpers'),
+ xml_helpers = require('cordova-common').xmlHelpers,
et = require('elementtree'),
fs = require('fs'),
glob = require('glob'),
shell = require('shelljs'),
- events = require('../../events'),
+ events = require('cordova-common').events,
path = require('path'),
semver = require('semver');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org