8000 Rev for 2.2.0 · 06linux/requirejs@11ecc75 · GitHub
[go: up one dir, main page]

Skip to content

Commit 11ecc75

Browse files
committed
Rev for 2.2.0
1 parent 4c9282d commit 11ecc75

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

dist/post.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
</div>
22
<div id="footer" class="mono">
3-
<span class="line">Latest Release: <a href="http://requirejs.org/docs/download.html">2.1.22</a></span>
3+
<span class="line">Latest Release: <a href="http://requirejs.org/docs/download.html">2.2.0</a></span>
44
<span class="line">Open source: <a href="https://github.com/requirejs/requirejs/blob/master/LICENSE">new BSD or MIT licensed</a></span>
55
<span class="line">web design by <a href="http://andychung.me/">Andy Chung</a> &copy; 2011-2015</span>
66
</div>

dist/pre.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ <h1>a javascript module loader</h1>
176176

177177

178178
<ul>
179-
<li class="version">2.1.22 Docs (<a href="https://github.com/requirejs/requirejs/wiki/Upgrading-to-RequireJS-2.1">upgrade info</a>)</li>
179+
<li class="version">2.2.0 Docs (<a href="https://github.com/requirejs/requirejs/wiki/Upgrading-to-RequireJS-2.1">upgrade info</a>)</li>
180180
<li class="version"><a class="local" href="1.0/">1.0 Doc Link</a></li>
181181
</ul>
182182

docs/api.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,8 @@ <h2>
619619

620620
<p>bundles config is useful if doing a build and that build target was not an existing module ID, or if you have loader plugin resources in built JS files that should not be loaded by the loader plugin. <strong>Note that the keys and values are module IDs</strong>, not path segments. They are absolute module IDs, not a module ID prefix like <a href="#config-paths">paths config</a> or <a href="#config-map">map config</a>. Also, bundle config is different from map config in that map config is a one-to-one module ID relationship, where bundle config is for pointing multiple module IDs to a bundle's module ID.</p>
621621

622+
<p>As of RequireJS 2.2.0, the optimizer can generate the bundles config and insert it into the top level requirejs.config() call. See the <a href="https://github.com/requirejs/r.js/blob/98a9949480d68a781c8d6fc4ce0a07c16a2c8a2a/build/example.build.js#L641">bundlesConfigOutFile</a> build config option for more details.</p>
623+
622624
<p id="config-shim"><strong><a href="#config-shim">shim</a></strong>: Configure the dependencies, exports, and custom initialization for older, traditional "browser globals" scripts that do not use define() to declare the dependencies and set a module value.</p>
623625

624626
<p>Here is an example. It requires RequireJS 2.1.0+, and assumes backbone.js, underscore.js and jquery.js have been installed in the baseUrl directory. If not, then you may need to set a paths config for them:</p>

docs/download.html

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ <h2><a name="latest">Latest Release</a><span class="sectionMark">&sect; 1</span>
2525

2626
<div class="subSection">
2727
<h4 class="hbox">
28-
<a name="requirejs">require.js 2.1.22</a>
28+
<a name="requirejs">require.js 2.2.0</a>
2929
<span class="boxFlex"></span>
30-
<a class="download" href="http://requirejs.org/docs/release/2.1.22/minified/require.js">Minified</a>
31-
<a class="download" href="http://requirejs.org/docs/release/2.1.22/comments/require.js">With Comments</a>
30+
<a class="download" href="http://requirejs.org/docs/release/2.2.0/minified/require.js">Minified</a>
31+
<a class="download" href="http://requirejs.org/docs/release/2.2.0/comments/require.js">With Comments</a>
3232
</h4>
3333

3434
<p>All you need to start using require.js in the browser.</p>
@@ -38,7 +38,7 @@ <h4 class="hbox">
3838
<h4 class="hbox">
3939
<a name="rjs">r.js: Optimizer and Node/Rhino/Nashorn/xpcshell adapter</a>
4040
<span class="boxFlex"></span>
41-
<a class="download" href="http://requirejs.org/docs/release/2.1.22/r.js">Download</a>
41+
<a class="download" href="http://requirejs.org/docs/release/2.2.0/r.js">Download</a>
4242
</h4>
4343

4444
<p>The r.js file allows you to run the optimizer as well as run modules in Node, Rhino, Nashorn or xpcshell.</p>
@@ -98,6 +98,17 @@ <h4 class="hbox">
9898
<div class="section">
9999
<h2><a name="releasenotes">Release Notes</a><span class="sectionMark">&sect; 3</span></h2>
100100

101+
<h3 id="2-2-0">2.2.0</h3>
102+
103+
<p><a href="http://jrburke.com/">More details on the higher level motivations for the 2.2 release.</a></p>
104+
105+
<p>Full list of changes:</p>
106+
107+
<ul>
108+
<li><a href="https://github.com/requirejs/requirejs/issues?q=milestone%3A2.2.0+is%3Aclosed">Fixed requirejs issues</a></li>
109+
<li><a href="https://github.com/requirejs/r.js/issues?q=milestone%3A2.2.0+is%3Aclosed">Fixed r.js issues</a></li>
110+
</ul>
111+
101112
<h3 id="2-1-22">2.1.22</h3>
102113

103114
<p>The main issue: a change in 2.1.21 of require.js created an extraneous global. While jshint is used in the repo, it was not properly configured to catch that issue, but it is now. Only the require.js loader changed. No r.js optimizer-specific bug fixes, but it uses require.js as a dependency.</p>

require.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** vim: et:ts=4:sw=4:sts=4
2-
* @license RequireJS 2.1.22 Copyright jQuery Foundation and other contributors.
2+
* @license RequireJS 2.2.0 Copyright jQuery Foundation and other contributors.
33
* Released under MIT license, http://github.com/requirejs/requirejs/LICENSE
44
*/
55
//Not using strict: uneven strict support in browsers, #392, and causes
@@ -11,7 +11,7 @@ var requirejs, require, define;
1111
(function (global) {
1212
var req, s, head, baseElement, dataMain, src,
1313
interactiveScript, currentlyAddingScript, mainScript, subPath,
14-
version = '2.1.22',
14+
version = '2.2.0',
1515
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
1616
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
1717
jsSuffixRegExp = /\.js$/,

0 commit comments

Comments
 (0)
0