ember-cli-assets 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf9a6ebe888202ce387d87c268d592573b0c419c
-  data.tar.gz: f97246c719574120e8ee3c2df0eaeb227e79a3f9
+  metadata.gz: b897477f94bc19709030dfdcfdcfb625d8b14156
+  data.tar.gz: 0bbaba61b1f5a1a77b2922566c6606f34c75cad8
 SHA512:
-  metadata.gz: 85bd029797961c83e81a514334e1a21bcd9de65250d9a70327054e8299747ff728d50a3f0b373866b5687d0f52d800b3a485242f75daeb261eaa90ec3f0a3b46
-  data.tar.gz: d7019ba49143a65359564ced594371e95aa6d75cc93c31a5c1c414bea0e25588b0e4a582f2bd9f4649fd4819490e4a1f0fedb74cf4b5947acd41bdc882a19930
+  metadata.gz: 4c1df6d52a62d9e3243a15b8cab43eccdb1a812466b7ed75756889dddf1feb50fd4c510f494954d3b1d53506c642bbf1b59c0d4da4854aadb77099562fc28258
+  data.tar.gz: 97eb8a779e2026563ef27ea72b90304e2f893de6b0520bea28536b3626db11dc54a31c9deb85ea9da1f64c04902999e0f7093ee38e7e9892e27c3cba1934110b

data/.travis.yml

@@ -6,6 +6,9 @@ rvm:
   - 2.2.4
   - 2.3.0
 
+cache:
+  - bundler
+
 before_install:
   - gem install bundler # To use 1.8.x or later
 

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

@@ -1,7 +1,7 @@
 module Ember
   module CLI
     module Assets
-      VERSION = '0.0.25'
+      VERSION = '0.0.26'
     end
   end
 end

data/lib/ember/cli/loader.rb

@@ -1,7 +1,7 @@
 module Ember
   module CLI
     module Loader
-      VERSION = '4.0.1'
+      VERSION = '4.0.2'
     end
   end
 end

data/vendor/assets/ember/loader.js

@@ -52,7 +52,7 @@ var loader, define, requireModule, require, requirejs;
 
   var defaultDeps = ['require', 'exports', 'module'];
 
-  function Module(name, deps, callback) {
+  function Module(name, deps, callback, alias) {
     this.id        = uuid++;
     this.name      = name;
     this.deps      = !deps.length && callback.length ? defaultDeps : deps;
@@ -62,6 +62,8 @@ var loader, define, requireModule, require, requirejs;
     this._require  = undefined;
     this.finalized = false;
     this.hasExportsAsDep = false;
+    this.isAlias = alias;
+    this.reified = new Array(deps.length);
   }
 
   Module.prototype.makeDefaultExport = function() {
@@ -73,14 +75,14 @@ var loader, define, requireModule, require, requirejs;
     }
   };
 
-  Module.prototype.exports = function(reifiedDeps) {
+  Module.prototype.exports = function() {
     if (this.finalized) {
       return this.module.exports;
     } else {
       if (loader.wrapModules) {
         this.callback = loader.wrapModules(this.name, this.callback);
       }
-      var result = this.callback.apply(this, reifiedDeps);
+      var result = this.callback.apply(this, this.reified);
       if (!(this.hasExportsAsDep && result === undefined)) {
         this.module.exports = result;
       }
@@ -98,11 +100,10 @@ var loader, define, requireModule, require, requirejs;
 
   Module.prototype.reify = function() {
     var deps = this.deps;
-    var length = deps.length;
-    var reified = new Array(length);
     var dep;
+    var reified = this.reified;
 
-    for (var i = 0, l = length; i < l; i++) {
+    for (var i = 0; i < deps.length; i++) {
       dep = deps[i];
       if (dep === 'exports') {
         this.hasExportsAsDep = true;
@@ -115,8 +116,6 @@ var loader, define, requireModule, require, requirejs;
         reified[i] = findModule(resolve(dep, this.name), this.name).module.exports;
       }
     }
-
-    return reified;
   };
 
   Module.prototype.makeRequire = function() {
@@ -128,9 +127,10 @@ var loader, define, requireModule, require, requirejs;
   };
 
   Module.prototype.build = function() {
-    if (this.state === FAILED) { return; }
+    if (this.state === FAILED || this.state === LOADED) { return; }
     this.state = FAILED;
-    this.exports(this.reify());
+    this.reify()
+    this.exports();
     this.state = LOADED;
   };
 
@@ -144,7 +144,11 @@ var loader, define, requireModule, require, requirejs;
       deps     =  [];
     }
 
-    registry[name] = new Module(name, deps, callback);
+    if (callback instanceof Alias) {
+      registry[name] = new Module(callback.name, deps, callback, true);
+    } else {
+      registry[name] = new Module(name, deps, callback, false);
+    }
   };
 
   // we don't support all of AMD
@@ -171,9 +175,8 @@ var loader, define, requireModule, require, requirejs;
   function findModule(name, referrer) {
     var mod = registry[name] || registry[name + '/index'];
 
-    while (mod && mod.callback instanceof Alias) {
-      name = mod.callback.name;
-      mod = registry[name];
+    while (mod && mod.isAlias) {
+      mod = registry[mod.name];
     }
 
     if (!mod) { missingModule(name, referrer); }
@@ -214,4 +217,24 @@ var loader, define, requireModule, require, requirejs;
     requirejs.entries = requirejs._eak_seen = registry = {};
     seen = {};
   };
+
+  // prime
+  define('foo',      function() {});
+  define('foo/bar',  [], function() {});
+  define('foo/asdf', ['module', 'exports', 'require'], function(module, exports, require) {
+    require('foo/bar');
+  });
+  define('foo/baz',  [], define.alias('foo'));
+  define('foo/quz',  define.alias('foo'));
+  define('foo/bar',  ['foo', './quz', './baz', './asdf', './bar', '../foo'], function() {});
+  define('foo/main', ['foo/bar'], function() {});
+
+  require('foo/main');
+  require.unsee('foo/bar');
+
+  requirejs.clear();
+
+  if (typeof module !== 'undefined') {
+    module.exports = { require: require, define: define };
+  }
 })(this);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-assets
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler