Merge branch 'master' into country-code-alpha-3

.github/FUNDING.yml

@@ -1,8 +1,8 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: marak
 patreon: # Replace with a single Patreon username
-open_collective: fakerjs
+open_collective: # fakerjs
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry

.gitignore

@@ -7,6 +7,7 @@ REVISION
 .project
 .tasks-cache
 .svn
+.nyc_output/
 *DONOTVERSION*
 /nbproject
 /.idea
@@ -19,4 +20,4 @@ reports/
 
 # meteor specific
 .build*
-versions.json
+versions.json

.travis.yml

@@ -2,29 +2,5 @@
 sudo: false
 language: node_js
 node_js:
-  - "10"
-  - "9"
-  - "8"
-  - "7"
-  - "6"
-  - "6.1"
-  - "5"
-  - "5.1"
-  - "4"
-  - "4.2"
-  - "4.1"
-  - "4.0"
-  - "0.12"
-  - "0.11"
-  - "0.10"
-  - "iojs"
-
-before_install:
-  # Install meteor and spacejam, a meteor command line package tester
-  - 'if [ "$(node -v)" = "v0.10.36" ]; then curl https://install.meteor.com | /bin/sh; fi'
-  - 'if [ "$(node -v)" = "v0.10.36" ]; then npm install -g spacejam; fi'
-  - 'if [ "$(node -v)" = "v0.10.36" ]; then export PATH="$HOME/.meteor:$PATH"; fi'
-
-script:
-  - "npm test"
-  - 'if [ "$(node -v)" = "v0.10.36" ]; then spacejam test-packages --mongo-url=dummy ./; fi'
+  - "node"
+  - "lts/*"

CODE_OF_MERIT.MD

@@ -6,10 +6,10 @@ of the project, technical or otherwise, including overruling previous decisions.
 There are no limitations to this decisional power.
 
 2. Contributions are an expected result of your membership on the project.
-Don't expect others to do your work or help you with your work forever. 
+Don't expect others to do your work or help you with your work forever.
 
 3. All members have the same opportunities to seek any challenge they want
-within the project. 
+within the project.
 
 4. Authority or position in the project will be proportional
 to the accrued contribution. Seniority must be earned.
@@ -39,8 +39,8 @@ of the originator to provide requested context.
 in the scope of the project. This Code of Merit does not take precedence over
 governing law.
 
-12. This Code of Merit governs the technical procedures of the project not the 
-activities outside of it. 
+12. This Code of Merit governs the technical procedures of the project not the
+activities outside of it.
 
 13. Participation on the project equates to agreement of this Code of Merit.
 
@@ -49,4 +49,4 @@ to the project. Any intent to deviate the project from its original purpose
 of existence will constitute grounds for remedial action which may include
 expulsion from the project.
 
-This document is the Code of Merit (http://code-of-merit.org), version 1.0.
+This document is the Code of Merit (https://codeofmerit.org/), version 1.0.

MIT-LICENSE.txt

@@ -1,5 +1,5 @@
-faker.js - Copyright (c) 2010-2015
-Matthew Bergman & Marak Squires
+faker.js - Copyright (c) 2020
+Marak Squires
 http://github.com/marak/faker.js/
 
 faker.js was inspired by and has used data definitions from: