Skip to content

Commit

Permalink
Remove global window.$ jQuery definition (redux) (#1413)
Browse files Browse the repository at this point in the history
* remove jquery global definition

* remove duplicate electron import

---------

Co-authored-by: Pascal Laliberté <pascal@hey.com>
  • Loading branch information
jagthedrummer and pascallaliberte authored Apr 2, 2024
1 parent b0334f5 commit 6cec495
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 13 deletions.
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.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"dragula": "^3.7.3",
"esbuild": "^0.20.2",
"glob": "^10.3.10",
"jquery": "^3.7.0",
"jstz": "^2.1.1",
"postcss": "^8.4.38",
"postcss-css-variables": "^0.19.0",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6cec495

Please sign in to comment.