Some prep for Bootstrap 5

Author: philwareham

dev-to-sort/carousel.html

@@ -178,8 +178,6 @@ <h2 class="featurette-heading">And lastly, this one. <span class="text-muted">Ch
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="../../../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
     <script src="../../../../assets/js/vendor/popper.min.js"></script>
     <script src="../../../../themes/js/bootstrap.min.js"></script>
     <!-- Just to make our placeholder images work. Don't actually copy the next line! -->

dev-to-sort/cover.html

@@ -49,8 +49,6 @@ <h1 class="cover-heading">Cover your page.</h1>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="../../../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
     <script src="../../../../assets/js/vendor/popper.min.js"></script>
     <script src="../../../../themes/js/bootstrap.min.js"></script>
   </body>

dev-to-sort/jumbotron.html

@@ -95,8 +95,6 @@ <h2>Heading</h2>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="../../../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
     <script src="../../../../assets/js/vendor/popper.min.js"></script>
     <script src="../../../../themes/js/bootstrap.min.js"></script>
   </body>

dev-to-sort/product.html

@@ -162,8 +162,6 @@ <h5>About</h5>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script>window.jQuery || document.write('<script src="../../../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
     <script src="../../../../assets/js/vendor/popper.min.js"></script>
     <script src="../../../../themes/js/bootstrap.min.js"></script>
     <script src="../../../../assets/js/vendor/holder.min.js"></script>

js/app.js

@@ -1,6 +1,6 @@
 // Comment out any Bootstrap modules that you are not using in your project.
 
-require('bootstrap/js/dist/util');
+//require('bootstrap/js/dist/util');
 require('bootstrap/js/dist/alert');
 require('bootstrap/js/dist/button');
 require('bootstrap/js/dist/carousel');

templates/forms/misc/head.txp

@@ -1,7 +1,6 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <link rel="stylesheet" href="<txp:page_url type="theme_path" />/assets/css/main.css">
-<link rel="dns-prefetch" href="https://code.jquery.com">
 <meta name="generator" content="Textpattern CMS">
 <txp:feed_link flavor="atom" format="link" label="Atom" />
 <txp:feed_link flavor="rss" format="link" label="RSS" />

themes/bootstrap_framework/forms/misc/head.txp

@@ -1,7 +1,6 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <link rel="stylesheet" href="<txp:page_url type="theme_path" />/assets/css/main.css">
-<link rel="dns-prefetch" href="https://code.jquery.com">
 <meta name="generator" content="Textpattern CMS">
 <txp:feed_link flavor="atom" format="link" label="Atom" />
 <txp:feed_link flavor="rss" format="link" label="RSS" />

webpack.config.js

@@ -19,12 +19,6 @@ module.exports = {
     performance: {
         hints: false
     },
-    resolve: {
-        extensions: ['.js'],
-        alias: {
-            'jquery': 'jquery/dist/jquery.slim.js',
-        }
-    },
     optimization: {
         minimize: true,
         minimizer: [new TerserPlugin()]
@@ -35,13 +29,9 @@ module.exports = {
             filename: 'assets/css/main.css'
         }),
         new webpack.ProvidePlugin({
-            $: 'jquery',
-            jQuery: 'jquery',
-            jquery: 'jquery',
-            'window.jQuery': 'jquery',
             Popper: ['popper.js', 'default'],
             // Bootstrap scripts.
-            Util: 'exports-loader?Util!bootstrap/js/dist/util',
+            //Util: 'exports-loader?Util!bootstrap/js/dist/util',
             Alert: 'exports-loader?Alert!bootstrap/js/dist/alert',
             Button: 'exports-loader?Button!bootstrap/js/dist/button',
             Carousel: 'exports-loader?Carousel!bootstrap/js/dist/carousel',