chartkick 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc72b4105d5e863040aec42ff49f32623f8fa3c74488b8ecdf5bb80d465653b3
-  data.tar.gz: 1e17d23367ad1ab3dd619d654e36f3f7cf179ed67f16164c22262460720627d7
+  metadata.gz: 89ed1824ceea10158a8321a32e75daeb96dcb1eaeea839dc6f4eddd1de97cd88
+  data.tar.gz: 8c4a6ff2477b7314cec55237fbcfafe7e0b95efb4890a50925edb4eb095bb468
 SHA512:
-  metadata.gz: cadb32e90ef25fa335d00410e753d28770f9ad245be0cd7d6b42e8de3fb984f8cb821f75d8cf61f0521fe25134110b6e3d5ff21c22fe8a54d441bb00b82ada54
-  data.tar.gz: 1a10102ebd8b97a6b4b27572c9efd825f75cdcb8353ab75505924c72e3424481f1220a0a7960dacba29b997e48af8f1d812c1a9d5cd5672d8faad8d6465fa401
+  metadata.gz: 5f6bedf2f1e49a194cdede42c1fb80d7dbf02a0d26955f0c0248b625736efc52269c966b3c8a50a0f3ba8bc5782bc7ad6843195a123fe6e9211026255305c825
+  data.tar.gz: 341942cf99eaf9a262d13b0abc8ca00898d88a2ac688a269bf932e6d0e365592a1ccca0f46bbc9e4ebca9fffcb9991853a8c4ea82448e73fe04b1847f12d5bd4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.1.3 (2022-01-15)
+
+- Support for `importmap-rails` is no longer experimental
+- Updated Chart.js to 3.7.0
+- Fixed asset precompilation error with `importmap-rails`
+
 ## 4.1.2 (2021-11-06)
 
 - Removed automatic pinning for `importmap-rails` (still experimental)

data/README.md

@@ -20,26 +20,17 @@ Add this line to your application’s Gemfile:
 gem "chartkick"
 ```
 
-For Rails 6 / Webpacker, run:
-
-```sh
-yarn add chartkick chart.js
-```
-
-And in `app/javascript/packs/application.js`, add:
+Then follow the instructions for your framework:
 
-```js
-import "chartkick/chart.js"
-```
+- [Rails 7 / Importmap](#rails-7--importmap)
+- [Rails 6 / Webpacker](#rails-6--webpacker)
+- [Rails 5 / Sprockets](#rails-5--sprockets)
 
-For Rails 5 / Sprockets, in `app/assets/javascripts/application.js`, add:
+This sets up Chartkick with [Chart.js](https://www.chartjs.org/). For other charting libraries and frameworks, see [detailed instructions](#installation).
 
-```js
-//= require chartkick
-//= require Chart.bundle
-```
+### Rails 7 / Importmap
 
-For Rails 7 / Importmap (experimental), in `config/importmap.rb`, add:
+In `config/importmap.rb`, add:
 
 ```ruby
 pin "chartkick", to: "chartkick.js"
@@ -53,7 +44,28 @@ import "chartkick"
 import "Chart.bundle"
 ```
 
-This sets up Chartkick with [Chart.js](https://www.chartjs.org/). For other charting libraries, see [detailed instructions](#installation).
+### Rails 6 / Webpacker
+
+Run:
+
+```sh
+yarn add chartkick chart.js
+```
+
+And in `app/javascript/packs/application.js`, add:
+
+```js
+import "chartkick/chart.js"
+```
+
+### Rails 5 / Sprockets
+
+In `app/assets/javascripts/application.js`, add:
+
+```js
+//= require chartkick
+//= require Chart.bundle
+```
 
 ## Charts
 
@@ -428,6 +440,20 @@ Next, choose your charting library.
 
 ### Chart.js
 
+For Rails 7 / Importmap, in `config/importmap.rb`, add:
+
+```ruby
+pin "chartkick", to: "chartkick.js"
+pin "Chart.bundle", to: "Chart.bundle.js"
+```
+
+And in `app/javascript/application.js`, add:
+
+```js
+import "chartkick"
+import "Chart.bundle"
+```
+
 For Rails 6 / Webpacker, run:
 
 ```sh
@@ -447,26 +473,24 @@ For Rails 5 / Sprockets, in `app/assets/javascripts/application.js`, add:
 //= require Chart.bundle
 ```
 
-For Rails 7 / Importmap (experimental), in `config/importmap.rb`, add:
+### Google Charts
+
+In your layout or views, add:
+
+```erb
+<%= javascript_include_tag "https://www.gstatic.com/charts/loader.js" %>
+```
+
+For Rails 7 / Importmap, in `config/importmap.rb`, add:
 
 ```ruby
 pin "chartkick", to: "chartkick.js"
-pin "Chart.bundle", to: "Chart.bundle.js"
 ```
 
 And in `app/javascript/application.js`, add:
 
 ```js
 import "chartkick"
-import "Chart.bundle"
-```
-
-### Google Charts
-
-In your layout or views, add:
-
-```erb
-<%= javascript_include_tag "https://www.gstatic.com/charts/loader.js" %>
 ```
 
 For Rails 6 / Webpacker, run:
@@ -487,18 +511,6 @@ For Rails 5 / Sprockets, in `app/assets/javascripts/application.js`, add:
 //= require chartkick
 ```
 
-For Rails 7 / Importmap (experimental), in `config/importmap.rb`, add:
-
-```ruby
-pin "chartkick", to: "chartkick.js"
-```
-
-And in `app/javascript/application.js`, add:
-
-```js
-import "chartkick"
-```
-
 To specify a language or Google Maps API key, use:
 
 ```js
@@ -509,44 +521,44 @@ before your charts.
 
 ### Highcharts
 
-For Rails 6 / Webpacker, run:
+For Rails 7 / Importmap, run:
 
 ```sh
-yarn add chartkick highcharts
+bin/importmap pin highcharts --download
 ```
 
-And in `app/javascript/packs/application.js`, add:
+And in `config/importmap.rb`, add:
 
-```js
-import "chartkick/highcharts"
+```ruby
+pin "chartkick", to: "chartkick.js"
 ```
 
-For Rails 5 / Sprockets, download [highcharts.js](https://code.highcharts.com/highcharts.js) into `vendor/assets/javascripts` (or use `yarn add highcharts` in Rails 5.1+), and in `app/assets/javascripts/application.js`, add:
+And in `app/javascript/application.js`, add:
 
 ```js
-//= require chartkick
-//= require highcharts
-```
-
-For Rails 7 / Importmap (experimental), in `config/importmap.rb`, add:
+import "chartkick"
+import Highcharts from "highcharts"
 
-```ruby
-pin "chartkick", to: "chartkick.js"
+window.Highcharts = Highcharts
 ```
 
-And run:
+For Rails 6 / Webpacker, run:
 
 ```sh
-bin/importmap pin highcharts --download
+yarn add chartkick highcharts
 ```
 
-And in `app/javascript/application.js`, add:
+And in `app/javascript/packs/application.js`, add:
 
 ```js
-import "chartkick"
-import Highcharts from "highcharts"
+import "chartkick/highcharts"
+```
 
-window.Highcharts = Highcharts
+For Rails 5 / Sprockets, download [highcharts.js](https://code.highcharts.com/highcharts.js) into `vendor/assets/javascripts` (or use `yarn add highcharts` in Rails 5.1+), and in `app/assets/javascripts/application.js`, add:
+
+```js
+//= require chartkick
+//= require highcharts
 ```
 
 ### Sinatra and Padrino

data/lib/chartkick/engine.rb

@@ -3,8 +3,8 @@ module Chartkick
     # for assets
 
     # for importmap
-    if defined?(Importmap)
-      initializer "chartkick.importmap", after: "importmap" do |app|
+    initializer "chartkick.importmap" do |app|
+      if defined?(Importmap)
         app.config.assets.precompile << "chartkick.js"
         app.config.assets.precompile << "Chart.bundle.js"
       end

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "4.1.2"
+  VERSION = "4.1.3"
 end