ember-cli-rails 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea73c50b7ae583d0d513fd537bbf9090a792981
-  data.tar.gz: 1d3ac0194431d6dabe1dd42f30b39122922a463d
+  metadata.gz: 02bdcb704d9cf103835f4d33f06a395b154e6f83
+  data.tar.gz: be0455d38e0af37abe4ce06880974c16fb2edbf5
 SHA512:
-  metadata.gz: cafc706e56398f3d3f0a991c12bff319e1b847642f7dffd8660508bd7dc6a905b0eabcc5d5504fae6d7b59dd12a0758839495b6dd1ed3fae10d12b85070cc3a6
-  data.tar.gz: c07db85db8e00b3e87a3b1141177bbc7d9845bf522d5bf2119440507a89b621875d67cf359e8d1290f52642f2c429471f25adfa15223b3d13e0d127d517c4dad
+  metadata.gz: b2f69ab85c0197d8581541bd4cd020f1e579ae34d40c27a5a16a8d5d9177cbb98550ac9687a712c917447cf3833deb15de3d9f25f479768b9f64be9c0204ed14
+  data.tar.gz: 22c0988bc923d89e60fd9ee0252ccb230a277e3fb38d5b37e9999fbf49f0a8e0494819e7f7c8ea9353b5b2b5d0f59e501263bf7744fd81549f82f14182face3d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.0.18
+------
+
+* Remove suppress jQuery feature [#49](https://github.com/rwz/ember-cli-rails/issues/49)
+* Add option to manually suppress Ember dependencies [#55](https://github.com/rwz/ember-cli-rails/pull/55)
+
 0.0.17
 ------
 

data/README.md

@@ -64,7 +64,7 @@ Once you've updated your initializer to taste, you need to install the
 For each of your EmberCLI applications install the addon with:
 
 ```sh
-npm install --save-dev ember-cli-rails-addon@0.0.7
+npm install --save-dev ember-cli-rails-addon@0.0.8
 ```
 
 And that's it!
@@ -145,6 +145,23 @@ polluting your git history. Note that for this to work, you must have
 building Ember CLI will not be enabled.
 
 
+#### Ember Depdencies
+
+Ember has several dependencies. Some of these dependencies might already be
+present in your asset list. For example jQuery is bundled in `jquery-rails` gem.
+If you have the jQuery assets included on your page you may want to exclude them
+from the Ember distribution. You can do so by setting the `exclude_ember_deps`
+option like so:
+
+```ruby
+EmberCLI.configure do |c|
+  c.app :frontend, exclude_ember_deps: "jquery"
+  c.app :admin_panel, exclude_ember_deps: ["jquery", "handlebars"]
+end
+```
+
+jQuery and Handlebars are the main use cases for this flag.
+
 ## Contributing
 
 1. Fork it (https://github.com/rwz/ember-cli-rails/fork)

data/lib/ember-cli/app.rb

@@ -2,9 +2,8 @@ require "timeout"
 
 module EmberCLI
   class App
-    ADDON_VERSION = "0.0.7"
-    EMBER_CLI_VERSION = "~> 0.1.3"
-    JQUERY_VERSIONS = ["~> 1.7", "~> 2.1"].freeze
+    ADDON_VERSION = "0.0.8"
+    EMBER_CLI_VERSION = "~> 0.1.5"
 
     attr_reader :name, :options, :pid
 
@@ -101,14 +100,6 @@ module EmberCLI
       end
     end
 
-    def suppress_jquery?
-      return false unless defined?(Jquery::Rails::JQUERY_VERSION)
-
-      JQUERY_VERSIONS.any? do |requirement|
-        match_version?(Jquery::Rails::JQUERY_VERSION, requirement)
-      end
-    end
-
     def check_ember_cli_version!
       version = dev_dependencies.fetch("ember-cli").split("-").first
 
@@ -206,10 +197,14 @@ module EmberCLI
         app_path.join("node_modules", "ember-cli-rails-addon", "package.json").exist?
     end
 
+    def excluded_ember_deps
+      Array.wrap(options[:exclude_ember_deps]).join(",")
+    end
+
     def env_hash
       ENV.clone.tap do |vars|
         vars.store "DISABLE_FINGERPRINTING", "true"
-        vars.store "SUPPRESS_JQUERY", "true" if suppress_jquery?
+        vars.store "EXCLUDE_EMBER_ASSETS", excluded_ember_deps
       end
     end
 

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.0.17".freeze
+  VERSION = "0.0.18".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Pavel Pravosud