[pull] master from jashkenas:master

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 tidelift: "npm/underscore"
 patreon: juliangonggrijp
+github: [jgonggrijp]

.github/config/codeql.yml

@@ -0,0 +1,6 @@
+paths:
+  - 'modules/**'
+  - 'test/**'
+  - 'test-treeshake/**'
+  - 'rollup*.js'
+  - 'index.html'

.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@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      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@v3
+
+    # ℹ️ 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@v3

.travis.yml

@@ -1,31 +1,34 @@
 language: node_js
-services:
-  - xvfb
 sudo: false
 jobs:
   include:
     - node_js: 8
       env:
         - DOWNGRADE=true
         - EXTRA=false
-    - node_js: 10
+    - node_js: 12
       env:
         - DOWNGRADE=false
         - EXTRA=false
-    - node_js: 14
+    - node_js: 16
       env:
         - DOWNGRADE=false
         - EXTRA=true
 before_install:
-  - npm install -g karma-cli
+  - "[ $EXTRA = false ] || npm install -g karma-cli"
 before_script:
-  - npm install karma-sauce-launcher
+  - "[ $EXTRA = false ] || npm install karma-sauce-launcher"
   - "[ $DOWNGRADE = false ] || npm install rollup@1"
 script:
-  - npm test
+  - "[ $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"
-  - "[ $EXTRA = false ] || npm run coveralls"
 notifications:
   email: false
 env:

CONTRIBUTING.md

@@ -2,9 +2,9 @@
 
 * 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.
+* Please do not open an issue 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.
+* Before you open an issue 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).
 
@@ -15,3 +15,6 @@
 * Use the same coding style as the rest of the [codebase](https://github.com/jashkenas/underscore/blob/master/modules/index.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.
+
+### "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.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2021 Jeremy Ashkenas, Julian Gonggrijp, and 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

docs/modules/_baseCreate.html

@@ -849,8 +849,8 @@ <h1>_baseCreate.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">import</span> isObject <span class="hljs-keyword">from</span> <span class="hljs-string">'./isObject.js'</span>;
-<span class="hljs-keyword">import</span> { nativeCreate } <span class="hljs-keyword">from</span> <span class="hljs-string">'./_setup.js'</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">import</span> isObject <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./isObject.js&#x27;</span>;
+<span class="hljs-keyword">import</span> { nativeCreate } <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./_setup.js&#x27;</span>;</pre></div></div>
 
         </li>
 
@@ -865,8 +865,8 @@ <h1>_baseCreate.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">ctor</span>(<span class="hljs-params"></span>) </span>{
-  <span class="hljs-keyword">return</span> <span class="hljs-function"><span class="hljs-keyword">function</span>(<span class="hljs-params"></span>)</span>{};
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">function</span> <span class="hljs-title function_">ctor</span>(<span class="hljs-params"></span>) {
+  <span class="hljs-keyword">return</span> <span class="hljs-keyword">function</span>(<span class="hljs-params"></span>){};
 }</pre></div></div>
 
         </li>
@@ -882,13 +882,13 @@ <h1>_baseCreate.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">export</span> <span class="hljs-keyword">default</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">baseCreate</span>(<span class="hljs-params">prototype</span>) </span>{
-  <span class="hljs-keyword">if</span> (!isObject(prototype)) <span class="hljs-keyword">return</span> {};
-  <span class="hljs-keyword">if</span> (nativeCreate) <span class="hljs-keyword">return</span> nativeCreate(prototype);
-  <span class="hljs-keyword">var</span> Ctor = ctor();
-  Ctor.prototype = prototype;
-  <span class="hljs-keyword">var</span> result = <span class="hljs-keyword">new</span> Ctor;
-  Ctor.prototype = <span class="hljs-literal">null</span>;
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">export</span> <span class="hljs-keyword">default</span> <span class="hljs-keyword">function</span> <span class="hljs-title function_">baseCreate</span>(<span class="hljs-params">prototype</span>) {
+  <span class="hljs-keyword">if</span> (!<span class="hljs-title function_">isObject</span>(prototype)) <span class="hljs-keyword">return</span> {};
+  <span class="hljs-keyword">if</span> (nativeCreate) <span class="hljs-keyword">return</span> <span class="hljs-title function_">nativeCreate</span>(prototype);
+  <span class="hljs-keyword">var</span> <span class="hljs-title class_">Ctor</span> = <span class="hljs-title function_">ctor</span>();
+  <span class="hljs-title class_">Ctor</span>.<span class="hljs-property"><span class="hljs-keyword">prototype</span></span> = prototype;
+  <span class="hljs-keyword">var</span> result = <span class="hljs-keyword">new</span> <span class="hljs-title class_">Ctor</span>;
+  <span class="hljs-title class_">Ctor</span>.<span class="hljs-property"><span class="hljs-keyword">prototype</span></span> = <span class="hljs-literal">null</span>;
   <span class="hljs-keyword">return</span> result;
 }</pre></div></div>
 

docs/modules/_baseIteratee.html

@@ -849,13 +849,13 @@ <h1>_baseIteratee.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">import</span> identity <span class="hljs-keyword">from</span> <span class="hljs-string">'./identity.js'</span>;
-<span class="hljs-keyword">import</span> isFunction <span class="hljs-keyword">from</span> <span class="hljs-string">'./isFunction.js'</span>;
-<span class="hljs-keyword">import</span> isObject <span class="hljs-keyword">from</span> <span class="hljs-string">'./isObject.js'</span>;
-<span class="hljs-keyword">import</span> isArray <span class="hljs-keyword">from</span> <span class="hljs-string">'./isArray.js'</span>;
-<span class="hljs-keyword">import</span> matcher <span class="hljs-keyword">from</span> <span class="hljs-string">'./matcher.js'</span>;
-<span class="hljs-keyword">import</span> property <span class="hljs-keyword">from</span> <span class="hljs-string">'./property.js'</span>;
-<span class="hljs-keyword">import</span> optimizeCb <span class="hljs-keyword">from</span> <span class="hljs-string">'./_optimizeCb.js'</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">import</span> identity <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./identity.js&#x27;</span>;
+<span class="hljs-keyword">import</span> isFunction <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./isFunction.js&#x27;</span>;
+<span class="hljs-keyword">import</span> isObject <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./isObject.js&#x27;</span>;
+<span class="hljs-keyword">import</span> isArray <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./isArray.js&#x27;</span>;
+<span class="hljs-keyword">import</span> matcher <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./matcher.js&#x27;</span>;
+<span class="hljs-keyword">import</span> property <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./property.js&#x27;</span>;
+<span class="hljs-keyword">import</span> optimizeCb <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./_optimizeCb.js&#x27;</span>;</pre></div></div>
 
         </li>
 
@@ -872,11 +872,11 @@ <h1>_baseIteratee.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">export</span> <span class="hljs-keyword">default</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">baseIteratee</span>(<span class="hljs-params">value, context, argCount</span>) </span>{
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">export</span> <span class="hljs-keyword">default</span> <span class="hljs-keyword">function</span> <span class="hljs-title function_">baseIteratee</span>(<span class="hljs-params">value, context, argCount</span>) {
   <span class="hljs-keyword">if</span> (value == <span class="hljs-literal">null</span>) <span class="hljs-keyword">return</span> identity;
-  <span class="hljs-keyword">if</span> (isFunction(value)) <span class="hljs-keyword">return</span> optimizeCb(value, context, argCount);
-  <span class="hljs-keyword">if</span> (isObject(value) &amp;&amp; !isArray(value)) <span class="hljs-keyword">return</span> matcher(value);
-  <span class="hljs-keyword">return</span> property(value);
+  <span class="hljs-keyword">if</span> (<span class="hljs-title function_">isFunction</span>(value)) <span class="hljs-keyword">return</span> <span class="hljs-title function_">optimizeCb</span>(value, context, argCount);
+  <span class="hljs-keyword">if</span> (<span class="hljs-title function_">isObject</span>(value) &amp;&amp; !<span class="hljs-title function_">isArray</span>(value)) <span class="hljs-keyword">return</span> <span class="hljs-title function_">matcher</span>(value);
+  <span class="hljs-keyword">return</span> <span class="hljs-title function_">property</span>(value);
 }</pre></div></div>
 
         </li>

docs/modules/_cb.html

@@ -849,9 +849,9 @@ <h1>_cb.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">import</span> _ <span class="hljs-keyword">from</span> <span class="hljs-string">'./underscore.js'</span>;
-<span class="hljs-keyword">import</span> baseIteratee <span class="hljs-keyword">from</span> <span class="hljs-string">'./_baseIteratee.js'</span>;
-<span class="hljs-keyword">import</span> iteratee <span class="hljs-keyword">from</span> <span class="hljs-string">'./iteratee.js'</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">import</span> _ <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./underscore.js&#x27;</span>;
+<span class="hljs-keyword">import</span> baseIteratee <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./_baseIteratee.js&#x27;</span>;
+<span class="hljs-keyword">import</span> iteratee <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./iteratee.js&#x27;</span>;</pre></div></div>
 
         </li>
 
@@ -867,9 +867,9 @@ <h1>_cb.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">export</span> <span class="hljs-keyword">default</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">cb</span>(<span class="hljs-params">value, context, argCount</span>) </span>{
-  <span class="hljs-keyword">if</span> (_.iteratee !== iteratee) <span class="hljs-keyword">return</span> _.iteratee(value, context);
-  <span class="hljs-keyword">return</span> baseIteratee(value, context, argCount);
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">export</span> <span class="hljs-keyword">default</span> <span class="hljs-keyword">function</span> <span class="hljs-title function_">cb</span>(<span class="hljs-params">value, context, argCount</span>) {
+  <span class="hljs-keyword">if</span> (_.<span class="hljs-property">iteratee</span> !== iteratee) <span class="hljs-keyword">return</span> _.<span class="hljs-title function_">iteratee</span>(value, context);
+  <span class="hljs-keyword">return</span> <span class="hljs-title function_">baseIteratee</span>(value, context, argCount);
 }</pre></div></div>
 
         </li>

docs/modules/_chainResult.html

@@ -849,7 +849,7 @@ <h1>_chainResult.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">import</span> _ <span class="hljs-keyword">from</span> <span class="hljs-string">'./underscore.js'</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">import</span> _ <span class="hljs-keyword">from</span> <span class="hljs-string">&#x27;./underscore.js&#x27;</span>;</pre></div></div>
 
         </li>
 
@@ -864,8 +864,8 @@ <h1>_chainResult.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">export</span> <span class="hljs-keyword">default</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">chainResult</span>(<span class="hljs-params">instance, obj</span>) </span>{
-  <span class="hljs-keyword">return</span> instance._chain ? _(obj).chain() : obj;
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">export</span> <span class="hljs-keyword">default</span> <span class="hljs-keyword">function</span> <span class="hljs-title function_">chainResult</span>(<span class="hljs-params">instance, obj</span>) {
+  <span class="hljs-keyword">return</span> instance.<span class="hljs-property">_chain</span> ? <span class="hljs-title function_">_</span>(obj).<span class="hljs-title function_">chain</span>() : obj;
 }</pre></div></div>
 
         </li>