diff --git a/package.json b/package.json index 7a7bf917e..9920b0d44 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "bootstrap": "^5.1.3", "flatpickr": "^4.6.9", "jquery": "^3.6.0", - "jquery-ui": "^1.12.1" + "jquery-ui": "^1.12.1 <1.14.0" }, "devDependencies": { "prettier": "^2.4.1" diff --git a/spec/dummy_app/package.json b/spec/dummy_app/package.json index c343a5f36..c320ba228 100644 --- a/spec/dummy_app/package.json +++ b/spec/dummy_app/package.json @@ -8,7 +8,7 @@ "@rails/actiontext": "^7.0.3-1", "@rails/activestorage": "^7.0.3-1", "@rails/webpacker": "5.4.3", - "rails_admin": "file:../../", + "rails_admin": "file:../..", "trix": "^2.0.0-beta.0", "webpack": "^4.46.0", "webpack-cli": "^3.3.12" diff --git a/spec/rails_admin/install_generator_spec.rb b/spec/rails_admin/install_generator_spec.rb index 1d819c0a8..4b97446d5 100644 --- a/spec/rails_admin/install_generator_spec.rb +++ b/spec/rails_admin/install_generator_spec.rb @@ -8,6 +8,7 @@ arguments ['admin', "--asset=#{CI_ASSET}", '--force'] before do + pending 'Until next version of npm package is released' if CI_ASSET == :importmap prepare_destination File.write(File.join(destination_root, 'package.json'), '{"license": "MIT"}') FileUtils.touch File.join(destination_root, 'Gemfile')