Merge pull request Leaflet#944 from kontrollanten/travis-node-8

Upgrade deps and Node version
tegendraads · Mar 3, 2019 · 93bf540 · 93bf540
2 parents 3aae0cb + b06c4da
commit 93bf540
Show file tree

Hide file tree

Showing 6 changed files with 5,855 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,12 @@
 sudo: false
 language: node_js
 node_js:
-  - 6
+  - 8
 cache:
   directories:
     - "travis_phantomjs"
+    - "$HOME/.npm"
+
 before_install:
   - "export PHANTOMJS_VERSION=2.1.1"
   - "hash -r"
@@ -17,4 +19,7 @@ before_install:
   - "if [ $(phantomjs --version) != \"$PHANTOMJS_VERSION\" ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
   - "if [ $(phantomjs --version) != \"$PHANTOMJS_VERSION\" ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
   - "hash -r"
-  - "phantomjs --version"
+  - "phantomjs --version"
+
+install:
+  - npm ci
diff --git a/Jakefile.js b/Jakefile.js
@@ -38,7 +38,7 @@ task('build', ['lint'], {
 
 desc('Compress bundled files');
 task('uglify', ['build'], function(){
-	jake.exec('npm run-script uglify', function() { console.log('Uglyfied.'); });
+  jake.exec('npm run-script uglify', function() { console.log('Uglyfied.'); });
 });
 
 desc('Run PhantomJS tests');

diff --git a/build/rollup-config.js b/build/rollup-config.js
@@ -28,14 +28,16 @@ const banner = `/*
  */`;
 
 export default {
-	format: 'umd',
-	moduleName: 'Leaflet.markercluster',
-	banner: banner,
-	entry: 'src/index.js',
-	dest: 'dist/leaflet.markercluster-src.js',
+	input: 'src/index.js',
+	output: {
+		banner,
+		file: 'dist/leaflet.markercluster-src.js',
+		format: 'umd',
+		legacy: true, // Needed to create files loadable by IE8
+		name: 'Leaflet.markercluster',
+		sourcemap: true,
+	},
 	plugins: [
 		release ? json() : rollupGitVersion(),
 	],
-	sourceMap: true,
-	legacy: true // Needed to create files loadable by IE8
 };