You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2017/10/20 23:55:10 UTC
[1/8] cordova-lib git commit: Undo accidental commit to qs/.eslintrc
Repository: cordova-lib
Updated Branches:
refs/heads/master 57ddb90ef -> 93a75f520
Undo accidental commit to qs/.eslintrc
This closes #597
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/93a75f52
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/93a75f52
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/93a75f52
Branch: refs/heads/master
Commit: 93a75f52044c5f8b3512d1a0628e6272e4b658c0
Parents: e33eb0c
Author: Roland <ro...@fraction7.com>
Authored: Fri Oct 20 22:45:04 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700
----------------------------------------------------------------------
.../fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/93a75f52/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc
----------------------------------------------------------------------
diff --git a/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc b/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc
index 17a99d0..1faac27 100644
--- a/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc
+++ b/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc
@@ -1,7 +1,7 @@
{
"root": true,
- /* "extends": "@ljharb", */
+ "extends": "@ljharb",
"rules": {
"complexity": [2, 22],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[7/8] cordova-lib git commit: More targeted eslintignore
Posted by st...@apache.org.
More targeted eslintignore
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e33eb0c2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e33eb0c2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e33eb0c2
Branch: refs/heads/master
Commit: e33eb0c2ae7504d2784e0dde7af1bb744f77d3cf
Parents: b0de5fe
Author: Roland <ro...@fraction7.com>
Authored: Fri Oct 20 22:42:26 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700
----------------------------------------------------------------------
.eslintignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e33eb0c2/.eslintignore
----------------------------------------------------------------------
diff --git a/.eslintignore b/.eslintignore
index 06683d8..46ad7cc 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,6 @@
+src/plugman/init-defaults.js
spec/cordova/fixtures/*
spec/plugman/projects/*
spec/plugman/plugins/*
spec/cordova/temp/*
-src/plugman/*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/8] cordova-lib git commit: Revert "Fix for 'pkg is not defined'
exception"
Posted by st...@apache.org.
Revert "Fix for 'pkg is not defined' exception"
This reverts commit e321bc319b94c86b77d993981491f99bac6f27f9.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/09f20b9e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/09f20b9e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/09f20b9e
Branch: refs/heads/master
Commit: 09f20b9e5aac1a4b6d6378b94859c467a65b7950
Parents: e38839d
Author: Roland <ro...@fraction7.com>
Authored: Wed Oct 18 20:45:23 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700
----------------------------------------------------------------------
src/plugman/init-defaults.js | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/09f20b9e/src/plugman/init-defaults.js
----------------------------------------------------------------------
diff --git a/src/plugman/init-defaults.js b/src/plugman/init-defaults.js
index 143bf01..f3c5ada 100644
--- a/src/plugman/init-defaults.js
+++ b/src/plugman/init-defaults.js
@@ -19,7 +19,7 @@
/* global dirname */
/* global config */
-/* global package */
+/* global pkg */
/* global basename */
/* global yes */
/* global prompt */
@@ -55,17 +55,17 @@ function readDeps (test) {
};
}
-var name = package.name || defaults.id || basename;
+var name = pkg.name || defaults.id || basename;
exports.name = yes ? name : prompt('name', name);
-var version = package.version ||
+var version = pkg.version ||
defaults.version ||
config.get('init.version') ||
config.get('init-version') ||
'1.0.0';
exports.version = yes ? version : prompt('version', version);
-if (!package.description) {
+if (!pkg.description) {
if (defaults.description) {
exports.description = defaults.description;
} else {
@@ -73,7 +73,7 @@ if (!package.description) {
}
}
-if (!package.cordova) {
+if (!pkg.cordova) {
exports.cordova = {};
if (defaults.id) {
exports.cordova.id = defaults.id;
@@ -83,15 +83,15 @@ if (!package.cordova) {
}
}
-if (!package.dependencies) {
+if (!pkg.dependencies) {
exports.dependencies = readDeps(false);
}
-if (!package.devDependencies) {
+if (!pkg.devDependencies) {
exports.devDependencies = readDeps(true);
}
-if (!package.repository) {
+if (!pkg.repository) {
exports.repository = function (cb) {
fs.readFile('.git/config', 'utf8', function (er, gconf) {
if (er || !gconf) {
@@ -116,7 +116,7 @@ if (!package.repository) {
};
}
-if (!package.keywords) {
+if (!pkg.keywords) {
if (defaults.keywords) {
exports.keywords = defaults.keywords;
} else {
@@ -129,14 +129,14 @@ if (!package.keywords) {
}
}
-if (!package.engines) {
+if (!pkg.engines) {
if (defaults.engines && defaults.engines.length > 0) {
exports.engines = defaults.engines;
}
}
/* eslint-disable indent */
-if (!package.author) {
+if (!pkg.author) {
exports.author = (config.get('init.author.name') ||
config.get('init-author-name')) ?
{
@@ -150,7 +150,7 @@ if (!package.author) {
: prompt('author');
}
/* eslint-enable indent */
-var license = package.license ||
+var license = pkg.license ||
defaults.license ||
config.get('init.license') ||
config.get('init-license') ||
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/8] cordova-lib git commit: Fix for 'pkg is not defined' exception A global js-lint pass on the cordova-lib codebase on the 30/8/2017 caused references to the global 'package' variable in init-default.js to be renamed to 'pkg’, presumably because the c
Posted by st...@apache.org.
Fix for 'pkg is not defined' exception
A global js-lint pass on the cordova-lib codebase on the 30/8/2017 caused references to the global 'package' variable in init-default.js to be renamed to 'pkg’, presumably because the cordova-lib source doesn’t declare a global variable called ‘package’ but _does_ declare a global variable called ‘pkg’ (in cordova/info.js). However in this case, the ‘package’ variable refers to the one declared in the plugman source, specifically main.js, so it should have stayed as 'package’. To test the fix, run:
plugman createpackagejson .
Without the fix, this will trigger the following exception: 'pkg is not defined'. Having patched in the fix, running the command line should work as expected, prompting the user with questions and then spitting out a package.json file.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e38839de
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e38839de
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e38839de
Branch: refs/heads/master
Commit: e38839de40ac46f7c9dc72935b35bec308cd36d4
Parents: 57ddb90
Author: Roland <ro...@fraction7.com>
Authored: Mon Oct 16 21:57:59 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700
----------------------------------------------------------------------
src/plugman/init-defaults.js | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e38839de/src/plugman/init-defaults.js
----------------------------------------------------------------------
diff --git a/src/plugman/init-defaults.js b/src/plugman/init-defaults.js
index f3c5ada..143bf01 100644
--- a/src/plugman/init-defaults.js
+++ b/src/plugman/init-defaults.js
@@ -19,7 +19,7 @@
/* global dirname */
/* global config */
-/* global pkg */
+/* global package */
/* global basename */
/* global yes */
/* global prompt */
@@ -55,17 +55,17 @@ function readDeps (test) {
};
}
-var name = pkg.name || defaults.id || basename;
+var name = package.name || defaults.id || basename;
exports.name = yes ? name : prompt('name', name);
-var version = pkg.version ||
+var version = package.version ||
defaults.version ||
config.get('init.version') ||
config.get('init-version') ||
'1.0.0';
exports.version = yes ? version : prompt('version', version);
-if (!pkg.description) {
+if (!package.description) {
if (defaults.description) {
exports.description = defaults.description;
} else {
@@ -73,7 +73,7 @@ if (!pkg.description) {
}
}
-if (!pkg.cordova) {
+if (!package.cordova) {
exports.cordova = {};
if (defaults.id) {
exports.cordova.id = defaults.id;
@@ -83,15 +83,15 @@ if (!pkg.cordova) {
}
}
-if (!pkg.dependencies) {
+if (!package.dependencies) {
exports.dependencies = readDeps(false);
}
-if (!pkg.devDependencies) {
+if (!package.devDependencies) {
exports.devDependencies = readDeps(true);
}
-if (!pkg.repository) {
+if (!package.repository) {
exports.repository = function (cb) {
fs.readFile('.git/config', 'utf8', function (er, gconf) {
if (er || !gconf) {
@@ -116,7 +116,7 @@ if (!pkg.repository) {
};
}
-if (!pkg.keywords) {
+if (!package.keywords) {
if (defaults.keywords) {
exports.keywords = defaults.keywords;
} else {
@@ -129,14 +129,14 @@ if (!pkg.keywords) {
}
}
-if (!pkg.engines) {
+if (!package.engines) {
if (defaults.engines && defaults.engines.length > 0) {
exports.engines = defaults.engines;
}
}
/* eslint-disable indent */
-if (!pkg.author) {
+if (!package.author) {
exports.author = (config.get('init.author.name') ||
config.get('init-author-name')) ?
{
@@ -150,7 +150,7 @@ if (!pkg.author) {
: prompt('author');
}
/* eslint-enable indent */
-var license = pkg.license ||
+var license = package.license ||
defaults.license ||
config.get('init.license') ||
config.get('init-license') ||
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/8] cordova-lib git commit: Second attempt at fix for CB-13451
Posted by st...@apache.org.
Second attempt at fix for CB-13451
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c3ea1592
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c3ea1592
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c3ea1592
Branch: refs/heads/master
Commit: c3ea159244c585e1e62cb4d9a5b65a1403802e26
Parents: 09f20b9
Author: Roland <ro...@fraction7.com>
Authored: Thu Oct 19 21:45:23 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700
----------------------------------------------------------------------
src/plugman/init-defaults.js | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c3ea1592/src/plugman/init-defaults.js
----------------------------------------------------------------------
diff --git a/src/plugman/init-defaults.js b/src/plugman/init-defaults.js
index f3c5ada..78efde2 100644
--- a/src/plugman/init-defaults.js
+++ b/src/plugman/init-defaults.js
@@ -19,7 +19,7 @@
/* global dirname */
/* global config */
-/* global pkg */
+/* global package */
/* global basename */
/* global yes */
/* global prompt */
@@ -55,17 +55,18 @@ function readDeps (test) {
};
}
-var name = pkg.name || defaults.id || basename;
+/* eslint-disable */
+var name = package.name || defaults.id || basename;
exports.name = yes ? name : prompt('name', name);
-var version = pkg.version ||
+var version = package.version ||
defaults.version ||
config.get('init.version') ||
config.get('init-version') ||
'1.0.0';
exports.version = yes ? version : prompt('version', version);
-if (!pkg.description) {
+if (!package.description) {
if (defaults.description) {
exports.description = defaults.description;
} else {
@@ -73,7 +74,7 @@ if (!pkg.description) {
}
}
-if (!pkg.cordova) {
+if (!package.cordova) {
exports.cordova = {};
if (defaults.id) {
exports.cordova.id = defaults.id;
@@ -83,15 +84,15 @@ if (!pkg.cordova) {
}
}
-if (!pkg.dependencies) {
+if (!package.dependencies) {
exports.dependencies = readDeps(false);
}
-if (!pkg.devDependencies) {
+if (!package.devDependencies) {
exports.devDependencies = readDeps(true);
}
-if (!pkg.repository) {
+if (!package.repository) {
exports.repository = function (cb) {
fs.readFile('.git/config', 'utf8', function (er, gconf) {
if (er || !gconf) {
@@ -116,7 +117,7 @@ if (!pkg.repository) {
};
}
-if (!pkg.keywords) {
+if (!package.keywords) {
if (defaults.keywords) {
exports.keywords = defaults.keywords;
} else {
@@ -129,14 +130,13 @@ if (!pkg.keywords) {
}
}
-if (!pkg.engines) {
+if (!package.engines) {
if (defaults.engines && defaults.engines.length > 0) {
exports.engines = defaults.engines;
}
}
-/* eslint-disable indent */
-if (!pkg.author) {
+if (!package.author) {
exports.author = (config.get('init.author.name') ||
config.get('init-author-name')) ?
{
@@ -149,10 +149,11 @@ if (!pkg.author) {
}
: prompt('author');
}
-/* eslint-enable indent */
-var license = pkg.license ||
+var license = package.license ||
defaults.license ||
config.get('init.license') ||
config.get('init-license') ||
'ISC';
+/* eslint-enable */
+
exports.license = yes ? license : prompt('license', license);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[8/8] cordova-lib git commit: Re-instated (and fixed?) glob patterns
for excluded spec folders
Posted by st...@apache.org.
Re-instated (and fixed?) glob patterns for excluded spec folders
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e700ab8a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e700ab8a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e700ab8a
Branch: refs/heads/master
Commit: e700ab8ae727ce206351026efda5e89614bd9fde
Parents: b90739c
Author: Roland <ro...@fraction7.com>
Authored: Fri Oct 20 20:41:55 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700
----------------------------------------------------------------------
.eslintignore | 7 ++++++-
.../platforms/cordova-browser/node_modules/qs/.eslintrc | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e700ab8a/.eslintignore
----------------------------------------------------------------------
diff --git a/.eslintignore b/.eslintignore
index 29ef117..06683d8 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,6 @@
-**/init-defaults.js
+spec/cordova/fixtures/*
+spec/plugman/projects/*
+spec/plugman/plugins/*
+spec/cordova/temp/*
+src/plugman/*
+
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e700ab8a/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc
----------------------------------------------------------------------
diff --git a/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc b/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc
index 1faac27..17a99d0 100644
--- a/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc
+++ b/spec/cordova/fixtures/platforms/cordova-browser/node_modules/qs/.eslintrc
@@ -1,7 +1,7 @@
{
"root": true,
- "extends": "@ljharb",
+ /* "extends": "@ljharb", */
"rules": {
"complexity": [2, 22],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/8] cordova-lib git commit: Removed redundant eslint-disable/enable
directives, now that we're excluding the whole file.
Posted by st...@apache.org.
Removed redundant eslint-disable/enable directives, now that we're excluding the whole file.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b0de5fe3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b0de5fe3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b0de5fe3
Branch: refs/heads/master
Commit: b0de5fe379e60ecadd81dd254ebbbcdb604b2eaf
Parents: e700ab8
Author: Roland <ro...@fraction7.com>
Authored: Fri Oct 20 20:43:53 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700
----------------------------------------------------------------------
src/plugman/init-defaults.js | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b0de5fe3/src/plugman/init-defaults.js
----------------------------------------------------------------------
diff --git a/src/plugman/init-defaults.js b/src/plugman/init-defaults.js
index 78efde2..9c80f40 100644
--- a/src/plugman/init-defaults.js
+++ b/src/plugman/init-defaults.js
@@ -55,7 +55,6 @@ function readDeps (test) {
};
}
-/* eslint-disable */
var name = package.name || defaults.id || basename;
exports.name = yes ? name : prompt('name', name);
@@ -154,6 +153,5 @@ var license = package.license ||
config.get('init.license') ||
config.get('init-license') ||
'ISC';
-/* eslint-enable */
exports.license = yes ? license : prompt('license', license);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[6/8] cordova-lib git commit: Make eslint ignore init-defaults.js
file(s) as it will fail otherwise on 'package' keword that PromZard injects
Posted by st...@apache.org.
Make eslint ignore init-defaults.js file(s) as it will fail otherwise on 'package' keword that PromZard injects
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b90739c9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b90739c9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b90739c9
Branch: refs/heads/master
Commit: b90739c93ccd9c2a255fb5ff840ea8473957d6fd
Parents: c3ea159
Author: Roland <ro...@fraction7.com>
Authored: Fri Oct 20 08:00:32 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700
----------------------------------------------------------------------
.eslintignore | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b90739c9/.eslintignore
----------------------------------------------------------------------
diff --git a/.eslintignore b/.eslintignore
index facec45..29ef117 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1 @@
-spec/cordova/fixtures/**
-spec/plugman/projects/**
-spec/plugman/plugins/**
-spec/cordova/temp/**
+**/init-defaults.js
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org