Fixing noConflict and merge rollup-config (#7855)

* fixing noConflict and merge rollup-config * Fix lint
Leaflet · Jan 19, 2022 · f3f27b0 · f3f27b0
1 parent 4d63087
commit f3f27b0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 48 deletions.
diff --git a/build/rollup-config.js b/build/rollup-config.js
@@ -1,4 +1,4 @@
-// Config file for running Rollup in "normal" mode (non-watch)
+// Config file for running Rollup
 
 import rollupGitVersion from 'rollup-plugin-git-version';
 import json from '@rollup/plugin-json';
@@ -7,42 +7,48 @@ import pkg from '../package.json';
 import {createBanner} from './banner';
 
 const release = process.env.NODE_ENV === 'release';
+const watch = process.argv.indexOf('-w') > -1 || process.argv.indexOf('--watch') > -1;
 // Skip the git branch+rev in the banner when doing a release build
 const version = release ? pkg.version : `${pkg.version}+${gitRev.branch()}.${gitRev.short()}`;
 const banner = createBanner(version);
 
 const outro = `var oldL = window.L;
-exports.noConflict = function() {
+leaflet.noConflict = function() {
 	window.L = oldL;
 	return this;
 }
-
 // Always export us to window global (see #2364)
-window.L = exports;`;
+window.L = leaflet;`;
 
 /** @type {import('rollup').RollupOptions} */
-export default {
+const config = {
 	input: 'src/Leaflet.js',
 	output: [
 		{
 			file: pkg.main,
 			format: 'umd',
-			name: 'L',
+			name: 'leaflet',
 			banner: banner,
 			outro: outro,
 			sourcemap: true,
 			freeze: false,
 			esModule: false
-		},
+		}
+	],
+	plugins: [
+		release ? json() : rollupGitVersion()
+	]
+};
+
+if (!watch) {
+	config.output.push(
 		{
 			file: 'dist/leaflet-src.esm.js',
 			format: 'es',
 			banner: banner,
 			sourcemap: true,
 			freeze: false
 		}
-	],
-	plugins: [
-		release ? json() : rollupGitVersion()
-	]
-};
+	);
+}
+export default config;
diff --git a/build/rollup-watch-config.js b/build/rollup-watch-config.js
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "lint": "eslint .",
     "lintfix": "npm run lint -- --fix",
     "rollup": "rollup -c build/rollup-config.js",
-    "watch": "rollup -w -c build/rollup-watch-config.js",
+    "watch": "rollup -w -c build/rollup-config.js",
     "uglify": "uglifyjs dist/leaflet-src.js -c -m -o dist/leaflet.js --source-map filename=dist/leaflet.js.map --source-map content=dist/leaflet-src.js.map --source-map url=leaflet.js.map --comments",
     "integrity": "node ./build/integrity.js",
     "bundlemon": "bundlemon --subProject no-compression --defaultCompression none && bundlemon --subProject gzip-compression --defaultCompression gzip"

diff --git a/spec/karma.conf.js b/spec/karma.conf.js
@@ -1,13 +1,13 @@
 var json = require('@rollup/plugin-json');
 
 const outro = `var oldL = window.L;
-exports.noConflict = function() {
+leaflet.noConflict = function() {
 	window.L = oldL;
 	return this;
 }
 
 // Always export us to window global (see #2364)
-window.L = exports;`;
+window.L = leaflet;`;
 
 // Karma configuration
 module.exports = function (config) {
@@ -63,7 +63,7 @@ module.exports = function (config) {
 			],
 			output: {
 				format: 'umd',
-				name: 'L',
+				name: 'leaflet',
 				outro: outro,
 				freeze: false,
 			},

diff --git a/spec/suites/core/GeneralSpec.js b/spec/suites/core/GeneralSpec.js
@@ -1,12 +1,9 @@
 describe('General', function () {
 	it('noConflict', function () {
 		var leaflet = L;
-
-		after(function () {
-			L = leaflet;
-		});
-
 		expect(L.noConflict()).to.eql(leaflet);
+		expect(L).to.eql(undefined);
+		L = leaflet;
 	});
 
 	it('namespace extension', function () {