Permalink
Browse files

rev for 2.1.0 release

  • Loading branch information...
1 parent ee1d1cf commit 69c9fd32af8d532fa269ead1bbb9962a0b34246e @jrburke jrburke committed Oct 4, 2012
Showing with 23 additions and 10 deletions.
  1. +1 −0 dist/README.md
  2. +1 −1 dist/post.html
  3. +1 −1 dist/pre.html
  4. +10 −6 docs/download.html
  5. +2 −2 require.js
  6. +8 −0 updatesubs.sh
View
@@ -17,6 +17,7 @@ When doing a release, do the following:
* Upload change in jQuery project to website even before the current release.
* Check in changes to sample projects:
* requirejs/example-multipage
+ * requirejs/example-multipage-shim
* requirejs/example-libglobal
* volojs/create-template
* volojs/create-responsive-template
View
@@ -1,6 +1,6 @@
</div>
<div id="footer" class="mono">
- <span class="line">Latest Release: <a href="http://requirejs.org/docs/download.html">2.0.6</a></span>
+ <span class="line">Latest Release: <a href="http://requirejs.org/docs/download.html">2.1.0</a></span>
<span class="line">Open source: <a href="https://github.com/jrburke/requirejs/blob/master/LICENSE">new BSD or MIT licensed</a></span>
<span class="line">web design by <a href="http://andychung.ca">Andy Chung</a> &copy; 2011</span>
</div>
View
@@ -168,7 +168,7 @@
<ul>
- <li class="version">2.0.6 Docs (<a href="https://github.com/jrburke/requirejs/wiki/Upgrading-to-RequireJS-2.0">upgrade info</a>)</li>
+ <li class="version">2.1.0 Docs (<a href="https://github.com/jrburke/requirejs/wiki/Upgrading-to-RequireJS-2.0">upgrade info</a>)</li>
<li class="version"><a class="local" href="1.0/">1.0 Doc Link</a></li>
</ul>
View
@@ -27,20 +27,20 @@
<div class="subSection">
<h4 class="hbox">
-<a name="requirejs">require.js 2.0.6</a>
+<a name="requirejs">require.js 2.1.0</a>
<span class="boxFlex"></span>
-<a class="download" href="http://requirejs.org/docs/release/2.0.6/minified/require.js">Minified</a>
-<a class="download" href="http://requirejs.org/docs/release/2.0.6/comments/require.js">With Comments</a>
+<a class="download" href="http://requirejs.org/docs/release/2.1.0/minified/require.js">Minified</a>
+<a class="download" href="http://requirejs.org/docs/release/2.1.0/comments/require.js">With Comments</a>
</h4>
<p>All you need to start using require.js in the browser.</p>
</div>
<div class="subSection">
<h4 class="hbox">
-<a name="samplejquery">Sample RequireJS 2.0.6 + jQuery 1.8.0 project</a>
+<a name="samplejquery">Sample RequireJS 2.1.0 + jQuery 1.8.2 project</a>
<span class="boxFlex"></span>
-<a class="download" href="http://requirejs.org/docs/release/jquery-require/jquery1.8.0-requirejs2.0.6/jquery-require-sample.zip">Download</a>
+<a class="download" href="http://requirejs.org/docs/release/jquery-require/jquery1.8.2-requirejs2.1.0/jquery-require-sample.zip">Download</a>
</h4>
<p>A zip file containing a sample project that uses jQuery and RequireJS.</p>
@@ -51,7 +51,7 @@ <h4 class="hbox">
<h4 class="hbox">
<a name="rjs">r.js: Optimizer and Node and Rhino adapter</a>
<span class="boxFlex"></span>
-<a class="download" href="http://requirejs.org/docs/release/2.0.6/r.js">Download</a>
+<a class="download" href="http://requirejs.org/docs/release/2.1.0/r.js">Download</a>
</h4>
<p>The r.js file allows you to run the optimizer as well as run modules in Node or Rhino.</p>
@@ -110,6 +110,10 @@ <h4 class="hbox">
<div class="section">
<h2><a name="releasenotes">Release Notes</a><span class="sectionMark">&sect; 3</span></h2>
+<h3 id="2-1-0">2.1.0</h3>
+
+<p>See the <a href="https://github.com/jrburke/requirejs/wiki/Upgrading-to-RequireJS-2.1">Upgrading to 2.1 page</a>.
+
<h3 id="2-0-6">2.0.6</h3>
<p>The main focus of this release was cleaning up some rough edges after switching to esprima for all module parsing. Most notably, findNestedDependencies should work correctly again. The bundled UglifyJS was updated to 1.3.3 too.</p>
View
@@ -1,5 +1,5 @@
/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS dev2.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.0 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
@@ -12,7 +12,7 @@ var requirejs, require, define;
(function (global) {
var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath,
- version = 'dev2.1',
+ version = '2.1.0',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
View
@@ -23,6 +23,14 @@ echo "Updating requirejs/example-multipage"
cp require.js ../example-multipage/www/js/lib/require.js
cp ../r.js/r.js ../example-multipage/tools/r.js
+echo "Updating requirejs/example-multipage-shim"
+cp require.js ../example-multipage-shim/www/js/lib/require.js
+cp ../r.js/r.js ../example-multipage-shim/tools/r.js
+
+echo "Updating requirejs/example-libglobal"
+cp require.js ../example-libglobal/lib/require.js
+cp ../r.js/r.js ../example-libglobal/tools/r.js
+
echo "Updating volojs/create-template"
cp require.js ../../volojs/create-template/www/js/lib/require.js
cp ../r.js/r.js ../../volojs/create-template/tools/r.js

0 comments on commit 69c9fd3

Please sign in to comment.