From e3954577911849545ebe864dbd5ef7d1a367d34e Mon Sep 17 00:00:00 2001
From: Jean de Klerk <jadekler@gmail.com>
Date: Mon, 16 Jan 2017 14:11:33 -0700
Subject: [PATCH] fix(styleguide): fixes jsx lexer issues [finishes #135360889]

Signed-off-by: Tom Chen <tochen@pivotal.io>
---
 styleguide/Gemfile                               |  1 +
 styleguide/Gemfile.lock                          |  9 +++++----
 .../code_example_renderers/jsx_renderer.rb       |  4 ++--
 .../jsx_example_template.html.erb                |  2 +-
 styleguide/hologram/css_critic_test_generator.rb |  2 --
 styleguide/package.json                          |  3 +--
 styleguide/src/styleguide.js                     | 16 +---------------
 7 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/styleguide/Gemfile b/styleguide/Gemfile
index baddd3bba..a06896adc 100644
--- a/styleguide/Gemfile
+++ b/styleguide/Gemfile
@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'hologram', '~> 1.4.0'
+gem 'rouge', '>= 2.0.6'
 gem 'pry'
 gem 'rspec'
 gem 'capybara'
diff --git a/styleguide/Gemfile.lock b/styleguide/Gemfile.lock
index 9d1ee5f2b..ba06be835 100644
--- a/styleguide/Gemfile.lock
+++ b/styleguide/Gemfile.lock
@@ -20,7 +20,7 @@ GEM
     coderay (1.1.1)
     diff-lcs (1.2.5)
     execjs (2.7.0)
-    ffi (1.9.14)
+    ffi (1.9.17)
     hologram (1.4.0)
       redcarpet (>= 2.2, < 4.0)
       rouge (>= 1.5)
@@ -29,7 +29,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -39,7 +39,7 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    redcarpet (3.3.4)
+    redcarpet (3.4.0)
     rouge (2.0.7)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -55,7 +55,7 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     rubyzip (1.2.0)
-    selenium-webdriver (3.0.4)
+    selenium-webdriver (3.0.5)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
@@ -73,6 +73,7 @@ DEPENDENCIES
   capybara
   hologram (~> 1.4.0)
   pry
+  rouge (>= 2.0.6)
   rspec
   selenium-webdriver
 
diff --git a/styleguide/hologram/code_example_renderers/jsx_renderer.rb b/styleguide/hologram/code_example_renderers/jsx_renderer.rb
index 7d094bd9a..de9cf3649 100644
--- a/styleguide/hologram/code_example_renderers/jsx_renderer.rb
+++ b/styleguide/hologram/code_example_renderers/jsx_renderer.rb
@@ -1,9 +1,9 @@
 require 'babel/transpiler'
 
 Hologram::CodeExampleRenderer::Factory.define 'jsx' do
-  example_template 'js_example_template'
+  example_template 'jsx_example_template'
 
-  lexer { Rouge::Lexer.find(:js) }
+  lexer { Rouge::Lexer.find(:jsx) }
 
   rendered_example do |code|
     Babel::Transpiler.transform(code.strip)["code"]
diff --git a/styleguide/hologram/code_example_templates/jsx_example_template.html.erb b/styleguide/hologram/code_example_templates/jsx_example_template.html.erb
index e60162ca5..a8b20ae64 100644
--- a/styleguide/hologram/code_example_templates/jsx_example_template.html.erb
+++ b/styleguide/hologram/code_example_templates/jsx_example_template.html.erb
@@ -1,5 +1,5 @@
 <script type='text/jsx'><%= rendered_example %></script>
-<div class="codeBlock jsExample" aria-hidden="true">
+<div class="codeBlock jsxExample" aria-hidden="true">
   <div class="highlight" data-code-to-copy>
     <pre><%= code_example %></pre>
   </div>
diff --git a/styleguide/hologram/css_critic_test_generator.rb b/styleguide/hologram/css_critic_test_generator.rb
index dda75e5cb..7a3c2621a 100644
--- a/styleguide/hologram/css_critic_test_generator.rb
+++ b/styleguide/hologram/css_critic_test_generator.rb
@@ -12,8 +12,6 @@ class CssCriticTestGenerator < Hologram::Plugin
     <link rel="stylesheet" href="components.css">
     <link rel="stylesheet" href="styleguide/styleguide.css">
     <link rel="stylesheet" href="styleguide/github.css">
-    <link rel="stylesheet" disabled href="prismjs/prism.css">
-    <link rel="stylesheet" href="prismjs/prism-okaidia.css">
   </head>
   <body class="pam">
   eos
diff --git a/styleguide/package.json b/styleguide/package.json
index f8e190f3d..77fd68f3c 100644
--- a/styleguide/package.json
+++ b/styleguide/package.json
@@ -57,7 +57,7 @@
     "pui-css-typography": "file:../library/dist/css/typography",
     "pui-css-vertical-alignment": "file:../library/dist/css/vertical-alignment",
     "pui-css-whitespace": "file:../library/dist/css/whitespace",
-    "pui-prismjs": "0.0.1",
+    "pui-prismjs": "file:../library/src/pivotal-ui/prismjs",
     "pui-react-alerts": "file:../library/dist/react/alerts",
     "pui-react-autocomplete": "file:../library/dist/react/autocomplete",
     "pui-react-back-to-top": "file:../library/dist/react/back-to-top",
@@ -138,7 +138,6 @@
     "phantomjs": "^1.9.17",
     "phantomjs-polyfill": "0.0.2",
     "postcss-cssnext": "^2.9.0",
-    "prismjs": "^1.3.0",
     "react-dom": "^15.0.1",
     "require-dir": "^0.3.0",
     "run-sequence": "^1.1.4",
diff --git a/styleguide/src/styleguide.js b/styleguide/src/styleguide.js
index fb9ff5f46..d6b70580f 100644
--- a/styleguide/src/styleguide.js
+++ b/styleguide/src/styleguide.js
@@ -1,20 +1,6 @@
 'use strict';
 var $ = require('jquery');
 
-
-/* Stylesheet swappin */
-$(document).ready(function(){
-  $('input.alternate-css').change(function() {
-    if($(this).get(0).checked) {
-      $("link[href*='prism-okaida.css']").attr('disabled', 'disabled');
-      $("link[href*='prism-default.css']").removeAttr('disabled');
-    } else {
-      $("link[href*='prism-okaida.css']").removeAttr('disabled');
-      $("link[href*='prism-default.css']").attr('disabled', 'disabled');
-    }
-  });
-});
-
 /* Adjust scrollTop when navigating to a subsection on the current page */
 
 $(document).ready(function() {
@@ -24,7 +10,7 @@ $(document).ready(function() {
     window.history.pushState('', '', e.target.hash);
     $('body, html').animate({
       scrollTop: desiredScrollPosition
-    }, 500, function () {
+    }, 500, function() {
       $target.focus();
     });
     return false;