Update require.js and r.js to 2.1.15, and almond.js to 0.3.0

Author: carsomyr

CHANGELOG.md

@@ -1,61 +1,71 @@
-<!--
-Marked Style: GitHub
--->
-# v0.9.4
+<!-- Marked Style: GitHub -->
+
+## requirejs-rails changelog
+
+### v0.9.5
+
+- Update `require.js` and `r.js` to `2.1.15`, and `almond.js` to `0.3.0`.
+- Remove `data-main` attribute generation from `requirejs_include_tag` and replicate its functionality with an explicit
+  `require` call. This paves the way for proper almond support.
+- Instead of disabling JS compression everywhere, only do so when staging `r.js` input files. This enables `require.js`
+  itself to be compiled (or not) by the asset pipeline, like any other asset.
+- Add support for `bower.json` modules.
+
+### v0.9.4
 
 - Restore compression of non-module JS assets if specified, including `require.js` itself.
 - Update `require.js` to `2.1.14`.
 
-# v0.9.3
+### v0.9.3
 
 - Add detection and proper handling of Bower-based modules.
 - Update `require.js` to `2.1.11` and `almond.js` to `0.2.9`.
 
-# v0.9.2
+### v0.9.2
 
 - Update `require.js` to `2.1.10` and `almond.js` to `0.2.5`.
 - Rails 4 support.
 
-# v0.9.1
+### v0.9.1
 
 - Updated to to require.js \ r.js 2.1.2, and almond 0.2.3
 
-# v0.9.0
+### v0.9.0
 
 - **BREAKING CHANGE**: Upgrade RequireJS and r.js to v2.0.0
 - order.js was removed. See the new [RequireJS 2.0 shim config](https://github.com/jrburke/requirejs/wiki/Upgrading-to-RequireJS-2.0#wiki-shim).
 - Build support for `empty:` is now handled by r.js 2.0 natively.
 
-# v0.8.2
+### v0.8.2
 
 - Fix for `requirejs_include_tag` error when `config/requirejs.yml` has no
   `paths` key.  Thanks to @JustinLove for the issue and failing test!
 
-# v0.8.0
+### v0.8.0
 
 - Build will now substitute `empty:` for the right-hand side of
   `config/requirejs.yml` paths entries that are URLs.
 - Documented how to configure assets hosted on a CDN.
 
-# v0.7.3
+### v0.7.3
 
 - Upgrade RequireJS and r.js to v1.0.8
 
-# v0.7.2
+### v0.7.2
 
 - Add require.js to config.assets.precompile in all environments.  Closes #45.
   This change allows builds to work in Rails environments other than
   'production', e.g. 'staging'.  Thanks to @hollow for the fix.
 
-# v0.7.1
+### v0.7.1
 
 - Liberalize asset path filtering.  `0.7.0` added filtering on the logical
   asset path which was too aggressive in that only `.js` files were allowed in
   builds.  The RequireJS config variable `logical_asset_filter` has been
   added, which allows `.js`, `.html`, `.txt` files by default and is user
   configurable.
 
-# v0.7.0
+### v0.7.0
 
 - Support for [almond](https://github.com/jrburke/almond) via
   `config.requirejs.loader = :almond` in application.rb.
@@ -66,11 +76,11 @@ Marked Style: GitHub
   leverage the asset pipeline for their needs.  Thanks to @hollow for the
   patch.
 
-# v0.6.1
+### v0.6.1
 
 - Fix regression in production env when `paths` specified in requirejs.yml.
 
-# v0.6.0
+### v0.6.0
 
 **NOTE:** Upgrade to 0.6.1! This was yanked due to a regression.
 
@@ -80,30 +90,30 @@ Marked Style: GitHub
   tag via `requirejs_include_tag`. See [README](README.md) for details. Closes 
   pull request #32; thanks to @hollow for the submission!
 
-# v0.5.6
+### v0.5.6
 
 - Upgrade to RequireJS and r.js 1.0.7
 
-# v0.5.5
+### v0.5.5
 
 - Support for Rails 3.2.x.  Rails 3.1.x is also supported by this release.
 
-# v0.5.4
+### v0.5.4
 
 - Upgrade to RequireJS and r.js 1.0.5
 - Pull request #31, closes #30.  Thanks @karelim!
 
-# v0.5.3
+### v0.5.3
 
 - Upgrade to RequireJS and r.js 1.0.4
 - Pulled #22, fix for asset compliation failure with no config/requirejs.yml.
   Thanks @arehberg!
 
-# v0.5.2
+### v0.5.2
 
 - Upgrade to RequireJS and r.js 1.0.3
 
-# v0.5.1
+### v0.5.1
 
 - This is a quick turn to fix an issue that could trigger an Anonymous mismatched define() error from require.js and/or r.js.
 
@@ -121,21 +131,20 @@ Marked Style: GitHub
 
     Thanks to Andrew de Andrade for the catch.
 
-# v0.5.0
+### v0.5.0
 
 - Precompilation via `rake assets:precompile` is now implemented.
 - gem configuration via application.js is deprecated.
 - Application-specific require.js configuration lives in `config/requirejs.yml`.
 - See [README](README.md) for updated usage details.
 
-# v0.0.2
+### v0.0.2
 
 - Fixed stupid problems with Rails::Engine instantiation.
 - Test improvements
 - Upgrade to RequireJS 1.0.2
 
-# v0.0.1
+### v0.0.1
 
 - Birthday!
 - This gem makes `require.js` and the `order.js` plugin available to the Rails 3 Asset Pipeline.
-

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    requirejs-rails (0.9.4)
+    requirejs-rails (0.9.5)
       railties (>= 3.1.1)
 
 GEM

bin/r.js

@@ -1,5 +1,5 @@
 /**
- * @license r.js 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -20,7 +20,7 @@ var requirejs, require, define, xpcUtil;
 (function (console, args, readFileFunc) {
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
-        version = '2.1.14',
+        version = '2.1.15',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         useLibLoaded = {},
@@ -238,7 +238,7 @@ var requirejs, require, define, xpcUtil;
     }
 
     /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -251,7 +251,7 @@ var requirejs, require, define, xpcUtil;
 (function (global) {
     var req, s, head, baseElement, dataMain, src,
         interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.14',
+        version = '2.1.15',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,
@@ -22949,7 +22949,7 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
         //Like traverse, but skips if branches that would not be processed
         //after has application that results in tests of true or false boolean
         //literal values.
-        var key, child, result, i, params, param,
+        var key, child, result, i, params, param, tempObject,
             hasHas = options && options.has;
 
         fnExpScope = fnExpScope || emptyScope;
@@ -22979,23 +22979,23 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
 
             //Build up a "scope" object that informs nested recurse calls if
             //the define call references an identifier that is likely a UMD
-            //wrapped function expresion argument.
+            //wrapped function expression argument.
             if (object.type === 'ExpressionStatement' && object.expression &&
                     object.expression.type === 'CallExpression' && object.expression.callee &&
                     object.expression.callee.type === 'FunctionExpression') {
-                    object = object.expression.callee;
-
-                    if (object.params && object.params.length) {
-                        params = object.params;
-                        fnExpScope = mixin({}, fnExpScope, true);
-                        for (i = 0; i < params.length; i++) {
-                            param = params[i];
-                            if (param.type === 'Identifier') {
-                                fnExpScope[param.name] = true;
-                            }
+                tempObject = object.expression.callee;
+
+                if (tempObject.params && tempObject.params.length) {
+                    params = tempObject.params;
+                    fnExpScope = mixin({}, fnExpScope, true);
+                    for (i = 0; i < params.length; i++) {
+                        param = params[i];
+                        if (param.type === 'Identifier') {
+                            fnExpScope[param.name] = true;
                         }
                     }
                 }
+            }
 
             for (key in object) {
                 if (object.hasOwnProperty(key)) {
@@ -23014,12 +23014,12 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
             //wrapping.
             if (typeof result === 'string') {
                 if (hasProp(fnExpScope, result)) {
-                    //Just a plain return, parsing can continue past this
-                    //point.
-                    return;
+                    //result still in scope, keep jumping out indicating the
+                    //identifier still in use.
+                    return result;
                 }
 
-                return result;
+                return;
             }
         }
     };
@@ -26539,7 +26539,8 @@ define('build', function (require) {
                 "excludeShallow": true,
                 "insertRequire": true,
                 "stubModules": true,
-                "deps": true
+                "deps": true,
+                "mainConfigFile": true
             };
 
         for (i = 0; i < ary.length; i++) {

lib/requirejs/rails/version.rb

@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
-    Version = "0.9.4"
-    LibVersion = "2.1.14"
+    Version = "0.9.5"
+    LibVersion = "2.1.15"
   end
 end

vendor/assets/javascripts/almond.js

@@ -1,5 +1,5 @@
 /**
- * @license almond 0.2.9 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
+ * @license almond 0.3.0 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/almond for details
  */
@@ -150,7 +150,15 @@ var requirejs, require, define;
             //A version of a require function that passes a moduleName
             //value for items that may need to
             //look up paths relative to the moduleName
-            return req.apply(undef, aps.call(arguments, 0).concat([relName, forceSync]));
+            var args = aps.call(arguments, 0);
+
+            //If first arg is not require('string'), and there is only
+            //one arg, it is the array form without a callback. Insert
+            //a null so that the following concat is correct.
+            if (typeof args[0] !== 'string' && args.length === 1) {
+                args.push(null);
+            }
+            return req.apply(undef, args.concat([relName, forceSync]));
         };
     }
 

vendor/assets/javascripts/require.js

@@ -1,5 +1,5 @@
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, 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 = '2.1.14',
+        version = '2.1.15',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,