Use Bower for front-end dependencies

mythmon · Mar 24, 2015 · 67be210 · 67be210
1 parent 8fd7ba6
commit 67be210
Show file tree

Hide file tree

Showing 24 changed files with 79 additions and 43,389 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "static/bower"
+}
diff --git a/bower.json b/bower.json
@@ -0,0 +1,27 @@
+{
+  "name": "Kitsune",
+  "description": "Platform for Firefox Help",
+  "homepage": "http://support.mozilla.org/",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "ace": "ace-builds#1.1.8",
+    "d3": "d3#3.1.5",
+    "jquery": "jquery#1.10.1",
+    "jquery-ui": "jquery-ui#1.10.2",
+    "mailcheck": "mailcheck#1.1.0",
+    "modernizr": "modernizr#2.6.1",
+    "moment": "moment#2.8.3",
+    "normalize-css": "normalize-css#3.0.2",
+    "nunjucks": "nunjucks#1.0.5",
+    "nwmatcher": "nwmatcher#1.3.4",
+    "selectivizr": "selectivizr#1.0.2",
+    "underscore": "underscore#1.2.1"
+  }
+}
diff --git a/kitsune/bundles.py b/kitsune/bundles.py
@@ -3,7 +3,7 @@
 PIPELINE_CSS = {
     'common': {
         'source_filenames': (
-            'css/normalize.css',
+            'bower/normalize-css/normalize.css',
             'less/main.less',
             'less/search.less',
         ),
@@ -19,7 +19,7 @@
     },
     'mobile-common': {
         'source_filenames': (
-            'css/normalize.css',
+            'bower/normalize-css/normalize.css',
             'less/mobile/main.less',
         ),
         'output_filename': 'mobile-common-min.css'
@@ -106,7 +106,7 @@
     },
     'mobile-wiki-minimal': {
         'source_filenames': (
-            'css/normalize.css',
+            'bower/normalize-css/normalize.css',
             'less/mobile/main.less',
             'less/mobile/wiki.less',
             'less/wiki-content.less',
@@ -245,16 +245,16 @@
     'common': {
         'source_filenames': (
             'js/i18n.js',
-            'js/libs/underscore.js',
-            'js/libs/moment-2.8.3.js',
-            'js/libs/jquery-1.10.1.min.js',
-            'js/libs/jquery.migrate.js',
+            'bower/underscore/underscore.js',
+            'bower/moment/moment.js',
+            'bower/jquery/jquery.min.js',
+            'bower/jquery/jquery-migrate.js',
             'js/libs/jquery.cookie.js',
             'js/libs/jquery.placeholder.js',
             'js/templates/macros.js',
             'js/templates/search-results-list.js',
             'js/templates/search-results.js',
-            'js/libs/nunjucks-slim.js',
+            'bower/nunjucks/browsers/nunjucks-slim.js',
             'js/nunjucks.js',
             'js/cached_xhr.js',
             'js/search_utils.js',
@@ -263,9 +263,9 @@
             'js/kbox.js',
             'js/main.js',
             'js/format.js',
-            'js/libs/modernizr-2.6.1.js',
+            'bower/modernizr/modernizr.js',
             'js/geoip-locale.js',
-            'js/libs/mailcheck.js',
+            'bower/mailcheck/src/mailcheck.js',
             'js/ui.js',
             'js/analytics.js',
             'js/surveygizmo.js',
@@ -275,7 +275,8 @@
     },
     'community': {
         'source_filenames': (
-            'js/libs/jquery-1.10.1.min.js',
+            'bower/jquery/jquery.min.js',
+            'bower/jquery/jquery-migrate.js',
             'js/community.js',
             'js/select.js',
         ),
@@ -284,10 +285,10 @@
     'mobile-common': {
         'source_filenames': (
             'js/i18n.js',
-            'js/libs/underscore.js',
-            'js/libs/jquery-1.10.1.min.js',
-            'js/libs/jquery.migrate.js',
-            'js/libs/modernizr-2.6.1.js',
+            'bower/underscore/underscore.js',
+            'bower/jquery/jquery.min.js',
+            'bower/jquery/jquery-migrate.js',
+            'bower/modernizr/modernizr.js',
             'js/browserdetect.js',
             'js/aaq.js',
             'js/mobile/ui.js',
@@ -297,14 +298,24 @@
     },
     'ie6-8': {
         'source_filenames': (
-            'js/libs/nwmatcher-1.2.5.js',
-            'js/libs/selectivizr-1.0.2.js',
+            'bower/nwmatcher/src/nwmatcher.js',
+            'bower/selectivizr/selectivizr.js',
         ),
         'output_filename': 'ie6-8-min.js'
     },
     'jqueryui': {
         'source_filenames': (
-            'js/libs/jqueryui.js',
+            'bower/jquery/jquery.ui.core.js',
+            'bower/jquery/jquery.ui.widget.js',
+            'bower/jquery/jquery.ui.mouse.js',
+            'bower/jquery/jquery.ui.position.js',
+            'bower/jquery/jquery.ui.sortable.js',
+            'bower/jquery/jquery.ui.accordion.js',
+            'bower/jquery/jquery.ui.autocomplete.js',
+            'bower/jquery/jquery.ui.datepicker.js',
+            'bower/jquery/jquery.ui.menu.js',
+            'bower/jquery/jquery.ui.slider.js',
+            'bower/jquery/jquery.ui.tabs.js',
         ),
         'output_filename': 'jqueryui-min.js'
     },
@@ -397,8 +408,7 @@
     },
     'rickshaw': {
         'source_filenames': (
-            'js/libs/jqueryui.js',
-            'js/libs/d3.js',
+            'bower/d3/d3.js',
             'js/libs/d3.layout.min.js',
             'js/libs/rickshaw.js',
             'js/rickshaw_utils.js',
@@ -407,7 +417,7 @@
     },
     'mobile-wiki': {
         'source_filenames': (
-            'js/libs/underscore.js',
+            'bower/underscore/underscore.js',
             'js/libs/jquery.cookie.js',
             'js/libs/jquery.lazyload.js',
             'js/browserdetect.js',
@@ -421,10 +431,10 @@
     'mobile-wiki-minimal': {
         'source_filenames': (
             'js/i18n.js',
-            'js/libs/underscore.js',
-            'js/libs/jquery-1.10.1.min.js',
-            'js/libs/jquery.migrate.js',
-            'js/libs/modernizr-2.6.1.js',
+            'bower/underscore/underscore.js',
+            'bower/jquery/jquery.min.js',
+            'bower/jquery/jquery-migrate.js',
+            'bower/modernizr/modernizr.js',
             'js/browserdetect.js',
             'js/mobile/ui.js',
             'js/analytics.js',
@@ -452,8 +462,8 @@
     },
     'wiki.editor': {
         'source_filenames': (
-            'js/libs/ace/ace.js',
-            'js/libs/ace/ext-language_tools.js',
+            'bower/ace/src/ace.js',
+            'bower/ace/src/ext-language_tools.js',
             'js/ace.mode-sumo.js',
         ),
         'output_filename': 'wiki.editor-min.js'

diff --git a/kitsune/dashboards/templates/dashboards/aggregated_metrics.html b/kitsune/dashboards/templates/dashboards/aggregated_metrics.html
@@ -2,7 +2,7 @@
 {% from "dashboards/includes/macros.html" import localization_sidebar_nav %}
 {% from "dashboards/includes/macros.html" import product_choice_list with context %}
 {% set title = _('Aggregated Localization Metrics') %}
-{% set scripts = ('wiki', 'rickshaw', 'wiki.dashboard') %}
+{% set scripts = ('wiki', 'jqueryui', 'rickshaw', 'wiki.dashboard') %}
 {% set styles = ('rickshaw', 'kbdashboards') %}
 {% set crumbs = [(None, title)] %}
 {% set classes = 'aggregated-metrics' %}

diff --git a/kitsune/dashboards/templates/dashboards/locale_metrics.html b/kitsune/dashboards/templates/dashboards/locale_metrics.html
@@ -2,7 +2,7 @@
 {% from "dashboards/includes/macros.html" import localization_sidebar_nav %}
 {% from "dashboards/includes/macros.html" import product_choice_list with context %}
 {% set title = _('[{locale}] Locale Metrics')|f(locale=current_locale) %}
-{% set scripts = ('wiki', 'rickshaw', 'wiki.dashboard') %}
+{% set scripts = ('wiki', 'jqueryui', 'rickshaw', 'wiki.dashboard') %}
 {% set styles = ('rickshaw', 'kbdashboards') %}
 {% set crumbs = [(None, title)] %}
 {% set classes = 'locale-metrics' %}

diff --git a/kitsune/kpi/templates/kpi/dashboard.html b/kitsune/kpi/templates/kpi/dashboard.html
@@ -3,7 +3,7 @@
 {% set classes = ('kpi-dashboard ') %}
 {% set title = _('KPI Dashboard') %}
 {% set crumbs = [(None, title)] %}
-{% set scripts = ('rickshaw', 'kpi.dashboard') %}
+{% set scripts = ('jqueryui', 'rickshaw', 'kpi.dashboard') %}
 {% set styles = ('rickshaw', 'kpi.dashboard') %}
 
 {% block content %}

diff --git a/kitsune/questions/templates/questions/metrics.html b/kitsune/questions/templates/questions/metrics.html
@@ -3,7 +3,7 @@
 {% set title = _('Support Forum Metrics') %}
 {% set crumbs = [(url('questions.home'), _('Support Forum')),
                  (None, _('Metrics'))] %}
-{% set scripts = ('rickshaw', 'questions.metrics') %}
+{% set scripts = ('jqueryui', 'rickshaw', 'questions.metrics') %}
 {% set styles = ('rickshaw', 'questions.metrics') %}
 
 {% block content %}

diff --git a/kitsune/sumo/static/js/libs/ace/README b/kitsune/sumo/static/js/libs/ace/README