ember-cli-assets 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88cd3faa2d222f70628a1ecb93cf95bf49b5a1a
-  data.tar.gz: 49dfbae2fbbb82bac1acc9e99080f7d885e1a0f3
+  metadata.gz: d8d01ca4031d0f81609bd9c180eae9f6617a0adb
+  data.tar.gz: a250a200c0d334a013f4ce205575188ed77e3185
 SHA512:
-  metadata.gz: ea6e0fefd83324a155023981253d744b63300b40034ff094422ba9ee5d0416eef206a34634638e376ce78989f1846f8f2145eaa2f1d5aa09ec8b8cffd61dd0dd
-  data.tar.gz: a343608996afb6117087f937a3a1808ce8e1d6b3d01244a0b9fd3722786f44923ad8bfe9938be30fb4d3e345a7075dd4515fede1aece0f7044cb0df14acfde77
+  metadata.gz: 30f28cd8f189b81c1629a6f2af0d2ebe18169402965b5c055fbd95e535f9d8420933e1819ae4390a08af11dc4424ef8ed10467d50d86d9943feaddac310421a1
+  data.tar.gz: 7dfd1b671f50f87caf0fac9e29d30a77919a368be8a17818001d859afe41b60f0e965b61ea58383bbd6d5122326c6dc2ce86d832cb1a2b8f8cccbc12f43c6a47

data/lib/ember/cli/assets/version.rb

@@ -1,7 +1,7 @@
 module Ember
   module CLI
     module Assets
-      VERSION = '0.0.17'
+      VERSION = '0.0.18'
     end
   end
 end

data/lib/ember/cli/loader.rb

@@ -1,7 +1,7 @@
 module Ember
   module CLI
     module Loader
-      VERSION = '3.4.0'
+      VERSION = '3.5.0'
     end
   end
 end

data/vendor/assets/ember/loader.js

@@ -1,8 +1,35 @@
-var define, requireModule, require, requirejs;
+var loader, define, requireModule, require, requirejs;
+var global = this;
 
 (function() {
   'use strict';
 
+  // Save off the original values of these globals, so we can restore them if someone asks us to
+  var oldGlobals = {
+    loader: loader,
+    define: define,
+    requireModule: requireModule,
+    require: require,
+    requirejs: requirejs
+  };
+
+  loader = {
+    noConflict: function(aliases) {
+      var oldName, newName;
+
+      for (oldName in aliases) {
+        if (aliases.hasOwnProperty(oldName)) {
+          if (oldGlobals.hasOwnProperty(oldName)) {
+            newName = aliases[oldName];
+
+            global[newName] = global[oldName];
+            global[oldName] = oldGlobals[oldName];
+          }
+        }
+      }
+    }
+  };
+
   var _isArray;
   if (!Array.isArray) {
     _isArray = function (x) {
@@ -140,7 +167,7 @@ var define, requireModule, require, requirejs;
   };
 
   function findModule(name, referrer) {
-    var mod = registry[name];
+    var mod = registry[name] || registry[name + '/index'];
 
     while (mod && mod.callback instanceof Alias) {
       name = mod.callback.name;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-assets
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Ryunosuke SATO