ember-cli-assets 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5d48f4e6c4be93c6be891462731344d9ae84c93a
4
- data.tar.gz: ee9591a3b1e3f771b6c192e2fd40feda49d19ad3
3
+ metadata.gz: 5aecd513cef5b10c97a714afedd6fb816865dddd
4
+ data.tar.gz: 8649dfc87def28d856fd082a841bab45eb078e0e
5
5
  SHA512:
6
- metadata.gz: b6964ea88ec612a1b9add47fd4866e45ac529da6c02e0b2f90fc5128773a123d3b5a03c45020541da9b7cf3bde37335a8c01fa72f058ffcaa97918f98d05e816
7
- data.tar.gz: 3f482e553f643a3a031402d642f77a078137cd71e009dbc8c916eb06fcb125b3785e3971f37520872c21308ec8ce100976d06bf0936b767b01bff24076c5a34f
6
+ metadata.gz: 591b72bce8962bef79cd093302299c6abef2c9d4de664cb6b496aa5d71d4691b47dd539ed069f9bbf6f850ec98d51eb5ceade5f62cd148ff4fd8034e75ee83ca
7
+ data.tar.gz: 6958bc5dd286639ea107c26c411a91f7e819d7443cbb6c66fe47fcf28f86072ff29e8d52543feb892c256670306e1cfe796c6dcef171e92b24eb11e00c45915d
@@ -1,7 +1,7 @@
1
1
  module Ember
2
2
  module CLI
3
3
  module Assets
4
- VERSION = '0.0.2'
4
+ VERSION = '0.0.3'
5
5
  end
6
6
  end
7
7
  end
@@ -7,7 +7,6 @@ module Ember
7
7
  autoload :Loader, 'ember/cli/loader'
8
8
  autoload :LoadInitializer, 'ember/cli/load_initializer'
9
9
  autoload :Resolver, 'ember/cli/resolver'
10
- autoload :Shims, 'ember/cli/shims'
11
10
 
12
11
  module Assets
13
12
  def self.root
@@ -1,7 +1,7 @@
1
1
  module Ember
2
2
  module CLI
3
3
  module Resolver
4
- VERSION = '0.1.12'
4
+ VERSION = '0.1.13'
5
5
  end
6
6
  end
7
7
  end
@@ -6,7 +6,7 @@
6
6
  // ==========================================================================
7
7
 
8
8
 
9
- // Version: 0.1.12
9
+ // Version: 0.1.13
10
10
 
11
11
  (function() {
12
12
  /*globals define registry requirejs */
@@ -94,35 +94,6 @@ define("ember/resolver",
94
94
  };
95
95
  }
96
96
 
97
- function chooseModuleName(moduleEntries, moduleName) {
98
- var underscoredModuleName = Ember.String.underscore(moduleName);
99
-
100
- if (moduleName !== underscoredModuleName && moduleEntries[moduleName] && moduleEntries[underscoredModuleName]) {
101
- throw new TypeError("Ambiguous module names: `" + moduleName + "` and `" + underscoredModuleName + "`");
102
- }
103
-
104
- if (moduleEntries[moduleName]) {
105
- return moduleName;
106
- } else if (moduleEntries[underscoredModuleName]) {
107
- return underscoredModuleName;
108
- } else {
109
- // workaround for dasherized partials:
110
- // something/something/-something => something/something/_something
111
- var partializedModuleName = moduleName.replace(/\/-([^\/]*)$/, '/_$1');
112
-
113
- if (moduleEntries[partializedModuleName]) {
114
- Ember.deprecate('Modules should not contain underscores. ' +
115
- 'Attempted to lookup "'+moduleName+'" which ' +
116
- 'was not found. Please rename "'+partializedModuleName+'" '+
117
- 'to "'+moduleName+'" instead.', false);
118
-
119
- return partializedModuleName;
120
- } else {
121
- return moduleName;
122
- }
123
- }
124
- }
125
-
126
97
  function resolveOther(parsedName) {
127
98
  /*jshint validthis:true */
128
99
 
@@ -172,6 +143,13 @@ define("ember/resolver",
172
143
  if (!this.pluralizedTypes.config) {
173
144
  this.pluralizedTypes.config = 'config';
174
145
  }
146
+
147
+ var podModulePrefix = this.namespace.podModulePrefix || '';
148
+ var podPath = podModulePrefix.substr(podModulePrefix.lastIndexOf('/') + 1);
149
+ Ember.deprecate('`podModulePrefix` is deprecated and will be removed '+
150
+ 'from future versions of ember-cli. Please move existing pods from '+
151
+ '\'app/' + podPath + '/\' to \'app/\'.', !this.namespace.podModulePrefix);
152
+
175
153
  },
176
154
  normalize: function(fullName) {
177
155
  return this._normalizeCache[fullName] || (this._normalizeCache[fullName] = this._normalize(fullName));
@@ -270,7 +248,7 @@ define("ember/resolver",
270
248
  // allow treat all dashed and all underscored as the same thing
271
249
  // supports components with dashes and other stuff with underscores.
272
250
  if (tmpModuleName) {
273
- tmpModuleName = chooseModuleName(moduleEntries, tmpModuleName);
251
+ tmpModuleName = self.chooseModuleName(moduleEntries, tmpModuleName);
274
252
  }
275
253
 
276
254
  if (tmpModuleName && moduleEntries[tmpModuleName]) {
@@ -291,6 +269,35 @@ define("ember/resolver",
291
269
  return moduleName;
292
270
  },
293
271
 
272
+ chooseModuleName: function(moduleEntries, moduleName) {
273
+ var underscoredModuleName = Ember.String.underscore(moduleName);
274
+
275
+ if (moduleName !== underscoredModuleName && moduleEntries[moduleName] && moduleEntries[underscoredModuleName]) {
276
+ throw new TypeError("Ambiguous module names: `" + moduleName + "` and `" + underscoredModuleName + "`");
277
+ }
278
+
279
+ if (moduleEntries[moduleName]) {
280
+ return moduleName;
281
+ } else if (moduleEntries[underscoredModuleName]) {
282
+ return underscoredModuleName;
283
+ } else {
284
+ // workaround for dasherized partials:
285
+ // something/something/-something => something/something/_something
286
+ var partializedModuleName = moduleName.replace(/\/-([^\/]*)$/, '/_$1');
287
+
288
+ if (moduleEntries[partializedModuleName]) {
289
+ Ember.deprecate('Modules should not contain underscores. ' +
290
+ 'Attempted to lookup "'+moduleName+'" which ' +
291
+ 'was not found. Please rename "'+partializedModuleName+'" '+
292
+ 'to "'+moduleName+'" instead.', false);
293
+
294
+ return partializedModuleName;
295
+ } else {
296
+ return moduleName;
297
+ }
298
+ }
299
+ },
300
+
294
301
  // used by Ember.DefaultResolver.prototype._logLookup
295
302
  lookupDescription: function(fullName) {
296
303
  var parsedName = this.parseName(fullName);
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ember-cli-assets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryunosuke SATO
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2015-03-13 00:00:00.000000000 Z
11
+ date: 2015-03-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler