Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CB-14145 resolve npm audit issues in 4.5.x patch fix #379

Merged
merged 12 commits into from
Jul 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
38 changes: 4 additions & 34 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,12 @@ tmp
*.pbxuser
xcuserdata
console.log
node_modules/.bin
node_modules/jshint
node_modules/eslint
node_modules/jasmine-node
node_modules/rewire
node_modules/istanbul
node_modules/.bin/cake
node_modules/.bin/codecov
node_modules/.bin/coffee
node_modules/.bin/color-support
node_modules/.bin/coveralls
node_modules/.bin/escodegen
node_modules/.bin/esgenerate
node_modules/.bin/eslint
node_modules/.bin/esparse
node_modules/.bin/esvalidate
node_modules/.bin/handlebars
node_modules/.bin/har-validator
node_modules/.bin/istanbul
node_modules/.bin/jasmine-node
node_modules/.bin/js-yaml
node_modules/.bin/jshint
node_modules/.bin/mkdirp
node_modules/.bin/nodeunit
node_modules/.bin/nyc
node_modules/.bin/opener
node_modules/.bin/r.js
node_modules/.bin/r_js
node_modules/.bin/sshpk-conv
node_modules/.bin/sshpk-sign
node_modules/.bin/sshpk-verify
node_modules/.bin/strip-json-comments
node_modules/.bin/tap
node_modules/.bin/tap-mocha-reporter
node_modules/.bin/tap-parser
node_modules/.bin/tape
node_modules/.bin/uglifyjs
node_modules/.bin/uncrustify
node_modules/.bin/which
node_modules/align-text/
node_modules/amdefine/
node_modules/ansi-regex/
Expand Down Expand Up @@ -226,4 +194,6 @@ node_modules/color-support/
node_modules/fs.realpath/
node_modules/jasmine-core/
node_modules/jasmine/
node_modules/eslint-*
node_modules/eslint-*
node_modules/pegjs
package-lock.json
15 changes: 12 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
language: objective-c
osx_image: xcode8.3
sudo: false

env:
matrix:
- TRAVIS_NODE_VERSION: '4.2'
- TRAVIS_NODE_VERSION: '6.11'
- TRAVIS_NODE_VERSION: '4'
- TRAVIS_NODE_VERSION: '6'
- TRAVIS_NODE_VERSION: '8'
- TRAVIS_NODE_VERSION: '10'

before_install:
- npm cache clean -f
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm
&& git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm
install $TRAVIS_NODE_VERSION
- node --version
- npm --version

install:
- npm install
- npm install ios-deploy
- npm install -g codecov

script:
- npm run unit-tests
- npm run e2e-tests
- open -b com.apple.iphonesimulator
- npm run objc-tests
- npm run cover
- npm run eslint
after_script: codecov

after_script:
- codecov
2 changes: 1 addition & 1 deletion CordovaLib/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.5.4
4.5.5-dev
13 changes: 7 additions & 6 deletions CordovaLib/cordova.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Platform: ios
// 4450a4cea50616e080a82e8ede9e3d6a1fe3c3ec
// e040d9e9343d5f27dd4f67616660b33b92a82ff7
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Expand All @@ -19,7 +19,7 @@
under the License.
*/
;(function() {
var PLATFORM_VERSION_BUILD_LABEL = '4.5.4';
var PLATFORM_VERSION_BUILD_LABEL = '4.5.5-dev';
// file: src/scripts/require.js

/* jshint -W079 */
Expand Down Expand Up @@ -307,6 +307,7 @@ var cordova = {
} catch (err) {
var msg = 'Error in ' + (isSuccess ? 'Success' : 'Error') + ' callbackId: ' + callbackId + ' : ' + err;
console && console.log && console.log(msg);
console && console.log && err.stack && console.log(err.stack);
cordova.fireWindowEvent('cordovacallbackerror', { 'message': msg });
throw err;
}
Expand Down Expand Up @@ -836,7 +837,7 @@ module.exports = channel;

});

// file: /Users/spindori/Documents/Cordova/cordova-ios/cordova-js-src/exec.js
// file: /Users/brodybits/Documents/cordova/cordova-ios/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) {

/*global require, module, atob, document */
Expand Down Expand Up @@ -1559,7 +1560,7 @@ exports.reset();

});

// file: /Users/spindori/Documents/Cordova/cordova-ios/cordova-js-src/platform.js
// file: /Users/brodybits/Documents/cordova/cordova-ios/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) {

module.exports = {
Expand All @@ -1575,7 +1576,7 @@ module.exports = {

});

// file: /Users/spindori/Documents/Cordova/cordova-ios/cordova-js-src/plugin/ios/console.js
// file: /Users/brodybits/Documents/cordova/cordova-ios/cordova-js-src/plugin/ios/console.js
define("cordova/plugin/ios/console", function(require, exports, module) {

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -1746,7 +1747,7 @@ for (var key in console) {

});

// file: /Users/spindori/Documents/Cordova/cordova-ios/cordova-js-src/plugin/ios/logger.js
// file: /Users/brodybits/Documents/cordova/cordova-ios/cordova-js-src/plugin/ios/logger.js
define("cordova/plugin/ios/logger", function(require, exports, module) {

//------------------------------------------------------------------------------
Expand Down
8 changes: 3 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ environment:
matrix:
- nodejs_version: "4"
- nodejs_version: "6"
- nodejs_version: "8"
- nodejs_version: "10"

install:
- ps: Install-Product node $env:nodejs_version
# Lines below required due to uncrustify installation failure on Windows
- npm install --prod
- npm install eslint eslint-config-semistandard jasmine rewire
- npm install eslint-config-standard eslint-plugin-import eslint-plugin-node
- npm install eslint-plugin-promise eslint-plugin-standard
- npm install

build: off

Expand Down
2 changes: 1 addition & 1 deletion bin/templates/scripts/cordova/version
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

// Coho updates this line
var VERSION="4.5.4";
var VERSION="4.5.5-dev";

module.exports.version = VERSION;

Expand Down
1 change: 0 additions & 1 deletion node_modules/.bin/ios-sim

This file was deleted.

1 change: 0 additions & 1 deletion node_modules/.bin/nopt

This file was deleted.

1 change: 0 additions & 1 deletion node_modules/.bin/pegjs

This file was deleted.

1 change: 0 additions & 1 deletion node_modules/.bin/semver

This file was deleted.

1 change: 0 additions & 1 deletion node_modules/.bin/shjs

This file was deleted.

1 change: 0 additions & 1 deletion node_modules/.bin/uuid

This file was deleted.

23 changes: 10 additions & 13 deletions node_modules/abbrev/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 10 additions & 13 deletions node_modules/ansi/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 10 additions & 13 deletions node_modules/balanced-match/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions node_modules/base64-js/.travis.yml

This file was deleted.

File renamed without changes.
5 changes: 3 additions & 2 deletions node_modules/base64-js/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions node_modules/base64-js/base64js.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions node_modules/base64-js/bench/bench.js

This file was deleted.

Loading