diff --git a/README.md b/README.md index 030ea60a..dc3678ae 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,9 @@ Such as [./docs](https://github.com/QingWei-Li/docsify/tree/master/docs), Create - - - + ``` - ## License MIT diff --git a/build/build.js b/build/build.js index c46343e8..51c2ab44 100644 --- a/build/build.js +++ b/build/build.js @@ -1,24 +1,52 @@ var rollup = require('rollup') var buble = require('rollup-plugin-buble') +var commonjs = require('rollup-plugin-commonjs') +var nodeResolve = require('rollup-plugin-node-resolve') +var uglify = require('rollup-plugin-uglify') -var build = function (entry, moduleName) { +var build = function (opts) { rollup .rollup({ - entry: 'src/' + entry, - plugins: [buble()] + entry: 'src/' + opts.entry, + plugins: [buble()].concat(opts.plugins || []) }) .then(function (bundle) { + var dest = 'lib/' + (opts.output || opts.entry) + + console.log(dest) bundle.write({ - globals: { + globals: !opts.inline ? { marked: 'marked', prismjs: 'Prism' - }, + } : {}, format: 'umd', - moduleName: moduleName, - dest: 'lib/' + entry + moduleName: opts.moduleName || 'Docsify', + dest: dest }) }) } -build('docsify.js', 'Docsify') -build('plugins/nav.js', 'Docsify.Nav') +build({ + entry: 'docsify.js' +}) +build({ + entry: 'docsify.js', + output: 'docsify.min.js', + plugins: [uglify()] +}) +build({ + entry: 'docsify.js', + output: 'docsify.pack.js', + plugins: [commonjs(), nodeResolve()], + inline: false +}) +build({ + entry: 'docsify.js', + output: 'docsify.pack.min.js', + plugins: [commonjs(), nodeResolve(), uglify()], + inline: false +}) +build({ + entry: 'plugins/nav.js', + moduleName: 'Docsify.Nav' +}) diff --git a/docs/404.html b/docs/404.html index ad577024..7eb32e20 100644 --- a/docs/404.html +++ b/docs/404.html @@ -6,7 +6,5 @@ - - - + diff --git a/docs/README.md b/docs/README.md index 030ea60a..dc3678ae 100644 --- a/docs/README.md +++ b/docs/README.md @@ -21,12 +21,9 @@ Such as [./docs](https://github.com/QingWei-Li/docsify/tree/master/docs), Create - - - + ``` - ## License MIT diff --git a/lib/docsify.js b/lib/docsify.js index 2022c7d4..1dd6fec0 100644 --- a/lib/docsify.js +++ b/lib/docsify.js @@ -128,6 +128,7 @@ function scrollActiveSidebar () { function scrollIntoView () { var id = window.location.hash.slice(1); + if (!id) { return } var section = document.querySelector('#' + id); if (section) { section.scrollIntoView(); } diff --git a/lib/docsify.min.js b/lib/docsify.min.js index bcbd3d9e..d623e10f 100644 --- a/lib/docsify.min.js +++ b/lib/docsify.min.js @@ -1 +1 @@ -(function(global,factory){typeof exports==="object"&&typeof module!=="undefined"?module.exports=factory(require("marked"),require("prismjs")):typeof define==="function"&&define.amd?define(["marked","prismjs"],factory):global.Docsify=factory(global.marked,global.Prism)})(this,function(marked,Prism){"use strict";marked="default"in marked?marked["default"]:marked;Prism="default"in Prism?Prism["default"]:Prism;var ajax=function(url,options){if(options===void 0)options={};var xhr=new XMLHttpRequest;xhr.open(options.method||"get",url);xhr.send();return{then:function(cb){return xhr.addEventListener("load",cb)}}};var tocToTree=function(toc){var headlines=[];var last={};toc.forEach(function(headline){var level=headline.level||1;var len=level-1;if(last[len]){last[len].children=last[len].children||[];last[len].children.push(headline)}else{headlines.push(headline);last[level]=headline}});return headlines};var buildHeadlinesTree=function(tree,tpl){if(tpl===void 0)tpl="";if(!tree||!tree.length){return""}tree.forEach(function(node){tpl+='
  • '+node.title+"
    • ";if(node.children){tpl+='
  • "};var genToc=function(toc){return buildHeadlinesTree(tocToTree(toc),"