js: upgraded jquery to the latest 3.x

SUSE · Jan 24, 2018 · ec07d22 · ec07d22
1 parent b7765cb
commit ec07d22
Show file tree

Hide file tree

Showing 13 changed files with 12,822 additions and 15 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    "es2015"
+    ["es2015", { "modules": false }]
   ],
   "plugins": [
     "lodash",

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
@@ -1,4 +1,3 @@
-import 'jquery';
 import 'jquery-ujs';
 
 // Bootstrap

diff --git a/app/assets/javascripts/utils/typeahead.js b/app/assets/javascripts/utils/typeahead.js
@@ -1,5 +1,3 @@
-import Bloodhound from 'typeahead.js';
-
 export const setTypeahead = function (el, url) {
   $(el).typeahead('destroy');
 

diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -30,6 +30,7 @@ html
 
     javascript:
       window.API_URL = '//#{app_path}';
+    = javascript_include_tag("unmanaged")
     = javascript_include_tag(*webpack_asset_paths("application"))
     = yield :js_header
 

diff --git a/app/views/layouts/authentication.html.slim b/app/views/layouts/authentication.html.slim
@@ -28,6 +28,7 @@ html
     meta content="/favicon/browserconfig.xml" name="msapplication-config"
     meta content="#205683" name="theme-color"
 
+    = javascript_include_tag("unmanaged")
     = javascript_include_tag(*webpack_asset_paths("application"))
     = yield :js_header
 

diff --git a/app/views/layouts/errors.html.slim b/app/views/layouts/errors.html.slim
@@ -3,7 +3,6 @@ html
   head
     title Portus
     = stylesheet_link_tag "application", media: "all"
-    = javascript_include_tag(*webpack_asset_paths("application"))
     = csrf_meta_tags
     meta content="width=device-width, initial-scale=1" name="viewport"
     link href="/favicon/apple-touch-icon-57x57.png" rel="apple-touch-icon" sizes="57x57"

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 Rails.application.config.assets.version = "1.0"
-Rails.application.config.assets.precompile += %w[*.woff2]
+Rails.application.config.assets.precompile += %w[unmanaged.js *.woff2]
diff --git a/config/webpack.js b/config/webpack.js
@@ -35,13 +35,6 @@ var config = {
       modules: false,
       assets: true,
     }),
-
-    // fix legacy jQuery plugins which depend on globals
-    new webpack.ProvidePlugin({
-      $: 'jquery',
-      jQuery: 'jquery',
-      'window.jQuery': 'jquery',
-    }),
   ],
 
   resolve: {

diff --git a/package.json b/package.json
@@ -41,7 +41,6 @@
     "compression-webpack-plugin": "^0.3.2",
     "core-js": "^2.5.1",
     "css-loader": "^0.28.1",
-    "jquery": "^2.2.1",
     "jquery-ujs": "^1.2.1",
     "lodash": "^4.17.4",
     "moment": "^2.18.1",