Skip to content

Commit

Permalink
Merge pull request #29 from bullet-train-co/bullet-train-update/1.7.1
Browse files Browse the repository at this point in the history
Bullet Train Update: 1.7.1
  • Loading branch information
jagthedrummer authored Apr 2, 2024
2 parents 6e52390 + e4aa2a8 commit 75283ed
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 111 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ end

# We use a constant here so that we can ensure that all of the bullet_train-*
# packages are on the same version.
BULLET_TRAIN_VERSION = "1.6.38"
BULLET_TRAIN_VERSION = "1.7.1"

# Core packages.
gem "bullet_train", BULLET_TRAIN_VERSION
Expand Down
88 changes: 44 additions & 44 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ GEM
bootsnap (1.17.1)
msgpack (~> 1.2)
builder (3.2.4)
bullet_train (1.6.38)
bullet_train (1.7.1)
awesome_print
bullet_train-has_uuid
bullet_train-roles
Expand Down Expand Up @@ -160,7 +160,7 @@ GEM
unicode-emoji
valid_email
xxhash
bullet_train-api (1.6.38)
bullet_train-api (1.7.1)
bullet_train
bullet_train-super_scaffolding
colorizer
Expand All @@ -171,61 +171,61 @@ GEM
pagy_cursor
rack-cors
rails (>= 6.0.0)
bullet_train-fields (1.6.38)
bullet_train-fields (1.7.1)
chronic
cloudinary
phonelib
rails (>= 6.0.0)
bullet_train-has_uuid (1.6.38)
bullet_train-has_uuid (1.7.1)
rails (>= 6.0.0)
bullet_train-incoming_webhooks (1.6.38)
bullet_train-incoming_webhooks (1.7.1)
bullet_train
bullet_train-api
bullet_train-super_scaffolding
rails (>= 6.0.0)
bullet_train-integrations (1.6.38)
bullet_train-integrations (1.7.1)
rails (>= 6.0.0)
bullet_train-integrations-stripe (1.6.38)
bullet_train-integrations-stripe (1.7.1)
omniauth
omniauth-rails_csrf_protection
omniauth-stripe-connect
rails (>= 6.0.0)
stripe
bullet_train-obfuscates_id (1.6.38)
bullet_train-obfuscates_id (1.7.1)
hashids
rails (>= 6.0.0)
bullet_train-outgoing_webhooks (1.6.38)
bullet_train-outgoing_webhooks (1.7.1)
public_suffix
rails (>= 6.0.0)
bullet_train-roles (1.6.38)
bullet_train-roles (1.7.1)
active_hash
activesupport
cancancan
bullet_train-routes (1.0.0)
rails (>= 6.0.0)
bullet_train-scope_questions (1.6.38)
bullet_train-scope_questions (1.7.1)
rails (>= 6.0.0)
bullet_train-scope_validator (1.6.38)
bullet_train-scope_validator (1.7.1)
rails
bullet_train-sortable (1.6.38)
bullet_train-sortable (1.7.1)
rails (>= 6.0.0)
bullet_train-super_load_and_authorize_resource (1.6.38)
bullet_train-super_load_and_authorize_resource (1.7.1)
cancancan
rails (>= 6.0.0)
bullet_train-super_scaffolding (1.6.38)
bullet_train-super_scaffolding (1.7.1)
colorizer
indefinite_article
masamune-ast (~> 2.0.2)
rails (>= 6.0.0)
bullet_train-themes (1.6.38)
bullet_train-themes (1.7.1)
bullet_train-fields
nice_partials (~> 0.9)
rails (>= 6.0.0)
bullet_train-themes-light (1.6.38)
bullet_train-themes-light (1.7.1)
bullet_train-themes-tailwind_css
masamune-ast (~> 2.0.2)
rails (>= 6.0.0)
bullet_train-themes-tailwind_css (1.6.38)
bullet_train-themes-tailwind_css (1.7.1)
bullet_train-themes
rails (>= 6.0.0)
cable_ready (5.0.3)
Expand Down Expand Up @@ -284,9 +284,9 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-pwned_password (0.1.10)
devise-pwned_password (0.1.11)
devise (~> 4)
pwned (~> 2.0.0)
pwned (~> 2.4)
devise-two-factor (5.0.0)
activesupport (~> 7.0)
devise (~> 4.0)
Expand Down Expand Up @@ -320,7 +320,7 @@ GEM
multipart-post (~> 2)
faraday-net_http (3.1.0)
net-http
fastimage (2.3.0)
fastimage (2.3.1)
ffi (1.16.3)
figaro (1.2.0)
thor (>= 0.14.0, < 2)
Expand Down Expand Up @@ -356,7 +356,7 @@ GEM
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jbuilder-schema (2.6.8)
jbuilder-schema (2.6.9)
jbuilder
method_source
rails (>= 5.0.0)
Expand Down Expand Up @@ -490,7 +490,7 @@ GEM
public_suffix (5.0.3)
puma (6.4.0)
nio4r (~> 2.0)
pwned (2.0.2)
pwned (2.4.1)
racc (1.7.1)
rack (2.2.8)
rack-cors (2.0.2)
Expand Down Expand Up @@ -592,7 +592,7 @@ GEM
rubocop-ast (>= 0.4.0)
ruby-graphviz (1.2.5)
rexml
ruby-openai (6.3.1)
ruby-openai (6.5.0)
event_stream_parser (>= 0.3.0, < 2.0.0)
faraday (>= 1)
faraday-multipart (>= 1)
Expand Down Expand Up @@ -654,7 +654,7 @@ GEM
stimulus-rails (1.3.0)
railties (>= 6.0.0)
stringio (3.0.8)
stripe (10.12.0)
stripe (10.14.0)
terser (1.1.20)
execjs (>= 0.3.0, < 3)
thor (1.3.0)
Expand All @@ -680,7 +680,7 @@ GEM
activemodel
mail (>= 2.6.1)
simpleidn
version_gem (1.1.3)
version_gem (1.1.4)
view_component (3.10.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -712,24 +712,24 @@ DEPENDENCIES
avo (>= 3.1.7)
aws-sdk-s3
bootsnap
bullet_train (= 1.6.38)
bullet_train-api (= 1.6.38)
bullet_train-fields (= 1.6.38)
bullet_train-has_uuid (= 1.6.38)
bullet_train-incoming_webhooks (= 1.6.38)
bullet_train-integrations (= 1.6.38)
bullet_train-integrations-stripe (= 1.6.38)
bullet_train-obfuscates_id (= 1.6.38)
bullet_train-outgoing_webhooks (= 1.6.38)
bullet_train-roles (= 1.6.38)
bullet_train-scope_questions (= 1.6.38)
bullet_train-scope_validator (= 1.6.38)
bullet_train-sortable (= 1.6.38)
bullet_train-super_load_and_authorize_resource (= 1.6.38)
bullet_train-super_scaffolding (= 1.6.38)
bullet_train-themes (= 1.6.38)
bullet_train-themes-light (= 1.6.38)
bullet_train-themes-tailwind_css (= 1.6.38)
bullet_train (= 1.7.1)
bullet_train-api (= 1.7.1)
bullet_train-fields (= 1.7.1)
bullet_train-has_uuid (= 1.7.1)
bullet_train-incoming_webhooks (= 1.7.1)
bullet_train-integrations (= 1.7.1)
bullet_train-integrations-stripe (= 1.7.1)
bullet_train-obfuscates_id (= 1.7.1)
bullet_train-outgoing_webhooks (= 1.7.1)
bullet_train-roles (= 1.7.1)
bullet_train-scope_questions (= 1.7.1)
bullet_train-scope_validator (= 1.7.1)
bullet_train-sortable (= 1.7.1)
bullet_train-super_load_and_authorize_resource (= 1.7.1)
bullet_train-super_scaffolding (= 1.7.1)
bullet_train-themes (= 1.7.1)
bullet_train-themes-light (= 1.7.1)
bullet_train-themes-tailwind_css (= 1.7.1)
capybara (~> 3.39)
capybara-email
capybara-lockstep
Expand Down
3 changes: 0 additions & 3 deletions app/javascript/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// includes should be specified at the end of the file, not in this section. This helps avoid merge conflicts in the
// future should the framework defaults change.

import "./support/jquery";
import Rails from "@rails/ujs"
import * as ActiveStorage from "@rails/activestorage"
import "@hotwired/turbo-rails"
Expand All @@ -27,8 +26,6 @@ require("@icon/themify-icons/themify-icons.css")
import { trixEditor } from "@bullet-train/fields"
trixEditor()

import "./electron"

// ✅ YOUR APPLICATION'S INCLUDES
// If you need to customize your application's includes, this is the place to do it. This helps avoid merge
// conflicts in the future when Rails or Bullet Train update their own default includes.
5 changes: 0 additions & 5 deletions app/javascript/electron/index.js

This file was deleted.

3 changes: 0 additions & 3 deletions app/javascript/support/jquery.js

This file was deleted.

13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "app",
"private": true,
"dependencies": {
"@bullet-train/bullet-train": "1.6.38",
"@bullet-train/bullet-train-sortable": "1.6.38",
"@bullet-train/fields": "1.6.38",
"@bullet-train/bullet-train": "1.7.1",
"@bullet-train/bullet-train-sortable": "1.7.1",
"@bullet-train/fields": "1.7.1",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@fullhuman/postcss-purgecss": "5.0.0",
"@hotwired/turbo-rails": "^8.0.4",
Expand All @@ -17,17 +17,16 @@
"@redocly/cli": "^1.0.0-beta.111",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"autoprefixer": "^10.4.18",
"autoprefixer": "^10.4.19",
"cable_ready": "^5.0.3",
"dragula": "^3.7.3",
"esbuild": "^0.20.2",
"glob": "^10.3.10",
"jquery": "^3.7.0",
"jstz": "^2.1.1",
"postcss": "^8.4.36",
"postcss": "^8.4.38",
"postcss-css-variables": "^0.19.0",
"postcss-extend-rule": "^4.0.0",
"postcss-import": "^16.0.1",
"postcss-import": "^16.1.0",
"postcss-nested": "^6.0.1",
"stimulus-reveal": "^1.4.2",
"stimulus-scroll-reveal": "^3.2.0",
Expand Down
Loading

0 comments on commit 75283ed

Please sign in to comment.