diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd2f1ed0f31..e8d8a7977ef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,6 @@ Contributing to Leaflet 2. [Reporting Bugs](#reporting-bugs) 3. [Contributing Code](#contributing-code) 4. [Running the Tests](#running-the-tests) - 5. [Code Coverage](#code-coverage) 6. [Improving Documentation](#improving-documentation) 7. [Code of Conduct](#code-of-conduct) 8. [Thank You](#thank-you) @@ -137,17 +136,6 @@ npm test -- -- --browsers Firefox,Chrome,Safari,IE To run the tests in a browser manually, open `spec/index.html`. -## Code Coverage - -To generate a detailed report about test coverage (which helps tremendously when working on test improvements), run: - -``` -npm test -- --cov -``` - -After that, open `coverage//index.html` in a browser to see the report. -From there you can click through folders/files to get details on their individual coverage. - ## Improving Documentation The code of the live Leaflet website that contains all documentation and examples is located in the `docs/` directory of the `master` branch diff --git a/bower.json b/bower.json deleted file mode 100644 index 6b42495910d..00000000000 --- a/bower.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "leaflet", - "description": "JavaScript library for mobile-friendly interactive maps", - "license": "BSD-2-Clause", - "main": [ - "dist/leaflet.css", - "dist/leaflet-src.js" - ], - "ignore": [ - ".*", - "CHANGELOG.json", - "FAQ.md", - "debug", - "spec", - "src", - "build" - ] -} diff --git a/package.json b/package.json index 6d6939a9020..32a88cc6ae1 100644 --- a/package.json +++ b/package.json @@ -3,32 +3,29 @@ "version": "1.4.0", "description": "JavaScript library for mobile-friendly interactive maps", "devDependencies": { - "eslint": "^4.5.0", + "eslint": "^4.19.1", "eslint-config-mourner": "^2.0.1", - "git-rev-sync": "^1.8.0", + "git-rev-sync": "^1.12.0", "happen": "~0.3.2", - "karma": "^1.3.0", - "karma-chrome-launcher": "^2.0.0", - "karma-coverage": "~1.1.1", + "karma": "^4.1.0", + "karma-chrome-launcher": "^2.2.0", "karma-expect": "^1.1.3", - "karma-firefox-launcher": "^1.1.0", - "karma-mocha": "^1.2.0", - "karma-phantomjs-launcher": "^1.0.2", - "karma-rollup-preprocessor": "^5.0.1", + "karma-firefox-launcher": "~1.1.0", + "karma-mocha": "^1.3.0", + "karma-phantomjs-launcher": "^1.0.4", + "karma-rollup-preprocessor": "^7.0.0", "karma-safari-launcher": "~1.0.0", "karma-sinon": "^1.0.5", "leafdoc": "^1.4.1", - "mocha": "^3.1.0", - "phantomjs-prebuilt": "^2.1.12", + "mocha": "^6.1.4", + "phantomjs-prebuilt": "^2.1.16", "prosthetic-hand": "^1.3.1", - "rollup": "^0.51.8", + "rollup": "^1.11.0", "rollup-plugin-git-version": "0.2.1", - "rollup-plugin-json": "^2.1.0", - "rollup-watch": "^4.3.1", - "sinon": "^1.6.0", - "source-map": "^0.5.6", - "ssri": "^5.2.2", - "uglify-js": "~3.0.26" + "rollup-plugin-json": "^4.0.0", + "sinon": "^7.3.2", + "ssri": "^6.0.1", + "uglify-js": "~3.5.10" }, "main": "dist/leaflet-src.js", "style": "dist/leaflet.css", diff --git a/spec/karma.conf.js b/spec/karma.conf.js index c74c211e2b9..60c1cf27a5f 100644 --- a/spec/karma.conf.js +++ b/spec/karma.conf.js @@ -27,10 +27,6 @@ module.exports = function (config) { var preprocessors = {}; - if (config.cov) { - preprocessors['src/**/*.js'] = ['coverage']; - } - preprocessors['src/Leaflet.js'] = ['rollup']; config.set({ @@ -42,7 +38,6 @@ module.exports = function (config) { 'karma-mocha', 'karma-sinon', 'karma-expect', - 'karma-coverage', 'karma-phantomjs-launcher', 'karma-chrome-launcher', 'karma-safari-launcher', @@ -64,16 +59,16 @@ module.exports = function (config) { plugins: [ json() ], - format: 'umd', - name: 'L', - outro: outro + output: { + format: 'umd', + name: 'L', + outro: outro + } }, // test results reporter to use // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage' - reporters: config.cov ? ['dots', 'coverage'] : ['dots'], - - coverageReporter: config.cov ? {type : 'html', dir : 'coverage/'} : null, + reporters: ['dots'], // web server port port: 9876,