Update dependencies; fix build-docs script

larsgw · Jul 25, 2017 · c8ac45b · c8ac45b
1 parent 07f78b9
commit c8ac45b
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 7 deletions.
diff --git a/.jsdoc.json b/.jsdoc.json
@@ -0,0 +1,21 @@
+{
+  "plugins": ["plugins/markdown"],
+  "tags": {
+    "allowUnknownTags": true,
+    "dictionaries": ["jsdoc", "closure"]
+  },
+  "opts": {
+    "template": "templates/default",
+    "encoding": "utf8",
+    "destination": "docs/api",
+    "recurse": true
+  },
+  "templates": {
+    "default": {
+      "layoutFile": ".jsdoc.tmpl",
+      "includeDate": false
+    },
+    "cleverLinks": false,
+    "monospaceLinks": false
+  }
+} 
diff --git a/.jsdoc.tmpl b/.jsdoc.tmpl
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title><?js= title ?> - Docs - Citation.js</title>
+
+    <meta name="theme-color" content="#FFC107">
+    <link rel="shortcut icon" type="image/png" href="../favicon.png"/>
+    <link rel="icon" type="image/png" href="../favicon.png"/>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+    <link type="text/css" rel="stylesheet" href="../static/css/api.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title"><?js= title ?></h1>
+
+    <?js= content ?>
+</div>
+
+<nav>
+    <?js= this.nav ?>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc <?js= env.version.number ?></a><?js if(env.conf.templates && env.conf.templates.default && env.conf.templates.default.includeDate !== false) { ?> on <?js= (new Date()) ?><?js } ?>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
diff --git a/package.json b/package.json
@@ -24,16 +24,16 @@
   "dependencies": {
     "babel-polyfill": "^6.23.0",
     "citeproc": "^2.0.2",
-    "commander": "~2.9.0",
+    "commander": "~2.11.0",
     "deep-freeze": "0.0.1",
     "isomorphic-fetch": "^2.2.1",
     "striptags": "^3.0.1",
-    "sync-request": "^4.0.3",
-    "wikidata-sdk": "^5.1.4"
+    "sync-request": "^4.1.0",
+    "wikidata-sdk": "^5.2.2"
   },
   "devDependencies": {
     "babel-cli": "^6.24.1",
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.25.0",
     "babel-preset-env": "^1.4.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
@@ -43,8 +43,7 @@
     "copyfiles": "^1.2.0",
     "disc": "^1.3.2",
     "jasmine-node": "^1.14.5",
-    "jsdoc": "^3.4.2",
-    "jsdoc-babel": "^0.3.0",
+    "jsdoc": "^3.5.3",
     "standard": "^10.0.2",
     "uglify-es": "^3.0.4"
   },
@@ -76,7 +75,7 @@
     "minify": "     uglifyjs build/citation.js      --ie8 -c -o build/citation.min.js      && copyfiles -u 1 build/citation.min.js      docs/src/",
     "minify-test": "uglifyjs build/test.citation.js --ie8 -c -o build/test.citation.min.js && copyfiles -u 1 build/test.citation.min.js docs/src/",
     "--2--": "miscs",
-    "build-docs": "jsdoc ./src README.md -c docs/conf.json",
+    "build-docs": "jsdoc ./src README.md -c .jsdoc.json",
     "build-disc": "browserify -e test/citation.spec.js       -o build/tmp/citation.js  -g [ babelify --ignore=citeproc --presets [ env ] ] -t brfs --full-paths && node tools/disc.js",
     "--3--": "combo",
     "build-all": "npm run build-files && npm run build-docs && npm run build-disc",