[pull] master from Leaflet:master

.bundlemonrc.json

@@ -0,0 +1,18 @@
+{
+  "baseDir": "dist",
+  "files": [
+    {
+      "path": "leaflet.js"
+    }
+  ],
+  "reportOutput": [
+    [
+      "github",
+      {
+        "checkRun": true,
+        "commitStatus": true,
+        "prComment": false
+      }
+    ]
+  ]
+}

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: /
+    open-pull-requests-limit: 999
+    rebase-strategy: disabled
+    schedule:
+      interval: weekly
+    ignore:
+      - dependency-name: eslint-config-mourner
+        update-types: ["version-update:semver-major"]
+      - dependency-name: sinon
+        update-types: ["version-update:semver-major"]

.github/workflows/main.yml

@@ -4,7 +4,10 @@ env:
   NODE_VERSION: 16
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-2019]
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -29,25 +32,27 @@ jobs:
 
       - name: Build project
         run: npm run build
+        env:
+          NODE_ENV: ${{ startsWith(github.ref, 'refs/tags/v') && 'release' || '' }}
 
       - name: Cache setup
         uses: actions/cache@v2
         with:
           path: ./*
-          key: ${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}
 
   run:
     needs: setup
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        command: [lint]
+        command: [lint, bundlemon]
     steps:
       - name: Restore setup
         uses: actions/cache@v2
         with:
           path: ./*
-          key: ${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}
 
       - name: Set up Node
         uses: actions/setup-node@v2
@@ -56,26 +61,30 @@ jobs:
 
       - name: Run ${{ matrix.command }} task
         run: npm run ${{ matrix.command }}
+        env:
+          BUNDLEMON_PROJECT_ID: 61e0545915f6c3000980d0ed
+          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
 
   test:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     strategy:
+      fail-fast: false
       matrix:
-        browser:
-          [
-            PhantomJSCustom,
-            Chrome1280x1024,
-            FirefoxPointer,
-            FirefoxTouch,
-            FirefoxPointerTouch,
-          ]
+        include:
+          - browser: Chrome1280x1024
+          - browser: FirefoxTouch
+          - browser: FirefoxNoTouch
+          - browser: IE
+            os: windows-2019
+          - browser: IE10
+            os: windows-2019
     steps:
       - name: Restore setup
         uses: actions/cache@v2
         with:
           path: ./*
-          key: ${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}
 
       - name: Set up Node
         uses: actions/setup-node@v2
@@ -85,31 +94,16 @@ jobs:
       - name: Run tests on ${{ matrix.browser }}
         run: npm test -- --browsers ${{ matrix.browser }}
 
-  check-secrets:
-    needs: [setup]
-    runs-on: ubuntu-latest
+  publish-artifacts:
+    needs: setup
     if: github.repository_owner == 'Leaflet' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
-    outputs:
-      ok: ${{ steps.ok.outputs.defined }}
-    steps:
-        - id: ok
-          env:
-              AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
-              AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-              AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          if: env.AWS_S3_BUCKET && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY
-          run: echo "::set-output name=defined::true"
-
-  deploy:
-    needs: [check-secrets]
-    if: needs.check-secrets.outputs.ok == 'true'
     runs-on: ubuntu-latest
     steps:
       - name: Restore setup
         uses: actions/cache@v2
         with:
           path: ./*
-          key: ${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}
 
       - name: Compress artifacts
         working-directory: dist
@@ -121,13 +115,35 @@ jobs:
           VERSION=$(git tag --points-at HEAD)
           echo "::set-output name=path::content/leaflet/${VERSION:-master}"
 
-      - name: Deploy artifacts
+      - name: Publish artifacts
         uses: jakejarvis/s3-sync-action@v0.5.1
         with:
-          args: --acl public-read --delete
+          args: --acl public-read --delete --exact-timestamps
         env:
           AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           SOURCE_DIR: dist
           DEST_DIR: ${{ steps.artifacts-directory.outputs.path }}
+
+  publish-npm:
+    needs: setup
+    if: github.repository_owner == 'Leaflet' && startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Restore setup
+        uses: actions/cache@v2
+        with:
+          path: ./*
+          key: ${{ runner.os }}-${{ github.sha }}
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          registry-url: https://registry.npmjs.org
+
+      - name: Publish to NPM
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -13,7 +13,6 @@ dist/reference.html
 coverage/
 *.js.html
 .mailmap
-bower.json
 component.json
 debug/local/
 Gemfile.lock

CONTRIBUTING.md

@@ -118,15 +118,13 @@ on rebuilding the bundles whenever any source file changes.
 
 ## Running the Tests
 
-To run the tests from the command line,
-install [PhantomJS](http://phantomjs.org/) (and make sure it's in your `PATH`),
-then run:
+To run the tests from the command line, install [Google Chrome](https://www.google.com/chrome/) then run:
 
 ```
 npm test
 ```
 
-To run all the tests in actual browsers at the same time, you can do:
+To run the tests in other browsers at the same time, you can do:
 
 ```
 npm test -- -- --browsers Firefox,Chrome,Safari,IE

FAQ.md

@@ -137,5 +137,3 @@ updated automatically on each commit to the repo.
 
 We removed the built versions from the repository because it's a chore to build and commit them manually on each change,
 and it often complicates merging branches and managing contributions.
-
-There's a common complaint that Leaflet can't be used with [Bower](http://bower.io/) because of that, but we'll resolve the issue soon.

LICENSE

@@ -1,23 +1,26 @@
-Copyright (c) 2010-2021, Vladimir Agafonkin
+BSD 2-Clause License
+
+Copyright (c) 2010-2022, Vladimir Agafonkin
 Copyright (c) 2010-2011, CloudMade
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-   1. Redistributions of source code must retain the above copyright notice, this list of
-      conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-   2. Redistributions in binary form must reproduce the above copyright notice, this list
-      of conditions and the following disclaimer in the documentation and/or other materials
-      provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

PLUGIN-GUIDE.md

@@ -213,7 +213,7 @@ Now your plugin is available as an AMD and CommonJS module and can be used in mo
 Once your plugin is published, it is a good idea to add it to the [Leaflet plugins list](http://leafletjs.com/plugins.html). To do so:
 
 * [Fork](https://help.github.com/articles/fork-a-repo/) the Leaflet repo.
-* In the `docs/plugins.md` file, find the section your plugin should go in, and add a table row with information and links about your plugin.
+* In the `docs/_plugins/` folder, copy the `template.md` file and add it to a category folder. Then put the information and links about your plugin into the new plugin file.
 * Commit the code to your fork.
 * [Open a pull request](https://help.github.com/articles/creating-a-pull-request/) from your fork to Leaflet's original repo.
 

RELEASE.md

@@ -1,28 +1,21 @@
-Documentation for the release process of Leaflet.
+## Releasing a new version of Leaflet
 
-**Please note that you will need to have a git remote called `origin` that points to Leaflet's GitHub repo, since the publish script assumes it**
-- [ ] Make a new release branch (for example named `prepare-X.Y.Z`)
-- [ ] Make sure you do not have any `package.lock.json` or `yarn.lock` locally, since they can potentially make you build with the wrong package versions
-- [ ] Update [the changelog](https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md) since last release and commit to the release branch
-- [ ] Write a blog post about the new release and put in `/docs/_posts` and commit to the release branch
-- [ ] Bump version number in `package.json` and commit to `master`
-- [ ] Run `npm run release`
+- [ ] Update [the changelog](https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md) since last release and commit.
+- [ ] Run `npm version <patch | minor | major>` (this will bump the version in `package.json` and create a new tag).
+- [ ] Run `git push --follow-tags` to push the commit created by NPM to Github (together with the tag).
+- [ ] Wait for the CI to complete and follow the logs to make sure it runs successfully.
 - [ ] Verify that the release was correctly published to NPM by checking:
   - [ ] [Leaflet NPM package page](https://www.npmjs.com/package/leaflet)
   - [ ] files on [Leaflet unpkg page](https://unpkg.com/leaflet@latest/)
-- [ ] Update API docs:
-  - [ ] run `npm run docs`
-  - [ ] Copy the built docs from `dist/reference-X.Y.Z.html` to `docs/reference-X.Y.Z.html`, remove content before first and after second "CUT HERE" comment
-  - [ ] Insert YAML front matter, see old `docs/reference-X.Y.Z.html` for reference
-  - [ ] Commit the new docs to the release branch
-- [ ] Update `docs/reference.html` to redirect to the new version and commit the change to the release branch
-- [ ] Update integrity hashes:
-  - [ ] Checkout the release tag (`git checkout vX.Y.Z`)
-  - [ ] Run `npm run integrity` or simply `node ./build/integrity.js` if you're not on Debian
-  - [ ] Copy the hashes and update `integrity_hash_css`, `integrity_hash_source` and `integrity_hash_uglified` in `docs/_config.yml`; commit changes to the release branch
-- [ ] Update link to latest release in `docs/download.html`, and commit to the release branch
-- [ ] Add link to new version reference in `docs/reference-versions.html`, and commit to the release branch
-- [ ] Update `latest_leaflet_version` (and possibly `latest_leaflet_reference`) in `docs/_config.yml` and commit to the release branch
-- [ ] Update the announcement section in `docs/index.html` and commit to the release branch
-- [ ] If it looks like everything is good at this point, merge the release branch into `master`
 - [ ] Make a new release on [Leaflet's GitHub release page](https://github.com/Leaflet/Leaflet/releases/) with the most important parts of the changelog
+
+### Updating docs after the release
+
+- [ ] Make a new branch for the update
+- [ ] Write a blog post about the new release and put it in `/docs/_posts`
+- [ ] If necessary to preserve previous version's docs, rename `dist/reference.html` to `dist/reference-X.Y.Z.html` and add it to the list in `docs/reference-versions.html`
+- [ ] Run `npm run docs` to generate the new `docs/reference.html`
+- [ ] Run `npm run integrity` and make sure `docs/_config.yml` is updated with new hashes
+- [ ] Update link to latest release in `docs/download.md`
+- [ ] Update the announcement section in `docs/index.html`
+- [ ] Commit all the changes and submit a PR for someone to review

build/banner.js

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

build/docs.js

@@ -1,5 +1,3 @@
-var packageDef = require('../package.json');
-
 function buildDocs() {
 
 	console.log('Building Leaflet documentation with Leafdoc ...');
@@ -27,7 +25,7 @@ function buildDocs() {
 	doc.addFile('build/docs-misc.leafdoc', false);
 
 	var out = doc.outputStr();
-	var path = 'dist/reference-' + packageDef.version + '.html';
+	var path = 'docs/reference.html';
 
 	var fs = require('fs');