jashkenas · Apr 2, 2015 · Apr 2, 2015 · Apr 2, 2015 · Apr 2, 2015 · Apr 2, 2015
Showing 386 changed files with 198,235 additions and 11,019 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -4,32 +4,7 @@
     "node": true,
     "amd": true
   },
-
-  "rules": {
-    "brace-style": [1, "1tbs"],
-    "curly": [0, "multi"],
-    "eqeqeq": [1, "smart"],
-    "max-depth": [1, 4],
-    "max-params": [1, 5],
-    "new-cap": 2,
-    "new-parens": 0,
-    "no-constant-condition": 0,
-    "no-div-regex": 1,
-    "no-else-return": 1,
-    "no-extra-parens": 1,
-    "no-floating-decimal": 2,
-    "no-inner-declarations": 2,
-    "no-lonely-if": 1,
-    "no-nested-ternary": 2,
-    "no-new-object": 0,
-    "no-new-func": 0,
-    "no-underscore-dangle": 0,
-    "quotes": [2, "single", "avoid-escape"],
-    "radix": 2,
-    "space-after-keywords": [2, "always"],
-    "space-in-brackets": [2, "never"],
-    "space-unary-word-ops": 2,
-    "strict": 0,
-    "wrap-iife": 2
+  "parserOptions": {
+    "ecmaVersion": 3
   }
 }
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+tidelift: "npm/underscore"
+patreon: juliangonggrijp
diff --git a/.github/config/codeql.yml b/.github/config/codeql.yml
@@ -0,0 +1,6 @@
+paths:
+  - 'modules/**'
+  - 'test/**'
+  - 'test-treeshake/**'
+  - 'rollup*.js'
+  - 'index.html'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+    paths:
+      - 'modules/**'
+      - 'test/**'
+      - 'test-treeshake/**'
+      - 'rollup*.js'
+      - 'index.html'
+  schedule:
+    - cron: '16 8 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at
+        # https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+        config-file: ./.github/config/codeql.yml
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,9 @@ node_modules
 *.log
 *.idea
 *.swp
+nyc_output
+coverage
+test-treeshake/*-umd.js
+amd
+cjs
+/underscore-node-*-pre*
diff --git a/.travis.yml b/.travis.yml
@@ -1,32 +1,38 @@
 language: node_js
-node_js:
-  - "0.8"
-  - "0.12"
-  - "io.js"
-matrix:
+sudo: false
+jobs:
   include:
-    - node_js: "0.10"
-      env: BROWSER=true
+    - node_js: 8
+      env:
+        - DOWNGRADE=true
+        - EXTRA=false
+    - node_js: 12
+      env:
+        - DOWNGRADE=false
+        - EXTRA=false
+    - node_js: 16
+      env:
+        - DOWNGRADE=false
+        - EXTRA=true
 before_install:
-  - npm install -g npm@2.6
-  - npm install -g karma-cli
+  - "[ $EXTRA = false ] || npm install -g karma-cli"
 before_script:
-  - npm install karma-sauce-launcher
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - "[ $EXTRA = false ] || npm install karma-sauce-launcher"
+  - "[ $DOWNGRADE = false ] || npm install rollup@1"
 script:
-  - npm test
-  - "[ $BROWSER == false ] || npm run test-browser"
-  # Karma sauce is limited to running about 5-7 browsers (or it will tiemout) at a time so we just run vendor by vendor here
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers FIREFOX_V4,FIREFOX_V11,FIREFOX_V20,FIREFOX_V30,FIREFOX_V35"
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers CHROME_V28,CHROME_V35,CHROME_V40,ANDROID_V4.0,ANDROID_V4.3"
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers INTERNET_EXPLORER_V9,INTERNET_EXPLORER_V10,INTERNET_EXPLORER_V11"
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers SAFARI_V5,SAFARI_V6,SAFARI_V7"
-  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers OPERA_V11,OPERA_V12"
+  - "[ $EXTRA = false ] || npm run lint"
+  - npm run prepare-tests
+  - "[ $EXTRA = false ] || npm run build-umd"
+  - "[ $EXTRA = false ] || npm run build-esm"
+  - "[ $EXTRA = false ] || npm run doc"
+  - "[ $EXTRA = true ] || npm run test-node"
+  - "[ $EXTRA = false ] || npm run coveralls"
+  - "[ $EXTRA = false ] || npm run test-browser"
+  - "[ $EXTRA = false ] || karma start karma.conf-sauce.js"
 notifications:
   email: false
 env:
   global:
+  - NPM_CONFIG_PROGRESS="false"
   - secure: bDZSBQfqr21hCayjcZ20IxrV6+XGhxQPFIfwWqEKLrF93Gu8LLVjZRxXE/mE8I8N4Z5WtDNb4ZHrm/TTzmcPa5MuHgIxEdknQCncobH8oimwc83SHwEPk6okeNKl39VlCjvvnmoe/V/KpnknuYn3Rqghtl/Uv9KLpCwskwjTtcw=
   - secure: SRECgXuwcZTcD3GVxTS2bYNgRyye4vq6BLrV2PH9FyNenowsKQR2EwlC/dppc1Q8NWMgv79J/R96q9JOFh+mEH9L5dlBb2yhnGH8amVeM/ChAJHT/F8YktKM453uVpz5fR00QcCQDDUOx6Pvx374ID0OKNpWKAkQBWA9mPTsLnE=
-  matrix: BROWSER=false
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,93 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at jashkenas@gmail.com. The project team
+will review and investigate all complaints, and will respond in a way that it deems
+appropriate to the circumstances. The project team is obligated to maintain
+confidentiality with regard to the reporter of an incident.
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Moderation
+
+Edits of another user's comment must be clearly marked with "**edit**", the
+moderator's username, and a timestamp for each occurrence. The only acceptable
+reasons for editing another user's comment are:
+
+1. to edit out violations of Our Pledge. These edits must include a rationale.
+2. to direct future readers to a relevant point later in the conversation
+   (usually the resolution). These edits must be append-only.
+
+Deletion of another user's comment is only acceptable when the comment includes
+no original value, such as "+1", ":+1:", or "me too".
+
+## Self-Moderation
+
+Edits of your own comment after someone has responded must be append-only and
+clearly marked with "**edit**". Typographical and formatting fixes to your own
+comment which do not affect its meaning are exempt from this requirement.
+Deletion of your own comment is only acceptable before any later comments have
+been posted.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [https://contributor-covenant.org/version/1/4][version]
+
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,11 +1,20 @@
 ## How to contribute to Underscore.js
 
+* This project adheres to a [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
+
+* Please do not open a ticket to report a security issue. Consult the [security policy](SECURITY.md) on what to do instead.
+
 * Before you open a ticket or send a pull request, [search](https://github.com/jashkenas/underscore/issues) for previous discussions about the same feature or issue. Add to the earlier ticket if you find one.
 
 * If you're proposing a new feature, make sure it isn't already implemented in [Underscore-Contrib](https://github.com/documentcloud/underscore-contrib).
 
-* Before sending a pull request for a feature, be sure to have [tests](http://underscorejs.org/test/).
+* When contributing code, make sure that you edit the source code in the `modules/` directory. Also, run `npm install` before committing any changes to ensure that our commit hooks can do their work.
+
+* Before sending a pull request for a feature, be sure to have [tests](https://underscorejs.org/test/).
+
+* Use the same coding style as the rest of the [codebase](https://github.com/jashkenas/underscore/blob/master/modules/index.js).
 
-* Use the same coding style as the rest of the [codebase](https://github.com/jashkenas/underscore/blob/master/underscore.js).
+* In your pull request, do not add documentation or re-build the minified `underscore-umd-min.js` file. We'll do those things before cutting a new release.
 
-* In your pull request, do not add documentation or re-build the minified `underscore-min.js` file. We'll do those things before cutting a new release.
+### "Help, cloning fails with `fatal: fsck error in packed object`"
+This error is caused by zero-padded file modes in the commit history. As fixing this is highly destructive, we suggest ignoring these warnings. The simplest way is to instruct git to do so when cloning. For example, to clone from `jashkenas/underscore`, run the following command: `git clone --config transfer.fsckobjects=false git@github.com:jashkenas/underscore.git`. If cloning from a different user or organization, replace `jashkenas` with their name in the previous command.
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,4 @@
-Copyright (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative
-Reporters & Editors
+Copyright (c) 2009-2022 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

diff --git a/README.md b/README.md
@@ -13,10 +13,22 @@ support for the usual functional suspects (each, map, reduce, filter...)
 without extending any core JavaScript objects.
 
 For Docs, License, Tests, and pre-packed downloads, see:
-http://underscorejs.org
+https://underscorejs.org
+
+For support and questions, please consult
+our [security policy](SECURITY.md),
+[the gitter channel](https://gitter.im/jashkenas/underscore)
+or [stackoverflow](https://stackoverflow.com/search?q=underscore.js)
 
 Underscore is an open-sourced component of DocumentCloud:
 https://github.com/documentcloud
 
 Many thanks to our contributors:
 https://github.com/jashkenas/underscore/contributors
+
+You can support the project by donating on
+[Patreon](https://patreon.com/juliangonggrijp).
+Enterprise coverage is available as part of the
+[Tidelift Subscription](https://tidelift.com/subscription/pkg/npm-underscore?utm_source=npm-underscore&utm_medium=referral&utm_campaign=enterprise).
+
+This project adheres to a [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,38 @@
+# Security Policy
+
+## Supported Versions
+
+We currently support the following versions of Underscore with security updates:
+
+- the latest commit on the `master` branch (published as "edge" on the
+  [project website][website]);
+- the 1.x release tagged as [latest][npm-latest] on npm;
+- any release tagged as [preview][npm-preview] on npm, if present.
+
+[website]: https://underscorejs.org
+[npm-latest]: https://www.npmjs.com/package/underscore/v/latest
+[npm-preview]: https://www.npmjs.com/package/underscore/v/preview
+
+## Reporting a Vulnerability
+
+Please report security issues by sending an email to
+dev@juliangonggrijp.com and jashkenas@gmail.com.
+
+Do __not__ submit an issue ticket or pull request or otherwise publicly
+disclose the issue.
+
+After receiving your email, we will respond as soon as possible and indicate
+what we plan to do.
+
+## Disclosure policy
+
+After confirming a vulnerability, we will generally release a security update
+as soon as possible, including the minimum amount of information required for
+software maintainers and system administrators to assess the urgency of the
+update for their particular situation.
+
+We postpone the publication of any further details such as code comments,
+tests, commit history and diffs, in order to enable a substantial share of the
+users to install the security fix before this time.
+
+Upon publication of full details, we will credit the reporter if the reporter wishes to be publicly identified.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,6 @@
 {
   "name": "underscore",
-  "version": "1.8.3",
-  "main": "underscore.js",
+  "main": "underscore-umd.js",
   "keywords": ["util", "functional", "server", "client", "browser"],
-  "ignore" : ["docs", "test", "*.yml", "CNAME", "index.html", "favicon.ico", "CONTRIBUTING.md", ".*", "component.json", "package.json", "karma.*"]
+  "ignore" : ["docs", "test", "*.yml", "CNAME", "index.html", "favicon.ico", "CONTRIBUTING.md", ".*", "package.json", "karma.*"]
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		tidelift: "npm/underscore"
		patreon: juliangonggrijp