From 5567799daba54b29ebb653a35f122ab9902d6629 Mon Sep 17 00:00:00 2001
From: Brian Sipple <brsipple42@gmail.com>
Date: Wed, 10 Oct 2018 22:59:11 -0400
Subject: [PATCH] Bundle tippy with the main Shepherd distribtion file.

Closes [#263](https://github.com/shipshapecode/shepherd/issues/263).
---
 docs/welcome/index.html |  2 --
 package.json            |  4 ++--
 test/dummy/index.html   |  2 --
 webpack.config.js       | 22 ----------------------
 yarn.lock               | 12 ++++++------
 5 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/docs/welcome/index.html b/docs/welcome/index.html
index 76b8e0141..ab52848a5 100644
--- a/docs/welcome/index.html
+++ b/docs/welcome/index.html
@@ -37,7 +37,6 @@ <h3>Including</h3>
 
         <script type="text/plain" class="language-markup" id="hero-including-code">
           <link rel="stylesheet" href="shepherd-theme-arrows.css"/>
-          <script src="tippy.all.min.js">&lt;/script>
           <script src="shepherd.min.js">&lt;/script>
         </script>
       </div>
@@ -80,7 +79,6 @@ <h3>Example</h3>
 </div>
 
 <!-- Shepherd -->
-<script src="/shepherd/dist/js/tippy.all.min.js"></script>
 <script src="/shepherd/dist/js/shepherd.js"></script>
 
 <!-- Welcome page -->
diff --git a/package.json b/package.json
index 7529a15d6..c31b37969 100644
--- a/package.json
+++ b/package.json
@@ -51,8 +51,8 @@
   },
   "dependencies": {
     "element-matches": "^0.1.2",
-    "lodash-es": "^4.17.10",
-    "tippy.js": "^3.0.3"
+    "lodash-es": "^4.17.11",
+    "tippy.js": "^3.0.6"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",
diff --git a/test/dummy/index.html b/test/dummy/index.html
index 8ce6f1ba1..e0641ea12 100644
--- a/test/dummy/index.html
+++ b/test/dummy/index.html
@@ -40,7 +40,6 @@ <h3>Including</h3>
 
         <script type="text/plain" class="language-markup" id="hero-including-code">
           <link rel="stylesheet" href="shepherd-theme-arrows.css"/>
-          <script src="tippy.all.min.js">&lt;/script>
           <script src="shepherd.min.js">&lt;/script>
         </script>
       </div>
@@ -83,7 +82,6 @@ <h3>Example</h3>
 </div>
 
 <!-- Shepherd -->
-<script src="/dist/js/tippy.all.min.js"></script>
 <script src="/dist/js/shepherd.js"></script>
 
 <!-- Welcome page -->
diff --git a/webpack.config.js b/webpack.config.js
index ff4b8bdac..115edc85f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,7 +3,6 @@ const webpack = require('webpack');
 const path = require('path');
 const autoprefixer = require('autoprefixer');
 const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
 const LodashModuleReplacementPlugin = require('lodash-webpack-plugin');
 const StyleLintWebpackPlugin = require('stylelint-webpack-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
@@ -120,7 +119,6 @@ module.exports = [{
         server: {
           baseDir: 'docs/welcome',
           routes: {
-            '/shepherd/dist/js/tippy.all.min.js': 'dist/js/tippy.all.min.js',
             '/shepherd/dist/js/shepherd.js': 'dist/js/shepherd.js',
             '/shepherd/docs/welcome/js/prism.js': 'docs/welcome/js/prism.js',
             '/shepherd/docs/welcome/js/welcome.js': 'docs/welcome/js/welcome.js',
@@ -179,14 +177,6 @@ module.exports.push({
       }
     ]
   },
-  externals: {
-    'tippy.js': {
-      root: 'tippy',
-      commonjs2: 'tippy.js',
-      commonjs: 'tippy.js',
-      amd: 'tippy.js'
-    }
-  },
   optimization: {
     minimizer: [
       new UglifyJsPlugin({
@@ -196,18 +186,6 @@ module.exports.push({
     ]
   },
   plugins: [
-    new CopyWebpackPlugin([
-      {
-        from: './node_modules/tippy.js/dist/tippy.all.min.js',
-        to: 'js',
-        flatten: true
-      },
-      {
-        from: './node_modules/tippy.js/dist/tippy.all.min.js.map',
-        to: 'js',
-        flatten: true
-      },
-    ]),
     new webpack.BannerPlugin(banner),
     new LodashModuleReplacementPlugin
   ]
diff --git a/yarn.lock b/yarn.lock
index 102ed94dc..715b97742 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5425,9 +5425,9 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-lodash-es@^4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
+lodash-es@^4.17.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
 
 lodash-webpack-plugin@^0.11.5:
   version "0.11.5"
@@ -8613,9 +8613,9 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
-tippy.js@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-3.0.3.tgz#ee543943808201e75d3a9369464576585d9d5305"
+tippy.js@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-3.0.6.tgz#ad29361e96129de582bf4088f00ea8413632ceb4"
   dependencies:
     popper.js "^1.14.4"