ember-cli-assets 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b897477f94bc19709030dfdcfdcfb625d8b14156
-  data.tar.gz: 0bbaba61b1f5a1a77b2922566c6606f34c75cad8
+  metadata.gz: f45a1c928f042ba8e28988fb2e4e1c486b69a04b
+  data.tar.gz: 6f75587983ba9707f3c6f654617be1713fae28d6
 SHA512:
-  metadata.gz: 4c1df6d52a62d9e3243a15b8cab43eccdb1a812466b7ed75756889dddf1feb50fd4c510f494954d3b1d53506c642bbf1b59c0d4da4854aadb77099562fc28258
-  data.tar.gz: 97eb8a779e2026563ef27ea72b90304e2f893de6b0520bea28536b3626db11dc54a31c9deb85ea9da1f64c04902999e0f7093ee38e7e9892e27c3cba1934110b
+  metadata.gz: 3d85515cc6b060aa3a7dd1042c6536509fcfe3af35d7b9a509ba8a8a3e237fec1894c7d8cd8c59c996057fe3c639e4ca063c1d04ddaaf437863e6ed3a59dbefc
+  data.tar.gz: 2205442b8f364446a9189f9bb6a8d4e3d2e13f7951305c453100b32273a7ce8f4e69b3e17386c443ed79d9ae0faf1f24010b000811cf751704c79932b82cffec

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

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

data/lib/ember/cli/loader.rb

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

data/vendor/assets/ember/loader.js

@@ -59,7 +59,6 @@ var loader, define, requireModule, require, requirejs;
     this.module    = { exports: {} };
     this.callback  = callback;
     this.state     = undefined;
-    this._require  = undefined;
     this.finalized = false;
     this.hasExportsAsDep = false;
     this.isAlias = alias;
@@ -120,10 +119,14 @@ var loader, define, requireModule, require, requirejs;
 
   Module.prototype.makeRequire = function() {
     var name = this.name;
-
-    return this._require || (this._require = function(dep) {
+    var r = function(dep) {
       return require(resolve(dep, name));
-    });
+    };
+    r['default'] = r;
+    r.has = function(dep) {
+      return has(resolve(dep, name));
+    }
+    return r;
   };
 
   Module.prototype.build = function() {
@@ -208,7 +211,12 @@ var loader, define, requireModule, require, requirejs;
     return parentBase.join('/');
   }
 
+  function has(name) {
+    return !!(registry[name] || registry[name + '/index']);
+  }
+
   requirejs.entries = requirejs._eak_seen = registry;
+  requirejs.has = has;
   requirejs.unsee = function(moduleName) {
     findModule(moduleName, '(unsee)').unsee();
   };
@@ -222,7 +230,9 @@ var loader, define, requireModule, require, requirejs;
   define('foo',      function() {});
   define('foo/bar',  [], function() {});
   define('foo/asdf', ['module', 'exports', 'require'], function(module, exports, require) {
-    require('foo/bar');
+    if (require.has('foo/bar')) {
+      require('foo/bar');
+    }
   });
   define('foo/baz',  [], define.alias('foo'));
   define('foo/quz',  define.alias('foo'));

metadata

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