diff --git a/app/javascript/legacy/jquery.coffee b/app/javascript/legacy/jquery.coffee deleted file mode 100644 index 10f9df6a..00000000 --- a/app/javascript/legacy/jquery.coffee +++ /dev/null @@ -1,9 +0,0 @@ -# HACK: Can't believe I have to do this, but this is a workaround -# as long as we have to deal with all the legacy code -# -# We're going to set up a global jQuery instance here and configure it -# with all our plugins because with newfangled bundling the old approach -# and especially jQuery doesn't really work out - -import jQuery from 'jquery' -window.$ = window.jQuery = jQuery \ No newline at end of file diff --git a/app/javascript/packs/legacy.coffee b/app/javascript/packs/legacy.coffee deleted file mode 100644 index 27076844..00000000 --- a/app/javascript/packs/legacy.coffee +++ /dev/null @@ -1,13 +0,0 @@ -import 'core-js/stable' -import 'regenerator-runtime/runtime' - -import '../legacy/jquery' -import 'popper.js' -import 'bootstrap' - -_ready = -> - $('[data-toggle="tooltip"]').tooltip() - $('.dropdown-toggle').dropdown() - -$(document).ready _ready -$(document).on 'turbo:load', _ready diff --git a/app/views/layouts/base.html.haml b/app/views/layouts/base.html.haml index e609528b..ba091d29 100644 --- a/app/views/layouts/base.html.haml +++ b/app/views/layouts/base.html.haml @@ -20,7 +20,6 @@ %title= yield(:title) = stylesheet_link_tag 'application', data: { 'turbo-track': 'reload' } = javascript_pack_tag 'application', data: { 'turbo-track': 'reload' } - = javascript_pack_tag 'legacy', data: { 'turbo-track': 'reload' } = csrf_meta_tags = yield(:og) = yield(:meta) diff --git a/config/webpack/environment.js b/config/webpack/environment.js index 7bf31a49..5e6d4b5f 100644 --- a/config/webpack/environment.js +++ b/config/webpack/environment.js @@ -1,8 +1,5 @@ const path = require('path') const { environment } = require('@rails/webpacker') -const coffee = require('./loaders/coffee') - -environment.loaders.prepend('coffee', coffee) environment.config.merge({ resolve: { diff --git a/config/webpack/loaders/coffee.js b/config/webpack/loaders/coffee.js deleted file mode 100644 index 77a7b891..00000000 --- a/config/webpack/loaders/coffee.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - test: /\.coffee(\.erb)?$/, - use: [{ - loader: 'coffee-loader', - options: { - bare: false, - transpile: { - presets: ['@babel/preset-env'], - }, - } - }] -} diff --git a/package.json b/package.json index 24e4791a..957a29b9 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,7 @@ "core-js": "^3.27.1", "croppr": "^2.3.1", "i18n-js": "^4.0", - "jquery": "^3.6.3", "js-cookie": "2.2.1", - "popper.js": "^1.16.1", "regenerator-runtime": "^0.13.11", "sass": "^1.57.1", "sweetalert": "1.1.3", @@ -34,8 +32,6 @@ "@rails/webpacker": "5.4.3", "@typescript-eslint/eslint-plugin": "^4.11.0", "@typescript-eslint/parser": "^4.11.0", - "coffee-loader": "1.0.1", - "coffeescript": "^2.5.1", "eslint": "^7.16.0", "eslint-plugin-import": "^2.26.0", "webpack": "^4", diff --git a/yarn.lock b/yarn.lock index 347a24ff..2ed6799d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2462,19 +2462,6 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" -coffee-loader@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-1.0.1.tgz#f672c4b2ea358e039f702ad590148f7a1dda77f0" - integrity sha512-l3lcWeyNE11ZXNYEpkIkerrvBdSpT06/kcR7MyY+0ys38MOuqzhr+s+s7Tsvv2QH1+qEmhvG8mGuUWIO2zH7Bg== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - -coffeescript@^2.5.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.6.1.tgz#f9e5d4930e1b8a1c5cfba7f95eebd18694ce58fd" - integrity sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg== - collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -4630,11 +4617,6 @@ jest-worker@^26.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jquery@^3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6" - integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg== - js-cookie@2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" @@ -5669,11 +5651,6 @@ pnp-webpack-plugin@^1.7.0: dependencies: ts-pnp "^1.1.6" -popper.js@^1.16.1: - version "1.16.1" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" - integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== - posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"