Skip to content

Commit

Permalink
Merge pull request #2834 from jashkenas/prepare-1.10
Browse files Browse the repository at this point in the history
Prepare 1.10 release (WIP)
  • Loading branch information
jashkenas committed Mar 30, 2020
2 parents 6b09e0e + e8da73c commit fa2c1f8
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 17 deletions.
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright (c) 2009-2018 Jeremy Ashkenas, DocumentCloud and Investigative
Copyright (c) 2009-2020 Jeremy Ashkenas, DocumentCloud and Investigative
Reporters & Editors

Permission is hereby granted, free of charge, to any person
Expand Down
65 changes: 56 additions & 9 deletions index.html
Expand Up @@ -183,7 +183,7 @@
<div id="sidebar" class="interface">

<a class="toc_title" href="#">
Underscore.js <span class="version">(1.9.2)</span>
Underscore.js <span class="version">(1.10.0)</span>
</a>
<ul class="toc_section">
<li>&raquo; <a href="https://github.com/jashkenas/underscore">GitHub Repository</a></li>
Expand Down Expand Up @@ -441,13 +441,16 @@ <h2>Downloads <i style="padding-left: 12px; font-size:12px;">(Right-click, and u

<table>
<tr>
<td><a href="underscore.js">Development Version (1.9.2)</a></td>
<td><i>60kb, Uncompressed with Plentiful Comments</i></td>
<td><a href="underscore.js">Development Version (1.10.0)</a></td>
<td>
<i>60kb, Uncompressed with Plentiful Comments</i>
&nbsp;<small>(<a href="underscore.js.map">Source Map</a>)</small>
</td>
</tr>
<tr>
<td><a href="underscore-min.js">Production Version (1.9.2)</a></td>
<td><a href="underscore-min.js">Production Version (1.10.0)</a></td>
<td>
<i>6.5kb, Minified and Gzipped</i>
<i>6.78kb, Minified and Gzipped</i>
&nbsp;<small>(<a href="underscore-min.js.map">Source Map</a>)</small>
</td>
</tr>
Expand Down Expand Up @@ -476,7 +479,13 @@ <h2>Installation</h2>
<b>Bower</b> <tt>bower install underscore</tt>
</li>
<li>
<b>Component</b> <tt>component install jashkenas/underscore</tt>
<b>ExtendScript</b> <tt>#include "underscore.js"</tt>
</li>
<li>
<b>Rollup</b> If you want to enable treeshaking and you don&rsquo;t
need the full <tt>_</tt> object (with all Underscore functions as
properties), you can import individual functions by name from
<tt>underscore/modules/index</tt> instead of <tt>underscore</tt>.
</li>
</ul>

Expand Down Expand Up @@ -1950,12 +1959,15 @@ <h2 id="utility">Utility Functions</h2>
<p id="noConflict">
<b class="header">noConflict</b><code>_.noConflict()</code>
<br />
Give control of the <tt>_</tt> variable back to its previous owner. Returns
a reference to the <b>Underscore</b> object.
Give control of the global <tt>_</tt> variable back to its previous
owner. Returns a reference to the <b>Underscore</b> object.
</p>
<pre>
var underscore = _.noConflict();
</pre>
<p>
The <tt>_.noConflict</tt> function is not present if you use the EcmaScript 6, AMD or CommonJS module system to import Underscore.
</p>

<p id="identity">
<b class="header">identity</b><code>_.identity(value)</code>
Expand Down Expand Up @@ -2392,8 +2404,39 @@ <h2 id="links">Links &amp; Suggested Reading</h2>

<h2 id="changelog">Change Log</h2>

<p id="1.10.0">
<b class="header">1.10.0</b> &mdash; <!--TODO: date--> &mdash; <a href="https://github.com/jashkenas/underscore/compare/1.9.2...1.10.0">Diff</a> &mdash; <a href="https://cdn.rawgit.com/jashkenas/underscore/1.10.0/index.html">Docs</a><br />
<ul>
<li>
Explicitly states in the documentation, and verifies in the
unittests, that <tt>_.sortedIndex(array, value)</tt> always returns
the lower bound, i.e., the smallest index, at which <tt>value</tt>
may be inserted in <tt>array</tt>.
</li>
<li>
Makes the notation of the <tt>_.max</tt> unittest consistent with
other unittests.
</li>
<li>
Fixes a bug that would cause infinite recursion if an overridden
implementation of <tt>_.iteratee</tt> attempted to fall back to the
original implementation.
</li>
<li>
Restores compatibility with EcmaScript 3 and ExtendScript.
</li>
<li>
Reformats the source code to use EcmaScript 6 <tt>export</tt>
notation. The <tt>underscore.js</tt> UMD bundle is now <i>compiled
from</i> underlying source modules instead of <i>being</i> the
source. From now on, Rollup users have the option to import from
the underlying source module in order to enable treeshaking.
</li>
</ul>
</p>

<p id="1.9.2">
<b class="header">1.9.2</b> &mdash; <small><i>Jan 6, 2020</i></small> &mdash; <a href="https://github.com/jashkenas/underscore/compare/1.9.1...1.9.2">Diff</a> &mdash; <a href="https://cdn.rawgit.com/jashkenas/underscore/1.9.1/index.html">Docs</a><br />
<b class="header">1.9.2</b> &mdash; <small><i>Jan 6, 2020</i></small> &mdash; <a href="https://github.com/jashkenas/underscore/compare/1.9.1...1.9.2">Diff</a> &mdash; <a href="https://cdn.rawgit.com/jashkenas/underscore/1.9.2/index.html">Docs</a><br />
<ul>
<li>
No code changes. Updated a test to help out
Expand Down Expand Up @@ -2444,6 +2487,10 @@ <h2 id="changelog">Change Log</h2>
Adds support for several environments including: WebWorkers,
browserify and ES6 imports.
</li>
<li>
Removes the <tt>component.json</tt> as the Component package
management system is discontinued.
</li>
<li>
The placeholder used for partial is now configurable by setting
<code>_.partial.placeholder</code>.
Expand Down
6 changes: 3 additions & 3 deletions modules/index.js
@@ -1,6 +1,6 @@
// Underscore.js 1.9.2
// Underscore.js 1.10.0
// https://underscorejs.org
// (c) 2009-2018 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
// (c) 2009-2020 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
// Underscore may be freely distributed under the MIT license.

// Baseline setup
Expand Down Expand Up @@ -46,7 +46,7 @@ export default function _(obj) {
}

// Current version.
export var VERSION = _.VERSION = '1.9.2';
export var VERSION = _.VERSION = '1.10.0';

// Internal function that returns an efficient (for current engines) version
// of the passed-in callback, to be repeatedly applied in other Underscore
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -53,6 +53,7 @@
"license": "MIT",
"files": [
"underscore.js",
"underscore.js.map",
"underscore-min.js",
"underscore-min.js.map",
"modules/"
Expand Down
6 changes: 3 additions & 3 deletions underscore.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion underscore.js.map

Large diffs are not rendered by default.

0 comments on commit fa2c1f8

Please sign in to comment.