[
https://issues.apache.org/jira/browse/CB-13501?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16227454#comment-16227454
]
ASF GitHub Bot commented on CB-13501:
-------------------------------------
audreyso closed pull request #604: CB-13501 : added support for node 8 and
cleaned up eslint
URL: https://github.com/apache/cordova-lib/pull/604
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.travis.yml b/.travis.yml
index aec9bd618..4bd6e4e42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,8 @@ git:
node_js:
- "4"
- "6"
+ - "8"
install:
- - git clone https://github.com/apache/cordova-js --depth 10
- - git clone https://github.com/apache/cordova-fetch --depth 10
- - git clone https://github.com/apache/cordova-serve --depth 10
- - git clone https://github.com/apache/cordova-common --depth 10
- - (cd cordova-js && npm install && npm link .)
- - (cd cordova-common && npm install && npm link .)
- - (cd cordova-serve && npm install && npm link .)
- - (cd cordova-fetch && npm link cordova-common && npm install && npm link .)
- - (npm link cordova-serve && npm link cordova-fetch && npm link
cordova-common && npm link cordova-js)
- npm install
# Workaround for npm/npm#10343 when dependency of linked module is moved to
dependent
# module's 'node_modules' In our case 'cordova-common' -> jshint' -> 'cli'
dependency
diff --git a/appveyor.yml b/appveyor.yml
index 535f54682..4c3d2982b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,31 +5,10 @@ environment:
matrix:
- nodejs_version: "4"
- nodejs_version: "6"
+ - nodejs_version: "8"
install:
- ps: Install-Product node $env:nodejs_version
- - git clone https://github.com/apache/cordova-js --depth 10
- - git clone https://github.com/apache/cordova-common --depth 10
- - git clone https://github.com/apache/cordova-fetch --depth 10
- - git clone https://github.com/apache/cordova-serve --depth 10
- - cd cordova-js
- - npm install
- - npm link .
- - cd ../cordova-common
- - npm install
- - npm link .
- - cd ../cordova-serve
- - npm install
- - npm link .
- - cd ../cordova-fetch
- - npm link cordova-common
- - npm install
- - npm link .
- - cd ../
- - npm link cordova-js
- - npm link cordova-fetch
- - npm link cordova-common
- - npm link cordova-serve
- npm install
# Workaround for npm/npm#10343 when dependency of linked module is moved to
dependent
# module's 'node_modules' In our case 'cordova-common' -> jshint' -> 'cli'
dependency
diff --git a/package.json b/package.json
index 6539a6838..07879c3d1 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"aliasify": "^2.1.0",
"cordova-common": "2.1.1",
"cordova-create": "~1.1.0",
- "cordova-fetch": "1.2.0",
+ "cordova-fetch": "1.2.1",
"cordova-js": "4.2.2",
"cordova-serve": "^2.0.0",
"dep-graph": "1.1.0",
diff --git a/spec/cordova/util.spec.js b/spec/cordova/util.spec.js
index 08b0a16b1..40fcf5df5 100644
--- a/spec/cordova/util.spec.js
+++ b/spec/cordova/util.spec.js
@@ -312,8 +312,9 @@ describe('util module', function () {
describe('getPlatformApiFunction', function () {
it('Test 027 : should throw error informing user to update
platform', function () {
- expect(function () { util.getPlatformApiFunction('some/path',
'android'); }).toThrow(new Error // eslint-disable-line func-call-spacing
- ('Uncaught, unspecified "error" event. ( Using this version of
Cordova with older version of cordova-android is deprecated. Upgrade to
[email protected] or newer.)'));
+ expect(function () { util.getPlatformApiFunction('some/path',
'android'); }).toThrowError(
+ /(Uncaught, unspecified|Unhandled) "error" event. \( Using
this version of Cordova with older version of cordova-android is deprecated\.
Upgrade to cordova-android@5\.0\.0 or newer.\)/
+ );
});
it('Test 028 : should throw error if platform is not supported',
function () {
diff --git a/src/cordova/plugin/add.js b/src/cordova/plugin/add.js
index 0bf5fb163..3b9b78627 100644
--- a/src/cordova/plugin/add.js
+++ b/src/cordova/plugin/add.js
@@ -240,9 +240,8 @@ function determinePluginTarget (projectRoot, cfg, target,
fetchOptions) {
// If parsedSpec.version satisfies pkgJson version, no writing to
pkg.json. Only write when
// it does not satisfy.
/* if (parsedSpec.version) {
-
if (pkgJson && pkgJson.dependencies &&
pkgJson.dependencies[parsedSpec.package]) {
- //it can only go in here if
+ //it can only go in here if
var noSymbolVersion = parsedSpec.version;
if (parsedSpec.version.charAt(0) === '^' ||
parsedSpec.version.charAt(0) === '~') {
noSymbolVersion = parsedSpec.version.slice(1);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Update cordova repos to also use node 8
> ---------------------------------------
>
> Key: CB-13501
> URL: https://issues.apache.org/jira/browse/CB-13501
> Project: Apache Cordova
> Issue Type: Bug
> Components: cordova-cli, cordova-common, cordova-fetch, cordova-serve
> Affects Versions: [email protected]
> Reporter: Audrey So
>
> Update cordova repos to also use node 8
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
