Merge into origin master

.github/workflows/npmpublish.yml

@@ -0,0 +1,45 @@
+name: Node.js Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm ci
+      - run: npm test
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+
+  publish-gpr:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://npm.pkg.github.com/
+          scope: '@your-github-username'
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

CNAME

@@ -0,0 +1 @@
+leafletjs.com

CONTRIBUTING.md

@@ -4,19 +4,20 @@ Contributing to Leaflet
  1. [Getting Involved](#getting-involved)
  2. [Reporting Bugs](#reporting-bugs)
  3. [Contributing Code](#contributing-code)
- 4. [Improving Documentation](#improving-documentation)
- 5. [Code of Conduct](#code-of-conduct)
+ 4. [Running the Tests](#running-the-tests)
+ 6. [Improving Documentation](#improving-documentation)
+ 7. [Code of Conduct](#code-of-conduct)
+ 8. [Thank You](#thank-you)
 
 ## Getting Involved
 
-Third-party patches are absolutely essential on our quest to create the best mapping library that will ever exist.
+Third-party patches are absolutely essential in our quest to create the best mapping library that will ever exist.
 However, they're not the only way to get involved with Leaflet development.
 You can help the project tremendously by discovering and [reporting bugs](#reporting-bugs);
 [improving documentation](#improving-documentation);
 helping others on [Stack Overflow](https://stackoverflow.com/questions/tagged/leaflet),
 [GIS Stack Exchange](https://gis.stackexchange.com/questions/tagged/leaflet)
 and [GitHub issues](https://github.com/Leaflet/Leaflet/issues);
-showing your support for your favorite feature suggestions on [Leaflet UserVoice page](http://leaflet.uservoice.com);
 tweeting to [@LeafletJS](http://twitter.com/LeafletJS);
 and spreading the word about Leaflet among your colleagues and friends.
 
@@ -33,7 +34,7 @@ here are some tips for creating a helpful report that will make fixing it much e
 
  * Write a **descriptive, specific title**. Bad: *Problem with polylines*. Good: *Doing X in IE9 causes Z*.
  * Include **browser, OS and Leaflet version** info in the description.
- * Create a **simple test case** that demonstrates the bug (e.g. using [Leaflet playground](http://playground-leaflet.rhcloud.com/)).
+ * Create a **simple test case** that demonstrates the bug (e.g. using [Leaflet plunker](http://leafletjs.com/edit.html)).
  * Check whether the bug can be reproduced in **other browsers**.
  * Check if the bug occurs in the stable version, master, or both.
  * *Bonus tip:* if the bug only appears in the master version but the stable version is fine,
@@ -52,8 +53,7 @@ So bugfixes, performance optimizations and small improvements that don't add a l
 are much more likely to get accepted quickly.
 
 Before sending a pull request with a new feature, check if it's been discussed before already
-(either on [GitHub issues](https://github.com/Leaflet/Leaflet/issues)
-or [Leaflet UserVoice](http://leaflet.uservoice.com/)),
+on [GitHub issues](https://github.com/Leaflet/Leaflet/issues)
 and ask yourself two questions:
 
  1. Are you sure that this new feature is important enough to justify its presence in the Leaflet core?
@@ -65,16 +65,17 @@ please consider submitting another pull request with the corresponding [document
 
 ### Setting up the Build System
 
-The Leaflet build system uses [Node](http://nodejs.org/), and the [Jake](http://jakejs.com/) Javascript build tool.
-To set up the Leaflet build system, install Node then run the following commands in the project root to install Jake:
+The Leaflet build system uses [NodeJS](http://nodejs.org/).
+To set up the Leaflet build system, install [NodeJS](https://nodejs.org/).
+Then run the following commands in the project root to install dependencies:
 
 ```
-npm install -g jake
 npm install
 ```
-
-You can build minified Leaflet by running `jake` (it will be built from source in the `dist` folder).
-For a custom build with selected components, open `build/build.html` in the browser and follow the instructions from there.
+or, if you prefer [`yarn`](https://yarnpkg.com/) over `npm`:
+```
+yarn install
+```
 
 ### Making Changes to Leaflet Source
 
@@ -88,61 +89,78 @@ Please do not commit to the `master` branch, or your unrelated changes will go i
 You should also follow the code style and whitespace conventions of the original codebase.
 In particular, use tabs for indentation and spaces for alignment.
 
-Before committing your changes, run `jake lint` to catch any JS errors in the code and fix them.
+Before committing your changes, run `npm run lint` to catch any JS errors in the code and fix them.
 If you add any new files to the Leaflet source, make sure to also add them to `build/deps.js`
 so that the build system knows about them.
 
 Also, please make sure that you have [line endings configured properly](https://help.github.com/articles/dealing-with-line-endings) in Git! Otherwise the diff will show that all lines of a file were changed even if you touched only one.
 
 Happy coding!
 
-## Running the Tests
+### Using RollupJS
 
-To run the tests from the command line,
-install [PhantomJS](http://phantomjs.org/) (and make sure it's in your `PATH`),
-then run:
+The source JavaScript code for Leaflet is a few dozen files, in the `src/` directory.
+But normally, Leaflet is loaded in a web browser as just one JavaScript file.
 
-```
-jake test
-```
+In order to create this file, run `npm run rollup` or `yarn run rollup`.
 
-To run all the tests in actual browsers at the same time, you can do:
+You'll find `dist/leaflet-src.js` and `dist/leaflet.js`. The difference is that
+`dist/leaflet-src.js` has sourcemaps and it's not uglified, so it's better for
+development. `dist/leaflet.js` is uglified and thus is smaller, so it's better
+for deployment.
+
+When developing (or bugfixing) core Leaflet functionalities, it's common to use
+the webpages in the `debug/` directory, and run the unit tests (`spec/index.html`)
+in a graphical browser. This requires regenerating the bundled files quickly.
+
+In order to do so, run `npm run watch` or `yarn run watch`. This will keep
+on rebuilding the bundles whenever any source file changes.
+
+## Running the Tests
+
+To run the tests from the command line, first make sure you have installed all
+the build system requirements with `npm install`. Then, simply run:
 
 ```
-jake test --ff --chrome --safari --ie
+npm test
 ```
 
-To run the tests in a browser manually, open `spec/index.html`.
-
-## Code Coverage
+By default, the tests will run in [PhantomJS](http://phantomjs.org/), and also
+in [SlimerJS](https://slimerjs.org/) if possible. If `npm test` complains about
+PhantomJS, install it manually and make sure it's in your `PATH`.
 
-To generate a detailed report about test coverage (which helps tremendously when working on test improvements), run:
+To run all the tests in actual browsers at the same time, you can do:
 
 ```
-jake test --cov
+npm test -- -- --browsers Firefox,Chrome,Safari,IE
 ```
 
-After that, open `spec/coverage/<environment>/index.html` in a browser to see the report.
-From there you can click through folders/files to get details on their individual coverage.
+(Note: the doubling of "`--`" [special option](https://docs.npmjs.com/cli/run-script#description) is [important](https://github.com/Leaflet/Leaflet/pull/6166#issuecomment-390959903))
+
+To run the tests in a browser manually, open `spec/index.html`.
 
 ## Improving Documentation
 
-The code of the live Leaflet website that contains all documentation and examples is located in the `gh-pages` branch
+The code of the live Leaflet website that contains all documentation and examples is located in the `docs/` directory of the `master` branch
 and is automatically generated from a set of HTML and Markdown files by [Jekyll](http://jekyllrb.com/).
 
 The easiest way to make little improvements such as fixing typos without even leaving the browser
 is by editing one of the files with the online GitHub editor:
-browse the [gh-pages branch](https://github.com/Leaflet/Leaflet/tree/gh-pages),
-choose a certain file for editing (e.g. `plugins.html` for the list of Leaflet plugins),
+browse the [`docs/ directory`](https://github.com/Leaflet/Leaflet/tree/master/docs),
+choose a certain file for editing (e.g. `plugins.md` for the list of Leaflet plugins),
 click the Edit button, make changes and follow instructions from there.
 Once it gets merged, the changes will immediately appear on the website.
 
 If you need to make edits in a local repository to see how it looks in the process, do the following:
 
- 1. [Install Ruby](http://www.ruby-lang.org/en/) if don't have it yet.
+ 1. [Install Ruby](http://www.ruby-lang.org/en/) if you don't have it yet.
  2. Run `gem install jekyll`.
- 3. Run `jekyll serve --watch` in the root `Leaflet` folder.
- 4. Open `localhost:4000` in your browser.
+ 3. Enter the directory where you cloned the Leaflet repository
+ 4. Run `bundle install`
+ 5. Make sure you are in the `master` branch by running `git checkout master`
+ 6. Enter the documentation subdirectory by running `cd docs`
+ 7. Run `jekyll serve --watch`.
+ 8. Open `localhost:4000` in your web browser.
 
 Now any file changes will be updated when you reload pages automatically.
 After committing the changes, just send a pull request.
@@ -155,17 +173,17 @@ code for every method, option or property there is a special code comment docume
 that feature. In order to edit the API documentation, just edit these comments in the
 source code.
 
-In order to generate the documentation, just run
+In order to generate the documentation, make sure that the development dependencies
+are installed (run either `npm install` or `yarn install`), then just run
 
 ```
-jake docs
+npm run docs
 ```
 
 and you'll find a `.html` file in the `dist/` directory.
 
 On every release of a new Leaflet version, this file will be generated and copied
-over to the `gh-pages` branch - there is no need to send pull requests to this
-branch anymore to update the API documentation.
+over to `docs/reference.html` - there is no need to send pull requests with changes to this file to update the API documentation.
 
 ## Code of Conduct
 

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'github-pages'

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016, Vladimir Agafonkin
+Copyright (c) 2010-2015, Vladimir Agafonkin
 Copyright (c) 2010-2011, CloudMade
 All rights reserved.
 

_config.yml

@@ -0,0 +1,6 @@
+source: docs
+
+markdown: kramdown
+
+kramdown:
+  entity_output: as_input

bower.json

@@ -1,11 +1,17 @@
 {
   "name": "leaflet",
+  "version": "0.7.8",
   "description": "JavaScript library for mobile-friendly interactive maps",
   "main": [
     "dist/leaflet.css",
-    "dist/leaflet-src.js"
+    "dist/leaflet-src.js",
+    "dist/images/layers-2x.png",
+    "dist/images/layers.png",
+    "dist/images/marker-icon-2x.png",
+    "dist/images/marker-icon.png",
+    "dist/images/marker-shadow.png"
   ],
-   "ignore": [
+  "ignore": [
     ".*",
     "CHANGELOG.json",
     "FAQ.md",

build/bower.json

@@ -0,0 +1,22 @@
+{
+  "name": "leaflet",
+  "description": "JavaScript library for mobile-friendly interactive maps",
+  "main": [
+    "dist/leaflet.css",
+    "dist/leaflet-src.js",
+    "dist/images/layers-2x.png",
+    "dist/images/layers.png",
+    "dist/images/marker-icon-2x.png",
+    "dist/images/marker-icon.png",
+    "dist/images/marker-shadow.png"
+  ],
+   "ignore": [
+    ".*",
+    "CHANGELOG.json",
+    "FAQ.md",
+    "debug",
+    "spec",
+    "src",
+    "build"
+  ]
+}