From f373444907f169168ba9b8e4e0390d5a09f07ba1 Mon Sep 17 00:00:00 2001 From: Guillermo Moreno Date: Mon, 20 Mar 2023 10:29:26 -0300 Subject: [PATCH 1/3] docs(changelog): add unreleased entries --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4ccb72e..64ae3de7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Unreleased +* Replaces [Select2](https://select2.org/) with [Slim Select](https://slimselectjs.com/) to make it easier to work with newer bundlers like esbuild [#448](https://github.com/platanus/activeadmin_addons/pull/448) +* Removes support for Paperclip since it has been deprecated. [#450](https://github.com/platanus/activeadmin_addons/pull/450) +* Removes support for enumerize [#452](https://github.com/platanus/activeadmin_addons/pull/452) +* Removes support for the Sprockets installation of ActiveAdmin [#451](https://github.com/platanus/activeadmin_addons/pull/452) + ### 1.10.0 #### Added From 934ec75c187f778c78651eaf8afc1d72a0c33e23 Mon Sep 17 00:00:00 2001 From: Guillermo Moreno Date: Mon, 20 Mar 2023 10:32:47 -0300 Subject: [PATCH 2/3] chore(slim-select): replace fork with official --- package.json | 2 +- yarn.lock | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index bed81dc8..add86f1c 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,6 @@ "jquery-datetimepicker": "^2.5.21", "lodash.merge": "^4.6.2", "script-loader": "^0.7.2", - "slim-select": "https://github.com/platanus/slim-select#b23791ceb150e73b9209b9978c56261347c510ed" + "slim-select": "^2.4.5" } } diff --git a/yarn.lock b/yarn.lock index 4c9cd2c8..26375d77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1077,14 +1077,10 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -"slim-select@https://github.com/platanus/slim-select#b23791ceb150e73b9209b9978c56261347c510ed": - version "2.4.4" - resolved "https://github.com/platanus/slim-select#b23791ceb150e73b9209b9978c56261347c510ed" +slim-select@^2.4.5: + version "2.4.5" + resolved "https://registry.yarnpkg.com/slim-select/-/slim-select-2.4.5.tgz#7453d9469c4ce6d6121608a8e384561e62057382" + integrity sha512-64plTJiYwJJqvOQrf3Ty8BvgC3GbNPlGelT7AdhLZ8Ax0z7hxyhHHc5Mfhp1BUVkDSt0+gTpRZH2McIrjia68Q== string.prototype.trimend@^1.0.5: version "1.0.6" From d33c82a17f2d8f90aae7f90be9720aa8874c1f0e Mon Sep 17 00:00:00 2001 From: Guillermo Moreno Date: Mon, 20 Mar 2023 10:33:37 -0300 Subject: [PATCH 3/3] chore(): update version --- CHANGELOG.md | 2 ++ Gemfile.lock | 2 +- lib/activeadmin_addons/version.rb | 2 +- .../activeadmin_addons/webpacker/webpacker_generator.rb | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64ae3de7..a55a726b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Unreleased +### 2.0.0.beta-0 + * Replaces [Select2](https://select2.org/) with [Slim Select](https://slimselectjs.com/) to make it easier to work with newer bundlers like esbuild [#448](https://github.com/platanus/activeadmin_addons/pull/448) * Removes support for Paperclip since it has been deprecated. [#450](https://github.com/platanus/activeadmin_addons/pull/450) * Removes support for enumerize [#452](https://github.com/platanus/activeadmin_addons/pull/452) diff --git a/Gemfile.lock b/Gemfile.lock index 5ac47a93..202905ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - activeadmin_addons (1.10.0) + activeadmin_addons (2.0.0.beta.0) railties redcarpet require_all diff --git a/lib/activeadmin_addons/version.rb b/lib/activeadmin_addons/version.rb index 7b7529a3..d33450ef 100644 --- a/lib/activeadmin_addons/version.rb +++ b/lib/activeadmin_addons/version.rb @@ -1,3 +1,3 @@ module ActiveadminAddons - VERSION = "1.10.0" + VERSION = "2.0.0.beta.0" end diff --git a/lib/generators/activeadmin_addons/webpacker/webpacker_generator.rb b/lib/generators/activeadmin_addons/webpacker/webpacker_generator.rb index 45011157..eb0979f8 100644 --- a/lib/generators/activeadmin_addons/webpacker/webpacker_generator.rb +++ b/lib/generators/activeadmin_addons/webpacker/webpacker_generator.rb @@ -17,7 +17,7 @@ def add_stylesheets end def install_package - run "yarn add activeadmin_addons" + run "yarn add activeadmin_addons@beta" end private diff --git a/package.json b/package.json index add86f1c..30fa716d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "activeadmin_addons", - "version": "1.0.0", + "version": "2.0.0-beta.0", "description": "Set of addons to help with the activeadmin ui", "main": "src/all.js", "files": [