Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  chore(docs): Add docs dist folder to ignore
  chore(docs): Fix base path
  chore(docs): Update deploy script
  • Loading branch information
apertureless committed Nov 7, 2018
2 parents ee3cc68 + 71254ec commit d59991b
Show file tree
Hide file tree
Showing 57 changed files with 10 additions and 826 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ selenium-debug.log
test/unit/coverage
test/e2e/reports
es/
docs/.vuepress/dist
9 changes: 8 additions & 1 deletion deploy-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,11 @@ cd docs/.vuepress/dist

# if you are deploying to a custom domain
echo 'vue-chartjs.org' > CNAME
touch .nojekyll

git init
git add -A
git commit -m 'docs: Deploy docs'

git push -f [email protected]:apertureless/vue-chartjs.git master:gh-pages

cd -
2 changes: 1 addition & 1 deletion docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
editLinkText: 'Help us improve this page!',
docsDir: 'docs',
docsBranch: 'master',
base: '/vue-chartjs/',
serviceWorker: true,
locales: {
'/': {
selectText: 'Languages',
Expand Down
Empty file removed docs/.vuepress/dist/.nojekyll
Empty file.
17 changes: 0 additions & 17 deletions docs/.vuepress/dist/404.html

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/CNAME

This file was deleted.

62 changes: 0 additions & 62 deletions docs/.vuepress/dist/api/index.html

This file was deleted.

Empty file.
1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/css/2.styles.8f5c8e96.css

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/css/styles.698fecae.css

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/img/search.83621669.svg

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/1.3ac4ce2d.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/10.b27c2bcc.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/11.49ff9f4e.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/12.01d63eaa.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/13.ebea3386.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/14.94612b70.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/15.fd4516df.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/16.9ae1da91.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/17.546d6885.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/18.26f4f9eb.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/19.4100c56d.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/2.8f5c8e96.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/20.8a5c8025.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/21.e2afe677.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/22.28a14c49.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/23.e1908054.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/3.5774cb5b.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/4.06a15e23.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/5.e04e82dd.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/6.b2f4c173.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/7.aed9035e.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/8.d5b39b11.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/.vuepress/dist/assets/js/9.39acf5c6.js

This file was deleted.

Loading

0 comments on commit d59991b

Please sign in to comment.