Merge branch 'master' into rename-hidden-setting

manosim · Jan 3, 2016 · 4fb1c1b · 4fb1c1b
2 parents 9e8717e + c2dc2ad
commit 4fb1c1b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ dist/
 drfdocs.egg-info/
 
 rest_framework_docs/static/node_modules/
-rest_framework_docs/static/rest_framework_docs/js/dist.js.map
+rest_framework_docs/static/rest_framework_docs/js/dist.min.js.map
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -11,5 +11,5 @@ prune rest_framework_docs/static/node_modules
 graft rest_framework_docs/static/rest_framework_docs
 graft rest_framework_docs/templates/rest_framework_docs
 
-recursive-exclude rest_framework_docs/static/rest_framework_docs dist.js.map index.js
+recursive-exclude rest_framework_docs/static/rest_framework_docs dist.min.js.map index.js
 recursive-exclude rest_framework_docs/static/rest_framework_docs/*/* *
diff --git a/rest_framework_docs/static/package.json b/rest_framework_docs/static/package.json
@@ -15,7 +15,7 @@
     "release-js": "webpack --config webpack.rel.config.js",
     "release": "npm run build-font-awesome && npm run build-bootstrap-fonts && npm run release-js && npm run build-less",
     "start": "npm run build && npm run watch-less",
-    "lint": "eslint 'rest_framework_docs/js/' --ignore-pattern 'rest_framework_docs/js/dist.js'",
+    "lint": "eslint 'rest_framework_docs/js/' --ignore-pattern 'rest_framework_docs/js/dist.min.js'",
     "test": "npm run lint"
   },
   "repository": {

diff --git a/...ocs/static/rest_framework_docs/js/dist.js → ...static/rest_framework_docs/js/dist.min.js b/...ocs/static/rest_framework_docs/js/dist.js → ...static/rest_framework_docs/js/dist.min.js
diff --git a/rest_framework_docs/static/webpack.config.js b/rest_framework_docs/static/webpack.config.js
@@ -5,7 +5,7 @@ module.exports = {
   entry: './index.js',
   output: {
     path: __dirname + '/rest_framework_docs/js',
-    filename: 'dist.js'
+    filename: 'dist.min.js'
   },
   devtool: 'source-map',
   plugins: [

diff --git a/rest_framework_docs/templates/rest_framework_docs/base.html b/rest_framework_docs/templates/rest_framework_docs/base.html
@@ -76,6 +76,6 @@ <h3>Document Web APIs made with <a href="http://www.django-rest-framework.org/"
     </div>
 
     <!-- Dist.js - Inlcuded Live API, jQuery, Bootstrap -->
-    <script type="text/javascript" src="{% static "rest_framework_docs/js/dist.js" %}"></script>
+    <script type="text/javascript" src="{% static "rest_framework_docs/js/dist.min.js" %}"></script>
   </body>
 </html>