Replace xdan-datetimepicker-rails gem on jquery-datetimepicker NPM package

Skumring · Skumring · commit 2dd537a1e986 · 2022-04-07T19:17:49.000+03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,4 +39,5 @@ jobs:
         run: |
           gem install bundler -v '< 2'
           bundle install
+          yarn install
           bundle exec rspec spec
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,11 @@ spec/rails/rails-*
 pkg
 .bundle
 vendor/bundl
+
+/public/packs
+/public/packs-test
+/public/assets
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ gem 'active_admin_datetimepicker'
 
 And then execute:
 
-    $ bundle
+    $ bundle && yarn
 
 Or install it yourself as:
 
@@ -39,7 +39,17 @@ Add the following line into `app/assets/javascripts/active_admin.js`:
 
 ## Usage
 
-This plugin adds the `date_time_picker` input and `date_time_range` filter, which use the [XDSoft DateTime Picker gem](https://github.com/shekibobo/xdan-datetimepicker-rails).
+This plugin adds the `date_time_picker` input and `date_time_range` filter, which use the [XDSoft DateTime Picker NPM package](https://github.com/xdan/datetimepicker).
+#### If you use Webpacker
+Will be enough to run `bundle && yarn`, but if you want to install `jquery-datetimepicker` with different version just run `yarn add jquery-datetimepicker@^2.5.4`
+#### If you use only Sprockets
+You should make sure about presence the `jquery-datetimepicker` into `node_modules` and `node_modules` correct load to you project `config/initializers/assets.rb`:
+```
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
+```
+helpful articles:
+- [Rails importing JavaScript packages from node_modules with assets pipeline(without webpacker](https://medium.com/@elicloudh/rails-importing-javascript-packages-from-node-modules-with-assets-pipeline-without-webpacker-98d985b22cea)
+- [Rails 5.1, the proof of the maturity of the ecosystem](https://g3ortega.com/rails/2017/05/30/rails-5-1-and-forward-yarn-on-rails.html)
 
 The `date_time_picker` input accepts many of the options available to the standard jQueryUI Datepicker. For example:
 
diff --git a/active_admin_datetimepicker.gemspec b/active_admin_datetimepicker.gemspec
@@ -21,5 +21,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "coffee-rails"
   spec.add_dependency "activeadmin", ">= 1.1", "< 3.a"
-  spec.add_dependency "xdan-datetimepicker-rails", "~> 2.5.4"
 end
diff --git a/app/assets/javascripts/active_admin_datetimepicker.js.coffee b/app/assets/javascripts/active_admin_datetimepicker.js.coffee
@@ -1,4 +1,4 @@
-#= require jquery.xdan.datetimepicker.full
+#= require jquery-datetimepicker/build/jquery.datetimepicker.full.min.js
 
 @setupDateTimePicker = (container) ->
   defaults = {
diff --git a/config/initializers/active_admin_datetimepicker.rb b/config/initializers/active_admin_datetimepicker.rb
@@ -1,5 +1,5 @@
 ActiveAdmin.setup do |config|
-  config.register_stylesheet 'jquery.xdan.datetimepicker.css'
+  config.register_stylesheet 'jquery-datetimepicker/build/jquery.datetimepicker.min.css'
 end
 
 Ransack.configure do |config|
diff --git a/lib/active_admin_datetimepicker.rb b/lib/active_admin_datetimepicker.rb
@@ -1,5 +1,4 @@
 require 'activeadmin'
-require 'xdan-datetimepicker-rails'
 require 'active_admin_datetimepicker/version'
 require 'active_admin_datetimepicker/base'
 require 'active_admin_datetimepicker/inputs/date_time_picker_input'
diff --git a/package.json b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "jquery-datetimepicker": "^2.5.4"
+  }
+}
diff --git a/spec/support/rails_template.rb b/spec/support/rails_template.rb
@@ -21,6 +21,7 @@
 
 generate :'active_admin:install --skip-users'
 generate :'formtastic:install'
+run 'yarn add jquery-datetimepicker@^2.5.4'
 
 # Install active_admin_date_time_datetimepicker assets
 inject_into_file "app/assets/stylesheets/active_admin.scss",
diff --git a/yarn.lock b/yarn.lock
@@ -0,0 +1,27 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+jquery-datetimepicker@^2.5.4:
+  version "2.5.21"
+  resolved "https://registry.yarnpkg.com/jquery-datetimepicker/-/jquery-datetimepicker-2.5.21.tgz#00c388a78df2732fedfdb5c6529b6e84d53e0235"
+  integrity sha512-wDTpZ4f1PWd1XGaIIE0n6jLynlm+akBJ7/NjaB1bk2UJSS593CHJPZ3+FNEXoyvNVUeBlBC0oX6WTfCyfUhX/w==
+  dependencies:
+    jquery ">= 1.7.2"
+    jquery-mousewheel ">= 3.1.13"
+    php-date-formatter "^1.3.4"
+
+"jquery-mousewheel@>= 3.1.13":
+  version "3.1.13"
+  resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5"
+  integrity sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU=
+
+"jquery@>= 1.7.2":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
+php-date-formatter@^1.3.4:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/php-date-formatter/-/php-date-formatter-1.3.6.tgz#6d67359da890c742005fa89d20be3ded31cc1d2a"
+  integrity sha512-/CKsZYmAwXeNh8KpD/CF9hcJDZNhdb2ICN8+qgqOt5sUu9liZIxZ1R284TNj5MtPt8RjG5X0xn6WSqL0kcKMBg==

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#= require jquery.xdan.datetimepicker.full`
	`1`	`+#= require jquery-datetimepicker/build/jquery.datetimepicker.full.min.js`
`2`	`2`
`3`	`3`	`@setupDateTimePicker = (container) ->`
`4`	`4`	`defaults = {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`require 'activeadmin'`
`2`		`-require 'xdan-datetimepicker-rails'`
`3`	`2`	`require 'active_admin_datetimepicker/version'`
`4`	`3`	`require 'active_admin_datetimepicker/base'`
`5`	`4`	`require 'active_admin_datetimepicker/inputs/date_time_picker_input'`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "dependencies": {
 +    "jquery-datetimepicker": "^2.5.4"
 +  }
 +}