From 60a6e18aca60819ce3b0732d57fde34ce3912bae Mon Sep 17 00:00:00 2001 From: Michal Przybys Date: Tue, 21 Jan 2020 14:13:11 +0100 Subject: [PATCH 1/2] Do not rely on global L --- build/rollup-config.js | 7 ++++ package-lock.json | 81 ++++++++++++++++++++++++++++++++++-------- package.json | 3 +- 3 files changed, 75 insertions(+), 16 deletions(-) diff --git a/build/rollup-config.js b/build/rollup-config.js index 4c4f8fd8..13ffa9c9 100644 --- a/build/rollup-config.js +++ b/build/rollup-config.js @@ -1,6 +1,7 @@ // Config file for running Rollup in "normal" mode (non-watch) +import inject from '@rollup/plugin-inject'; import rollupGitVersion from 'rollup-plugin-git-version' import json from 'rollup-plugin-json' @@ -36,8 +37,14 @@ export default { legacy: true, // Needed to create files loadable by IE8 name: 'Leaflet.markercluster', sourcemap: true, + globals: { + "leaflet": "L" + } }, plugins: [ release ? json() : rollupGitVersion(), + inject({ + L: "leaflet" + }) ], }; diff --git a/package-lock.json b/package-lock.json index ae29d52b..aa74d3a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,16 +4,52 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@rollup/plugin-inject": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-4.0.0.tgz", + "integrity": "sha512-qWBNZgTxnbE3aFstAd3xMXk5QlkTI3eEnXCQ2kgtbGBy3iz9Xz5OP27skm2HUFVqdORrn57dDe/VU3AWfv43Qw==", + "dev": true, + "requires": { + "estree-walker": "^0.9.0", + "magic-string": "^0.25.2", + "rollup-pluginutils": "^2.6.0" + }, + "dependencies": { + "estree-walker": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.9.0.tgz", + "integrity": "sha512-12U47o7XHUX329+x3FzNVjCx3SHEzMF0nkDv7r/HnBzX/xNTKxajBk6gyygaxrAFtLj39219oMfbtxv4KpaOiA==", + "dev": true + }, + "rollup-pluginutils": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", + "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", + "dev": true, + "requires": { + "estree-walker": "^0.6.1" + }, + "dependencies": { + "estree-walker": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", + "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", + "dev": true + } + } + } + } + }, "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "version": "0.0.42", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz", + "integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==", "dev": true }, "@types/node": { - "version": "11.9.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.9.5.tgz", - "integrity": "sha512-vVjM0SVzgaOUpflq4GYBvCpozes8OgIIS5gVXVka+OfK3hvnkC1i93U8WiY2OtNE4XUWyyy/86Kf6e0IHTQw1Q==", + "version": "13.1.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.8.tgz", + "integrity": "sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A==", "dev": true }, "abbrev": { @@ -33,9 +69,9 @@ } }, "acorn": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", - "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", + "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", "dev": true }, "after": { @@ -3338,6 +3374,15 @@ "signal-exit": "^3.0.0" } }, + "magic-string": { + "version": "0.25.6", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.6.tgz", + "integrity": "sha512-3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g==", + "dev": true, + "requires": { + "sourcemap-codec": "^1.4.4" + } + }, "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -4392,14 +4437,14 @@ } }, "rollup": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.3.2.tgz", - "integrity": "sha512-xU6L5HqOY0sDeFxMTTs/GoYwcLiuKWfxxFWQTlwsZlQinQh1wfoxtDR4F3E2cHLS81nL9yl8LjZzuOWKd19smg==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.29.1.tgz", + "integrity": "sha512-dGQ+b9d1FOX/gluiggTAVnTvzQZUEkCi/TwZcax7ujugVRHs0nkYJlV9U4hsifGEMojnO+jvEML2CJQ6qXgbHA==", "dev": true, "requires": { - "@types/estree": "0.0.39", - "@types/node": "^11.9.5", - "acorn": "^6.1.1" + "@types/estree": "*", + "@types/node": "*", + "acorn": "^7.1.0" } }, "rollup-plugin-git-version": { @@ -5068,6 +5113,12 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, + "sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "dev": true + }, "spdx-correct": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", diff --git a/package.json b/package.json index 8a0fda8a..fa20c2f7 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "leaflet": "^1.3.1", "mocha": "6.0.2", "phantomjs-prebuilt": "^2.1.14", - "rollup": "1.3.2", + "rollup": "1.29.1", + "@rollup/plugin-inject": "^4.0.0", "rollup-plugin-git-version": "0.2.1", "rollup-plugin-json": "3.1.0", "uglify-js": "3.4.9" From 9c56a46c0f1bc327c0b4802849187684f0fea4fe Mon Sep 17 00:00:00 2001 From: Michal Przybys Date: Thu, 23 Jan 2020 15:23:08 +0100 Subject: [PATCH 2/2] Declare leaflet as external to avoid buildtime warning --- build/rollup-config.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/rollup-config.js b/build/rollup-config.js index 13ffa9c9..45db6650 100644 --- a/build/rollup-config.js +++ b/build/rollup-config.js @@ -41,6 +41,9 @@ export default { "leaflet": "L" } }, + external: [ + "leaflet" + ], plugins: [ release ? json() : rollupGitVersion(), inject({