Replace vendored theme with commonjs import and bower sources

bower.json

@@ -14,12 +14,16 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~2.0.3",
+    "jquery": "2.0.3",
     "underscore": "~1.7.0",
     "readthedocs-client": "https://github.com/agjohnson/readthedocs-client-js.git",
+    "sphinx-rtd-theme": "https://github.com/snide/sphinx-rtd-theme.git#js-refactor",
     "knockout": "~3.3.0",
     "jquery.payment": "~1.2.3",
     "jquery-migrate": "~1.2.1",
     "jquery-ui": "1.8.23"
+  },
+  "resolutions": {
+    "jquery": "2.0.3"
   }
 }

fabfile.py

@@ -6,20 +6,6 @@
 fabfile_dir = os.path.dirname(__file__)
 
 
-def update_theme():
-    theme_dir = os.path.join(fabfile_dir, 'readthedocs', 'templates', 'sphinx')
-    if not os.path.exists('/tmp/sphinx_rtd_theme'):
-        local('git clone https://github.com/snide/sphinx_rtd_theme.git /tmp/sphinx_rtd_theme')
-    with lcd('/tmp/sphinx_rtd_theme'):
-        local('git remote update')
-        local('git reset --hard origin/master ')
-        local('cp -r /tmp/sphinx_rtd_theme/sphinx_rtd_theme %s' % theme_dir)
-        local('cp -r /tmp/sphinx_rtd_theme/sphinx_rtd_theme/static/fonts/ %s' % os.path.join(fabfile_dir, 'media', 'font'))
-        local('cp /tmp/sphinx_rtd_theme/sphinx_rtd_theme/static/css/badge_only.css %s' % os.path.join(fabfile_dir, 'media', 'css'))
-        local('cp /tmp/sphinx_rtd_theme/sphinx_rtd_theme/static/css/theme.css %s' %
-              os.path.join(fabfile_dir, 'media', 'css', 'sphinx_rtd_theme.css'))
-
-
 def i18n():
     with lcd('readthedocs'):
         local('rm -rf rtd_tests/tests/builds/')

gulpfile.js

@@ -1,6 +1,7 @@
 var gulp = require('gulp'),
     gulp_util = require('gulp-util'),
     watch = require('gulp-watch'),
+    rename = require('gulp-rename'),
     run = require('gulp-run'),
     less = require('gulp-less'),
     bower_resolve = require('bower-resolve'),
@@ -22,6 +23,22 @@ var sources = {
         'js/readthedocs-doc-embed.js': {expose: false},
         'js/autocomplete.js': {},
         'js/projectimport.js': {},
+        'css/badge_only.css': {src: 'bower_components/sphinx-rtd-theme/sphinx_rtd_theme/static/css/badge_only.css'},
+        'css/theme.css': {src: 'bower_components/sphinx-rtd-theme/sphinx_rtd_theme/static/css/theme.css'},
+
+        'font/Lato-Bold.ttf': {src: 'bower_components/lato-googlefont/Lato-Bold.ttf'},
+        'font/Lato-Regular.ttf': {src: 'bower_components/lato-googlefont/Lato-Regular.ttf'},
+        'font/Inconsolata-Bold.ttf': {src: 'bower_components/inconsolata-googlefont/Inconsolata-Bold.ttf'},
+        'font/Inconsolata-Regular.ttf': {src: 'bower_components/inconsolata-googlefont/Inconsolata-Regular.ttf'},
+        'font/RobotoSlab-Bold.ttf': {src: 'bower_components/robotoslab-googlefont/RobotoSlab-Bold.ttf'},
+        'font/RobotoSlab-Regular.ttf': {src: 'bower_components/robotoslab-googlefont/RobotoSlab-Regular.ttf'},
+        'font/FontAwesome.otf': {src: 'bower_components/font-awesome/FontAwesome.otf'},
+
+        'font/fontawesome-webfont.eot': {src: 'bower_components/font-awesome/fonts/fontawesome-webfont.eot'},
+        'font/fontawesome-webfont.svg': {src: 'bower_components/font-awesome/fonts/fontawesome-webfont.svg'},
+        'font/fontawesome-webfont.ttf': {src: 'bower_components/font-awesome/fonts/fontawesome-webfont.ttf'},
+        'font/fontawesome-webfont.woff': {src: 'bower_components/font-awesome/fonts/fontawesome-webfont.woff'},
+        'font/FontAwesome.otf': {src: 'bower_components/font-awesome/fonts/FontAwesome.otf'}
     },
     projects: {'js/tools.js': {}},
     gold: {'js/gold.js': {}},
@@ -42,10 +59,10 @@ var standalone = {
 // application. This is called by build and dev tasks.
 function build_app_sources (application, minify) {
     // Normalize file glob lists
-    var bundles = Object.keys(sources[application]).map(function (n) {
+    var bundles = Object.keys(sources[application]).map(function (entry_path) {
         var bundle_path = path.join(
-                pkg_config.name, application, 'static-src', '**', n),
-            bundle_config = sources[application][n] || {},
+                pkg_config.name, application, 'static-src', '**', entry_path),
+            bundle_config = sources[application][entry_path] || {},
             bundle;
 
         if (/\.js$/.test(bundle_path)) {
@@ -79,14 +96,27 @@ function build_app_sources (application, minify) {
             }
         }
         else if (/\.less$/.test(bundle_path)) {
-            // CSS sources
+            // LESS sources
             bundle = gulp.src(bundle_path)
                 .pipe(less({}))
                 .on('error', function (ev) {
                     gulp_util.beep();
                     gulp_util.log('LESS error:', ev.message);
                 });
         }
+        else {
+            // Copy only sources, from bower_components/etc
+            var bundle = gulp;
+            if (bundle_config.src) {
+                bundle = bundle
+                    .src(bundle_config.src)
+                    .pipe(rename(application + path.sep + entry_path));
+            }
+            else {
+                bundle = bundle
+                    .src(bundle_path);
+            }
+        }
 
         return bundle;
     });

media/css/badge_only.css

@@ -0,0 +1 @@
+../static/core/css/badge_only.css

media/css/sphinx_rtd_theme.css

@@ -0,0 +1 @@
+../static/core/css/theme.css

media/font/fontawesome_webfont.eot

@@ -0,0 +1 @@
+../static/core/font/fontawesome-webfont.eot