Skip to content

Bundle tippy with the main Shepherd distribution file. #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobbieTheWagner merged 1 commit into from
Oct 11, 2018
Merged

Bundle tippy with the main Shepherd distribution file. #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/welcome/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions test/dummy/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down
22 changes: 0 additions & 22 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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({
Expand All @@ -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
]
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down