Upgrade to latest version of Rollup (#7677)

* Upgrade to latest version of Rollup

* add esModule: false for legacy compat

Co-authored-by: Vladimir Agafonkin <agafonkin@gmail.com>

build/banner.js

@@ -0,0 +1,7 @@
+export function createBanner(version) {
+	return `/* @preserve
+ * Leaflet ${version}, a JS library for interactive maps. http://leafletjs.com
+ * (c) 2010-${new Date().getFullYear()} Vladimir Agafonkin, (c) 2010-2011 CloudMade
+ */
+`;
+}

build/rollup-config.js

@@ -1,28 +1,15 @@
 // Config file for running Rollup in "normal" mode (non-watch)
 
 import rollupGitVersion from 'rollup-plugin-git-version';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import gitRev from 'git-rev-sync';
 import pkg from '../package.json';
+import {createBanner} from './banner';
 
-let {version} = pkg;
+const release = process.env.NODE_ENV === 'release';
-let release;
-
 // Skip the git branch+rev in the banner when doing a release build
-if (process.env.NODE_ENV === 'release') {
+const version = release ? pkg.version : `${pkg.version}+${gitRev.branch()}.${gitRev.short()}`;
-	release = true;
+const banner = createBanner(version);
-} else {
-	release = false;
-	const branch = gitRev.branch();
-	const rev = gitRev.short();
-	version += '+' + branch + '.' + rev;
-}
-
-const banner = `/* @preserve
- * Leaflet ${version}, a JS library for interactive maps. http://leafletjs.com
- * (c) 2010-2021 Vladimir Agafonkin, (c) 2010-2011 CloudMade
- */
-`;
 
 const outro = `var oldL = window.L;
 exports.noConflict = function() {
@@ -33,6 +20,7 @@ exports.noConflict = function() {
 // Always export us to window global (see #2364)
 window.L = exports;`;
 
+/** @type {import('rollup').RollupOptions} */
 export default {
 	input: 'src/Leaflet.js',
 	output: [
@@ -43,8 +31,8 @@ export default {
 			banner: banner,
 			outro: outro,
 			sourcemap: true,
-			legacy: true, // Needed to create files loadable by IE8
+			freeze: false,
-			freeze: false
+			esModule: false
 		},
 		{
 			file: 'dist/leaflet-src.esm.js',

build/rollup-watch-config.js

@@ -3,16 +3,13 @@
 
 import rollupGitVersion from 'rollup-plugin-git-version';
 import gitRev from 'git-rev-sync';
+import pkg from '../package.json';
+import {createBanner} from './banner';
 
-const branch = gitRev.branch();
+const version = `${pkg.version}+${gitRev.branch()}.${gitRev.short()}`;
-const rev = gitRev.short();
+const banner = createBanner(version);
-const version = require('../package.json').version + '+' + branch + '.' + rev;
-const banner = `/* @preserve
- * Leaflet ${version}, a JS library for interactive maps. http://leafletjs.com
- * (c) 2010-2021 Vladimir Agafonkin, (c) 2010-2011 CloudMade
- */
-`;
 
+/** @type {import('rollup').RollupOptions} */
 export default {
 	input: 'src/Leaflet.js',
 	output: {
@@ -21,8 +18,8 @@ export default {
 		name: 'L',
 		banner: banner,
 		sourcemap: true,
-		legacy: true, // Needed to create files loadable by IE8
 		freeze: false,
+		esModule: false
 	},
 	plugins: [
 		rollupGitVersion()

package.json

@@ -4,6 +4,7 @@
   "homepage": "https://leafletjs.com/",
   "description": "JavaScript library for mobile-friendly interactive maps",
   "devDependencies": {
+    "@rollup/plugin-json": "^4.1.0",
     "eslint": "^7.32.0",
     "eslint-config-mourner": "^2.0.3",
     "git-rev-sync": "^3.0.1",
@@ -16,16 +17,15 @@
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "karma-phantomjs-launcher": "^1.0.4",
-    "karma-rollup-preprocessor": "^6.1.2",
+    "karma-rollup-preprocessor": "^7.0.7",
     "karma-safari-launcher": "~1.0.0",
     "karma-sinon": "^1.0.5",
     "leafdoc": "^2.3.0",
     "mocha": "^9.1.1",
     "phantomjs-prebuilt": "^2.1.16",
     "prosthetic-hand": "^1.3.1",
-    "rollup": "^0.59.4",
+    "rollup": "^2.56.3",
     "rollup-plugin-git-version": "^0.3.1",
-    "rollup-plugin-json": "^4.0.0",
     "sinon": "^7.5.0",
     "ssri": "^8.0.1",
     "uglify-js": "^3.14.1"

spec/karma.conf.js

@@ -1,4 +1,4 @@
-var json = require('rollup-plugin-json');
+var json = require('@rollup/plugin-json');
 
 const outro = `var oldL = window.L;
 exports.noConflict = function() {
@@ -12,7 +12,7 @@ window.L = exports;`;
 // Karma configuration
 module.exports = function (config) {
 
-// 	var libSources = require(__dirname + '/../build/build.js').getFiles();
+	// 	var libSources = require(__dirname + '/../build/build.js').getFiles();
 
 	var files = [
 		"spec/before.js",
@@ -66,7 +66,6 @@ module.exports = function (config) {
 				format: 'umd',
 				name: 'L',
 				outro: outro,
-				legacy: true, // Needed to create files loadable by IE8
 				freeze: false,
 			},
 		},