v0.14.0

Update AUTHORS for 0.14

.editorconfig

@@ -2,11 +2,17 @@
 root = true
 
 [*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
 charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
 trim_trailing_whitespace = true
 
 [*.md]
+max_line_length = 0
 trim_trailing_whitespace = false
+
+[COMMIT_EDITMSG]
+max_line_length = 0

.eslintignore

@@ -0,0 +1,19 @@
+# We can probably lint these later but not important at this point
+src/shared/vendor
+# But not in docs/_js/examples/*
+docs/_js/*.js
+docs/js/
+docs/_site/
+# gems
+docs/vendor/bundle/
+# This should be more like examples/**/thirdparty/** but
+# we should fix https://github.com/facebook/esprima/pull/85 first
+examples/
+# Ignore built files.
+build/
+# react-codemod
+packages/react-codemod/test/
+packages/react-codemod/scripts/
+packages/react-codemod/build/
+packages/react-codemod/node_modules/
+vendor/react-dom.js

.eslintrc

@@ -0,0 +1,63 @@
+---
+parser: babel-eslint
+
+extends:
+  - ./node_modules/fbjs-scripts/eslint/.eslintrc
+
+plugins:
+  - react
+  - react-internal
+
+# We're stricter than the default config, mostly. We'll override a few rules and
+# then enable some React specific ones.
+rules:
+  accessor-pairs: 0
+  brace-style: [2, 1tbs]
+  comma-dangle: [2, always-multiline]
+  consistent-return: 2
+  dot-location: [2, property]
+  dot-notation: 2
+  eol-last: 2
+  indent: [2, 2, {SwitchCase: 1}]
+  jsx-quotes: [2, prefer-double]
+  no-bitwise: 0
+  no-dupe-class-members: 2
+  no-multi-spaces: 2
+  no-restricted-syntax: [2, WithStatement]
+  no-shadow: 2
+  no-unused-expressions: 2
+  no-unused-vars: [2, {args: none}]
+  quotes: [2, single, avoid-escape]
+  space-after-keywords: 2
+  space-before-blocks: 2
+  # TODO: enable this rule after https://github.com/eslint/eslint/pull/3768 lands
+  space-before-keywords: 0
+  strict: [2, global]
+
+  # JSX
+  # Our transforms set this automatically
+  react/display-name: 0
+  react/jsx-boolean-value: [2, always]
+  react/jsx-no-undef: 2
+  # We don't care to do this
+  react/jsx-sort-prop-types: 0
+  react/jsx-sort-props: 0
+  react/jsx-uses-react: 2
+  react/jsx-uses-vars: 2
+  # It's easier to test some things this way
+  react/no-did-mount-set-state: 0
+  react/no-did-update-set-state: 0
+  # We define multiple components in test files
+  react/no-multi-comp: 0
+  react/no-unknown-property: 2
+  # This isn't useful in our test code
+  react/prop-types: 0
+  react/react-in-jsx-scope: 2
+  react/self-closing-comp: 2
+  # We don't care to do this
+  react/sort-comp: 0
+  react/wrap-multilines: [2, {declaration: false, assignment: false}]
+
+  # CUSTOM RULES
+  # the second argument of warning/invariant should be a literal string
+  react-internal/warning-and-invariant-args: 2

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -9,11 +9,18 @@ __benchmarks__
 build/
 .module-cache
 *.gem
+docs/.bundle
 docs/code
 docs/_site
 docs/.sass-cache
-docs/css/react.css
 docs/js/*
 docs/downloads
+docs/vendor/bundle
 examples/shared/*.js
-
+test/the-files-to-test.generated.js
+*.log*
+chrome-user-data
+*.sublime-project
+*.sublime-workspace
+.idea
+*.iml

.jshintrc

@@ -1,20 +0,0 @@
-{
-  "node": true,
-
-  "boss": true,
-  "curly": true,
-  "devel": true,
-  "eqnull": true,
-  "expr": true,
-  "funcscope": true,
-  "globalstrict": true,
-  "loopfunc": true,
-  "newcap": false,
-  "noempty": true,
-  "nonstandard": true,
-  "onecase": true,
-  "regexdash": true,
-  "trailing": true,
-  "undef": true,
-  "unused": "vars"
-}

.mailmap

@@ -1,21 +1,127 @@
+Adam Timberlake <adam.timberlake@gmail.com>
+Alex Mykyta <dancingwithcows@gmail.com>
+Alex Pien <alexpien@gmail.com>
+Alex Pien <alexpien@gmail.com> <pien@pien-mbp.dhcp.thefacebook.com>
+Alex Pien <alexpien@gmail.com> <pien@pien-mbp.local>
+Andreas Savvides <asavvides@twitter.com> <AnSavvides@users.noreply.github.com>
+Andreas Savvides <asavvides@twitter.com> <andreas@nibbli.com>
+Andreas Svensson <andreas@syranide.com>
+Andres Suarez <zertosh@gmail.com>
+Andrew Sokolov <asokolov@atlassian.com>
+Baraa Hamodi <bhamodi@uwaterloo.ca> <baraa@optimizely.com>
+Ben Alpert <ben@benalpert.com> <balpert@fb.com>
+Ben Alpert <ben@benalpert.com> <spicyjalapeno@gmail.com>
 Ben Newman <bn@cs.stanford.edu> <benjamn@fb.com>
+Benjamin Woodruff <github@benjam.info> <bgw@fb.com>
+Bill Fisher <fisherwebdev@gmail.com>
+Blaine Kasten <blainekasten@gmail.com>
+Brandon Tilley <brandon@brandontilley.com>
+Cheng Lou <chenglou92@gmail.com> <chenglou@fb.com>
+Christian Oliff <christianoliff@yahoo.com>
+Christoph Pojer <christoph.pojer@gmail.com>
+Christoph Pojer <christoph.pojer@gmail.com> <cpojer@fb.com>
+Connor McSheffrey <c@conr.me> <connor.mcsheffrey@gmail.com>
 Dan Schafer <dschafer@fb.com>
+Daniel Gasienica <daniel@gasienica.ch> <daniel@fiftythree.com>
+Daniel Gasienica <daniel@gasienica.ch> <dgasienica@zynga.com>
+Daniel Lo Nigro <daniel@dan.cx> <danlo@fb.com>
+Dmitry Blues <dmitri.blyus@gmail.com>
+Erik Harper <eharper@mixpo.com>
+Evan Coonrod <evan@paloalto.com>
+Fabio M. Costa <fabiomcosta@gmail.com> <fabs@fb.com>
+Felix Kling <felix.kling@gmx.net> <fkling@fb.com>
+François-Xavier Bois <fxbois@gmail.com>
+Gabe Levi <gabelevi@gmail.com> <glevi@fb.com>
+Geert Pasteels <geert.pasteels@gmail.com>
+George A Sisco III <george.sisco@gmail.com>
+Georgii Dolzhykov <thorn.mailbox@gmail.com>
 Harry Hull <harry.hull1@gmail.com>
+Hendrik Swanepoel <hendrik.swanepoel@gmail.com>
+Ian Obermiller <ian@obermillers.com> <iano@fb.com>
+Ilyá Belsky <gelias.gbelsky@gmail.com>
+Ingvar Stepanyan <me@rreverser.com> <rreverser@ubuntu.rreverser.a4.internal.cloudapp.net>
+Irae Carvalho <irae@irae.pro.br>
+Ivan Vergiliev <ivan.vergiliev@gmail.com>
+Jae Hun Ro <jhr24@duke.edu>
+Jaime Mingo <j.mingov@3boll.com>
+James Brantly <james@jbrantly.com>
+Jan Hancic <jan.hancic@gmail.com> <jan.hancic@caplin.com>
+Jan Kassens <jan@kassens.net> <jkassens@fb.com>
+Jason Bonta <jbonta@gmail.com> <jasonbonta@fb.com>
+Jason Trill <jason@jasontrill.com>
+Jeff Chan <jefftchan@gmail.com> <jeff@quizlet.com>
 Jeff Morrison <jeff@anafx.com> <Jeff@anafx.com>
-Jeff Morrison <jeff@anafx.com> JeffMo <jeffmo@fb.com>
+Jeff Morrison <jeff@anafx.com> <jeffmo@fb.com>
+Jeff Morrison <jeff@anafx.com> <lbljeffmo@gmail.com>
 Jeffrey Lin <lin.jeffrey@gmail.com> <jeffreylin@fb.com>
+Jim Sproch <jsproch@fb.com>
+Jim Sproch <jsproch@fb.com> <jsfb@github>
+Jiyeon Seo <zzzeons@gmail.com>
+Jon Chester <jonchester@fb.com>
+Jon Madison <jon@tfftech.com>
+Jonathan Hsu <jhiswin@gmail.com>
 Jordan Walke <jordojw@gmail.com>
 Jordan Walke <jordojw@gmail.com> <jordanjcw@fb.com>
+Joseph Savona <joesavona@fb.com> <josephsavona@users.noreply.github.com>
+Josh Duck <josh@fb.com> <github@joshduck.com>
+Juan Serrano <germ13@users.noreply.github.com>
+Jun Wu <quark@lihdd.net>
+Justin Robison <jrobison151@gmail.com>
+Keito Uchiyama <projects@keito.me> <keito@fb.com>
+Kevin Coughlin <kevintcoughlin@gmail.com> <kevincoughlin@tumblr.com>
+Kunal Mehta <k.mehta@berkeley.edu> <kunalm@fb.com>
 Laurence Rowe <l@lrowe.co.uk> <laurence@lrowe.co.uk>
+Marcin K. <katzoo@github.mail>
+Mark Anderson <undernewmanagement@users.noreply.github.com>
+Martin Andert <mandert@gmail.com>
+Mathieu M-Gosselin <mathieumg@gmail.com> <mathieumg@atx33.com>
+Matsunoki <himkt@klis.tsukuba.ac.jp>
+Matt Brookes <matt@brookes.net>
+Matt Dunn-Rankin <mdunnrankin@gmail.com> <matchu1993@gmail.com>
+Matt Zabriskie <mzabriskie@gmail.com>
+Matthew Johnston <matthewjohnston4@outlook.com> <matthewjohnston4@users.noreply.github.com>
+Max Heiber <max.heiber@gmail.com>
+Michal Srb <xixixao@seznam.cz> xixixao <xixixao@seznam.cz>
+Michelle Todd <himichelletodd@gmail.com> <michelle@khanacademy.org>
+Mihai Parparita <mihai.parparita@gmail.com> <mihai@persistent.info>
+Minwe LUO <minwe@yunshipei.com>
+Murray M. Moss <murray@mmoss.name> <MMoss@cainc.com>
+Murray M. Moss <murray@mmoss.name> <mmoss@users.noreply.github.com>
+Neri Marschik <marschik_neri@cyberagent.co.jp>
 Nick Gavalas <njg57@cornell.edu>
+Nick Thompson <ncthom91@gmail.com> <nickt@instagram.com>
+Patrick Stapleton <github@gdi2290.com>
 Paul O’Shannessy <paul@oshannessy.com> <poshannessy@fb.com>
 Paul Shen <paul@mnml0.com> <paulshen@fb.com>
 Pete Hunt <floydophone@gmail.com>
 Pete Hunt <floydophone@gmail.com> <pete.hunt@fb.com>
 Pete Hunt <floydophone@gmail.com> <pete@instagram.com>
+Pete Hunt <floydophone@gmail.com> <phunt@instagram.com>
+Petri Lievonen <plievone@cc.hut.fi>
+Petri Lievonen <plievone@cc.hut.fi> <petri.lievonen@tkk.fi>
+Pieter Vanderwerff <me@pieter.io> <pieter@heyday.co.nz>
+Pouja Nikray <poujanik@gmail.com>
+Ray <ray@tomo.im>
+Richard Feldman <richard.t.feldman@gmail.com> <richard@noredink.com>
+Richard Livesey <Livesey7@hotmail.co.uk>
+Rob Arnold <robarnold@cs.cmu.edu>
 Sander Spies <sandermail@gmail.com>
+Scott Feeney <scott@oceanbase.org> <smf@fb.com>
 Sebastian Markbåge <sebastian@calyptus.eu> <sema@fb.com>
+Sergey Rubanov <chi187@gmail.com>
+Steven Luscher <react@steveluscher.com> <github@steveluscher.com>
+Steven Luscher <react@steveluscher.com> <steveluscher@fb.com>
+Steven Luscher <react@steveluscher.com> <steveluscher@instagram.com>
+Steven Luscher <react@steveluscher.com> <steveluscher@users.noreply.github.com>
 Stoyan Stefanov <ssttoo@ymail.com>
+Thomas Aylott <oblivious@subtlegradient.com> <aylott@fb.com>
 Timothy Yung <yungsters@gmail.com> <yungsters@fb.com>
+Vasiliy Loginevskiy <Yeti.or@gmail.com>
+Vasiliy Loginevskiy <Yeti.or@gmail.com> <yeti-or@yandex-team.ru>
 Vjeux <vjeuxx@gmail.com>
 Vjeux <vjeuxx@gmail.com> <vjeux@fb.com>
+Volkan Unsal <spocksplanet@gmail.com>
+Xavier Morel <xmo-odoo@users.noreply.github.com>
+YouBao Nong <noyobo@gmail.com> <nongyoubao@alibaba-inc.com>
+Zach Bruggeman <mail@bruggie.com> <zbruggeman@me.com>
+张敏 <cookfront@gmail.com>

.travis.yml

@@ -1,15 +1,91 @@
 ---
 language: node_js
 node_js:
-- '0.10'
-after_script:
-- curl -F "react=@build/react.js" -F "react.min=@build/react.min.js" -F "transformer=@build/JSXTransformer.js"
-  -F "react-with-addons=@build/react-with-addons.js" -F "react-with-addons.min=@build/react-with-addons.min.js"
-  -F "commit=$TRAVIS_COMMIT" -F "date=`git log --format='%ct' -1`" -F "pull_request=$TRAVIS_PULL_REQUEST"
-  -F "token=$SECRET_TOKEN" -F "branch=$TRAVIS_BRANCH" $SERVER
+- 4
+sudo: false
+cache:
+  directories:
+  - docs/vendor/bundle
+  - node_modules
+before_install:
+- |
+    if [ "$TEST_TYPE" != build_website ] && \
+      ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.md$)|(^(docs|examples))/'
+    then
+      echo "Only docs were updated, stopping build process."
+      exit
+    fi
+    npm install -g npm@latest-2
+    npm --version
+script:
+- |
+    if [ "$TEST_TYPE" = build_website ]; then
+      if [ "$TRAVIS_BRANCH" = "$REACT_WEBSITE_BRANCH" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
+        set -e
+
+        GH_PAGES_DIR="$TRAVIS_BUILD_DIR"/../react-gh-pages
+        echo "machine github.com login reactjs-bot password $GITHUB_TOKEN" >~/.netrc
+        git config --global user.name "Travis CI"
+        git config --global user.email "travis@reactjs.org"
+
+        git clone --branch gh-pages --depth=50 \
+          https://reactjs-bot@github.com/facebook/react.git \
+          $GH_PAGES_DIR
+        pushd docs
+        bundle install --jobs=3 --retry=3 --path=vendor/bundle
+        bundle exec rake release
+        cd $GH_PAGES_DIR
+        git status
+        if ! git diff-index --quiet HEAD --; then
+          git add -A .
+          git commit -m "Rebuild website"
+          git push origin gh-pages
+        fi
+        popd
+      fi
+    elif [ "$TEST_TYPE" = build ]; then
+      if [ "$SERVER" ]; then
+        set -e
+        ./node_modules/.bin/grunt build
+        curl \
+          -F "react=@build/react.js" \
+          -F "react.min=@build/react.min.js" \
+          -F "react-with-addons=@build/react-with-addons.js" \
+          -F "react-with-addons.min=@build/react-with-addons.min.js" \
+          -F "react-dom=@build/react-dom.js" \
+          -F "react-dom.min=@build/react-dom.min.js" \
+          -F "npm-react=@build/packages/react.tgz" \
+          -F "npm-react-dom=@build/packages/react-dom.tgz" \
+          -F "commit=$TRAVIS_COMMIT" \
+          -F "date=`git log --format='%ct' -1`" \
+          -F "pull_request=$TRAVIS_PULL_REQUEST" \
+          -F "token=$SECRET_TOKEN" \
+          -F "branch=$TRAVIS_BRANCH" \
+          $SERVER
+      fi
+    else
+      ./node_modules/.bin/grunt $TEST_TYPE
+    fi
 env:
+  matrix:
+  - TEST_TYPE=build
+  - TEST_TYPE=jest
+  - TEST_TYPE=lint
+  - TEST_TYPE=build_website
   global:
   # SERVER
   - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
   # SECRET_TOKEN
   - secure: dkpPW+VnoqC/okhRdV90m36NcyBFhcwEKL3bNFExAwi0dXnFao8RoFlvnwiPlA23h2faROkMIetXlti6Aju08BgUFV+f9aL6vLyU7gUent4Nd3413zf2fwDtXIWIETg6uLnOpSykGKgCAT/hY3Q2oPLqOoY0OxfgnbqwxkxljrE=
+  # GITHUB_TOKEN
+  - secure: EHCyCSKMwKlLHNtcj9nmkRzmiiPE3aDGlPcnEyrDJeRI0SeN/iCXHXfFivR0vFq3vr+9naMBczAR2AEidtps5KbJrKqdZnjPFRbmfVtzWr/LlvVCub3u13Pub6TdKIVBTny1PuZ5X8GvdxMNVig89jGjvzhhWuQRaz3VhJnTra4=
+matrix:
+  fast_finish: true
+notifications:
+  irc:
+    use_notice: true
+    skip_join: true
+    on_success: change
+    on_failure: change
+    channels:
+    - chat.freenode.net#reactjs

AUTHORS

@@ -1,66 +1,551 @@
+839 <8398a7@gmail.com>
+Aaron Franks <aaron.franks@gmail.com>
+Aaron Gelter <aaron.gelter@harman.com>
+Adam Krebs <amk528@cs.nyu.edu>
+Adam Mark <adammark75@gmail.com>
+Adam Solove <asolove@gmail.com>
+Adam Timberlake <adam.timberlake@gmail.com>
+Adam Zapletal <adamzap@gmail.com>
+Ahmad Wali Sidiqi <wali-s@users.noreply.github.com>
+Alan Souza <alansouzati@gmail.com>
+Alan deLevie <adelevie@gmail.com>
+Alastair Hole <afhole@gmail.com>
+Alex <ultrafez@users.noreply.github.com>
+Alex Boyd <alex@opengroove.org>
+Alex Lopatin <alex@alexlopatin.com>
+Alex Mykyta <dancingwithcows@gmail.com>
+Alex Pien <alexpien@gmail.com>
+Alex Smith <iqwz@ya.ru>
+Alex Zelenskiy <azelenskiy@fb.com>
+Alexander Shtuchkin <ashtuchkin@gmail.com>
 Alexander Solovyov <alexander@solovyov.net>
+Alexander Tseung <alextsg@gmail.com>
+Alexandre Gaudencio <shahor@shahor.fr>
+Alexey Raspopov <avenger7x13@gmail.com>
+Alexey Shamrin <shamrin@gmail.com>
+Andre Z Sanchez <andrezacsanchez@gmail.com>
+Andreas Savvides <asavvides@twitter.com>
 Andreas Svensson <andreas@syranide.com>
+Andres Kalle <mjomble@gmail.com>
+Andres Suarez <zertosh@gmail.com>
+Andrew Cobby <cobbweb@users.noreply.github.com>
+Andrew Davey <andrew@equin.co.uk>
+Andrew Rasmussen <andras@fb.com>
+Andrew Sokolov <asokolov@atlassian.com>
 Andrew Zich <azich@fb.com>
 Andrey Popp <8mayday@gmail.com>
-Ben Alpert <spicyjalapeno@gmail.com>
+Anthony van der Hoorn <anthony.vanderhoorn@gmail.com>
+Antonio Ruberto <anto.ruberto@gmail.com>
+Antti Ahti <antti.ahti@gmail.com>
+Anuj Tomar <ankuto@gmail.com>
+AoDev <AoDev@users.noreply.github.com>
+Areeb Malik <areeb.malik91@gmail.com>
+Aria Buckles <aria@khanacademy.org>
+Aria Stewart <aredridel@dinhe.net>
+Arian Faurtosh <arian@icloud.com>
+Artem Nezvigin <artem@artnez.com>
+Austin Wright <aaa@bzfx.net>
+Ayman Osman <aymano.osman@gmail.com>
+Baraa Hamodi <bhamodi@uwaterloo.ca>
+Bartosz Kaszubowski <gosimek@gmail.com>
+Basarat Ali Syed <basaratali@gmail.com>
+Battaile Fauber <battaile@gmail.com>
+Beau Smith <beau@beausmith.com>
+Ben Alpert <ben@benalpert.com>
+Ben Anderson <banderson@constantcontact.com>
+Ben Foxall <benfoxall@gmail.com>
+Ben Jaffe <jaffe.ben@gmail.com>
+Ben Moss <ben@mossity.com>
 Ben Newman <bn@cs.stanford.edu>
+Ben Ripkens <bripkens.dev@gmail.com>
+Benjamin Keen <ben.keen@gmail.com>
+Benjamin Leiken <benleiken@gmail.com>
+Benjamin Woodruff <github@benjam.info>
+Bill Fisher <fisherwebdev@gmail.com>
+Blaine Hatab <jbhatab@gmail.com>
+Blaine Kasten <blainekasten@gmail.com>
+Bob Eagan <bob@synapsestudios.com>
+Bob Ralian <bob.ralian@gmail.com>
+Bob Renwick <bob.renwick@gmail.com>
+Bojan Mihelac <bmihelac@mihelac.org>
+Bradley Spaulding <brad.spaulding@gmail.com>
+Brandon Bloom <brandon@brandonbloom.name>
+Brandon Tilley <brandon@brandontilley.com>
+Brian Cooke <bri@bricooke.com>
+Brian Holt <btholt@gmail.com>
+Brian Hsu <brianhsu@Brians-MacBook-Pro.local>
 Brian Kim <briankimpossible@gmail.com>
+Brian Kung <brian@callmekung.com>
+Brian Reavis <brian@thirdroute.com>
 Brian Rue <brian@rollbar.com>
+Bruno Škvorc <bruno@skvorc.me>
+Cam Song <neosoyn@gmail.com>
 Cam Spiers <camspiers@gmail.com>
+Carter Chung <carterchung@users.noreply.github.com>
+Cassus Adam Banko <banko.adam@gmail.com>
 Cat Chen <catchen@fb.com>
+Cedric Sohrauer <cedric.sohrauer@infopark.de>
+Charles Marsh <charlie@khanacademy.org>
+Chase Adams <realchaseadams@gmail.com>
 Cheng Lou <chenglou92@gmail.com>
+Chitharanjan Das <das.chitharanjan@gmail.com>
+Chris Grovers <chrisgrovers@users.noreply.github.com>
+Chris Ha <chriskevinha@gmail.com>
+Chris Rebert <github@rebertia.com>
+Chris Sciolla <csciolla1@gmail.com>
+Christian Alfoni <christianalfoni@gmail.com>
+Christian Oliff <christianoliff@yahoo.com>
 Christian Roman <chroman16@gmail.com>
-Christoph Pojer <cpojer@fb.com>
+Christoph Pojer <christoph.pojer@gmail.com>
+Christopher Monsanto <chris@monsan.to>
 Clay Allsopp <clay.allsopp@gmail.com>
-Connor McSheffrey <connor.mcsheffrey@gmail.com>
+Connor McSheffrey <c@conr.me>
+Cory House <housecor@gmail.com>
+Cotton Hou <himcotton@gmail.com>
+Cristovao Verstraeten <cristovao@apleasantview.com>
+Damien Pellier <dpellier@leadformance.com>
+Dan Abramov <dan.abramov@gmail.com>
+Dan Fox <iamdanfox@gmail.com>
 Dan Schafer <dschafer@fb.com>
-Daniel Gasienica <dgasienica@zynga.com>
+Daniel Carlsson <daniel.carlsson.1987@gmail.com>
+Daniel Cousens <dcousens@users.noreply.github.com>
+Daniel Friesen <daniel@nadir-seen-fire.com>
+Daniel Gasienica <daniel@gasienica.ch>
+Daniel Hejl <hejldaniel@gmail.com>
+Daniel Lo Nigro <daniel@dan.cx>
+Daniel Mané <danmane@gmail.com>
 Daniel Miladinov <dmiladinov@wingspan.com>
+Daniel Rodgers-Pryor <djrodgerspryor@gmail.com>
+Daniel Schonfeld <daniel@schonfeld.org>
 Danny Ben-David <dannybd@fb.com>
+Darcy <smadad@me.com>
+Daryl Lau <daryl@weak.io>
+Darío Javier Cravero <dario@uxtemple.com>
+David Baker <djbaker2@gmail.com>
+David Goldberg <gberg1@users.noreply.github.com>
+David Greenspan <dgreenspan@alum.mit.edu>
+David Hellsing <david@aino.se>
 David Hu <davidhu91@gmail.com>
+David Mininger <dmininger@gmail.com>
+David Neubauer <davidneub@gmail.com>
+David Percy <davetp425@gmail.com>
+Denis Sokolov <denis@sokolov.cc>
+Dennis Johnson <djohnson@rallydev.com>
+Devon Blandin <dblandin@gmail.com>
+Devon Harvey <devonharvey@gmail.com>
+Dmitrii Abramov <dmitrii@rheia.us>
+Dmitry Blues <dmitri.blyus@gmail.com>
+Dmitry Mazuro <dmitry.mazuro@icloud.com>
+Domenico Matteo <matteo.domenico@gmail.com>
+Don Abrams <donabrams@gmail.com>
+Dustan Kasten <dustan.kasten@gmail.com>
+Dustin Getz <dgetz@wingspan.com>
+Dylan Harrington <dylanharrington@gmail.com>
+Eduardo Garcia <emumaniacx@gmail.com>
+Edvin Erikson <edvin@rocketblast.com>
+Elaine Fang <elainefang@Elaines-MacBook-Pro.local>
+Enguerran <engcolson@gmail.com>
 Eric Clemmons <eric@smarterspam.com>
+Eric Eastwood <contact@ericeastwood.com>
+Eric Florenzano <floguy@gmail.com>
+Eric O'Connell <eric.oconnell@idealist.org>
+Eric Schoffstall <contra@wearefractal.com>
+Erik Harper <eharper@mixpo.com>
+Espen Hovlandsdal <rexxars@gmail.com>
+Evan Coonrod <evan@paloalto.com>
 Fabio M. Costa <fabiomcosta@gmail.com>
-Felix Kling <fkling@fb.com>
+Federico Rampazzo <frampone@gmail.com>
+Felipe Oliveira Carvalho <felipekde@gmail.com>
+Felix Gnass <fgnass@gmail.com>
+Felix Kling <felix.kling@gmx.net>
+Fernando Correia <fernando@servicero.com>
+Frankie Bagnardi <f.bagnardi@gmail.com>
+François-Xavier Bois <fxbois@gmail.com>
+Fred Zhao <fredz@fb.com>
+G Scott Olson <gscottolson@gmail.com>
+G. Kay Lee <balancetraveller+github@gmail.com>
+Gabe Levi <gabelevi@gmail.com>
+Gareth Nicholson <gareth.nic@gmail.com>
+Garren Smith <garren.smith@gmail.com>
+Geert Pasteels <geert.pasteels@gmail.com>
+Geert-Jan Brits <gbrits@gmail.com>
+George A Sisco III <george.sisco@gmail.com>
+Georgii Dolzhykov <thorn.mailbox@gmail.com>
+Gilbert <gilbertbgarza@gmail.com>
+Glen Mailer <glenjamin@gmail.com>
+Grant Timmerman <granttimmerman@gmail.com>
+Greg Hurrell <glh@fb.com>
+Greg Perkins <gregrperkins@fb.com>
 Greg Roodt <groodt@gmail.com>
+Gregory <g.marcilhacy@gmail.com>
+Guangqiang Dong <gqdong@fb.com>
 Guido Bouman <m@guido.vc>
 Harry Hull <harry.hull1@gmail.com>
+Harry Marr <harry.marr@gmail.com>
+Harry Moreno <morenoh149@gmail.com>
+Harshad Sabne <harshadsabne@users.noreply.github.com>
+Hekar Khani <hekark@gmail.com>
+Hendrik Swanepoel <hendrik.swanepoel@gmail.com>
+Henrik Nyh <henrik@nyh.se>
+Henry Zhu <hi@henryzoo.com>
+Hou Chia <kchia87@gmail.com>
 Hugo Jobling <me@thisishugo.com>
-Ian Obermiller <iano@fb.com>
+Héliton Nordt <hnordt@hnordt.com>
+Ian Obermiller <ian@obermillers.com>
+Ignacio Carbajo <icarbajop@gmail.com>
+Igor Scekic <igorscekic2@gmail.com>
+Ilya Shuklin <ilya.shuklin@gmail.com>
+Ilyá Belsky <gelias.gbelsky@gmail.com>
+Ingvar Stepanyan <me@rreverser.com>
+Irae Carvalho <irae@irae.pro.br>
 Isaac Salier-Hellendag <isaac@fb.com>
+Ivan Kozik <ivan@ludios.org>
+Ivan Krechetov <ikr@ikr.su>
+Ivan Vergiliev <ivan.vergiliev@gmail.com>
+J. Andrew Brassington <jabbrass@zoho.com>
+J. Renée Beach <splendidnoise@gmail.com>
+JD Isaacks <jd@jisaacks.com>
+JW <JW00000@gmail.com>
+Jack Zhang <jzhang31191@gmail.com>
+Jacob Gable <jacob.gable@gmail.com>
+Jacob Greenleaf <jake@imgur.com>
+Jae Hun Ro <jhr24@duke.edu>
+Jaime Mingo <j.mingov@3boll.com>
 Jakub Malinowski <jakubmal@gmail.com>
+James <james@mystrata.com>
+James Brantly <james@jbrantly.com>
+James Burnett <jtburnett@tribune.com>
 James Ide <ide@fb.com>
+James Long <longster@gmail.com>
+James Pearce <jpearce@fb.com>
+James Seppi <james.seppi@gmail.com>
+James South <james_south@hotmail.com>
 Jamie Wong <jamie.lf.wong@gmail.com>
-Jan Kassens <jkassens@fb.com>
+Jamis Charles <jacharles@paypal.com>
+Jamison Dance <jergason@gmail.com>
+Jan Hancic <jan.hancic@gmail.com>
+Jan Kassens <jan@kassens.net>
+Jan Raasch <jan@janraasch.com>
+Jared Forsyth <jared@jaredforsyth.com>
+Jason <usaman2010us@gmail.com>
+Jason Bonta <jbonta@gmail.com>
+Jason Ly <jason.ly@gmail.com>
+Jason Miller <aidenn0@geocities.com>
+Jason Quense <monastic.panic@gmail.com>
+Jason Trill <jason@jasontrill.com>
+Jason Webster <jason@metalabdesign.com>
+Jay Jaeho Lee <jay@spoqa.com>
+Jean Lauliac <lauliacj@gmail.com>
+Jed Watson <jed.watson@me.com>
+Jeff Barczewski <jeff.barczewski@gmail.com>
+Jeff Carpenter <gcarpenterv@gmail.com>
+Jeff Chan <jefftchan@gmail.com>
+Jeff Hicken <jhicken@gmail.com>
+Jeff Kolesky <github@kolesky.com>
 Jeff Morrison <jeff@anafx.com>
+Jeff Welch <whatthejeff@gmail.com>
 Jeffrey Lin <lin.jeffrey@gmail.com>
+Jesse Skinner <jesse@thefutureoftheweb.com>
+Jignesh Kakadiya <jigneshhk1992@gmail.com>
+Jim OBrien <jimobrien930@gmail.com>
+Jim Sproch <jsproch@fb.com>
+Jimmy Jea <jimjea@gmail.com>
+Jing Chen <jingc@fb.com>
+Jinwoo Oh <arkist@gmail.com>
+Jiyeon Seo <zzzeons@gmail.com>
+Joe Stein <joeaarons@gmail.com>
+Joel Auterson <joel.auterson@googlemail.com>
+Johannes Baiter <johannes.baiter@gmail.com>
+Johannes Emerich <johannes@emerich.de>
+Johannes Lumpe <johannes@johanneslumpe.de>
+John Heroy <johnheroy@users.noreply.github.com>
 John Watson <jwatson@fb.com>
+Jon Beebe <jon.beebe@daveramsey.com>
+Jon Chester <jonchester@fb.com>
+Jon Hester <jon.d.hester@gmail.com>
+Jon Madison <jon@tfftech.com>
+Jon Scott Clark <jonscottclark@gmail.com>
+Jon Tewksbury <jontewks@gmail.com>
+Jonas Enlund <jonas.enlund@gmail.com>
+Jonas Gebhardt <jonas@instagram.com>
+Jonathan Hsu <jhiswin@gmail.com>
+Jordan Harband <ljharb@gmail.com>
 Jordan Walke <jordojw@gmail.com>
+Jorrit Schippers <jorrit@ncode.nl>
+Joseph Nudell <joenudell@gmail.com>
+Joseph Savona <joesavona@fb.com>
+Josh Bassett <josh.bassett@gmail.com>
 Josh Duck <josh@fb.com>
-Keito Uchiyama <keito@fb.com>
+Josh Yudaken <yud@instagram.com>
+Joshua Go <joshuago@gmail.com>
+Joshua Goldberg <jsgoldberg90@gmail.com>
+Joshua Ma <me@joshma.com>
+João Valente <filipevalente@gmail.com>
+Juan Serrano <germ13@users.noreply.github.com>
+Julen Ruiz Aizpuru <julenx@gmail.com>
+Julian Viereck <julian.viereck@gmail.com>
+Julien Bordellier <git@julienbordellier.com>
+Jun Wu <quark@lihdd.net>
+Juraj Dudak <jdudak@fb.com>
+Justin Jaffray <justinjaffray@khanacademy.org>
+Justin Robison <jrobison151@gmail.com>
+Justin Woo <moomoowoo@gmail.com>
+Kamron Batman <kamronbatman@users.noreply.github.com>
+Karl Mikkelsen <karl@kingkarl.com>
+Karpich Dmitry <karpich@gollard.ru>
+Keito Uchiyama <projects@keito.me>
+Kevin Coughlin <kevintcoughlin@gmail.com>
+Kevin Huang <huang.kev@gmail.com>
+Kevin Old <kevin@kevinold.com>
+KimCoding <jeokrang@hanmail.net>
+Kirk Steven Hansen <hanski07@kirk-hansens-macbook.local>
+Kit Randel <kit@nocturne.net.nz>
+Kohei TAKATA <kt.koheitakata@gmail.com>
+Koo Youngmin <youngmin@youngminz.kr>
 Kunal Mehta <k.mehta@berkeley.edu>
+Kurt Ruppel <me@kurtruppel.com>
+Kyle Kelley <rgbkrk@gmail.com>
+Kyle Mathews <mathews.kyle@gmail.com>
 Laurence Rowe <l@lrowe.co.uk>
+Laurent Etiemble <laurent.etiemble@monobjc.net>
+Lee Byron <lee@leebyron.com>
+Lee Jaeyoung <jaeyoung@monodiary.net>
+Lei <tendant@gmail.com>
+Leon Fedotov <LeonFedotov@users.noreply.github.com>
+Leon Yip <lyip1992@users.noreply.github.com>
+Leonardo YongUk Kim <dalinaum@gmail.com>
+Levi Buzolic <levibuzolic@gmail.com>
 Levi McCallum <levi@levimccallum.com>
+Lily <qvang.j@gmail.com>
+Logan Allen <loganfynne@gmail.com>
+Luigy Leon <luichi.19@gmail.com>
+Luke Horvat <lukehorvat@gmail.com>
+MIKAMI Yoshiyuki <yoshuki@saikyoline.jp>
+Marcin K. <katzoo@github.mail>
+Marcin Kwiatkowski <marcin.kwiatkowski@hotmail.com>
+Marcin Szczepanski <marcins@gmail.com>
+Mariano Desanze <protronm@gmail.com>
+Marjan <marjan.georgiev@gmail.com>
+Mark Anderson <undernewmanagement@users.noreply.github.com>
+Mark Funk <mark@boomtownroi.com>
+Mark Hintz <markohintz@gmail.com>
+Mark IJbema <markijbema@gmail.com>
 Mark Richardson <echo@fb.com>
+Marlon Landaverde <milanlandaverde@gmail.com>
 Marshall Roch <mroch@fb.com>
+Martin Andert <mandert@gmail.com>
+Martin Jul <martin@mjul.com>
 Martin Konicek <mkonicek@fb.com>
+Martin Mihaylov <martomi@users.noreply.github.com>
+Masaki KOBAYASHI <makky.4d6b.3f5@gmail.com>
 Mathieu M-Gosselin <mathieumg@gmail.com>
+Matias Singers <mail@matiassingers.com>
+Matsunoki <himkt@klis.tsukuba.ac.jp>
+Matt Brookes <matt@brookes.net>
+Matt Dunn-Rankin <mdunnrankin@gmail.com>
+Matt Harrison <mt.harrison86@gmail.com>
+Matt Huggins <matt.huggins@gmail.com>
+Matt Zabriskie <mzabriskie@gmail.com>
+Matthew Dapena-Tretter <m@tthewwithanm.com>
+Matthew Johnston <matthewjohnston4@outlook.com>
+Matthew King <mking@users.noreply.github.com>
+Matthew Miner <matthew@matthewminer.com>
+Matthias Le Brun <mlbli@me.com>
 Matti Nelimarkka <matti.nelimarkka@hiit.fi>
+Max F. Albrecht <1@178.is>
+Max Heiber <max.heiber@gmail.com>
+Maxi Ferreira <charca@gmail.com>
+Maxim Abramchuk <MaximAbramchuck@gmail.com>
+Merrick Christensen <merrick.christensen@gmail.com>
+Mert Kahyaoğlu <mertkahyaoglu93@gmail.com>
+Michael Chan <mijoch@gmail.com>
+Michael Randers-Pehrson <michael.rp@gmail.com>
+Michael Ridgway <mridgway@yahoo-inc.com>
+Michael Warner <MichaelJWarner@hotmail.com>
+Michal Srb <xixixao@seznam.cz>
+Michelle Todd <himichelletodd@gmail.com>
+Mihai Parparita <mihai.parparita@gmail.com>
+Mike D Pilsbury <mike.pilsbury@gmail.com>
+Mike Groseclose <mike.groseclose@gmail.com>
+Mikolaj Dadela <mikolaj.dadela@hgv-online.de>
+Minwe LUO <minwe@yunshipei.com>
+Miorel Palii <miorel@fb.com>
+Morhaus <alexandre.kirszenberg@gmail.com>
 Mouad Debbar <mdebbar@fb.com>
+Murad <rogozhnikoff@users.noreply.github.com>
+Murray M. Moss <murray@mmoss.name>
+Nadeesha Cabral <nadeesha.cabral@gmail.com>
+Naman Goel <naman34@gmail.com>
+Nate Hunzaker <nate.hunzaker@gmail.com>
+Nathan White <nw@nwhite.net>
+Neri Marschik <marschik_neri@cyberagent.co.jp>
+Nicholas Bergson-Shilcock <me@nicholasbs.net>
+Nick Fitzgerald <fitzgen@gmail.com>
 Nick Gavalas <njg57@cornell.edu>
+Nick Merwin <nick@lemurheavy.com>
+Nick Raienko <enaqxx@gmail.com>
+Nick Thompson <ncthom91@gmail.com>
+Nick Williams <WickyNilliams@users.noreply.github.com>
+Niklas Boström <nbostrom@gmail.com>
+Ning Xia <ning-github@users.noreply.github.com>
+Niole Nelson <niolenelson@gmail.com>
+Oiva Eskola <oiva.eskola@gmail.com>
+Oleg <o.yanchinskiy@gmail.com>
+Oleksii Markhovskyi <olexiy.markhovsky@gmail.com>
+Oliver Zeigermann <oliver.zeigermann@gmail.com>
+Olivier Tassinari <Olivier.tassinari@gmail.com>
 Owen Coutts <owenc@fb.com>
+Pablo Lacerda de Miranda <pablolm@yahoo-inc.com>
+Paolo Moretti <moretti@users.noreply.github.com>
+Pascal Hartig <passy@twitter.com>
+Patrick Laughlin <patrick@laughl.info>
+Patrick Stapleton <github@gdi2290.com>
+Paul Harper <benekastah@gmail.com>
 Paul O’Shannessy <paul@oshannessy.com>
 Paul Seiffert <paul.seiffert@gmail.com>
 Paul Shen <paul@mnml0.com>
+Pedro Nauck <pedronauck@gmail.com>
 Pete Hunt <floydophone@gmail.com>
+Peter Blazejewicz <peter.blazejewicz@gmail.com>
 Peter Cottle <pcottle@fb.com>
-Pieter Vanderwerff <pieter@heyday.co.nz>
+Peter Jaros <peter.a.jaros@gmail.com>
+Petri Lehtinen <petri@digip.org>
+Petri Lievonen <plievone@cc.hut.fi>
+Pieter Vanderwerff <me@pieter.io>
+Pouja Nikray <poujanik@gmail.com>
+Prathamesh Sonpatki <csonpatki@gmail.com>
+Preston Parry <ClimbsRocks@users.noreply.github.com>
+Rafael <rafael.garcia@clever.com>
+Rafal Dittwald <rafal.dittwald@gmail.com>
+Rajiv Tirumalareddy <rajivtreddy@gmail.com>
+Randall Randall <randall@randallsquared.com>
+Ray <ray@tomo.im>
+Raymond Ha <raymond@shraymonks.com>
+Reed Loden <reed@reedloden.com>
+Richard D. Worth <rdworth@gmail.com>
+Richard Feldman <richard.t.feldman@gmail.com>
+Richard Kho <hello@richardkho.com>
+Richard Littauer <richard.littauer@gmail.com>
+Richard Livesey <Livesey7@hotmail.co.uk>
+Richard Wood <rwoodnz@gmail.com>
+Rick Beerendonk <rick@beerendonk.com>
+Riley Tomasek <riley.tomasek@gmail.com>
+Rob Arnold <robarnold@cs.cmu.edu>
+Robert Knight <robert.knight@mendeley.com>
+Robert Sedovsek <robert.sedovsek@gmail.com>
+Robin Berjon <robin@berjon.com>
+Roman Vanesyan <roman.vanesyan@gmail.com>
+Russ <russwirtz@gmail.com>
+Ryan Seddon <seddon.ryan@gmail.com>
+Sahat Yalkabov <sakhat@gmail.com>
+Saif Hakim <saif@benchling.com>
+Sam Saccone <samccone@gmail.com>
+Sam Selikoff <sam.selikoff@gmail.com>
+Samy Al Zahrani <samy@sadeem.net>
 Sander Spies <sandermail@gmail.com>
+Scott Burch <scott@bulldoginfo.com>
+Scott Feeney <scott@oceanbase.org>
 Sean Kinsey <oyvind@fb.com>
 Sebastian Markbåge <sebastian@calyptus.eu>
+Seoh Char <devthewild@gmail.com>
+Serg <undrdog@yandex.ru>
+Sergey Generalov <sergey@genbit.ru>
+Sergey Rubanov <chi187@gmail.com>
+Seyi Adebajo <hello@seyinanigans.com>
+Shane O'Sullivan <shaneosullivan1@gmail.com>
+Shaun Trennery <shaun.trennery@gmail.com>
+ShihChi Huang <hhuang@netflix.com>
+Shim Won <marocchino@gmail.com>
+Shota Kubota <kubosho@users.noreply.github.com>
+Shripad K <assortmentofsorts@gmail.com>
+Sibi <psibi2000@gmail.com>
 Simon Højberg <r.hackr@gmail.com>
+Simon Welsh <simon@simon.geek.nz>
+Sophia Westwood <sophia@quip.com>
+Spencer Handley <spencerhandley@gmail.com>
+Stefan Dombrowski <sdo451@gmail.com>
+Stephen Murphy <smurphy3@apple.com>
+Sterling Cobb <sterlingcobb@gmail.com>
+Steve Baker <_steve_@outlook.com>
+Steven Luscher <react@steveluscher.com>
 Stoyan Stefanov <ssttoo@ymail.com>
 Sundeep Malladi <sundeep.malladi@gmail.com>
-Thomas Aylott <aylott@fb.com>
+Sunny Juneja <me@sunnyjuneja.com>
+Sven Helmberger <fforw@gmx.de>
+Sverre Johansen <sverre.johansen@gmail.com>
+Sébastien Lorber <lorber.sebastien@gmail.com>
+Sławomir Laskowski <laskowski.box@gmail.com>
+Taeho Kim <dittos@gmail.com>
+Tay Yang Shun <tay.yang.shun@gmail.com>
+Ted Kim <ted@vcnc.co.kr>
+Teodor Szente <teodor98sz@gmail.com>
+Thomas Aylott <oblivious@subtlegradient.com>
+Thomas Boyt <thomas.boyt@venmo.com>
+Thomas Reggi <socialtr@gmail.com>
+Thomas Röggla <t.roggla@cwi.nl>
+Thomas Shaddox <thomas@heyzap.com>
+Thomas Shafer <thomasjshafer@gmail.com>
+ThomasCrvsr <crevoisier.thomas@gmail.com>
+Tienchai Wirojsaksaree <tienchai@fb.com>
+Tim Routowicz <troutowicz@gmail.com>
+Tim Schaub <tschaub@users.noreply.github.com>
 Timothy Yung <yungsters@gmail.com>
+Tobias Reiss <tag+github@basecode.de>
+Tom Haggie <thaggie@gmail.com>
+Tom Hauburger <thauburger@gmail.com>
+Tom MacWright <tom@macwright.org>
+Tom Occhino <tomocchino@gmail.com>
+Tomasz Kołodziejski <tkolodziejski@gmail.com>
+Tony Spiro <tspiro@tonyspiro.com>
+Toru Kobayashi <koba0004@gmail.com>
+Trinh Hoang Nhu <trinhhoangnhu@gmail.com>
+Tsung Hung <thung@me.com>
+Tyler Brock <tyler.brock@gmail.com>
+Ustin Zarubin <ustin.zarubin@campusbellhops.com>
+Vadim Chernysh <chernysh.vadim@gmail.com>
+Varun Rau <varunrau@gmail.com>
+Vasiliy Loginevskiy <Yeti.or@gmail.com>
+Victor Alvarez <v.alvarez312@gmail.com>
+Victor Koenders <victor.koenders@gmail.com>
+Ville Immonen <ville.immonen@iki.fi>
+Vincent Riemer <vincentriemer@gmail.com>
+Vincent Siao <vincent@asana.com>
+Vipul A M <vipulnsward@gmail.com>
+Vitaly Kramskikh <vkramskikh@gmail.com>
 Vjeux <vjeuxx@gmail.com>
-Zach Bruggeman <zbruggeman@me.com>
+Volkan Unsal <spocksplanet@gmail.com>
+Wayne Larsen <wayne@larsen.st>
+WickyNilliams <WickyNilliams@MBA>
+Wincent Colaiuta <win@wincent.com>
+Wout Mertens <Wout.Mertens@gmail.com>
+Xavier Morel <xmo-odoo@users.noreply.github.com>
+XuefengWu <benewu@gmail.com>
+Yakov Dalinchuk <murashki@users.noreply.github.com>
+Yasar icli <hello@yasaricli.com>
+YouBao Nong <noyobo@gmail.com>
+Yuichi Hagio <yhagio87@gmail.com>
+Yuriy Dybskiy <yuriy@dybskiy.com>
+Yuval Dekel <thedekel@fb.com>
+Zach Bruggeman <mail@bruggie.com>
+Zacharias <zachasme@users.noreply.github.com>
+arush <arush@ilovebrands.net>
+brafdlog <brafdlog@gmail.com>
+chen <kikyous@163.com>
+clariroid <clarinette.uranus@gmail.com>
+claudiopro <claudio.procida@gmail.com>
+cutbko <kutsenko.eugene@hotmail.com>
+davidxi <davidgraycn@gmail.com>
+dongmeng.ldm <dongmeng.ldm@alibaba-inc.com>
+iamchenxin <iamchenxin@gmail.com>
+iamdoron <doronpagot@gmail.com>
+imagentleman <imagentlemail@gmail.com>
+laiso <laiso@lai.so>
+li.li <li.li@ele.me>
+sugarshin <shinsugar@gmail.com>
+wali-s <ahmad3y2k@hotmail.com>
+yiminghe <yiminghe@gmail.com>
+youmoo <youmoolee@gmail.com>
+zhangjg <jinguozhang@qq.com>
+Árni Hermann Reynisson <arnihr@gmail.com>
+凌恒 <jiakun.dujk@alibaba-inc.com>
+张敏 <cookfront@gmail.com>

CHANGELOG.md

@@ -1,3 +1,437 @@
+## 0.13.3 (May 8, 2015)
+
+### React Core
+
+#### New Features
+
+* Added `clipPath` element and attribute for SVG
+* Improved warnings for deprecated methods in plain JS classes
+
+#### Bug Fixes
+
+* Loosened `dangerouslySetInnerHTML` restrictions so `{__html: undefined}` will no longer throw
+* Fixed extraneous context warning with non-pure `getChildContext`
+* Ensure `replaceState(obj)` retains prototype of `obj`
+
+### React with Add-ons
+
+### Bug Fixes
+
+* Test Utils: Ensure that shallow rendering works when components define `contextTypes`
+
+
+## 0.13.2 (April 18, 2015)
+
+### React Core
+
+#### New Features
+
+* Added `strokeDashoffset`, `flexPositive`, `flexNegative` to the list of unitless CSS properties
+* Added support for more DOM properties:
+  * `scoped` - for `<style>` elements
+  * `high`, `low`, `optimum` - for `<meter>` elements
+  * `unselectable` - IE-specific property to prevent user selection
+
+#### Bug Fixes
+
+* Fixed a case where re-rendering after rendering null didn't properly pass context
+* Fixed a case where re-rendering after rendering with `style={null}` didn't properly update `style`
+* Update `uglify` dependency to prevent a bug in IE8
+* Improved warnings
+
+### React with Add-Ons
+
+#### Bug Fixes
+
+* Immutabilty Helpers: Ensure it supports `hasOwnProperty` as an object key
+
+### React Tools
+
+* Improve documentation for new options
+
+
+## 0.13.1 (March 16, 2015)
+
+### React Core
+
+#### Bug Fixes
+
+* Don't throw when rendering empty `<select>` elements
+* Ensure updating `style` works when transitioning from `null`
+
+### React with Add-Ons
+
+#### Bug Fixes
+
+* TestUtils: Don't warn about `getDOMNode` for ES6 classes
+* TestUtils: Ensure wrapped full page components (`<html>`, `<head>`, `<body>`) are treated as DOM components
+* Perf: Stop double-counting DOM components
+
+### React Tools
+
+#### Bug Fixes
+
+* Fix option parsing for `--non-strict-es6module`
+
+
+## 0.13.0 (March 10, 2015)
+
+### React Core
+
+#### Breaking Changes
+
+* Deprecated patterns that warned in 0.12 no longer work: most prominently, calling component classes without using JSX or React.createElement and using non-component functions with JSX or createElement
+* Mutating `props` after an element is created is deprecated and will cause warnings in development mode; future versions of React will incorporate performance optimizations assuming that props aren't mutated
+* Static methods (defined in `statics`) are no longer autobound to the component class
+* `ref` resolution order has changed slightly such that a ref to a component is available immediately after its `componentDidMount` method is called; this change should be observable only if your component calls a parent component's callback within your `componentDidMount`, which is an anti-pattern and should be avoided regardless
+* Calls to `setState` in life-cycle methods are now always batched and therefore asynchronous. Previously the first call on the first mount was synchronous.
+* `setState` and `forceUpdate` on an unmounted component now warns instead of throwing. That avoids a possible race condition with Promises.
+* Access to most internal properties has been completely removed, including `this._pendingState` and `this._rootNodeID`.
+
+#### New Features
+
+* Support for using ES6 classes to build React components; see the [v0.13.0 beta 1 notes](https://facebook.github.io/react/blog/2015/01/27/react-v0.13.0-beta-1.html) for details.
+* Added new top-level API `React.findDOMNode(component)`, which should be used in place of `component.getDOMNode()`. The base class for ES6-based components will not have `getDOMNode`. This change will enable some more patterns moving forward.
+* Added a new top-level API `React.cloneElement(el, props)` for making copies of React elements – see the [v0.13 RC2 notes](/react/blog/2015/03/03/react-v0.13-rc2.html#react.cloneelement) for more details.
+* New `ref` style, allowing a callback to be used in place of a name: `<Photo ref={(c) => this._photo = c} />` allows you to reference the component with `this._photo` (as opposed to `ref="photo"` which gives `this.refs.photo`).
+* `this.setState()` can now take a function as the first argument for transactional state updates, such as `this.setState((state, props) => ({count: state.count + 1}));` – this means that you no longer need to use `this._pendingState`, which is now gone.
+* Support for iterators and immutable-js sequences as children.
+
+#### Deprecations
+
+* `ComponentClass.type` is deprecated. Just use `ComponentClass` (usually as `element.type === ComponentClass`).
+* Some methods that are available on `createClass`-based components are removed or deprecated from ES6 classes (`getDOMNode`, `replaceState`, `isMounted`, `setProps`, `replaceProps`).
+
+### React with Add-Ons
+
+#### New Features
+
+* [`React.addons.createFragment` was added](/react/docs/create-fragment.html) for adding keys to entire sets of children.
+
+#### Deprecations
+
+* `React.addons.classSet` is now deprecated. This functionality can be replaced with several freely available modules. [classnames](https://www.npmjs.com/package/classnames) is one such module.
+* Calls to `React.addons.cloneWithProps` can be migrated to use `React.cloneElement` instead – make sure to merge `style` and `className` manually if desired.
+
+### React Tools
+
+#### Breaking Changes
+
+* When transforming ES6 syntax, `class` methods are no longer enumerable by default, which requires `Object.defineProperty`; if you support browsers such as IE8, you can pass `--target es3` to mirror the old behavior
+
+#### New Features
+
+* `--target` option is available on the jsx command, allowing users to specify and ECMAScript version to target.
+  * `es5` is the default.
+  * `es3` restores the previous default behavior. An additional transform is added here to ensure the use of reserved words as properties is safe (eg `this.static` will become `this['static']` for IE8 compatibility).
+* The transform for the call spread operator has also been enabled.
+
+### JSXTransformer
+
+#### Breaking Changes
+
+* The return value of `transform` now contains `sourceMap` as a JS object already, not an instance of `SourceMapGenerator`.
+
+### JSX
+
+#### Breaking Changes
+* A change was made to how some JSX was parsed, specifically around the use of `>` or `}` when inside an element. Previously it would be treated as a string but now it will be treated as a parse error. The [`jsx_orphaned_brackets_transformer`](https://www.npmjs.com/package/jsx_orphaned_brackets_transformer) package on npm can be used to find and fix potential issues in your JSX code.
+
+
+## 0.12.2 (December 18, 2014)
+
+### React Core
+
+* Added support for more HTML attributes: `formAction`, `formEncType`, `formMethod`, `formTarget`, `marginHeight`, `marginWidth`
+* Added `strokeOpacity` to the list of unitless CSS properties
+* Removed trailing commas (allows npm module to be bundled and used in IE8)
+* Fixed bug resulting in error when passing `undefined` to `React.createElement` - now there is a useful warning
+
+### React Tools
+
+* JSX-related transforms now always use double quotes for props and `displayName`
+
+
+## 0.12.1 (November 18, 2014)
+
+### React Tools
+
+* Types transform updated with latest support
+* jstransform version updated with improved ES6 transforms
+* Explicit Esprima dependency removed in favor of using Esprima information exported by jstransform
+
+
+## 0.12.0 (October 28, 2014)
+
+### React Core
+
+#### Breaking Changes
+
+* `key` and `ref` moved off props object, now accessible on the element directly
+* React is now BSD licensed with accompanying Patents grant
+* Default prop resolution has moved to Element creation time instead of mount time, making them effectively static
+* `React.__internals` is removed - it was exposed for DevTools which no longer needs access
+* Composite Component functions can no longer be called directly - they must be wrapped with `React.createFactory` first. This is handled for you when using JSX.
+
+#### New Features
+
+* Spread operator (`{...}`) introduced to deprecate `this.transferPropsTo`
+* Added support for more HTML attributes: `acceptCharset`, `classID`, `manifest`
+
+#### Deprecations
+
+* `React.renderComponent` --> `React.render`
+* `React.renderComponentToString` --> `React.renderToString`
+* `React.renderComponentToStaticMarkup` --> `React.renderToStaticMarkup`
+* `React.isValidComponent` --> `React.isValidElement`
+* `React.PropTypes.component` --> `React.PropTypes.element`
+* `React.PropTypes.renderable` --> `React.PropTypes.node`
+* **DEPRECATED** `React.isValidClass`
+* **DEPRECATED** `instance.transferPropsTo`
+* **DEPRECATED** Returning `false` from event handlers to preventDefault
+* **DEPRECATED** Convenience Constructor usage as function, instead wrap with `React.createFactory`
+* **DEPRECATED** use of `key={null}` to assign implicit keys
+
+#### Bug Fixes
+
+* Better handling of events and updates in nested results, fixing value restoration in "layered" controlled components
+* Correctly treat `event.getModifierState` as case sensitive
+* Improved normalization of `event.charCode`
+* Better error stacks when involving autobound methods
+* Removed DevTools message when the DevTools are installed
+* Correctly detect required language features across browsers
+* Fixed support for some HTML attributes:
+  * `list` updates correctly now
+  * `scrollLeft`, `scrollTop` removed, these should not be specified as props
+* Improved error messages
+
+### React With Addons
+
+#### New Features
+
+* `React.addons.batchedUpdates` added to API for hooking into update cycle
+
+#### Breaking Changes
+
+* `React.addons.update` uses `assign` instead of `copyProperties` which does `hasOwnProperty` checks. Properties on prototypes will no longer be updated correctly.
+
+#### Bug Fixes
+
+* Fixed some issues with CSS Transitions
+
+### JSX
+
+#### Breaking Changes
+
+* Enforced convention: lower case tag names are always treated as HTML tags, upper case tag names are always treated as composite components
+* JSX no longer transforms to simple function calls
+
+#### New Features
+
+* `@jsx React.DOM` no longer required
+* spread (`{...}`) operator introduced to allow easier use of props
+
+#### Bug Fixes
+
+* JSXTransformer: Make sourcemaps an option when using APIs directly (eg, for react-rails)
+
+
+## 0.11.2 (September 16, 2014)
+
+### React Core
+
+#### New Features
+
+* Added support for `<dialog>` element and associated `open` attribute
+* Added support for `<picture>` element and associated `media` and `sizes` attributes
+* Added `React.createElement` API in preparation for React v0.12
+  * `React.createDescriptor` has been deprecated as a result
+
+### JSX
+
+* `<picture>` is now parsed into `React.DOM.picture`
+
+### React Tools
+
+* Update `esprima` and `jstransform` for correctness fixes
+* The `jsx` executable now exposes a `--strip-types` flag which can be used to remove TypeScript-like type annotations
+  * This option is also exposed to `require('react-tools').transform` as `stripTypes`
+
+## 0.11.1 (July 24, 2014)
+
+### React Core
+
+#### Bug Fixes
+* `setState` can be called inside `componentWillMount` in non-DOM environments
+* `SyntheticMouseEvent.getEventModifierState` correctly renamed to `getModifierState`
+* `getModifierState` correctly returns a `boolean`
+* `getModifierState` is now correctly case sensitive
+* Empty Text node used in IE8 `innerHTML` workaround is now removed, fixing rerendering in certain cases
+
+### JSX
+* Fix duplicate variable declaration in JSXTransformer (caused issues in some browsers)
+
+
+## 0.11.0 (July 17, 2014)
+
+### React Core
+
+#### Breaking Changes
+* `getDefaultProps()` is now called once per class and shared across all instances
+* `MyComponent()` now returns a descriptor, not an instance
+* `React.isValidComponent` and `React.PropTypes.component` validate *descriptors*, not component instances
+* Custom `propType` validators should return an `Error` instead of logging directly
+
+#### New Features
+* Rendering to `null`
+* Keyboard events include normalized `e.key` and `e.getModifierState()` properties
+* New normalized `onBeforeInput` event
+* `React.Children.count` has been added as a helper for counting the number of children
+
+#### Bug Fixes
+
+* Re-renders are batched in more cases
+* Events: `e.view` properly normalized
+* Added Support for more HTML attributes (`coords`, `crossOrigin`, `download`, `hrefLang`, `mediaGroup`, `muted`, `scrolling`, `shape`, `srcSet`, `start`, `useMap`)
+* Improved SVG support
+  * Changing `className` on a mounted SVG component now works correctly
+  * Added support for elements `mask` and `tspan`
+  * Added support for attributes `dx`, `dy`, `fillOpacity`, `fontFamily`, `fontSize`, `markerEnd`, `markerMid`, `markerStart`, `opacity`, `patternContentUnits`, `patternUnits`, `preserveAspectRatio`, `strokeDasharray`, `strokeOpacity`
+* CSS property names with vendor prefixes (`Webkit`, `ms`, `Moz`, `O`) are now handled properly
+* Duplicate keys no longer cause a hard error; now a warning is logged (and only one of the children with the same key is shown)
+* `img` event listeners are now unbound properly, preventing the error "Two valid but unequal nodes with the same `data-reactid`"
+* Added explicit warning when missing polyfills
+
+### React With Addons
+* PureRenderMixin: a mixin which helps optimize "pure" components
+* Perf: a new set of tools to help with performance analysis
+* Update: New `$apply` command to transform values
+* TransitionGroup bug fixes with null elements, Android
+
+### React NPM Module
+* Now includes the pre-built packages under `dist/`.
+* `envify` is properly listed as a dependency instead of a peer dependency
+
+### JSX
+* Added support for namespaces, eg `<Components.Checkbox />`
+* JSXTransformer
+  * Enable the same `harmony` features available in the command line with `<script type="text/jsx;harmony=true">`
+  * Scripts are downloaded in parallel for more speed. They are still executed in order (as you would expect with normal script tags)
+  * Fixed a bug preventing sourcemaps from working in Firefox
+
+### React Tools Module
+* Improved readme with usage and API information
+* Improved ES6 transforms available with `--harmony` option
+* Added `--source-map-inline` option to the `jsx` executable
+* New `transformWithDetails` API which gives access to the raw sourcemap data
+
+
+## 0.10.0 (March 21, 2014)
+
+### React Core
+
+#### New Features
+* Added warnings to help migrate towards descriptors
+* Made it possible to server render without React-related markup (`data-reactid`, `data-react-checksum`). This DOM will not be mountable by React. [Read the docs for `React.renderComponentToStaticMarkup`](https://facebook.github.io/react/docs/top-level-api.html#react.rendercomponenttostaticmarkup)
+* Added support for more attributes:
+  * `srcSet` for `<img>` to specify images at different pixel ratios
+  * `textAnchor` for SVG
+
+#### Bug Fixes
+* Ensure all void elements don’t insert a closing tag into the markup.
+* Ensure `className={false}` behaves consistently
+* Ensure `this.refs` is defined, even if no refs are specified.
+
+### Addons
+
+* `update` function to deal with immutable data. [Read the docs](https://facebook.github.io/react/docs/update.html)
+
+### react-tools
+* Added an option argument to `transform` function. The only option supported is `harmony`, which behaves the same as `jsx --harmony` on the command line. This uses the ES6 transforms from [jstransform](https://github.com/facebook/jstransform).
+
+
+## 0.9.0 (February 20, 2014)
+
+### React Core
+
+#### Breaking Changes
+
+- The lifecycle methods `componentDidMount` and `componentDidUpdate` no longer receive the root node as a parameter; use `this.getDOMNode()` instead
+- Whenever a prop is equal to `undefined`, the default value returned by `getDefaultProps` will now be used instead
+- `React.unmountAndReleaseReactRootNode` was previously deprecated and has now been removed
+- `React.renderComponentToString` is now synchronous and returns the generated HTML string
+- Full-page rendering (that is, rendering the `<html>` tag using React) is now supported only when starting with server-rendered markup
+- On mouse wheel events, `deltaY` is no longer negated
+- When prop types validation fails, a warning is logged instead of an error thrown (with the production build of React, type checks are now skipped for performance)
+- On `input`, `select`, and `textarea` elements, `.getValue()` is no longer supported; use `.getDOMNode().value` instead
+- `this.context` on components is now reserved for internal use by React
+
+#### New Features
+
+- React now never rethrows errors, so stack traces are more accurate and Chrome's purple break-on-error stop sign now works properly
+- Added support for SVG tags `defs`, `linearGradient`, `polygon`, `radialGradient`, `stop`
+- Added support for more attributes:
+  - `crossOrigin` for CORS requests
+  - `download` and `hrefLang` for `<a>` tags
+  - `mediaGroup` and `muted` for `<audio>` and `<video>` tags
+  - `noValidate` and `formNoValidate` for forms
+  - `property` for Open Graph `<meta>` tags
+  - `sandbox`, `seamless`, and `srcDoc` for `<iframe>` tags
+  - `scope` for screen readers
+  - `span` for `<colgroup>` tags
+- Added support for defining `propTypes` in mixins
+- Added `any`, `arrayOf`, `component`, `oneOfType`, `renderable`, `shape` to `React.PropTypes`
+- Added support for `statics` on component spec for static component methods
+- On all events, `.currentTarget` is now properly set
+- On keyboard events, `.key` is now polyfilled in all browsers for special (non-printable) keys
+- On clipboard events, `.clipboardData` is now polyfilled in IE
+- On drag events, `.dragTransfer` is now present
+- Added support for `onMouseOver` and `onMouseOut` in addition to the existing `onMouseEnter` and `onMouseLeave` events
+- Added support for `onLoad` and `onError` on `<img>` elements
+- Added support for `onReset` on `<form>` elements
+- The `autoFocus` attribute is now polyfilled consistently on `input`, `select`, and `textarea`
+
+#### Bug Fixes
+
+- React no longer adds an `__owner__` property to each component's `props` object; passed-in props are now never mutated
+- When nesting top-level components (e.g., calling `React.renderComponent` within `componentDidMount`), events now properly bubble to the parent component
+- Fixed a case where nesting top-level components would throw an error when updating
+- Passing an invalid or misspelled propTypes type now throws an error
+- On mouse enter/leave events, `.target`, `.relatedTarget`, and `.type` are now set properly
+- On composition events, `.data` is now properly normalized in IE9 and IE10
+- CSS property values no longer have `px` appended for the unitless properties `columnCount`, `flex`, `flexGrow`, `flexShrink`, `lineClamp`, `order`, `widows`
+- Fixed a memory leak when unmounting children with a `componentWillUnmount` handler
+- Fixed a memory leak when `renderComponentToString` would store event handlers
+- Fixed an error that could be thrown when removing form elements during a click handler
+- Boolean attributes such as `disabled` are rendered without a value (previously `disabled="true"`, now simply `disabled`)
+- `key` values containing `.` are now supported
+- Shortened `data-reactid` values for performance
+- Components now always remount when the `key` property changes
+- Event handlers are attached to `document` only when necessary, improving performance in some cases
+- Events no longer use `.returnValue` in modern browsers, eliminating a warning in Chrome
+- `scrollLeft` and `scrollTop` are no longer accessed on document.body, eliminating a warning in Chrome
+- General performance fixes, memory optimizations, improvements to warnings and error messages
+
+### React with Addons
+
+- `React.addons.TestUtils` was added to help write unit tests
+- `React.addons.TransitionGroup` was renamed to `React.addons.CSSTransitionGroup`
+- `React.addons.TransitionGroup` was added as a more general animation wrapper
+- `React.addons.cloneWithProps` was added for cloning components and modifying their props
+- Bug fix for adding back nodes during an exit transition for CSSTransitionGroup
+- Bug fix for changing `transitionLeave` in CSSTransitionGroup
+- Performance optimizations for CSSTransitionGroup
+- On checkbox `<input>` elements, `checkedLink` is now supported for two-way binding
+
+### JSX Compiler and react-tools Package
+
+- Whitespace normalization has changed; now space between two tags on the same line will be preserved, while newlines between two tags will be removed
+- The `react-tools` npm package no longer includes the React core libraries; use the `react` package instead.
+- `displayName` is now added in more cases, improving error messages and names in the React Dev Tools
+- Fixed an issue where an invalid token error was thrown after a JSX closing tag
+- `JSXTransformer` now uses source maps automatically in modern browsers
+- `JSXTransformer` error messages now include the filename and problematic line contents when a file fails to parse
+
 ## 0.8.0 (December 19, 2013)
 
 ### React
@@ -72,7 +506,7 @@
 
 ### React with Addons (New!)
 
-* Introduced a separate build with several "addons" which we think can help improve the React experience. We plan to deprecate this in the long-term, instead shipping each as standalone pieces. [Read more in the docs](http://facebook.github.io/react/docs/addons.html).
+* Introduced a separate build with several "addons" which we think can help improve the React experience. We plan to deprecate this in the long-term, instead shipping each as standalone pieces. [Read more in the docs](https://facebook.github.io/react/docs/addons.html).
 
 ### JSX
 
@@ -105,10 +539,10 @@
 * Switch from using `id` attribute to `data-reactid` to track DOM nodes. This allows you to integrate with other JS and CSS libraries more easily.
 * Support for more DOM elements and attributes (e.g., `<canvas>`)
 * Improved server-side rendering APIs. `React.renderComponentToString(<component>, callback)` allows you to use React on the server and generate markup which can be sent down to the browser.
-* `prop` improvements: validation and default values. [Read our blog post for details...](http://facebook.github.io/react/blog/2013/07/11/react-v0-4-prop-validation-and-default-values.html)
-* Support for the `key` prop, which allows for finer control over reconciliation. [Read the docs for details...](http://facebook.github.io/react/docs/multiple-components.html)
-* Removed `React.autoBind`. [Read our blog post for details...](http://facebook.github.io/react/blog/2013/07/02/react-v0-4-autobind-by-default.html)
-* Improvements to forms. We've written wrappers around `<input>`, `<textarea>`, `<option>`, and `<select>` in order to standardize many inconsistencies in browser implementations. This includes support for `defaultValue`, and improved implementation of the `onChange` event, and circuit completion. [Read the docs for details...](http://facebook.github.io/react/docs/forms.html)
+* `prop` improvements: validation and default values. [Read our blog post for details...](https://facebook.github.io/react/blog/2013/07/11/react-v0-4-prop-validation-and-default-values.html)
+* Support for the `key` prop, which allows for finer control over reconciliation. [Read the docs for details...](https://facebook.github.io/react/docs/multiple-components.html)
+* Removed `React.autoBind`. [Read our blog post for details...](https://facebook.github.io/react/blog/2013/07/02/react-v0-4-autobind-by-default.html)
+* Improvements to forms. We've written wrappers around `<input>`, `<textarea>`, `<option>`, and `<select>` in order to standardize many inconsistencies in browser implementations. This includes support for `defaultValue`, and improved implementation of the `onChange` event, and circuit completion. [Read the docs for details...](https://facebook.github.io/react/docs/forms.html)
 * We've implemented an improved synthetic event system that conforms to the W3C spec.
 * Updates to your component are batched now, which may result in a significantly faster re-render of components. `this.setState` now takes an optional callback as it's second parameter. If you were using `onClick={this.setState.bind(this, state)}` previously, you'll want to make sure you add a third parameter so that the event is not treated as the callback.
 

CONTRIBUTING.md

@@ -1,6 +1,10 @@
 # Contributing to React
 
-React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on facebook.com. We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and preempts some questions you may have.
+React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on [facebook.com](https://www.facebook.com). We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and answers some questions that you may have.
+
+## [Code of Conduct](https://code.facebook.com/codeofconduct)
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
 
 ## Our Development Process
 
@@ -23,11 +27,11 @@ The core team will be monitoring for pull requests. When we get one, we'll run s
 5. Make sure your code lints (`grunt lint`) - we've done our best to make sure these rules match our internal linting guidelines.
 6. If you haven't already, complete the CLA.
 
-### Contributor License Agreement ("CLA")
+### Contributor License Agreement (CLA)
 
 In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, just let us know that you have completed the CLA and we can cross-check with your GitHub username.
 
-Complete your CLA here: <https://developers.facebook.com/opensource/cla>
+[Complete your CLA here.](https://code.facebook.com/cla)
 
 ## Bugs
 
@@ -41,23 +45,35 @@ The best way to get your bug fixed is to provide a reduced test case. jsFiddle,
 
 ### Security Bugs
 
-Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. With that in mind, please do not file public issues and go through the process outlined on that page.
+Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe disclosure of security bugs. With that in mind, please do not file public issues; go through the process outlined on that page.
 
 ## How to Get in Touch
 
-* IRC - [#reactjs on freenode](http://webchat.freenode.net/?channels=reactjs)
-* Mailing list - [reactjs on Google Groups](http://groups.google.com/group/reactjs)
+* IRC - [#reactjs on freenode](https://webchat.freenode.net/?channels=reactjs)
+* Discussion forum - [discuss.reactjs.org](https://discuss.reactjs.org/)
 
-## Coding Style
+## Style Guide
 
-* Use semicolons;
-* Commas last,
+Our linter will catch most styling issues that may exist in your code.
+You can check the status of your code styling by simply running: `grunt lint`
+
+However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb's Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
+
+### Code Conventions
+
+* Use semicolons `;`
+* Commas last `,`
 * 2 spaces for indentation (no tabs)
 * Prefer `'` over `"`
-* `"use strict";`
+* `'use strict';`
 * 80 character line length
-* "Attractive"
+* Write "attractive" code
+* Do not use the optional parameters of `setTimeout` and `setInterval`
+
+### Documentation
+
+* Do not wrap lines at 80 characters
 
 ## License
 
-By contributing to React, you agree that your contributions will be licensed under the [Apache License Version 2.0 (APLv2)](LICENSE).
+By contributing to React, you agree that your contributions will be licensed under its BSD license.

Gruntfile.js

@@ -1,123 +1,138 @@
 'use strict';
 
-var exec = require('child_process').exec;
-var jsxTask = require('./grunt/tasks/jsx');
-var browserifyTask = require('./grunt/tasks/browserify');
-var wrapupTask = require('./grunt/tasks/wrapup');
-var populistTask = require('./grunt/tasks/populist');
-var phantomTask = require('./grunt/tasks/phantom');
-var npmTask = require('./grunt/tasks/npm');
-var releaseTasks = require('./grunt/tasks/release');
-var npmReactTasks = require('./grunt/tasks/npm-react');
+var assign = require('object-assign');
+var path = require('path');
 
 module.exports = function(grunt) {
 
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
-    copy: require('./grunt/config/copy'),
-    jsx: require('./grunt/config/jsx/jsx'),
+    jsx: require('./grunt/config/jsx'),
     browserify: require('./grunt/config/browserify'),
-    wrapup: require('./grunt/config/wrapup'),
-    populist: require('./grunt/config/populist'),
-    phantom: require('./grunt/config/phantom'),
     npm: require('./grunt/config/npm'),
-    clean: ['./build', './*.gem', './docs/_site', './examples/shared/*.js'],
-    jshint: require('./grunt/config/jshint'),
-    compare_size: require('./grunt/config/compare_size')
+    clean: [
+      './build',
+      './*.gem',
+      './docs/_site',
+      './examples/shared/*.js',
+      '.module-cache',
+    ],
+    /*eslint-disable camelcase */
+    compare_size: require('./grunt/config/compare_size'),
+    /*eslint-enable camelcase */
   });
 
   grunt.config.set('compress', require('./grunt/config/compress'));
 
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-compare-size');
-  grunt.loadNpmTasks('grunt-contrib-compress');
+  function spawnGulp(args, opts, done) {
+    grunt.util.spawn({
+      // This could be more flexible (require.resolve & lookup bin in package)
+      // but if it breaks we'll fix it then.
+      cmd: path.join('node_modules', '.bin', 'gulp'),
+      args: args,
+      opts: assign({stdio: 'inherit'}, opts),
+    }, function(err, result, code) {
+      if (err) {
+        grunt.fail.fatal('Something went wrong running gulp: ', result);
+      }
+      done(code === 0);
+    });
+  }
 
-  // Alias 'jshint' to 'lint' to better match the workflow we know
-  grunt.registerTask('lint', ['jshint']);
+  Object.keys(grunt.file.readJSON('package.json').devDependencies)
+    .filter(function(npmTaskName) {
+      return npmTaskName.indexOf('grunt-') === 0;
+    })
+    .filter(function(npmTaskName) {
+      return npmTaskName !== 'grunt-cli';
+    })
+    .forEach(function(npmTaskName) {
+      grunt.loadNpmTasks(npmTaskName);
+    });
 
-  // Register jsx:debug and :release tasks.
-  grunt.registerMultiTask('jsx', jsxTask);
+  grunt.registerTask('eslint', require('./grunt/tasks/eslint'));
 
-  // Our own browserify-based tasks to build a single JS file build
-  grunt.registerMultiTask('browserify', browserifyTask);
+  grunt.registerTask('lint', ['eslint']);
 
-  // Similar to Browserify, use WrapUp to generate single JS file that
-  // defines global variables instead of using require.
-  grunt.registerMultiTask('wrapup', wrapupTask);
-
-  grunt.registerMultiTask('populist', populistTask);
-
-  grunt.registerMultiTask('phantom', phantomTask);
-
-  grunt.registerMultiTask('npm', npmTask);
-
-  grunt.registerTask('npm-react:release', npmReactTasks.buildRelease);
-
-  // Check that the version we're exporting is the same one we expect in the
-  // package. This is not an ideal way to do this, but makes sure that we keep
-  // them in sync.
-  var reactVersionExp = /\bReact\.version\s*=\s*['"]([^'"]+)['"];/;
-  grunt.registerTask('version-check', function() {
-    var reactVersion = reactVersionExp.exec(
-      grunt.file.read('./build/modules/React.js')
-    )[1];
-    var npmReactVersion = grunt.file.readJSON('./npm-react/package.json').version;
-    var reactToolsVersion = grunt.config.data.pkg.version;
-
-    if (reactVersion !== reactToolsVersion) {
-      grunt.log.error(
-        'React version does not match react-tools version. Expected %s, saw %s',
-        reactToolsVersion,
-        reactVersion
-      );
-      return false;
-    }
-    if (npmReactVersion !== reactToolsVersion) {
-      grunt.log.error(
-        'npm-react version does not match react-tools veersion. Expected %s, saw %s',
-        reactToolsVersion,
-        npmReactVersion
-      );
-      return false;
-    }
+  grunt.registerTask('delete-build-modules', function() {
+    // Use gulp here.
+    spawnGulp(['react:clean'], null, this.async());
   });
 
-  grunt.registerTask('build:basic', ['jsx:debug', 'version-check', 'browserify:basic']);
-  grunt.registerTask('build:addons', ['jsx:debug', 'browserify:addons']);
-  grunt.registerTask('build:transformer', ['jsx:debug', 'browserify:transformer']);
-  grunt.registerTask('build:min', ['jsx:release', 'version-check', 'browserify:min']);
-  grunt.registerTask('build:addons-min', ['jsx:debug', 'browserify:addonsMin']);
-  grunt.registerTask('build:test', [
-    'jsx:jasmine',
-    'jsx:test',
-    'version-check',
-    'populist:jasmine',
-    'populist:test'
-  ]);
-  grunt.registerTask('build:npm-react', ['version-check', 'jsx:release', 'npm-react:release']);
+  // Register jsx:normal and :release tasks.
+  grunt.registerMultiTask('jsx', require('./grunt/tasks/jsx'));
 
-  grunt.registerTask('test', ['build:test', 'build:basic', 'phantom:run']);
-  grunt.registerTask('npm:test', ['build', 'npm:pack']);
+  // Our own browserify-based tasks to build a single JS file build.
+  grunt.registerMultiTask('browserify', require('./grunt/tasks/browserify'));
 
-  // Optimized build task that does all of our builds. The subtasks will be run
-  // in order so we can take advantage of that and only run jsx:debug once.
-  grunt.registerTask('build', [
-    'jsx:debug',
+  grunt.registerMultiTask('npm', require('./grunt/tasks/npm'));
+
+  var npmReactTasks = require('./grunt/tasks/npm-react');
+  grunt.registerTask('npm-react:release', npmReactTasks.buildRelease);
+  grunt.registerTask('npm-react:pack', npmReactTasks.packRelease);
+
+  var npmReactDOMTasks = require('./grunt/tasks/npm-react-dom');
+  grunt.registerTask('npm-react-dom:release', npmReactDOMTasks.buildRelease);
+  grunt.registerTask('npm-react-dom:pack', npmReactDOMTasks.packRelease);
+
+  var npmReactAddonsTasks = require('./grunt/tasks/npm-react-addons');
+  grunt.registerTask('npm-react-addons:release', npmReactAddonsTasks.buildReleases);
+  grunt.registerTask('npm-react-addons:pack', npmReactAddonsTasks.packReleases);
+
+  grunt.registerTask('version-check', require('./grunt/tasks/version-check'));
+
+  grunt.registerTask('build:basic', [
+    'build-modules',
+    'version-check',
+    'browserify:basic',
+  ]);
+  grunt.registerTask('build:addons', [
+    'build-modules',
+    'browserify:addons',
+  ]);
+  grunt.registerTask('build:min', [
+    'build-modules',
+    'version-check',
+    'browserify:min',
+  ]);
+  grunt.registerTask('build:addons-min', [
+    'build-modules',
+    'browserify:addonsMin',
+  ]);
+  grunt.registerTask('build:npm-react', [
+    'version-check',
+    'build-modules',
+    'npm-react:release',
+  ]);
+  grunt.registerTask('build:react-dom', require('./grunt/tasks/react-dom'));
+
+  grunt.registerTask('test', ['jest']);
+  grunt.registerTask('npm:test', ['build', 'npm:pack']);
+
+  grunt.registerTask('jest', require('./grunt/tasks/jest'));
+
+  // Optimized build task that does all of our builds. The subtasks will be run
+  // in order so we can take advantage of that and only run build-modules once.
+  grunt.registerTask('build', [
+    'delete-build-modules',
+    'build-modules',
     'version-check',
     'browserify:basic',
-    'browserify:transformer',
     'browserify:addons',
-    'jsx:release',
     'browserify:min',
     'browserify:addonsMin',
+    'build:react-dom',
     'npm-react:release',
-    'copy:react_docs',
-    'compare_size'
+    'npm-react:pack',
+    'npm-react-dom:release',
+    'npm-react-dom:pack',
+    'npm-react-addons:release',
+    'npm-react-addons:pack',
+    'compare_size',
   ]);
 
   // Automate the release!
+  var releaseTasks = require('./grunt/tasks/release');
   grunt.registerTask('release:setup', releaseTasks.setup);
   grunt.registerTask('release:bower', releaseTasks.bower);
   grunt.registerTask('release:docs', releaseTasks.docs);
@@ -128,22 +143,17 @@ module.exports = function(grunt) {
     'release:setup',
     'clean',
     'build',
-    'gem:only',
     'release:bower',
     'release:starter',
     'compress',
     'release:docs',
-    'release:msg'
+    'release:msg',
   ]);
 
-  // `gem` task to build the react-source gem
-  grunt.registerTask('gem', ['build', 'gem:only']);
-
-  grunt.registerTask('gem:only', function() {
-    var done = this.async();
-    exec('gem build react-source.gemspec', done);
+  grunt.registerTask('build-modules', function() {
+    spawnGulp(['react:modules'], null, this.async());
   });
 
-  // The default task - build - to keep setup easy
+  // The default task - build - to keep setup easy.
   grunt.registerTask('default', ['build']);
 };

LICENSE

@@ -1,201 +1,31 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+BSD License
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+For React software
 
-   1. Definitions.
+Copyright (c) 2013-2015, Facebook, Inc.
+All rights reserved.
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE-docs

@@ -0,0 +1,393 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public:
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public licenses.
+Notwithstanding, Creative Commons may elect to apply one of its public
+licenses to material it publishes and in those instances will be
+considered the "Licensor." Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the public
+licenses.
+
+Creative Commons may be contacted at creativecommons.org.

LICENSE-examples

@@ -0,0 +1,9 @@
+The examples provided by Facebook are for non-commercial testing and evaluation
+purposes only. Facebook reserves all rights not expressly granted.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

PATENTS

@@ -0,0 +1,33 @@
+Additional Grant of Patent Rights Version 2
+
+"Software" means the React software distributed by Facebook, Inc.
+
+Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software
+("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
+(subject to the termination provision below) license under any Necessary
+Claims, to make, have made, use, sell, offer to sell, import, and otherwise
+transfer the Software. For avoidance of doubt, no license is granted under
+Facebook's rights in any patent claims that are infringed by (i) modifications
+to the Software made by you or any third party or (ii) the Software in
+combination with any software or other technology.
+
+The license granted hereunder will terminate, automatically and without notice,
+if you (or any of your subsidiaries, corporate affiliates or agents) initiate
+directly or indirectly, or take a direct financial interest in, any Patent
+Assertion: (i) against Facebook or any of its subsidiaries or corporate
+affiliates, (ii) against any party if such Patent Assertion arises in whole or
+in part from any software, technology, product or service of Facebook or any of
+its subsidiaries or corporate affiliates, or (iii) against any party relating
+to the Software. Notwithstanding the foregoing, if Facebook or any of its
+subsidiaries or corporate affiliates files a lawsuit alleging patent
+infringement against you in the first instance, and you respond by filing a
+patent infringement counterclaim in that lawsuit against that party that is
+unrelated to the Software, the license granted hereunder will not terminate
+under section (i) of this paragraph due to such counterclaim.
+
+A "Necessary Claim" is a claim of a patent owned by Facebook that is
+necessarily infringed by the Software standing alone.
+
+A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
+or contributory infringement or inducement to infringe any patent, including a
+cross-claim or counterclaim.

README.md

@@ -1,30 +1,27 @@
-# [React](http://facebook.github.io/react) [![Build Status](https://travis-ci.org/facebook/react.png?branch=master)](https://travis-ci.org/facebook/react)
+# [React](https://facebook.github.io/react/) [![Build Status](https://travis-ci.org/facebook/react.svg?branch=master)](https://travis-ci.org/facebook/react) [![npm version](https://badge.fury.io/js/react.svg)](http://badge.fury.io/js/react)
 
 React is a JavaScript library for building user interfaces.
 
 * **Just the UI:** Lots of people use React as the V in MVC. Since React makes no assumptions about the rest of your technology stack, it's easy to try it out on a small feature in an existing project.
-* **Virtual DOM:** React uses a *virtual DOM* diff implementation for ultra-high performance. It can also render on the server using Node.js — no heavy browser DOM required.
+* **Virtual DOM:** React abstracts away the DOM from you, giving a simpler programming model and better performance. React can also render on the server using Node, and it can power native apps using [React Native](https://facebook.github.io/react-native/).
 * **Data flow:** React implements one-way reactive data flow which reduces boilerplate and is easier to reason about than traditional data binding.
 
-[Learn how to use React in your own project.](http://facebook.github.io/react/docs/getting-started.html)
+**NEW**! Check out our newest project [React Native](https://github.com/facebook/react-native), which uses React and JavaScript to create native mobile apps.
 
-## The `react` npm package has recently changed!
-
-If you're looking for jeffbski's [React.js](https://github.com/jeffbski/react) project, it's now in `npm` as `reactjs` rather than `react`.
+[Learn how to use React in your own project](https://facebook.github.io/react/docs/getting-started.html).
 
 ## Examples
 
-We have several examples [on the website](http://facebook.github.io/react/). Here is the first one to get you started:
+We have several examples [on the website](https://facebook.github.io/react/). Here is the first one to get you started:
 
 ```js
-/** @jsx React.DOM */
 var HelloMessage = React.createClass({
   render: function() {
     return <div>Hello {this.props.name}</div>;
   }
 });
 
-React.renderComponent(
+React.render(
   <HelloMessage name="John" />,
   document.getElementById('container')
 );
@@ -32,20 +29,20 @@ React.renderComponent(
 
 This example will render "Hello John" into a container on the page.
 
-You'll notice that we used an XML-like syntax; [we call it JSX](http://facebook.github.io/react/docs/jsx-in-depth.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML. A simple transform is included with React that allows converting JSX into native JavaScript for browsers to digest.
+You'll notice that we used an HTML-like syntax; [we call it JSX](https://facebook.github.io/react/docs/jsx-in-depth.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML. A simple transform is included with React that allows converting JSX into native JavaScript for browsers to digest.
 
 ## Installation
 
-The fastest way to get started is to serve JavaScript from the CDN (also available on [CDNJS](http://cdnjs.com/#react)):
+The fastest way to get started is to serve JavaScript from the CDN (also available on [cdnjs](https://cdnjs.com/libraries/react) and [jsdelivr](http://www.jsdelivr.com/#!react)):
 
 ```html
 <!-- The core React library -->
-<script src="http://fb.me/react-0.8.0.js"></script>
+<script src="https://fb.me/react-0.13.3.js"></script>
 <!-- In-browser JSX transformer, remove when pre-compiling JSX. -->
-<script src="http://fb.me/JSXTransformer-0.8.0.js"></script>
+<script src="https://fb.me/JSXTransformer-0.13.3.js"></script>
 ```
 
-We've also built a [starter kit](http://facebook.github.io/react/downloads/react-0.8.0.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
+We've also built a [starter kit](https://facebook.github.io/react/downloads/react-0.13.3.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
 
 If you'd like to use [bower](http://bower.io), it's as easy as:
 
@@ -63,7 +60,7 @@ The process to build `react.js` is built entirely on top of node.js, using many
 
 #### Prerequisites
 
-* You have `node` installed at v0.10.0+ (it might work at lower versions, we just haven't tested).
+* You have `node` installed at v0.10.0+ (it might work at lower versions, we just haven't tested) and `npm` at v2.0.0+.
 * You are familiar with `npm` and know whether or not you need to use `sudo` when installing packages globally.
 * You are familiar with `git`.
 
@@ -87,12 +84,25 @@ We use grunt to automate many tasks. Run `grunt -h` to see a mostly complete lis
 ```sh
 # Build and run tests with PhantomJS
 grunt test
-# Lint the code with JSHint
+# Build and run tests in your browser
+grunt test --debug
+# Lint the code with ESLint
 grunt lint
 # Wipe out build directory
 grunt clean
 ```
 
+### License
+
+React is [BSD licensed](./LICENSE). We also provide an additional [patent grant](./PATENTS).
+
+React documentation is [Creative Commons licensed](./LICENSE-docs).
+
+Examples provided in this repository and in the documentation are [separately licensed](./LICENSE-examples).
+
 ### More…
 
 There's only so much we can cram in here. To read more about the community and guidelines for submitting pull requests, please read the [Contributing document](CONTRIBUTING.md).
+
+## Troubleshooting
+See the [Troubleshooting Guide](https://github.com/facebook/react/wiki/Troubleshooting)

bin/jsx

@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-var visitors = require('../vendor/fbtransform/visitors').transformVisitors;
-var transform = require('jstransform').transform;
-
-require("commoner").resolve(function(id) {
-  return this.readModuleP(id);
-}).process(function(id, source) {
-  // This is where JSX, ES6, etc. desugaring happens.
-  return transform(visitors.react, source).code;
-});

bin/jsx-internal

@@ -1,11 +1,18 @@
 #!/usr/bin/env node
-"use strict";
+// -*- mode: js -*-
+// vim: set ft=javascript :
 
-var visitors = require('../vendor/fbtransform/visitors').transformVisitors;
-var transform = require('jstransform').transform;
-var propagate = require("../vendor/constants").propagate;
+'use strict';
 
-require("commoner").resolve(function(id) {
+var babel = require('babel');
+
+var devExpressionPlugin = require('fbjs/scripts/babel/dev-expression');
+
+var TRANSFORM_IGNORE_RE = /^WebComponents$/;
+
+require('commoner').version(
+  require('../package.json').version
+).resolve(function(id) {
   var context = this;
 
   // Note that the result of context.getProvidedP() is cached for the
@@ -25,30 +32,16 @@ require("commoner").resolve(function(id) {
 
 }).process(function(id, source) {
   var context = this;
-  var constants = context.config.constants || {};
 
-  // This is where JSX, ES6, etc. desugaring happens.
-  source = transform(visitors.react, source).code;
-
-  // Constant propagation means removing any obviously dead code after
-  // replacing constant expressions with literal (boolean) values.
-  source = propagate(constants, source);
-
-  if (context.config.mocking) {
-    // Make sure there is exactly one newline at the end of the module.
-    source = source.replace(/\s+$/m, "\n");
-
-    return context.getProvidedP().then(function(idToPath) {
-      if (id !== "mock-modules" &&
-          id !== "mocks" &&
-          id !== "test/all" &&
-          idToPath.hasOwnProperty("mock-modules")) {
-        return source + '\nrequire("mock-modules").register(' +
-          JSON.stringify(id) + ', module);\n';
-      }
-
-      return source;
-    });
+  // This is hacky but that's ok… It really only matters for tests since it
+  // won't otherwise be in the dependency tree.
+  if (!TRANSFORM_IGNORE_RE.test(id)) {
+    // This is where JSX, ES6, etc. desugaring happens.
+    source = babel.transform(source, {
+      blacklist: ['spec.functionName', 'validation.react'],
+      plugins: [devExpressionPlugin],
+      filename: id,
+    }).code;
   }
 
   return source;

docs/404.md

@@ -0,0 +1,8 @@
+---
+layout: single
+title: Page Not Found
+---
+
+We couldn't find what you were looking for.
+
+Please contact the owner of the site that linked you to the original URL and let them know their link is broken.

docs/Gemfile

@@ -3,19 +3,17 @@ source 'https://rubygems.org'
 gem 'rake'
 
 # jekyll, which builds it all
-gem 'jekyll', '~>1.3.0'
+# 2.0 includes sass processing
+gem 'jekyll', '~>2.0'
+
+# Auto redirect pages
+gem 'jekyll-redirect-from'
 
 # JSON
 gem 'json'
 
-# SASS for CSS
-gem 'sass'
-
 # For `rake watch`
 gem 'rb-fsevent'
 
-# Redcarpet for Markdown
-gem 'redcarpet'
-
 # For markdown header cleanup
-gem 'sanitize'
+gem 'sanitize', '~>2.0'

docs/Gemfile.lock

@@ -1,61 +1,85 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    classifier (1.3.3)
+    blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.1)
     colorator (0.1)
-    commander (4.1.5)
-      highline (~> 1.6.11)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
-    highline (1.6.20)
-    jekyll (1.3.0)
+    jekyll (2.2.0)
       classifier (~> 1.3)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.2)
-      listen (~> 1.3)
-      maruku (~> 0.6.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.9.7)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.0)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-paginate (1.0.0)
+    jekyll-redirect-from (0.5.0)
+      jekyll (~> 2.0)
+    jekyll-sass-converter (1.2.0)
+      sass (~> 3.2)
+    jekyll-watch (1.1.0)
+      listen (~> 2.7)
     json (1.8.1)
-    liquid (2.5.4)
-    listen (1.3.1)
+    kramdown (1.4.1)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    mini_portile (0.5.2)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.5.4)
+    mercenary (0.3.4)
+    mini_portile (0.6.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.9)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
-    safe_yaml (0.9.7)
+    redcarpet (3.1.2)
+    safe_yaml (1.0.4)
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
-    sass (3.2.12)
-    syntax (1.0.0)
+    sass (3.3.14)
+    timers (1.1.0)
+    toml (0.1.1)
+      parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 1.3.0)
+  jekyll (~> 2.0)
+  jekyll-redirect-from
   json
   rake
   rb-fsevent
-  redcarpet
-  sanitize
-  sass
+  sanitize (~> 2.0)
+
+BUNDLED WITH
+   1.10.1

docs/README.md

@@ -21,7 +21,7 @@ Once you have RubyGems and installed Bundler (via `gem install bundler`), use it
 ```sh
 $ cd react/docs
 $ bundle install # Might need sudo.
-$ npm install # Might need sudo.
+$ npm install
 ```
 
 ### Instructions
@@ -32,8 +32,8 @@ Use Jekyll to serve the website locally (by default, at `http://localhost:4000`)
 
 ```sh
 $ cd react/docs
-$ rake
-$ jekyll serve -w
+$ bundle exec rake
+$ bundle exec jekyll serve -w
 $ open http://localhost:4000/react/
 ```
 
@@ -43,19 +43,24 @@ If you want to modify the CSS or JS, use [Rake](http://rake.rubyforge.org/) to c
 
 ```sh
 $ cd react/docs
-$ rake watch # Automatically compiles as needed.
-# rake         Manually compile CSS and JS.
-# rake css     Manually compile CSS, only.
-# rake js      Manually compile JS, only.
+$ bundle exec rake watch # Automatically compiles as needed.
+# bundle exec rake         Manually compile CSS and JS.
+# bundle exec rake js      Manually compile JS, only.
 ```
 
 ## Afterthoughts
 
 ### Updating `facebook.github.io/react`
 
-The easiest way to do this is to have a separate clone of this repository, checked out to the `gh-pages` branch. We have a build step that expects this to be in a directory named `react-gh-pages` at the same depth as `react`. Then it's just a matter of running `grunt docs`, which will compile the site and copy it out to this repository. From there you can check it in.
+The easiest way to do this is to have a separate clone of this repository, checked out to the `gh-pages` branch. We have a build step that expects this to be in a directory named `react-gh-pages` at the same depth as `react`. Then it's just a matter of running `grunt docs`, which will compile the site and copy it out to this repository. From there, you can check it in.
 
-**Note:** This should only be done for new releases. You should create a tag corresponding to the relase tag in the main repository.
+**Note:** This should only be done for new releases. You should create a tag corresponding to the release tag in the main repository.
+
+We also have a rake task that does the same thing (without creating commits). It expects the directory structure mentioned above.
+
+```sh
+$ bundle exec rake release
+```
 
 ### Removing the Jekyll / Ruby Dependency
 

docs/Rakefile

@@ -2,20 +2,15 @@ require('rubygems')
 require('json')
 require('yaml')
 
-desc "generate css from sass"
-task :css do
-  system "sass --style=compressed _css/react.scss css/react.css"
-end
-
 desc "generate js from jsx"
 task :js do
-  system "../bin/jsx _js js"
+  system "cp ../node_modules/babel/node_modules/babel-core/browser.min.js ./js/babel-browser.min.js"
+  system "../node_modules/.bin/babel _js --out-dir=js"
 end
 
-desc "watch css & js"
+desc "watch js"
 task :watch do
-  Process.spawn "sass --style=compressed --watch _css/react.scss:css/react.css"
-  Process.spawn "../bin/jsx --watch _js js"
+  Process.spawn "../node_modules/.bin/babel _js --out-dir=js --watch"
   Process.waitall
 end
 
@@ -29,9 +24,19 @@ task :update_version do
   end
 end
 
+desc "update acknowledgements list"
+task :update_acknowledgements do
+  authors = File.readlines('../AUTHORS').map {|author| author.gsub(/ <.*\n/,'')}
+  # split into cols here because nobody knows how to use liquid
+  # need to to_f because ruby will keep slice_size as int and round on its own
+  slice_size = (authors.size / 3.to_f).ceil
+  cols = authors.each_slice(slice_size).to_a
+  File.open('_data/acknowledgements.yml', 'w+') { |f| f.write(cols.to_yaml) }
+end
+
 desc "build into ../../react-gh-pages"
 task :release => [:update_version, :default] do
   system "jekyll build -d ../../react-gh-pages"
 end
 
-task :default => [:css, :js]
+task :default => [:js]

docs/_config.yml

@@ -1,21 +1,39 @@
 ---
-baseurl: /react
-url: http://facebook.github.io
-permalink: /blog/:year/:month/:day/:title.html
+name: React
+description: A JavaScript library for building user interfaces
+url: https://facebook.github.io
+baseurl: "/react"
+permalink: "/blog/:year/:month/:day/:title.html"
+paginate_path: "/blog/page:num/"
+relative_permalinks: true
+paginate: 5
+timezone: America/Los_Angeles
+highlighter: pygments
+defaults:
+- scope:
+    path: ''
+    type: post
+  values:
+    layout: post
+- scope:
+    path: docs
+    type: page
+  values:
+    layout: docs
 exclude:
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- vendor/bundle
+markdown: redcarpet
 redcarpet:
   extensions:
   - fenced_code_blocks
-pygments: true
-name: React
-markdown: redcarpet
-react_version: 0.8.0
-description: A JavaScript library for building user interfaces
-relative_permalinks: true
-paginate: 5
-paginate_path: /blog/page:num/
-timezone: America/Los_Angeles
+  - footnotes
+sass:
+  style: :compressed
+  sass_dir: _css
+gems:
+- jekyll-redirect-from
+react_version: 0.14.0

docs/_css/_typography.scss

@@ -6,7 +6,6 @@ $textColorLight: lighten($textColor, 20%);
 html {
   font-family: $helvetica;
   font-family: proxima-nova, $helvetica;
-  font-weight: 300;
   color: $textColor;
   line-height: 1.28;
 }
@@ -69,7 +68,7 @@ h3 {
 }
 
 h4 {
-  font-size: 17px;
+  font-size: 16px;
 }
 
 h5 {
@@ -132,5 +131,3 @@ a {
 .center {
   text-align: center;
 }
-
-

docs/_css/bourbon/_bourbon-deprecated-upcoming.scss

@@ -2,12 +2,7 @@
 // These mixins/functions are deprecated
 // They will be removed in the next MAJOR version release
 //************************************************************************//
-@mixin box-shadow ($shadows...) {
-  @include prefixer(box-shadow, $shadows, spec);
-  @warn "box-shadow is deprecated and will be removed in the next major version release";
-}
-
-@mixin background-size ($lengths...) {
-  @include prefixer(background-size, $lengths, spec);
-  @warn "background-size is deprecated and will be removed in the next major version release";
+@mixin inline-block {
+  display: inline-block;
+  @warn "inline-block mixin is deprecated and will be removed in the next major version release";
 }

docs/_css/bourbon/_bourbon.scss

@@ -1,22 +1,36 @@
+// Settings
+@import "settings/prefixer";
+@import "settings/px-to-em";
+@import "settings/asset-pipeline";
+
 // Custom Helpers
-@import "helpers/deprecated-webkit-gradient";
+@import "helpers/convert-units";
 @import "helpers/gradient-positions-parser";
+@import "helpers/is-num";
+@import "helpers/linear-angle-parser";
+@import "helpers/linear-gradient-parser";
 @import "helpers/linear-positions-parser";
+@import "helpers/linear-side-corner-parser";
 @import "helpers/radial-arg-parser";
 @import "helpers/radial-positions-parser";
+@import "helpers/radial-gradient-parser";
 @import "helpers/render-gradients";
 @import "helpers/shape-size-stripper";
+@import "helpers/str-to-num";
 
 // Custom Functions
-@import "functions/compact";
+@import "functions/assign";
+@import "functions/color-lightness";
 @import "functions/flex-grid";
+@import "functions/golden-ratio";
 @import "functions/grid-width";
-@import "functions/linear-gradient";
 @import "functions/modular-scale";
 @import "functions/px-to-em";
-@import "functions/radial-gradient";
+@import "functions/px-to-rem";
+@import "functions/strip-units";
 @import "functions/tint-shade";
 @import "functions/transition-property-name";
+@import "functions/unpack";
 
 // CSS3 Mixins
 @import "css3/animation";
@@ -27,12 +41,15 @@
 @import "css3/border-image";
 @import "css3/border-radius";
 @import "css3/box-sizing";
+@import "css3/calc";
 @import "css3/columns";
+@import "css3/filter";
 @import "css3/flex-box";
 @import "css3/font-face";
+@import "css3/font-feature-settings";
+@import "css3/hyphens";
 @import "css3/hidpi-media-query";
 @import "css3/image-rendering";
-@import "css3/inline-block";
 @import "css3/keyframes";
 @import "css3/linear-gradient";
 @import "css3/perspective";
@@ -45,6 +62,8 @@
 // Addons & other mixins
 @import "addons/button";
 @import "addons/clearfix";
+@import "addons/directional-values";
+@import "addons/ellipsis";
 @import "addons/font-family";
 @import "addons/hide-text";
 @import "addons/html5-input-types";
@@ -54,6 +73,7 @@
 @import "addons/size";
 @import "addons/timing-functions";
 @import "addons/triangle";
+@import "addons/word-wrap";
 
 // Soon to be deprecated Mixins
 @import "bourbon-deprecated-upcoming";

docs/_css/bourbon/addons/_button.scss

@@ -1,38 +1,51 @@
-@mixin button ($style: simple, $base-color: #4294f0) {
+@mixin button ($style: simple, $base-color: #4294f0, $text-size: inherit, $padding: 7px 18px) {
 
-  @if type-of($style) == color {
+  @if type-of($style) == string and type-of($base-color) == color {
+    @include buttonstyle($style, $base-color, $text-size, $padding);
+  }
+
+  @if type-of($style) == string and type-of($base-color) == number {
+    $padding: $text-size;
+    $text-size: $base-color;
+    $base-color: #4294f0;
+
+    @if $padding == inherit {
+      $padding: 7px 18px;
+    }
+
+    @include buttonstyle($style, $base-color, $text-size, $padding);
+  }
+
+  @if type-of($style) == color and type-of($base-color) == color {
     $base-color: $style;
     $style: simple;
+    @include buttonstyle($style, $base-color, $text-size, $padding);
   }
 
-  // Grayscale button
-  @if $base-color == grayscale($base-color) {
-    @if $style == simple {
-      @include simple($base-color, $grayscale: true);
+  @if type-of($style) == color and type-of($base-color) == number {
+    $padding: $text-size;
+    $text-size: $base-color;
+    $base-color: $style;
+    $style: simple;
+
+    @if $padding == inherit {
+      $padding: 7px 18px;
     }
 
-    @else if $style == shiny {
-      @include shiny($base-color, $grayscale: true);
-    }
-
-    @else if $style == pill {
-      @include pill($base-color, $grayscale: true);
-    }
+    @include buttonstyle($style, $base-color, $text-size, $padding);
   }
 
-  // Colored button
-  @else {
-    @if $style == simple {
-      @include simple($base-color);
+  @if type-of($style) == number {
+    $padding: $base-color;
+    $text-size: $style;
+    $base-color: #4294f0;
+    $style: simple;
+
+    @if $padding == #4294f0 {
+      $padding: 7px 18px;
     }
 
-    @else if $style == shiny {
-      @include shiny($base-color);
-    }
-
-    @else if $style == pill {
-      @include pill($base-color);
-    }
+    @include buttonstyle($style, $base-color, $text-size, $padding);
   }
 
   &:disabled {
@@ -42,16 +55,55 @@
 }
 
 
+// Selector Style Button
+//************************************************************************//
+@mixin buttonstyle($type, $b-color, $t-size, $pad) {
+  // Grayscale button
+  @if $type == simple and $b-color == grayscale($b-color) {
+    @include simple($b-color, true, $t-size, $pad);
+  }
+
+  @if $type == shiny and $b-color == grayscale($b-color) {
+    @include shiny($b-color, true, $t-size, $pad);
+  }
+
+  @if $type == pill and $b-color == grayscale($b-color) {
+    @include pill($b-color, true, $t-size, $pad);
+  }
+
+  @if $type == flat and $b-color == grayscale($b-color) {
+    @include flat($b-color, true, $t-size, $pad);
+  }
+
+  // Colored button
+  @if $type == simple {
+    @include simple($b-color, false, $t-size, $pad);
+  }
+
+  @else if $type == shiny {
+    @include shiny($b-color, false, $t-size, $pad);
+  }
+
+  @else if $type == pill {
+    @include pill($b-color, false, $t-size, $pad);
+  }
+
+  @else if $type == flat {
+    @include flat($b-color, false, $t-size, $pad);
+  }
+}
+
+
 // Simple Button
 //************************************************************************//
-@mixin simple($base-color, $grayscale: false) {
+@mixin simple($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
   $color:         hsl(0, 0, 100%);
   $border:        adjust-color($base-color, $saturation:  9%,  $lightness: -14%);
   $inset-shadow:  adjust-color($base-color, $saturation: -8%,  $lightness:  15%);
   $stop-gradient: adjust-color($base-color, $saturation:  9%,  $lightness: -11%);
   $text-shadow:   adjust-color($base-color, $saturation:  15%, $lightness: -18%);
 
-  @if lightness($base-color) > 70% {
+  @if is-light($base-color) {
     $color:       hsl(0, 0, 20%);
     $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
   }
@@ -68,10 +120,10 @@
   box-shadow: inset 0 1px 0 0 $inset-shadow;
   color: $color;
   display: inline-block;
-  font-size: 11px;
+  font-size: $textsize;
   font-weight: bold;
   @include linear-gradient ($base-color, $stop-gradient);
-  padding: 7px 18px;
+  padding: $padding;
   text-decoration: none;
   text-shadow: 0 1px 0 $text-shadow;
   background-clip: padding-box;
@@ -92,7 +144,8 @@
     @include linear-gradient ($base-color-hover, $stop-gradient-hover);
   }
 
-  &:active:not(:disabled) {
+  &:active:not(:disabled),
+  &:focus:not(:disabled) {
     $border-active:       adjust-color($base-color, $saturation: 9%, $lightness: -14%);
     $inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%);
 
@@ -102,14 +155,14 @@
     }
 
     border: 1px solid $border-active;
-    box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active, 0 1px 1px 0 #eee;
+    box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active;
   }
 }
 
 
 // Shiny Button
 //************************************************************************//
-@mixin shiny($base-color, $grayscale: false) {
+@mixin shiny($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
   $color:         hsl(0, 0, 100%);
   $border:        adjust-color($base-color, $red: -117, $green: -111, $blue: -81);
   $border-bottom: adjust-color($base-color, $red: -126, $green: -127, $blue: -122);
@@ -119,7 +172,7 @@
   $text-shadow:   adjust-color($base-color, $red: -140, $green: -141, $blue: -114);
   $third-stop:    adjust-color($base-color, $red: -86,  $green: -75,  $blue: -48);
 
-  @if lightness($base-color) > 70% {
+  @if is-light($base-color) {
     $color:       hsl(0, 0, 20%);
     $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
   }
@@ -140,10 +193,10 @@
   box-shadow: inset 0 1px 0 0 $inset-shadow;
   color: $color;
   display: inline-block;
-  font-size: 14px;
+  font-size: $textsize;
   font-weight: bold;
   @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%);
-  padding: 8px 20px;
+  padding: $padding;
   text-align: center;
   text-decoration: none;
   text-shadow: 0 -1px 1px $text-shadow;
@@ -168,21 +221,22 @@
                                   $fourth-stop-hover 100%);
   }
 
-  &:active:not(:disabled) {
+  &:active:not(:disabled),
+  &:focus:not(:disabled) {
     $inset-shadow-active: adjust-color($base-color, $red: -111, $green: -116, $blue: -122);
 
     @if $grayscale == true {
       $inset-shadow-active: grayscale($inset-shadow-active);
     }
 
-    box-shadow: inset 0 0 20px 0 $inset-shadow-active, 0 1px 0 #fff;
+    box-shadow: inset 0 0 20px 0 $inset-shadow-active;
   }
 }
 
 
 // Pill Button
 //************************************************************************//
-@mixin pill($base-color, $grayscale: false) {
+@mixin pill($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
   $color:         hsl(0, 0, 100%);
   $border-bottom: adjust-color($base-color, $hue:  8, $saturation: -11%, $lightness: -26%);
   $border-sides:  adjust-color($base-color, $hue:  4, $saturation: -21%, $lightness: -21%);
@@ -191,7 +245,7 @@
   $stop-gradient: adjust-color($base-color, $hue:  8, $saturation:  14%, $lightness: -10%);
   $text-shadow:   adjust-color($base-color, $hue:  5, $saturation: -19%, $lightness: -15%);
 
-  @if lightness($base-color) > 70% {
+  @if is-light($base-color) {
     $color:       hsl(0, 0, 20%);
     $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
   }
@@ -208,14 +262,14 @@
   border: 1px solid $border-top;
   border-color: $border-top $border-sides $border-bottom;
   border-radius: 16px;
-  box-shadow: inset 0 1px 0 0 $inset-shadow, 0 1px 2px 0 #b3b3b3;
+  box-shadow: inset 0 1px 0 0 $inset-shadow;
   color: $color;
   display: inline-block;
-  font-size: 11px;
+  font-size: $textsize;
   font-weight: normal;
   line-height: 1;
   @include linear-gradient ($base-color, $stop-gradient);
-  padding: 5px 16px;
+  padding: $padding;
   text-align: center;
   text-decoration: none;
   text-shadow: 0 -1px 1px $text-shadow;
@@ -249,7 +303,8 @@
     background-clip: padding-box;
   }
 
-  &:active:not(:disabled) {
+  &:active:not(:disabled),
+  &:focus:not(:disabled) {
     $active-color:         adjust-color($base-color, $hue: 4,  $saturation: -12%,  $lightness: -10%);
     $border-active:        adjust-color($base-color, $hue: 6,  $saturation: -2.5%, $lightness: -30%);
     $border-bottom-active: adjust-color($base-color, $hue: 11, $saturation:  6%,   $lightness: -31%);
@@ -267,7 +322,53 @@
     background: $active-color;
     border: 1px solid $border-active;
     border-bottom: 1px solid $border-bottom-active;
-    box-shadow: inset 0 0 6px 3px $inset-shadow-active, 0 1px 0 0 #fff;
+    box-shadow: inset 0 0 6px 3px $inset-shadow-active;
     text-shadow: 0 -1px 1px $text-shadow-active;
   }
 }
+
+
+
+// Flat Button
+//************************************************************************//
+@mixin flat($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
+  $color:         hsl(0, 0, 100%);
+
+  @if is-light($base-color) {
+    $color:       hsl(0, 0, 20%);
+  }
+
+  background-color: $base-color;
+  border-radius: 3px;
+  border: none;
+  color: $color;
+  display: inline-block;
+  font-size: inherit;
+  font-weight: bold;
+  padding: 7px 18px;
+  text-decoration: none;
+  background-clip: padding-box;
+
+  &:hover:not(:disabled){
+    $base-color-hover:    adjust-color($base-color, $saturation: 4%, $lightness: 5%);
+
+    @if $grayscale == true {
+      $base-color-hover: grayscale($base-color-hover);
+    }
+
+    background-color: $base-color-hover;
+    cursor: pointer;
+  }
+
+  &:active:not(:disabled),
+  &:focus:not(:disabled) {
+    $base-color-active: adjust-color($base-color, $saturation: -4%, $lightness: -5%);
+
+    @if $grayscale == true {
+      $base-color-active: grayscale($base-color-active);
+    }
+
+    background-color: $base-color-active;
+    cursor: pointer;
+  }
+}

docs/_css/bourbon/addons/_clearfix.scss

@@ -1,4 +1,4 @@
-// Micro clearfix provides an easy way to contain floats without adding additional markup
+// Modern micro clearfix provides an easy way to contain floats without adding additional markup.
 //
 // Example usage:
 //
@@ -12,18 +12,12 @@
 //    }
 
 @mixin clearfix {
-  *zoom: 1;
-
-  &:before,
   &:after {
-    content: " ";
-    display: table;
-  }
-
-  &:after {
-    clear: both;
+    content:"";
+    display:table;
+    clear:both;
   }
 }
 
 // Acknowledgements
-// Micro clearfix: [Nicolas Gallagher](http://nicolasgallagher.com/micro-clearfix-hack/)
+// Beat *that* clearfix: [Thierry Koblentz](http://www.css-101.org/articles/clearfix/latest-new-clearfix-so-far.php)

docs/_css/bourbon/addons/_directional-values.scss

@@ -0,0 +1,111 @@
+// directional-property mixins are shorthands
+// for writing properties like the following
+//
+// @include margin(null 0 10px);
+// ------
+// margin-right: 0;
+// margin-bottom: 10px;
+// margin-left: 0;
+//
+// - or -
+//
+// @include border-style(dotted null);
+// ------
+// border-top-style: dotted;
+// border-bottom-style: dotted;
+//
+// ------
+//
+// Note: You can also use false instead of null
+
+@function collapse-directionals($vals) {
+  $output: null;
+
+  $A: nth( $vals, 1 );
+  $B: if( length($vals) < 2, $A, nth($vals, 2));
+  $C: if( length($vals) < 3, $A, nth($vals, 3));
+  $D: if( length($vals) < 2, $A, nth($vals, if( length($vals) < 4, 2, 4) ));
+
+  @if $A == 0 { $A: 0 }
+  @if $B == 0 { $B: 0 }
+  @if $C == 0 { $C: 0 }
+  @if $D == 0 { $D: 0 }
+
+  @if $A == $B and $A == $C and $A == $D { $output: $A          }
+  @else if $A == $C and $B == $D         { $output: $A $B       }
+  @else if $B == $D                      { $output: $A $B $C    }
+  @else                                  { $output: $A $B $C $D }
+
+  @return $output;
+}
+
+@function contains-falsy($list) {
+  @each $item in $list {
+    @if not $item {
+      @return true;
+    }
+  }
+
+  @return false;
+}
+
+@mixin directional-property($pre, $suf, $vals) {
+  // Property Names
+  $top:    $pre + "-top"    + if($suf, "-#{$suf}", "");
+  $bottom: $pre + "-bottom" + if($suf, "-#{$suf}", "");
+  $left:   $pre + "-left"   + if($suf, "-#{$suf}", "");
+  $right:  $pre + "-right"  + if($suf, "-#{$suf}", "");
+  $all:    $pre +             if($suf, "-#{$suf}", "");
+
+  $vals: collapse-directionals($vals);
+
+  @if contains-falsy($vals) {
+    @if nth($vals, 1) { #{$top}: nth($vals, 1); }
+
+    @if length($vals) == 1 {
+      @if nth($vals, 1) { #{$right}: nth($vals, 1); }
+    } @else {
+      @if nth($vals, 2) { #{$right}: nth($vals, 2); }
+    }
+
+    // prop: top/bottom right/left
+    @if length($vals) == 2 {
+      @if nth($vals, 1) { #{$bottom}: nth($vals, 1); }
+      @if nth($vals, 2) { #{$left}:   nth($vals, 2); }
+
+    // prop: top right/left bottom
+    } @else if length($vals) == 3 {
+      @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }
+      @if nth($vals, 2) { #{$left}:   nth($vals, 2); }
+
+    // prop: top right bottom left
+    } @else if length($vals) == 4 {
+      @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }
+      @if nth($vals, 4) { #{$left}:   nth($vals, 4); }
+    }
+
+  // prop: top/right/bottom/left
+  } @else {
+    #{$all}: $vals;
+  }
+}
+
+@mixin margin($vals...) {
+  @include directional-property(margin, false, $vals...);
+}
+
+@mixin padding($vals...) {
+  @include directional-property(padding, false, $vals...);
+}
+
+@mixin border-style($vals...) {
+  @include directional-property(border, style, $vals...);
+}
+
+@mixin border-color($vals...) {
+  @include directional-property(border, color, $vals...);
+}
+
+@mixin border-width($vals...) {
+  @include directional-property(border, width, $vals...);
+}

docs/_css/bourbon/addons/_ellipsis.scss

@@ -0,0 +1,7 @@
+@mixin ellipsis($width: 100%) {
+  display: inline-block;
+  max-width: $width;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

docs/_css/bourbon/addons/_font-family.scss

@@ -1,5 +1,5 @@
 $georgia: Georgia, Cambria, "Times New Roman", Times, serif;
-$helvetica: "Helvetica Neue", Helvetica, Arial, sans-serif;
+$helvetica: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
 $lucida-grande: "Lucida Grande", Tahoma, Verdana, Arial, sans-serif;
 $monospace: "Bitstream Vera Sans Mono", Consolas, Courier, monospace;
 $verdana: Verdana, Geneva, sans-serif;

docs/_css/bourbon/addons/_hide-text.scss

@@ -1,5 +1,10 @@
 @mixin hide-text {
-  color:            transparent;
-  font:             0/0 a;
-  text-shadow:      none;
+  overflow: hidden;
+
+  &:before {
+    content: "";
+    display: block;
+    width: 0;
+    height: 100%;
+  }
 }

docs/_css/bourbon/addons/_html5-input-types.scss

@@ -20,29 +20,19 @@ $inputs-list: 'input[type="email"]',
               'input[type="time"]',
               'input[type="week"]';
 
-$unquoted-inputs-list: ();
-@each $input-type in $inputs-list {
-  $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma);
-}
-
-$all-text-inputs: $unquoted-inputs-list;
-
+// Bare inputs
+//************************************************************************//
+$all-text-inputs: assign-inputs($inputs-list);
 
 // Hover Pseudo-class
 //************************************************************************//
-$all-text-inputs-hover: ();
-@each $input-type in $unquoted-inputs-list {
-      $input-type-hover: $input-type + ":hover";
-      $all-text-inputs-hover: append($all-text-inputs-hover, $input-type-hover, comma);
-}
+$all-text-inputs-hover: assign-inputs($inputs-list, hover);
 
 // Focus Pseudo-class
 //************************************************************************//
-$all-text-inputs-focus: ();
-@each $input-type in $unquoted-inputs-list {
-      $input-type-focus: $input-type + ":focus";
-      $all-text-inputs-focus: append($all-text-inputs-focus, $input-type-focus, comma);
-}
+$all-text-inputs-focus: assign-inputs($inputs-list, focus);
+
+
 
 // You must use interpolation on the variable:
 // #{$all-text-inputs}
@@ -54,3 +44,43 @@ $all-text-inputs-focus: ();
 //   #{$all-text-inputs}, textarea {
 //     border: 1px solid red;
 //   }
+
+
+
+//************************************************************************//
+// Generate a variable ($all-button-inputs) with a list of all html5
+// input types that have a button-based input, excluding button.
+//************************************************************************//
+$inputs-button-list: 'input[type="button"]',
+                     'input[type="reset"]',
+                     'input[type="submit"]';
+
+// Bare inputs
+//************************************************************************//
+$all-button-inputs: assign-inputs($inputs-button-list);
+
+// Hover Pseudo-class
+//************************************************************************//
+$all-button-inputs-hover: assign-inputs($inputs-button-list, hover);
+
+// Focus Pseudo-class
+//************************************************************************//
+$all-button-inputs-focus: assign-inputs($inputs-button-list, focus);
+
+// Active Pseudo-class
+//************************************************************************//
+$all-button-inputs-active: assign-inputs($inputs-button-list, active);
+
+
+
+// You must use interpolation on the variable:
+// #{$all-button-inputs}
+// #{$all-button-inputs-hover}
+// #{$all-button-inputs-focus}
+// #{$all-button-inputs-active}
+
+// Example
+//************************************************************************//
+//   #{$all-button-inputs}, button {
+//     border: 1px solid red;
+//   }

docs/_css/bourbon/addons/_position.scss

@@ -1,10 +1,12 @@
-@mixin position ($position: relative, $coordinates: 0 0 0 0) {
+@mixin position ($position: relative, $coordinates: null null null null) {
 
   @if type-of($position) == list {
     $coordinates: $position;
     $position: relative;
   }
 
+  $coordinates: unpack($coordinates);
+
   $top: nth($coordinates, 1);
   $right: nth($coordinates, 2);
   $bottom: nth($coordinates, 3);
@@ -12,31 +14,19 @@
 
   position: $position;
 
-  @if $top == auto {
-    top: $top;
-  }
-  @else if not(unitless($top)) {
+  @if ($top and $top == auto) or (type-of($top) == number) {
     top: $top;
   }
 
-  @if $right == auto {
-    right: $right;
-  }
-  @else if not(unitless($right)) {
+  @if ($right and $right == auto) or (type-of($right) == number) {
     right: $right;
   }
 
-  @if $bottom == auto {
-    bottom: $bottom;
-  }
-  @else if not(unitless($bottom)) {
+  @if ($bottom and $bottom == auto) or (type-of($bottom) == number) {
     bottom: $bottom;
   }
 
-  @if $left == auto {
-    left: $left;
-  }
-  @else if not(unitless($left)) {
+  @if ($left and $left == auto) or (type-of($left) == number) {
     left: $left;
   }
 }

docs/_css/bourbon/addons/_prefixer.scss

@@ -1,11 +1,7 @@
 //************************************************************************//
 // Example: @include prefixer(border-radius, $radii, webkit ms spec);
 //************************************************************************//
-$prefix-for-webkit:    true !default;
-$prefix-for-mozilla:   true !default;
-$prefix-for-microsoft: true !default;
-$prefix-for-opera:     true !default;
-$prefix-for-spec:      true !default; // required for keyframe mixin
+// Variables located in /settings/_prefixer.scss
 
 @mixin prefixer ($property, $value, $prefixes) {
   @each $prefix in $prefixes {
@@ -41,9 +37,9 @@ $prefix-for-spec:      true !default; // required for keyframe mixin
 }
 
 @mixin disable-prefix-for-all() {
-  $prefix-for-webkit:    false;
-  $prefix-for-mozilla:   false;
-  $prefix-for-microsoft: false;
-  $prefix-for-opera:     false;
-  $prefix-for-spec:      false;
+  $prefix-for-webkit:    false !global;
+  $prefix-for-mozilla:   false !global;
+  $prefix-for-microsoft: false !global;
+  $prefix-for-opera:     false !global;
+  $prefix-for-spec:      false !global;
 }

docs/_css/bourbon/addons/_retina-image.scss

@@ -1,28 +1,27 @@
-@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $asset-pipeline: false) {
+@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) {
   @if $asset-pipeline {
-    background-image: image_url($filename + "." + $extension);
+    background-image: image-url("#{$filename}.#{$extension}");
   }
   @else {
-    background-image: url($filename + "." + $extension);
+    background-image:       url("#{$filename}.#{$extension}");
   }
 
   @include hidpi {
-
     @if $asset-pipeline {
       @if $retina-filename {
-        background-image: image_url($retina-filename + "." + $extension);
+        background-image: image-url("#{$retina-filename}.#{$extension}");
       }
       @else {
-        background-image: image_url($filename + "@2x" + "." + $extension);
+        background-image: image-url("#{$filename}#{$retina-suffix}.#{$extension}");
       }
     }
 
     @else {
       @if $retina-filename {
-        background-image: url($retina-filename + "." + $extension);
+        background-image: url("#{$retina-filename}.#{$extension}");
       }
       @else {
-        background-image: url($filename + "@2x" + "." + $extension);
+        background-image: url("#{$filename}#{$retina-suffix}.#{$extension}");
       }
     }
 

docs/_css/bourbon/addons/_size.scss

@@ -1,44 +1,16 @@
 @mixin size($size) {
-  @if length($size) == 1 {
-    @if $size == auto {
-      width:  $size;
-      height: $size;
-    }
+  $height: nth($size, 1);
+  $width: $height;
 
-    @else if unitless($size) {
-      width:  $size + px;
-      height: $size + px;
-    }
-
-    @else if not(unitless($size)) {
-      width:  $size;
-      height: $size;
-    }
+  @if length($size) > 1 {
+    $height: nth($size, 2);
   }
 
-  // Width x Height
-  @if length($size) == 2 {
-    $width:  nth($size, 1);
-    $height: nth($size, 2);
+  @if $height == auto or (type-of($height) == number and not unitless($height)) {
+    height: $height;
+  }
 
-    @if $width == auto {
-      width: $width;
-    }
-    @else if not(unitless($width)) {
-      width: $width;
-    }
-    @else if unitless($width) {
-      width: $width + px;
-    }
-
-    @if $height == auto {
-      height: $height;
-    }
-    @else if not(unitless($height)) {
-      height: $height;
-    }
-    @else if unitless($height) {
-      height: $height + px;
-    }
+  @if $width == auto or (type-of($width) == number and not unitless($width)) {
+    width: $width;
   }
 }

docs/_css/bourbon/addons/_timing-functions.scss

@@ -1,5 +1,5 @@
 // CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com/jaukia/easie)
-// Timing functions are the same as demo'ed here: http://jqueryui.com/demos/effect/easing.html
+// Timing functions are the same as demo'ed here: http://jqueryui.com/resources/demos/effect/easing.html
 
 // EASE IN
 $ease-in-quad:      cubic-bezier(0.550,  0.085, 0.680, 0.530);

docs/_css/bourbon/addons/_triangle.scss

@@ -2,44 +2,82 @@
   height: 0;
   width: 0;
 
+  $width: nth($size, 1);
+  $height: nth($size, length($size));
+
+  $foreground-color: nth($color, 1);
+  $background-color: if(length($color) == 2, nth($color, 2), transparent);
+
   @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {
-    border-color: transparent;
-    border-style: solid;
-    border-width: $size / 2;
+
+    $width: $width / 2;
+    $height: if(length($size) > 1, $height, $height/2);
 
     @if $direction == up {
-      border-bottom-color: $color;
+      border-left: $width solid $background-color;
+      border-right: $width solid $background-color;
+      border-bottom: $height solid $foreground-color;
 
     } @else if $direction == right {
-      border-left-color:   $color;
+      border-top: $width solid $background-color;
+      border-bottom: $width solid $background-color;
+      border-left: $height solid $foreground-color;
 
     } @else if $direction == down {
-      border-top-color:    $color;
+      border-left: $width solid $background-color;
+      border-right: $width solid $background-color;
+      border-top: $height solid $foreground-color;
 
     } @else if $direction == left {
-      border-right-color:  $color;
+      border-top: $width solid $background-color;
+      border-bottom: $width solid $background-color;
+      border-right: $height solid $foreground-color;
     }
   }
 
   @else if ($direction == up-right) or ($direction == up-left) {
-    border-top: $size solid $color;
+    border-top: $height solid $foreground-color;
 
     @if $direction == up-right {
-      border-left:  $size solid transparent;
+      border-left:  $width solid $background-color;
 
     } @else if $direction == up-left {
-      border-right: $size solid transparent;
+      border-right: $width solid $background-color;
     }
   }
 
   @else if ($direction == down-right) or ($direction == down-left) {
-    border-bottom: $size solid $color;
+    border-bottom: $height solid $foreground-color;
 
     @if $direction == down-right {
-      border-left:  $size solid transparent;
+      border-left:  $width solid $background-color;
 
     } @else if $direction == down-left {
-      border-right: $size solid transparent;
+      border-right: $width solid $background-color;
     }
   }
+
+  @else if ($direction == inset-up) {
+    border-width: $height $width;
+    border-style: solid;
+    border-color: $background-color $background-color $foreground-color;
+  }
+
+  @else if ($direction == inset-down) {
+    border-width: $height $width;
+    border-style: solid;
+    border-color: $foreground-color $background-color $background-color;
+  }
+
+  @else if ($direction == inset-right) {
+    border-width: $width $height;
+    border-style: solid;
+    border-color: $background-color $background-color $background-color $foreground-color;
+  }
+
+  @else if ($direction == inset-left) {
+    border-width: $width $height;
+    border-style: solid;
+    border-color: $background-color $foreground-color $background-color $background-color;
+  }
 }

docs/_css/bourbon/addons/_word-wrap.scss

@@ -0,0 +1,8 @@
+@mixin word-wrap($wrap: break-word) {
+  word-wrap: $wrap;
+
+  @if $wrap == break-word {
+    overflow-wrap: break-word;
+    word-break: break-all;
+  }
+}

docs/_css/bourbon/css3/_background-image.scss

@@ -4,45 +4,39 @@
 //************************************************************************//
 
 @mixin background-image($images...) {
-  background-image: _add-prefix($images, webkit);
-  background-image: _add-prefix($images);
-}
+  $webkit-images: ();
+  $spec-images: ();
 
-@function _add-prefix($images, $vendor: false) {
-  $images-prefixed: ();
-  $gradient-positions: false;
-  @for $i from 1 through length($images) {
-    $type: type-of(nth($images, $i)); // Get type of variable - List or String
+  @each $image in $images {
+    $webkit-image: ();
+    $spec-image: ();
 
-    // If variable is a list - Gradient
-    @if $type == list {
-      $gradient-type: nth(nth($images, $i), 1); // linear or radial
-      $gradient-pos: null;
-      $gradient-args: null;
+    @if (type-of($image) == string) {
+      $url-str:       str-slice($image, 0, 3);
+      $gradient-type: str-slice($image, 0, 6);
 
-      @if ($gradient-type == linear) or ($gradient-type == radial) {
-        $gradient-pos:  nth(nth($images, $i), 2); // Get gradient position
-        $gradient-args: nth(nth($images, $i), 3); // Get actual gradient (red, blue)
-      }
-      @else {
-        $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue)
+      @if $url-str == "url" {
+        $webkit-image: $image;
+          $spec-image: $image;
       }
 
-      $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);
-      $gradient: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
-      $images-prefixed: append($images-prefixed, $gradient, comma);
-    }
-    // If variable is a string - Image
-    @else if $type == string {
-      $images-prefixed: join($images-prefixed, nth($images, $i), comma);
+      @else if $gradient-type == "linear" {
+        $gradients: _linear-gradient-parser($image);
+        $webkit-image:  map-get($gradients, webkit-image);
+        $spec-image:    map-get($gradients, spec-image);
+      }
+
+      @else if $gradient-type == "radial" {
+        $gradients: _radial-gradient-parser($image);
+        $webkit-image: map-get($gradients, webkit-image);
+        $spec-image:   map-get($gradients, spec-image);
+      }
     }
+
+    $webkit-images: append($webkit-images, $webkit-image, comma);
+    $spec-images:   append($spec-images,   $spec-image,   comma);
   }
-  @return $images-prefixed;
-}
 
-//Examples:
-  //@include background-image(linear-gradient(top, orange, red));
-  //@include background-image(radial-gradient(50% 50%, cover circle, orange, red));
-  //@include background-image(url("/images/a.png"), linear-gradient(orange, red));
-  //@include background-image(url("image.png"), linear-gradient(orange, red), url("image.png"));
-  //@include background-image(linear-gradient(hsla(0, 100%, 100%, 0.25) 0%, hsla(0, 100%, 100%, 0.08) 50%, transparent 50%), linear-gradient(orange, red));
+  background-image: $webkit-images;
+  background-image: $spec-images;
+}

docs/_css/bourbon/css3/_background.scss

@@ -3,101 +3,53 @@
 // notation.
 //************************************************************************//
 
-@mixin background(
-  $background-1       , $background-2: false,
-  $background-3: false, $background-4: false,
-  $background-5: false, $background-6: false,
-  $background-7: false, $background-8: false,
-  $background-9: false, $background-10: false,
-  $fallback: false
-) {
-  $backgrounds: compact($background-1, $background-2,
-                $background-3, $background-4,
-                $background-5, $background-6,
-                $background-7, $background-8,
-                $background-9, $background-10);
+@mixin background($backgrounds...) {
+  $webkit-backgrounds: ();
+  $spec-backgrounds: ();
 
-  $fallback-color: false;
-  @if (type-of($fallback) == color) or ($fallback == "transparent") {
-    $fallback-color: $fallback;
-  }
-  @else {
-    $fallback-color: _extract-background-color($backgrounds);
-  }
+  @each $background in $backgrounds {
+    $webkit-background: ();
+    $spec-background: ();
+    $background-type: type-of($background);
 
-  @if $fallback-color {
-    background-color: $fallback-color;
-  }
-  background: _background-add-prefix($backgrounds, webkit);
-  background: _background-add-prefix($backgrounds);
-}
+    @if $background-type == string or list {
+      $background-str: if($background-type == list, nth($background, 1), $background);
 
-@function _extract-background-color($backgrounds) {
-  $final-bg-layer: nth($backgrounds, length($backgrounds));
-  @if type-of($final-bg-layer) == list {
-    @for $i from 1 through length($final-bg-layer) {
-      $value: nth($final-bg-layer, $i);
-      @if type-of($value) == color {
-        @return $value;
+      $url-str:       str-slice($background-str, 0, 3);
+      $gradient-type: str-slice($background-str, 0, 6);
+
+      @if $url-str == "url" {
+        $webkit-background: $background;
+          $spec-background: $background;
       }
-    }
-  }
-  @return false;
-}
 
-@function _background-add-prefix($backgrounds, $vendor: false) {
-  $backgrounds-prefixed: ();
-
-  @for $i from 1 through length($backgrounds) {
-    $shorthand: nth($backgrounds, $i); // Get member for current index
-    $type: type-of($shorthand); // Get type of variable - List (gradient) or String (image)
-
-    // If shorthand is a list (gradient)
-    @if $type == list {
-      $first-member: nth($shorthand, 1); // Get first member of shorthand
-
-      // Linear Gradient
-      @if index(linear radial, nth($first-member, 1)) {
-        $gradient-type: nth($first-member, 1); // linear || radial
-        $gradient-args:      false;
-        $gradient-positions: false;
-        $shorthand-start:    false;
-        @if type-of($first-member) == list { // Linear gradient plus additional shorthand values - lg(red,orange)repeat,...
-          $gradient-positions: nth($first-member, 2);
-          $gradient-args:      nth($first-member, 3);
-          $shorthand-start: 2;
-        }
-        @else { // Linear gradient only - lg(red,orange),...
-          $gradient-positions: nth($shorthand, 2);
-          $gradient-args:      nth($shorthand, 3); // Get gradient (red, blue)
-        }
-
-        $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-positions);
-        $gradient: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
-
-        // Append any additional shorthand args to gradient
-        @if $shorthand-start {
-          @for $j from $shorthand-start through length($shorthand) {
-            $gradient: join($gradient, nth($shorthand, $j), space);
-          }
-        }
-        $backgrounds-prefixed: append($backgrounds-prefixed, $gradient, comma);
+      @else if $gradient-type == "linear" {
+        $gradients: _linear-gradient-parser("#{$background}");
+        $webkit-background: map-get($gradients, webkit-image);
+        $spec-background:   map-get($gradients, spec-image);
       }
-      // Image with additional properties
+
+      @else if $gradient-type == "radial" {
+        $gradients: _radial-gradient-parser("#{$background}");
+        $webkit-background: map-get($gradients, webkit-image);
+        $spec-background:   map-get($gradients, spec-image);
+      }
+
       @else {
-        $backgrounds-prefixed: append($backgrounds-prefixed, $shorthand, comma);
+        $webkit-background: $background;
+          $spec-background: $background;
       }
     }
-    // If shorthand is a simple string (color or image)
-    @else if $type == string {
-      $backgrounds-prefixed: join($backgrounds-prefixed, $shorthand, comma);
-    }
-  }
-  @return $backgrounds-prefixed;
-}
 
-//Examples:
-  //@include background(linear-gradient(top, orange, red));
-  //@include background(radial-gradient(circle at 40% 40%, orange, red));
-  //@include background(url("/images/a.png") no-repeat, linear-gradient(orange, red));
-  //@include background(url("image.png") center center, linear-gradient(orange, red), url("image.png"));
+    @else {
+      $webkit-background: $background;
+        $spec-background: $background;
+    }
+
+    $webkit-backgrounds: append($webkit-backgrounds, $webkit-background, comma);
+    $spec-backgrounds:   append($spec-backgrounds,   $spec-background,   comma);
+  }
+
+  background: $webkit-backgrounds;
+  background: $spec-backgrounds;
+}

docs/_css/bourbon/css3/_border-image.scss

@@ -1,48 +1,53 @@
-@mixin border-image($images) {
-  -webkit-border-image: _border-add-prefix($images, webkit);
-     -moz-border-image: _border-add-prefix($images, moz);
-       -o-border-image: _border-add-prefix($images, o);
-          border-image: _border-add-prefix($images);
-}
+@mixin border-image($borders...) {
+  $webkit-borders: ();
+  $spec-borders: ();
 
-@function _border-add-prefix($images, $vendor: false) {
-  $border-image: null;
-  $images-type:  type-of(nth($images, 1));
-  $first-var:    nth(nth($images, 1), 1);          // Get type of Gradient (Linear || radial)
+  @each $border in $borders {
+    $webkit-border: ();
+    $spec-border: ();
+    $border-type: type-of($border);
 
-  // If input is a gradient
-  @if $images-type == string {
-    @if ($first-var == "linear") or ($first-var == "radial") {
-      $gradient-type: nth($images, 1);           // Get type of gradient (linear || radial)
-      $gradient-pos:  nth($images, 2);           // Get gradient position
-      $gradient-args: nth($images, 3);           // Get actual gradient (red, blue)
-      $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);
-      $border-image:  _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
-    }
-    // If input is a URL
-    @else {
-      $border-image: $images;
-    }
-  }
-  // If input is gradient or url + additional args
-  @else if $images-type == list {
-    $type: type-of(nth($images, 1));           // Get type of variable - List or String
+    @if $border-type == string or list {
+      $border-str: if($border-type == list, nth($border, 1), $border);
 
-    // If variable is a list - Gradient
-    @if $type == list {
-      $gradient: nth($images, 1);
-      $gradient-type: nth($gradient, 1);           // Get type of gradient (linear || radial)
-      $gradient-pos:  nth($gradient, 2);           // Get gradient position
-      $gradient-args: nth($gradient, 3);           // Get actual gradient (red, blue)
-      $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);
-      $border-image:  _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
+      $url-str:       str-slice($border-str, 0, 3);
+      $gradient-type: str-slice($border-str, 0, 6);
 
-      @for $i from 2 through length($images) {
-        $border-image: append($border-image, nth($images, $i));
+      @if $url-str == "url" {
+        $webkit-border: $border;
+          $spec-border: $border;
+      }
+
+      @else if $gradient-type == "linear" {
+        $gradients: _linear-gradient-parser("#{$border}");
+        $webkit-border: map-get($gradients, webkit-image);
+        $spec-border:   map-get($gradients, spec-image);
+      }
+
+      @else if $gradient-type == "radial" {
+        $gradients: _radial-gradient-parser("#{$border}");
+        $webkit-border: map-get($gradients, webkit-image);
+        $spec-border:   map-get($gradients, spec-image);
+      }
+
+      @else {
+        $webkit-border: $border;
+          $spec-border: $border;
       }
     }
+
+    @else {
+      $webkit-border: $border;
+        $spec-border: $border;
+    }
+
+    $webkit-borders: append($webkit-borders, $webkit-border, comma);
+    $spec-borders:   append($spec-borders,   $spec-border,   comma);
   }
-  @return $border-image;
+
+  -webkit-border-image: $webkit-borders;
+          border-image: $spec-borders;
+          border-style: solid;
 }
 
 //Examples:
@@ -52,4 +57,3 @@
 // @include border-image(linear-gradient(45deg, orange, yellow) stretch);
 // @include border-image(linear-gradient(45deg, orange, yellow) 20 30 40 50 stretch round);
 // @include border-image(radial-gradient(top, cover, orange, yellow, orange));
-

docs/_css/bourbon/css3/_calc.scss

@@ -0,0 +1,4 @@
+@mixin calc($property, $value) {
+  #{$property}: -webkit-calc(#{$value});
+  #{$property}:         calc(#{$value});
+}

docs/_css/bourbon/css3/_columns.scss

@@ -15,7 +15,7 @@
 
 @mixin column-fill($arg: auto) {
 // auto || length
-  @include prefixer(columns-fill, $arg, webkit moz spec);
+  @include prefixer(column-fill, $arg, webkit moz spec);
 }
 
 @mixin column-rule($arg) {

docs/_css/bourbon/css3/_filter.scss

@@ -0,0 +1,5 @@
+@mixin filter($function: none) {
+  // <filter-function> [<filter-function]* | none
+  @include prefixer(filter, $function, webkit spec);
+}
+

docs/_css/bourbon/css3/_flex-box.scss

@@ -11,6 +11,7 @@
 @mixin display-box {
   display: -webkit-box;
   display: -moz-box;
+  display: -ms-flexbox; // IE 10
   display: box;
 }
 
@@ -22,16 +23,19 @@
 @mixin box-pack($pack: start) {
 // start|end|center|justify
   @include prefixer(box-pack, $pack, webkit moz spec);
+  -ms-flex-pack: $pack; // IE 10
 }
 
 @mixin box-align($align: stretch) {
 // start|end|center|baseline|stretch
   @include prefixer(box-align, $align, webkit moz spec);
+  -ms-flex-align: $align; // IE 10
 }
 
 @mixin box-direction($direction: normal) {
 // normal|reverse|inherit
   @include prefixer(box-direction, $direction, webkit moz spec);
+  -ms-flex-direction: $direction; // IE 10
 }
 
 @mixin box-lines($lines: single) {
@@ -41,12 +45,277 @@
 
 @mixin box-ordinal-group($int: 1) {
   @include prefixer(box-ordinal-group, $int, webkit moz spec);
+  -ms-flex-order: $int; // IE 10
 }
 
 @mixin box-flex($value: 0.0) {
   @include prefixer(box-flex, $value, webkit moz spec);
+  -ms-flex: $value; // IE 10
 }
 
 @mixin box-flex-group($int: 1) {
   @include prefixer(box-flex-group, $int, webkit moz spec);
 }
+
+// CSS3 Flexible Box Model and property defaults
+// Unified attributes for 2009, 2011, and 2012 flavours.
+
+// 2009 - display (box | inline-box)
+// 2011 - display (flexbox | inline-flexbox)
+// 2012 - display (flex | inline-flex)
+@mixin display($value) {
+//  flex | inline-flex
+    @if $value == "flex" {
+        // 2009
+        display: -webkit-box;
+        display: -moz-box;
+        display: box;
+
+        // 2012
+        display: -webkit-flex;
+        display: -moz-flex;
+        display: -ms-flexbox; // 2011 (IE 10)
+        display: flex;
+    }
+
+    @elseif $value == "inline-flex" {
+        display: -webkit-inline-box;
+        display: -moz-inline-box;
+        display: inline-box;
+
+        display: -webkit-inline-flex;
+        display: -moz-inline-flex;
+        display: -ms-inline-flexbox;
+        display: inline-flex;
+    }
+
+    @else {
+        display: $value;
+    }
+}
+
+// 2009 - box-flex (integer)
+// 2011 - flex (decimal | width decimal)
+// 2012 - flex (integer integer width)
+@mixin flex($value) {
+
+    // Grab flex-grow for older browsers.
+    $flex-grow: nth($value, 1);
+
+    // 2009
+    @include prefixer(box-flex, $flex-grow, webkit moz spec);
+
+    // 2011 (IE 10), 2012
+    @include prefixer(flex, $value, webkit moz ms spec);
+}
+
+// 2009 - box-orient ( horizontal | vertical | inline-axis | block-axis)
+//      - box-direction (normal | reverse)      
+// 2011 - flex-direction (row | row-reverse | column | column-reverse)
+// 2012 - flex-direction (row | row-reverse | column | column-reverse)
+@mixin flex-direction($value: row) {
+
+    // Alt values.
+    $value-2009: $value;
+    $value-2011: $value;
+    $direction: "normal";
+
+    @if $value == row {
+        $value-2009: horizontal;
+    }
+
+    @elseif $value == "row-reverse" {
+        $value-2009: horizontal;
+        $direction: reverse;
+    }
+
+    @elseif $value == column {
+        $value-2009: vertical;
+    }
+
+    @elseif $value == "column-reverse" {
+        $value-2009: vertical;
+        $direction: reverse;
+    }
+
+    // 2009
+    @include prefixer(box-orient, $value-2009, webkit moz spec);
+    @if $direction == "reverse" {
+        @include prefixer(box-direction, $direction, webkit moz spec);
+    }
+
+    // 2012
+    @include prefixer(flex-direction, $value, webkit moz spec);
+
+    // 2011 (IE 10)
+    -ms-flex-direction: $value;
+}
+
+// 2009 - box-lines (single | multiple)
+// 2011 - flex-wrap (nowrap | wrap | wrap-reverse)
+// 2012 - flex-wrap (nowrap | wrap | wrap-reverse)
+@mixin flex-wrap($value: nowrap) {
+
+    // Alt values.
+    $alt-value: $value;
+    @if $value == nowrap {
+        $alt-value: single;
+    }
+
+    @elseif $value == wrap {
+        $alt-value: multiple;
+    }
+
+    @elseif $value == "wrap-reverse" {
+        $alt-value: multiple;
+    }
+
+    @include prefixer(box-lines, $alt-value, webkit moz spec);
+    @include prefixer(flex-wrap, $value, webkit moz ms spec);
+}
+
+// 2009 - TODO: parse values into flex-direction/flex-wrap
+// 2011 - TODO: parse values into flex-direction/flex-wrap
+// 2012 - flex-flow (flex-direction || flex-wrap)
+@mixin flex-flow($value) {
+    @include prefixer(flex-flow, $value, webkit moz spec);
+}
+
+// 2009 - box-ordinal-group (integer)
+// 2011 - flex-order (integer)
+// 2012 - order (integer)
+@mixin order($int: 0) {
+    // 2009
+    @include prefixer(box-ordinal-group, $int, webkit moz spec);
+
+    // 2012
+    @include prefixer(order, $int, webkit moz spec);
+
+    // 2011 (IE 10)
+    -ms-flex-order: $int;
+}
+
+// 2012 - flex-grow (number)
+@mixin flex-grow($number: 0) {
+    @include prefixer(flex-grow, $number, webkit moz spec);
+    -ms-flex-positive: $number;
+}
+
+// 2012 - flex-shrink (number)
+@mixin flex-shrink($number: 1) {
+    @include prefixer(flex-shrink, $number, webkit moz spec);
+    -ms-flex-negative: $number;
+}
+
+// 2012 - flex-basis (number)
+@mixin flex-basis($width: auto) {
+    @include prefixer(flex-basis, $width, webkit moz spec);
+    -ms-flex-preferred-size: $width;
+}
+
+// 2009 - box-pack (start | end | center | justify)
+// 2011 - flex-pack (start | end | center | justify)
+// 2012 - justify-content (flex-start | flex-end | center | space-between | space-around)
+@mixin justify-content ($value: flex-start) {
+
+    // Alt values.
+    $alt-value: $value;
+    @if $value == "flex-start" {
+        $alt-value: start;
+    }
+
+    @elseif $value == "flex-end" {
+        $alt-value: end;
+    }
+
+    @elseif $value == "space-between" {
+        $alt-value: justify;
+    }
+
+    @elseif $value == "space-around" {
+        $alt-value: center;
+    }
+
+    // 2009
+    @include prefixer(box-pack, $alt-value, webkit moz spec);
+
+    // 2012
+    @include prefixer(justify-content, $value, webkit moz ms o spec);
+
+    // 2011 (IE 10)
+    -ms-flex-pack: $alt-value;
+}
+
+// 2009 - box-align (start | end | center | baseline | stretch)
+// 2011 - flex-align (start | end | center | baseline | stretch)
+// 2012 - align-items (flex-start | flex-end | center | baseline | stretch)
+@mixin align-items($value: stretch) {
+
+    $alt-value: $value;
+
+    @if $value == "flex-start" {
+        $alt-value: start;
+    }    
+
+    @elseif $value == "flex-end" {
+        $alt-value: end;
+    }
+
+    // 2009
+    @include prefixer(box-align, $alt-value, webkit moz spec);
+
+    // 2012
+    @include prefixer(align-items, $value, webkit moz ms o spec);
+    
+    // 2011 (IE 10)
+    -ms-flex-align: $alt-value;    
+}
+
+// 2011 - flex-item-align (auto | start | end | center | baseline | stretch)
+// 2012 - align-self (auto | flex-start | flex-end | center | baseline | stretch)
+@mixin align-self($value: auto) {
+
+    $value-2011: $value;
+    @if $value == "flex-start" {
+        $value-2011: start;
+    }    
+
+    @elseif $value == "flex-end" {
+        $value-2011: end;
+    }
+
+    // 2012
+    @include prefixer(align-self, $value, webkit moz spec);
+
+    // 2011 (IE 10)
+    -ms-flex-item-align: $value-2011;
+}
+
+// 2011 - flex-line-pack (start | end | center | justify | distribute | stretch)
+// 2012 - align-content (flex-start | flex-end | center | space-between | space-around | stretch)
+@mixin align-content($value: stretch) {
+
+    $value-2011: $value;
+    @if $value == "flex-start" {
+        $value-2011: start;
+    }    
+
+    @elseif $value == "flex-end" {
+        $value-2011: end;
+    }
+
+    @elseif $value == "space-between" {
+        $value-2011: justify;
+    }
+
+    @elseif $value == "space-around" {
+        $value-2011: distribute;
+    }
+
+    // 2012
+    @include prefixer(align-content, $value, webkit moz spec);
+
+    // 2011 (IE 10)
+    -ms-flex-line-pack: $value-2011;
+}
+

docs/_css/bourbon/css3/_font-face.scss

@@ -1,6 +1,6 @@
 // Order of the includes matters, and it is: normal, bold, italic, bold+italic.
 
-@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: false ) {
+@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: $asset-pipeline) {
   @font-face {
     font-family: $font-family;
     font-weight: $weight;

docs/_css/bourbon/css3/_font-feature-settings.scss

@@ -0,0 +1,10 @@
+// Font feature settings mixin and property default.
+// Examples: @include font-feature-settings("liga");
+//           @include font-feature-settings("lnum" false);
+//           @include font-feature-settings("pnum" 1, "kern" 0);
+//           @include font-feature-settings("ss01", "ss02");
+
+@mixin font-feature-settings($settings...) {
+  @if length($settings) == 0 { $settings: none; }
+  @include prefixer(font-feature-settings, $settings, webkit moz ms spec);
+}

docs/_css/bourbon/css3/_hyphens.scss

@@ -0,0 +1,4 @@
+@mixin hyphens($hyphenation: none) {
+// none | manual | auto
+  @include prefixer(hyphens, $hyphenation, webkit moz ms spec);
+}

docs/_css/bourbon/css3/_image-rendering.scss

@@ -1,10 +1,11 @@
-@mixin image-rendering ($mode:optimizeQuality) {
+@mixin image-rendering ($mode:auto) {
 
-  @if ($mode == optimize-contrast) {
+  @if ($mode == crisp-edges) {
+      -ms-interpolation-mode: nearest-neighbor; // IE8+
       image-rendering: -moz-crisp-edges;
       image-rendering: -o-crisp-edges;
       image-rendering: -webkit-optimize-contrast;
-      image-rendering: optimize-contrast;
+      image-rendering: crisp-edges;
   }
 
   @else {

docs/_css/bourbon/css3/_inline-block.scss

@@ -1,8 +0,0 @@
-// Legacy support for inline-block in IE7 (maybe IE6)
-@mixin inline-block {
-  display: inline-block;
-  vertical-align: baseline;
-  zoom: 1;
-  *display: inline;
-  *vertical-align: auto;
-}

docs/_css/bourbon/css3/_keyframes.scss

@@ -8,36 +8,28 @@
 
   @if $original-prefix-for-webkit {
     @include disable-prefix-for-all();
-    $prefix-for-webkit: true;
+    $prefix-for-webkit: true !global;
     @-webkit-keyframes #{$name} {
       @content;
     }
   }
   @if $original-prefix-for-mozilla {
     @include disable-prefix-for-all();
-    $prefix-for-mozilla: true;
+    $prefix-for-mozilla: true !global;
     @-moz-keyframes #{$name} {
       @content;
     }
   }
-  @if $original-prefix-for-opera {
-    @include disable-prefix-for-all();
-    $prefix-for-opera: true;
-    @-o-keyframes #{$name} {
-      @content;
-    }
-  }
+
+  $prefix-for-webkit:    $original-prefix-for-webkit    !global;
+  $prefix-for-mozilla:   $original-prefix-for-mozilla   !global;
+  $prefix-for-microsoft: $original-prefix-for-microsoft !global;
+  $prefix-for-opera:     $original-prefix-for-opera     !global;
+  $prefix-for-spec:      $original-prefix-for-spec      !global;
+
   @if $original-prefix-for-spec {
-    @include disable-prefix-for-all();
-    $prefix-for-spec: true;
     @keyframes #{$name} {
       @content;
     }
   }
-
-  $prefix-for-webkit:    $original-prefix-for-webkit;
-  $prefix-for-mozilla:   $original-prefix-for-mozilla;
-  $prefix-for-microsoft: $original-prefix-for-microsoft;
-  $prefix-for-opera:     $original-prefix-for-opera;
-  $prefix-for-spec:      $original-prefix-for-spec;
 }

docs/_css/bourbon/css3/_linear-gradient.scss

@@ -1,11 +1,9 @@
-@mixin linear-gradient($pos, $G1, $G2: false,
-                       $G3: false, $G4: false,
-                       $G5: false, $G6: false,
-                       $G7: false, $G8: false,
-                       $G9: false, $G10: false,
-                       $deprecated-pos1: left top,
-                       $deprecated-pos2: left bottom,
-                       $fallback: false) {
+@mixin linear-gradient($pos, $G1, $G2: null,
+                       $G3: null, $G4: null,
+                       $G5: null, $G6: null,
+                       $G7: null, $G8: null,
+                       $G9: null, $G10: null,
+                       $fallback: null) {
   // Detect what type of value exists in $pos
   $pos-type: type-of(nth($pos, 1));
   $pos-spec: null;
@@ -24,7 +22,7 @@
     $pos-spec:   nth($positions, 2);
   }
 
-  $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
+  $full: $G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10;
 
   // Set $G1 as the default fallback color
   $fallback-color: nth($G1, 1);
@@ -35,7 +33,6 @@
   }
 
   background-color: $fallback-color;
-  background-image: _deprecated-webkit-gradient(linear, $deprecated-pos1, $deprecated-pos2, $full); // Safari <= 5.0
   background-image: -webkit-linear-gradient($pos-degree $full); // Safari 5.1+, Chrome
   background-image: unquote("linear-gradient(#{$pos-spec}#{$full})");
 }

docs/_css/bourbon/css3/_placeholder.scss

@@ -1,29 +1,8 @@
-$placeholders: '-webkit-input-placeholder',
-               '-moz-placeholder',
-               '-ms-input-placeholder';
-
 @mixin placeholder {
+  $placeholders: ":-webkit-input" ":-moz" "-moz" "-ms-input";
   @each $placeholder in $placeholders {
-    @if $placeholder == "-webkit-input-placeholder" {
-      &::#{$placeholder} {
-        @content;
-      }
-    }
-    @else if $placeholder == "-moz-placeholder" {
-      // FF 18-
-      &:#{$placeholder} {
-        @content;
-      }
-
-      // FF 19+
-      &::#{$placeholder} {
-        @content;
-      }
-    }
-    @else {
-      &:#{$placeholder} {
-        @content;
-      }
+    &:#{$placeholder}-placeholder {
+      @content;
     }
   }
 }

docs/_css/bourbon/css3/_radial-gradient.scss

@@ -1,16 +1,12 @@
 // Requires Sass 3.1+
 @mixin radial-gradient($G1,        $G2,
-                       $G3: false, $G4: false,
-                       $G5: false, $G6: false,
-                       $G7: false, $G8: false,
-                       $G9: false, $G10: false,
+                       $G3: null, $G4: null,
+                       $G5: null, $G6: null,
+                       $G7: null, $G8: null,
+                       $G9: null, $G10: null,
                        $pos: null,
                        $shape-size: null,
-                       $deprecated-pos1: center center,
-                       $deprecated-pos2: center center,
-                       $deprecated-radius1: 0,
-                       $deprecated-radius2: 460,
-                       $fallback: false) {
+                       $fallback: null) {
 
   $data: _radial-arg-parser($G1, $G2, $pos, $shape-size);
   $G1:  nth($data, 1);
@@ -18,7 +14,7 @@
   $pos: nth($data, 3);
   $shape-size: nth($data, 4);
 
-  $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
+  $full: $G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10;
 
   // Strip deprecated cover/contain for spec
   $shape-size-spec: _shape-size-stripper($shape-size);
@@ -38,7 +34,6 @@
   $shape-size-spec: if(($shape-size-spec != ' ') and ($pos == null), '#{$shape-size-spec}, ', '#{$shape-size-spec} ');
 
   background-color:  $fallback-color;
-  background-image: _deprecated-webkit-gradient(radial, $deprecated-pos1, $deprecated-pos2, $full, $deprecated-radius1, $deprecated-radius2); // Safari <= 5.0 && IOS 4
   background-image: -webkit-radial-gradient(unquote(#{$pos}#{$shape-size}#{$full}));
   background-image: unquote("radial-gradient(#{$shape-size-spec}#{$pos-spec}#{$full})");
 }

docs/_css/bourbon/css3/_transition.scss

@@ -1,16 +1,59 @@
 // Shorthand mixin. Supports multiple parentheses-deliminated values for each variable.
-// Example: @include transition (all, 2.0s, ease-in-out);
-//          @include transition ((opacity, width), (1.0s, 2.0s), ease-in, (0, 2s));
-//          @include transition ($property:(opacity, width), $delay: (1.5s, 2.5s));
+// Example: @include transition (all 2s ease-in-out);
+//          @include transition (opacity 1s ease-in 2s, width 2s ease-out);
+//          @include transition-property (transform, opacity);
 
 @mixin transition ($properties...) {
-  @if length($properties) >= 1 {
-    @include prefixer(transition, $properties, webkit moz spec);
+  // Fix for vendor-prefix transform property
+  $needs-prefixes: false;
+  $webkit: ();
+  $moz: ();
+  $spec: ();
+
+  // Create lists for vendor-prefixed transform
+  @each $list in $properties {
+    @if nth($list, 1) == "transform" {
+      $needs-prefixes: true;
+      $list1: -webkit-transform;
+      $list2: -moz-transform;
+      $list3: ();
+
+      @each $var in $list {
+        $list3: join($list3, $var);
+
+        @if $var != "transform" {
+          $list1: join($list1, $var);
+          $list2: join($list2, $var);
+        }
+      }
+
+      $webkit: append($webkit, $list1);
+         $moz: append($moz,    $list2);
+        $spec: append($spec,   $list3);
+    }
+
+    // Create lists for non-prefixed transition properties
+    @else {
+      $webkit:  append($webkit, $list, comma);
+      $moz:     append($moz,    $list, comma);
+      $spec:    append($spec,   $list, comma);
+    }
   }
 
+  @if $needs-prefixes {
+    -webkit-transition: $webkit;
+       -moz-transition: $moz;
+            transition: $spec;
+  }
   @else {
-    $properties: all 0.15s ease-out 0;
-    @include prefixer(transition, $properties, webkit moz spec);
+    @if length($properties) >= 1 {
+      @include prefixer(transition, $properties, webkit moz spec);
+    }
+
+    @else {
+      $properties: all 0.15s ease-out 0s;
+      @include prefixer(transition, $properties, webkit moz spec);
+    }
   }
 }
 

docs/_css/bourbon/functions/_assign.scss

@@ -0,0 +1,11 @@
+@function assign-inputs($inputs, $pseudo: null) {
+  $list : ();
+
+  @each $input in $inputs {
+    $input: unquote($input);
+    $input: if($pseudo, $input + ":" + $pseudo, $input);
+    $list: append($list, $input, comma);
+  }
+
+  @return $list;
+}

docs/_css/bourbon/functions/_color-lightness.scss

@@ -0,0 +1,13 @@
+// Programatically determines whether a color is light or dark
+// Returns a boolean
+// More details here http://robots.thoughtbot.com/closer-look-color-lightness
+
+@function is-light($hex-color) {
+  $-local-red: red(rgba($hex-color, 1.0));
+  $-local-green: green(rgba($hex-color, 1.0));
+  $-local-blue: blue(rgba($hex-color, 1.0));
+
+  $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) / 255;
+
+  @return $-local-lightness > .6;
+}

docs/_css/bourbon/functions/_compact.scss

@@ -1,11 +0,0 @@
-// Remove `false` values from a list
-
-@function compact($vars...) {
-  $list: ();
-  @each $var in $vars {
-    @if $var {
-      $list: append($list, $var, comma);
-    }
-  }
-  @return $list;
-}

docs/_css/bourbon/functions/_golden-ratio.scss

@@ -0,0 +1,3 @@
+@function golden-ratio($value, $increment) {
+  @return modular-scale($value, $increment, $golden)
+}

docs/_css/bourbon/functions/_linear-gradient.scss

@@ -1,13 +0,0 @@
-@function linear-gradient($pos, $gradients...) {
-  $type: linear;
-  $pos-type: type-of(nth($pos, 1));
-
-  // if $pos doesn't exist, fix $gradient
-  @if ($pos-type == color) or (nth($pos, 1) == "transparent")  {
-    $gradients: zip($pos $gradients);
-    $pos: false;
-  }
-
-  $type-gradient: $type, $pos, $gradients;
-  @return $type-gradient;
-}

docs/_css/bourbon/functions/_modular-scale.scss

@@ -1,40 +1,66 @@
+// Scaling Variables
+$golden:           1.618;
+$minor-second:     1.067;
+$major-second:     1.125;
+$minor-third:      1.2;
+$major-third:      1.25;
+$perfect-fourth:   1.333;
+$augmented-fourth: 1.414;
+$perfect-fifth:    1.5;
+$minor-sixth:      1.6;
+$major-sixth:      1.667;
+$minor-seventh:    1.778;
+$major-seventh:    1.875;
+$octave:           2;
+$major-tenth:      2.5;
+$major-eleventh:   2.667;
+$major-twelfth:    3;
+$double-octave:    4;
+
 @function modular-scale($value, $increment, $ratio) {
+  $v1: nth($value, 1);
+  $v2: nth($value, length($value));
+  $value: $v1;
+
+  // scale $v2 to just above $v1
+  @while $v2 > $v1 {
+    $v2: ($v2 / $ratio); // will be off-by-1
+  }
+  @while $v2 < $v1 {
+    $v2: ($v2 * $ratio); // will fix off-by-1
+  }
+
+  // check AFTER scaling $v2 to prevent double-counting corner-case
+  $double-stranded: $v2 > $v1;
+
   @if $increment > 0 {
     @for $i from 1 through $increment {
-      $value: ($value * $ratio);
+      @if $double-stranded and ($v1 * $ratio) > $v2 {
+        $value: $v2;
+        $v2: ($v2 * $ratio);
+      } @else {
+        $v1: ($v1 * $ratio);
+        $value: $v1;
+      }
     }
   }
 
   @if $increment < 0 {
-    $increment: abs($increment);
-    @for $i from 1 through $increment {
-      $value: ($value / $ratio);
+    // adjust $v2 to just below $v1
+    @if $double-stranded {
+      $v2: ($v2 / $ratio);
+    }
+
+    @for $i from $increment through -1 {
+      @if $double-stranded and ($v1 / $ratio) < $v2 {
+        $value: $v2;
+        $v2: ($v2 / $ratio);
+      } @else {
+        $v1: ($v1 / $ratio);
+        $value: $v1;
+      }
     }
   }
 
   @return $value;
 }
-
-//  div {
-//                     Increment Up GR with positive value
-//   font-size:        modular-scale(14px,   1, 1.618); // returns: 22.652px
-//
-//                     Increment Down GR with negative value
-//   font-size:        modular-scale(14px,  -1, 1.618); // returns: 8.653px
-//
-//                     Can be used with ceil(round up) or floor(round down)
-//   font-size: floor( modular-scale(14px, 1, 1.618) ); // returns: 22px
-//   font-size:  ceil( modular-scale(14px, 1, 1.618) ); // returns: 23px
-//  }
-//
-// modularscale.com
-
-@function golden-ratio($value, $increment) {
-  @return modular-scale($value, $increment, 1.618)
-}
-
-//  div {
-//    font-size: golden-ratio(14px, 1); // returns: 22.652px
-//  }
-//
-// goldenratiocalculator.com

docs/_css/bourbon/functions/_px-to-em.scss

@@ -2,7 +2,12 @@
 // eg. for a relational value of 12px write em(12) when the parent is 16px
 // if the parent is another value say 24px write em(12, 24)
 
-@function em($pxval, $base: 16) {
+@function em($pxval, $base: $em-base) {
+  @if not unitless($pxval) {
+      $pxval: strip-units($pxval);
+  }
+  @if not unitless($base) {
+      $base: strip-units($base);
+  }
   @return ($pxval / $base) * 1em;
 }
-

docs/_css/bourbon/functions/_px-to-rem.scss

@@ -0,0 +1,15 @@
+// Convert pixels to rems
+// eg. for a relational value of 12px write rem(12)
+// Assumes $em-base is the font-size of <html>
+
+@function rem($pxval) {
+  @if not unitless($pxval) {
+      $pxval: strip-units($pxval);
+  }
+
+  $base: $em-base;
+  @if not unitless($base) {
+      $base: strip-units($base);
+  }
+  @return ($pxval / $base) * 1rem;
+}

docs/_css/bourbon/functions/_radial-gradient.scss

@@ -1,23 +0,0 @@
-// This function is required and used by the background-image mixin.
-@function radial-gradient($G1,        $G2,
-                       $G3: false, $G4: false,
-                       $G5: false, $G6: false,
-                       $G7: false, $G8: false,
-                       $G9: false, $G10: false,
-                       $pos: null,
-                       $shape-size: null) {
-
-  $data: _radial-arg-parser($G1, $G2, $pos, $shape-size);
-  $G1:  nth($data, 1);
-  $G2:  nth($data, 2);
-  $pos: nth($data, 3);
-  $shape-size: nth($data, 4);
-
-  $type: radial;
-  $gradient: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
-
-  $type-gradient: $type, $shape-size $pos, $gradient;
-  @return $type-gradient;
-}
-
-

docs/_css/bourbon/functions/_strip-units.scss

@@ -0,0 +1,5 @@
+// Srtips the units from a value. e.g. 12px -> 12
+
+@function strip-units($val) {
+  @return ($val / ($val * 0 + 1));
+}

docs/_css/bourbon/functions/_unpack.scss

@@ -0,0 +1,17 @@
+// Convert shorthand to the 4-value syntax
+
+@function unpack($shorthand) {
+  @if length($shorthand) == 1 {
+    @return nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1);
+  }
+  @else if length($shorthand) == 2 {
+    @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 1) nth($shorthand, 2);
+  }
+  @else if length($shorthand) == 3 {
+    @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 3) nth($shorthand, 2);
+  }
+  @else {
+    @return $shorthand;
+  }
+}
+

docs/_css/bourbon/helpers/_convert-units.scss

@@ -0,0 +1,15 @@
+//************************************************************************//
+// Helper function for str-to-num fn.
+// Source: http://sassmeister.com/gist/9647408
+//************************************************************************//
+@function _convert-units($number, $unit) {
+  $strings: 'px' 'cm' 'mm' '%' 'ch' 'pica' 'in' 'em' 'rem' 'pt' 'pc' 'ex' 'vw' 'vh' 'vmin' 'vmax', 'deg', 'rad', 'grad', 'turn';
+  $units:   1px  1cm  1mm  1%  1ch  1pica  1in  1em  1rem  1pt  1pc  1ex  1vw  1vh  1vmin  1vmax,  1deg,  1rad,  1grad, 1turn;
+  $index: index($strings, $unit);
+
+  @if not $index {
+    @warn "Unknown unit `#{$unit}`.";
+    @return false;
+  }
+  @return $number * nth($units, $index);
+}

docs/_css/bourbon/helpers/_deprecated-webkit-gradient.scss

@@ -1,39 +0,0 @@
-// Render Deprecated Webkit Gradient - Linear || Radial
-//************************************************************************//
-@function _deprecated-webkit-gradient($type,
-                                     $deprecated-pos1, $deprecated-pos2,
-                                     $full,
-                                     $deprecated-radius1: false, $deprecated-radius2: false) {
-  $gradient-list: ();
-  $gradient: false;
-  $full-length: length($full);
-  $percentage: false;
-  $gradient-type: $type;
-
-  @for $i from 1 through $full-length {
-    $gradient: nth($full, $i);
-
-    @if length($gradient) == 2 {
-      $color-stop: color-stop(nth($gradient, 2), nth($gradient, 1));
-      $gradient-list: join($gradient-list, $color-stop, comma);
-    }
-    @else if $gradient != null {
-      @if $i == $full-length {
-        $percentage: 100%;
-      }
-      @else {
-        $percentage: ($i - 1) * (100 / ($full-length - 1)) + "%";
-      }
-      $color-stop: color-stop(unquote($percentage), $gradient);
-      $gradient-list: join($gradient-list, $color-stop, comma);
-    }
-  }
-
-  @if $type == radial {
-    $gradient: -webkit-gradient(radial, $deprecated-pos1, $deprecated-radius1, $deprecated-pos2, $deprecated-radius2, $gradient-list);
-  }
-  @else if $type == linear {
-    $gradient: -webkit-gradient(linear, $deprecated-pos1, $deprecated-pos2, $gradient-list);
-  }
-  @return $gradient;
-}

docs/_css/bourbon/helpers/_is-num.scss

@@ -0,0 +1,8 @@
+//************************************************************************//
+// Helper for linear-gradient-parser
+//************************************************************************//
+@function _is-num($char) {
+  $values: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9' 0 1 2 3 4 5 6 7 8 9;
+  $index: index($values, $char);
+  @return if($index, true, false);
+}

docs/_css/bourbon/helpers/_linear-angle-parser.scss

@@ -0,0 +1,25 @@
+// Private function for linear-gradient-parser
+@function _linear-angle-parser($image, $first-val, $prefix, $suffix) {
+  $offset: null;
+  $unit-short:  str-slice($first-val, str-length($first-val) - 2, str-length($first-val));
+  $unit-long:   str-slice($first-val, str-length($first-val) - 3, str-length($first-val));
+
+  @if ($unit-long == "grad") or
+      ($unit-long == "turn") {
+    $offset: if($unit-long == "grad", -100grad * 3, -0.75turn);
+  }
+
+  @else if ($unit-short == "deg") or
+           ($unit-short == "rad") {
+    $offset: if($unit-short == "deg", -90 * 3, 1.6rad);
+  }
+
+  @if $offset {
+    $num: _str-to-num($first-val);
+
+    @return (
+      webkit-image: -webkit- + $prefix + ($offset - $num) + $suffix,
+      spec-image: $image
+    );
+  }
+}

docs/_css/bourbon/helpers/_linear-gradient-parser.scss

@@ -0,0 +1,41 @@
+@function _linear-gradient-parser($image) {
+  $image: unquote($image);
+  $gradients: ();
+  $start: str-index($image, "(");
+  $end: str-index($image, ",");
+  $first-val: str-slice($image, $start + 1, $end - 1);
+
+  $prefix: str-slice($image, 0, $start);
+  $suffix: str-slice($image, $end, str-length($image));
+
+  $has-multiple-vals: str-index($first-val, " ");
+  $has-single-position: unquote(_position-flipper($first-val) + "");
+  $has-angle: _is-num(str-slice($first-val, 0, 0));
+
+  @if $has-multiple-vals {
+    $gradients: _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals);
+  }
+
+  @else if $has-single-position != "" {
+    $pos: unquote($has-single-position + "");
+
+    $gradients: (
+      webkit-image: -webkit- + $image,
+      spec-image: $prefix + "to " + $pos + $suffix
+    );
+  }
+
+  @else if $has-angle {
+    // Rotate degree for webkit
+    $gradients: _linear-angle-parser($image, $first-val, $prefix, $suffix);
+  }
+
+  @else {
+    $gradients: (
+      webkit-image: -webkit- + $image,
+      spec-image: $image
+    );
+  }
+
+  @return $gradients;
+}

docs/_css/bourbon/helpers/_linear-side-corner-parser.scss

@@ -0,0 +1,31 @@
+// Private function for linear-gradient-parser
+@function _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals) {
+  $val-1: str-slice($first-val, 0, $has-multiple-vals - 1 );
+  $val-2: str-slice($first-val, $has-multiple-vals + 1, str-length($first-val));
+  $val-3: null;
+  $has-val-3: str-index($val-2, " ");
+
+  @if $has-val-3 {
+    $val-3: str-slice($val-2, $has-val-3 + 1, str-length($val-2));
+    $val-2: str-slice($val-2, 0, $has-val-3 - 1);
+  }
+
+  $pos: _position-flipper($val-1) _position-flipper($val-2) _position-flipper($val-3);
+  $pos: unquote($pos + "");
+
+  // Use old spec for webkit
+  @if $val-1 == "to" {
+    @return (
+      webkit-image: -webkit- + $prefix + $pos + $suffix,
+      spec-image: $image
+    );
+  }
+
+  // Bring the code up to spec
+  @else {
+    @return (
+      webkit-image: -webkit- + $image,
+      spec-image: $prefix + "to " + $pos + $suffix
+    );
+  }
+}

docs/_css/bourbon/helpers/_radial-arg-parser.scss

@@ -22,7 +22,7 @@
           $pos: $pos nth($value, $i);
         }
       }
-      $G1: false;
+      $G1: null;
     }
 
     // If not spec calculate correct values
@@ -38,7 +38,7 @@
           $pos: $value;
 
           @if $pos == $G1 {
-            $G1: false;
+            $G1: null;
           }
         }
 
@@ -55,11 +55,11 @@
           $shape-size: $value;
 
           @if $value == $G1 {
-            $G1: false;
+            $G1: null;
           }
 
           @else if $value == $G2 {
-            $G2: false;
+            $G2: null;
           }
         }
       }

docs/_css/bourbon/helpers/_radial-gradient-parser.scss

@@ -0,0 +1,50 @@
+@function _radial-gradient-parser($image) {
+  $image: unquote($image);
+  $gradients: ();
+  $start: str-index($image, "(");
+  $end: str-index($image, ",");
+  $first-val: str-slice($image, $start + 1, $end - 1);
+
+  $prefix: str-slice($image, 0, $start);
+  $suffix: str-slice($image, $end, str-length($image));
+
+  $is-spec-syntax: str-index($first-val, "at");
+
+  @if $is-spec-syntax and $is-spec-syntax > 1 {
+    $keyword: str-slice($first-val, 1, $is-spec-syntax - 2);
+    $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val));
+    $pos: append($pos, $keyword, comma);
+
+    $gradients: (
+      webkit-image: -webkit- + $prefix + $pos + $suffix,
+      spec-image: $image
+    )
+  }
+
+  @else if $is-spec-syntax == 1 {
+    $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val));
+
+    $gradients: (
+      webkit-image: -webkit- + $prefix + $pos + $suffix,
+      spec-image: $image
+    )
+  }
+
+  @else if str-index($image, "cover") or str-index($image, "contain") {
+    @warn "Radial-gradient needs to be updated to conform to latest spec.";
+
+    $gradients: (
+      webkit-image: null,
+      spec-image: $image
+    )
+  }
+
+  @else {
+    $gradients: (
+      webkit-image: -webkit- + $image,
+      spec-image: $image
+    )
+  }
+
+  @return $gradients;
+}

docs/_css/bourbon/helpers/_str-to-num.scss

@@ -0,0 +1,50 @@
+//************************************************************************//
+// Helper function for linear/radial-gradient-parsers.
+// Source: http://sassmeister.com/gist/9647408
+//************************************************************************//
+@function _str-to-num($string) {
+  // Matrices
+  $strings: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
+  $numbers:  0   1   2   3   4   5   6   7   8   9;
+
+  // Result
+  $result: 0;
+  $divider: 0;
+  $minus: false;
+
+  // Looping through all characters
+  @for $i from 1 through str-length($string) {
+    $character: str-slice($string, $i, $i);
+    $index: index($strings, $character);
+
+    @if $character == '-' {
+      $minus: true;
+    }
+
+    @else if $character == '.' {
+      $divider: 1;
+    }
+
+    @else {
+      @if not $index {
+        $result: if($minus, $result * -1, $result);
+        @return _convert-units($result, str-slice($string, $i));
+      }
+
+      $number: nth($numbers, $index);
+
+      @if $divider == 0 {
+        $result: $result * 10;
+      }
+
+      @else {
+        // Move the decimal dot to the left
+        $divider: $divider * 10;
+        $number: $number / $divider;
+      }
+
+      $result: $result + $number;
+    }
+  }
+  @return if($minus, $result * -1, $result);
+}

docs/_css/bourbon/settings/_asset-pipeline.scss

@@ -0,0 +1 @@
+$asset-pipeline: false !default;

docs/_css/bourbon/settings/_prefixer.scss

@@ -0,0 +1,6 @@
+// Variable settings for /addons/prefixer.scss
+$prefix-for-webkit:    true !default;
+$prefix-for-mozilla:   true !default;
+$prefix-for-microsoft: true !default;
+$prefix-for-opera:     true !default;
+$prefix-for-spec:      true !default; // required for keyframe mixin

docs/_css/bourbon/settings/_px-to-em.scss

@@ -0,0 +1 @@
+$em-base: 16px !default;

docs/_data/acknowledgements.yml

@@ -0,0 +1,552 @@
+---
+- - '839'
+  - Aaron Franks
+  - Aaron Gelter
+  - Adam Krebs
+  - Adam Mark
+  - Adam Solove
+  - Adam Timberlake
+  - Adam Zapletal
+  - Ahmad Wali Sidiqi
+  - Alan Souza
+  - Alan deLevie
+  - Alastair Hole
+  - Alex
+  - Alex Boyd
+  - Alex Lopatin
+  - Alex Mykyta
+  - Alex Pien
+  - Alex Smith
+  - Alex Zelenskiy
+  - Alexander Shtuchkin
+  - Alexander Solovyov
+  - Alexander Tseung
+  - Alexandre Gaudencio
+  - Alexey Raspopov
+  - Alexey Shamrin
+  - Andre Z Sanchez
+  - Andreas Savvides
+  - Andreas Svensson
+  - Andres Kalle
+  - Andres Suarez
+  - Andrew Cobby
+  - Andrew Davey
+  - Andrew Rasmussen
+  - Andrew Sokolov
+  - Andrew Zich
+  - Andrey Popp
+  - Anthony van der Hoorn
+  - Antonio Ruberto
+  - Antti Ahti
+  - Anuj Tomar
+  - AoDev
+  - Areeb Malik
+  - Aria Buckles
+  - Aria Stewart
+  - Arian Faurtosh
+  - Artem Nezvigin
+  - Austin Wright
+  - Ayman Osman
+  - Baraa Hamodi
+  - Bartosz Kaszubowski
+  - Basarat Ali Syed
+  - Battaile Fauber
+  - Beau Smith
+  - Ben Alpert
+  - Ben Anderson
+  - Ben Foxall
+  - Ben Jaffe
+  - Ben Moss
+  - Ben Newman
+  - Ben Ripkens
+  - Benjamin Keen
+  - Benjamin Leiken
+  - Benjamin Woodruff
+  - Bill Fisher
+  - Blaine Hatab
+  - Blaine Kasten
+  - Bob Eagan
+  - Bob Ralian
+  - Bob Renwick
+  - Bojan Mihelac
+  - Bradley Spaulding
+  - Brandon Bloom
+  - Brandon Tilley
+  - Brian Cooke
+  - Brian Holt
+  - Brian Hsu
+  - Brian Kim
+  - Brian Kung
+  - Brian Reavis
+  - Brian Rue
+  - Bruno Škvorc
+  - Cam Song
+  - Cam Spiers
+  - Carter Chung
+  - Cassus Adam Banko
+  - Cat Chen
+  - Cedric Sohrauer
+  - Charles Marsh
+  - Chase Adams
+  - Cheng Lou
+  - Chitharanjan Das
+  - Chris Grovers
+  - Chris Ha
+  - Chris Rebert
+  - Chris Sciolla
+  - Christian Alfoni
+  - Christian Oliff
+  - Christian Roman
+  - Christoph Pojer
+  - Christopher Monsanto
+  - Clay Allsopp
+  - Connor McSheffrey
+  - Cory House
+  - Cotton Hou
+  - Cristovao Verstraeten
+  - Damien Pellier
+  - Dan Abramov
+  - Dan Fox
+  - Dan Schafer
+  - Daniel Carlsson
+  - Daniel Cousens
+  - Daniel Friesen
+  - Daniel Gasienica
+  - Daniel Hejl
+  - Daniel Lo Nigro
+  - Daniel Mané
+  - Daniel Miladinov
+  - Daniel Rodgers-Pryor
+  - Daniel Schonfeld
+  - Danny Ben-David
+  - Darcy
+  - Daryl Lau
+  - Darío Javier Cravero
+  - David Baker
+  - David Goldberg
+  - David Greenspan
+  - David Hellsing
+  - David Hu
+  - David Mininger
+  - David Neubauer
+  - David Percy
+  - Denis Sokolov
+  - Dennis Johnson
+  - Devon Blandin
+  - Devon Harvey
+  - Dmitrii Abramov
+  - Dmitry Blues
+  - Dmitry Mazuro
+  - Domenico Matteo
+  - Don Abrams
+  - Dustan Kasten
+  - Dustin Getz
+  - Dylan Harrington
+  - Eduardo Garcia
+  - Edvin Erikson
+  - Elaine Fang
+  - Enguerran
+  - Eric Clemmons
+  - Eric Eastwood
+  - Eric Florenzano
+  - Eric O'Connell
+  - Eric Schoffstall
+  - Erik Harper
+  - Espen Hovlandsdal
+  - Evan Coonrod
+  - Fabio M. Costa
+  - Federico Rampazzo
+  - Felipe Oliveira Carvalho
+  - Felix Gnass
+  - Felix Kling
+  - Fernando Correia
+  - Frankie Bagnardi
+  - François-Xavier Bois
+  - Fred Zhao
+  - G Scott Olson
+  - G. Kay Lee
+  - Gabe Levi
+  - Gareth Nicholson
+  - Garren Smith
+  - Geert Pasteels
+  - Geert-Jan Brits
+  - George A Sisco III
+  - Georgii Dolzhykov
+  - Gilbert
+  - Glen Mailer
+  - Grant Timmerman
+  - Greg Hurrell
+  - Greg Perkins
+  - Greg Roodt
+  - Gregory
+  - Guangqiang Dong
+  - Guido Bouman
+  - Harry Hull
+  - Harry Marr
+- - Harry Moreno
+  - Harshad Sabne
+  - Hekar Khani
+  - Hendrik Swanepoel
+  - Henrik Nyh
+  - Henry Zhu
+  - Hou Chia
+  - Hugo Jobling
+  - Héliton Nordt
+  - Ian Obermiller
+  - Ignacio Carbajo
+  - Igor Scekic
+  - Ilya Shuklin
+  - Ilyá Belsky
+  - Ingvar Stepanyan
+  - Irae Carvalho
+  - Isaac Salier-Hellendag
+  - Ivan Kozik
+  - Ivan Krechetov
+  - Ivan Vergiliev
+  - J. Andrew Brassington
+  - J. Renée Beach
+  - JD Isaacks
+  - JW
+  - Jack Zhang
+  - Jacob Gable
+  - Jacob Greenleaf
+  - Jae Hun Ro
+  - Jaime Mingo
+  - Jakub Malinowski
+  - James
+  - James Brantly
+  - James Burnett
+  - James Ide
+  - James Long
+  - James Pearce
+  - James Seppi
+  - James South
+  - Jamie Wong
+  - Jamis Charles
+  - Jamison Dance
+  - Jan Hancic
+  - Jan Kassens
+  - Jan Raasch
+  - Jared Forsyth
+  - Jason
+  - Jason Bonta
+  - Jason Ly
+  - Jason Miller
+  - Jason Quense
+  - Jason Trill
+  - Jason Webster
+  - Jay Jaeho Lee
+  - Jean Lauliac
+  - Jed Watson
+  - Jeff Barczewski
+  - Jeff Carpenter
+  - Jeff Chan
+  - Jeff Hicken
+  - Jeff Kolesky
+  - Jeff Morrison
+  - Jeff Welch
+  - Jeffrey Lin
+  - Jesse Skinner
+  - Jignesh Kakadiya
+  - Jim OBrien
+  - Jim Sproch
+  - Jimmy Jea
+  - Jing Chen
+  - Jinwoo Oh
+  - Jiyeon Seo
+  - Joe Stein
+  - Joel Auterson
+  - Johannes Baiter
+  - Johannes Emerich
+  - Johannes Lumpe
+  - John Heroy
+  - John Watson
+  - Jon Beebe
+  - Jon Chester
+  - Jon Hester
+  - Jon Madison
+  - Jon Scott Clark
+  - Jon Tewksbury
+  - Jonas Enlund
+  - Jonas Gebhardt
+  - Jonathan Hsu
+  - Jordan Harband
+  - Jordan Walke
+  - Jorrit Schippers
+  - Joseph Nudell
+  - Joseph Savona
+  - Josh Bassett
+  - Josh Duck
+  - Josh Yudaken
+  - Joshua Go
+  - Joshua Goldberg
+  - Joshua Ma
+  - João Valente
+  - Juan Serrano
+  - Julen Ruiz Aizpuru
+  - Julian Viereck
+  - Julien Bordellier
+  - Jun Wu
+  - Juraj Dudak
+  - Justin Jaffray
+  - Justin Robison
+  - Justin Woo
+  - Kamron Batman
+  - Karl Mikkelsen
+  - Karpich Dmitry
+  - Keito Uchiyama
+  - Kevin Coughlin
+  - Kevin Huang
+  - Kevin Old
+  - KimCoding
+  - Kirk Steven Hansen
+  - Kit Randel
+  - Kohei TAKATA
+  - Koo Youngmin
+  - Kunal Mehta
+  - Kurt Ruppel
+  - Kyle Kelley
+  - Kyle Mathews
+  - Laurence Rowe
+  - Laurent Etiemble
+  - Lee Byron
+  - Lee Jaeyoung
+  - Lei
+  - Leon Fedotov
+  - Leon Yip
+  - Leonardo YongUk Kim
+  - Levi Buzolic
+  - Levi McCallum
+  - Lily
+  - Logan Allen
+  - Luigy Leon
+  - Luke Horvat
+  - MIKAMI Yoshiyuki
+  - Marcin K.
+  - Marcin Kwiatkowski
+  - Marcin Szczepanski
+  - Mariano Desanze
+  - Marjan
+  - Mark Anderson
+  - Mark Funk
+  - Mark Hintz
+  - Mark IJbema
+  - Mark Richardson
+  - Marlon Landaverde
+  - Marshall Roch
+  - Martin Andert
+  - Martin Jul
+  - Martin Konicek
+  - Martin Mihaylov
+  - Masaki KOBAYASHI
+  - Mathieu M-Gosselin
+  - Matias Singers
+  - Matsunoki
+  - Matt Brookes
+  - Matt Dunn-Rankin
+  - Matt Harrison
+  - Matt Huggins
+  - Matt Zabriskie
+  - Matthew Dapena-Tretter
+  - Matthew Johnston
+  - Matthew King
+  - Matthew Miner
+  - Matthias Le Brun
+  - Matti Nelimarkka
+  - Max F. Albrecht
+  - Max Heiber
+  - Maxi Ferreira
+  - Maxim Abramchuk
+  - Merrick Christensen
+  - Mert Kahyaoğlu
+  - Michael Chan
+  - Michael Randers-Pehrson
+  - Michael Ridgway
+  - Michael Warner
+  - Michal Srb
+  - Michelle Todd
+  - Mihai Parparita
+  - Mike D Pilsbury
+- - Mike Groseclose
+  - Mikolaj Dadela
+  - Minwe LUO
+  - Miorel Palii
+  - Morhaus
+  - Mouad Debbar
+  - Murad
+  - Murray M. Moss
+  - Nadeesha Cabral
+  - Naman Goel
+  - Nate Hunzaker
+  - Nathan White
+  - Neri Marschik
+  - Nicholas Bergson-Shilcock
+  - Nick Fitzgerald
+  - Nick Gavalas
+  - Nick Merwin
+  - Nick Raienko
+  - Nick Thompson
+  - Nick Williams
+  - Niklas Boström
+  - Ning Xia
+  - Niole Nelson
+  - Oiva Eskola
+  - Oleg
+  - Oleksii Markhovskyi
+  - Oliver Zeigermann
+  - Olivier Tassinari
+  - Owen Coutts
+  - Pablo Lacerda de Miranda
+  - Paolo Moretti
+  - Pascal Hartig
+  - Patrick Laughlin
+  - Patrick Stapleton
+  - Paul Harper
+  - Paul O’Shannessy
+  - Paul Seiffert
+  - Paul Shen
+  - Pedro Nauck
+  - Pete Hunt
+  - Peter Blazejewicz
+  - Peter Cottle
+  - Peter Jaros
+  - Petri Lehtinen
+  - Petri Lievonen
+  - Pieter Vanderwerff
+  - Pouja Nikray
+  - Prathamesh Sonpatki
+  - Preston Parry
+  - Rafael
+  - Rafal Dittwald
+  - Rajiv Tirumalareddy
+  - Randall Randall
+  - Ray
+  - Raymond Ha
+  - Reed Loden
+  - Richard D. Worth
+  - Richard Feldman
+  - Richard Kho
+  - Richard Littauer
+  - Richard Livesey
+  - Richard Wood
+  - Rick Beerendonk
+  - Riley Tomasek
+  - Rob Arnold
+  - Robert Knight
+  - Robert Sedovsek
+  - Robin Berjon
+  - Roman Vanesyan
+  - Russ
+  - Ryan Seddon
+  - Sahat Yalkabov
+  - Saif Hakim
+  - Sam Saccone
+  - Sam Selikoff
+  - Samy Al Zahrani
+  - Sander Spies
+  - Scott Burch
+  - Scott Feeney
+  - Sean Kinsey
+  - Sebastian Markbåge
+  - Seoh Char
+  - Serg
+  - Sergey Generalov
+  - Sergey Rubanov
+  - Seyi Adebajo
+  - Shane O'Sullivan
+  - Shaun Trennery
+  - ShihChi Huang
+  - Shim Won
+  - Shota Kubota
+  - Shripad K
+  - Sibi
+  - Simon Højberg
+  - Simon Welsh
+  - Sophia Westwood
+  - Spencer Handley
+  - Stefan Dombrowski
+  - Stephen Murphy
+  - Sterling Cobb
+  - Steve Baker
+  - Steven Luscher
+  - Stoyan Stefanov
+  - Sundeep Malladi
+  - Sunny Juneja
+  - Sven Helmberger
+  - Sverre Johansen
+  - Sébastien Lorber
+  - Sławomir Laskowski
+  - Taeho Kim
+  - Tay Yang Shun
+  - Ted Kim
+  - Teodor Szente
+  - Thomas Aylott
+  - Thomas Boyt
+  - Thomas Reggi
+  - Thomas Röggla
+  - Thomas Shaddox
+  - Thomas Shafer
+  - ThomasCrvsr
+  - Tienchai Wirojsaksaree
+  - Tim Routowicz
+  - Tim Schaub
+  - Timothy Yung
+  - Tobias Reiss
+  - Tom Haggie
+  - Tom Hauburger
+  - Tom MacWright
+  - Tom Occhino
+  - Tomasz Kołodziejski
+  - Tony Spiro
+  - Toru Kobayashi
+  - Trinh Hoang Nhu
+  - Tsung Hung
+  - Tyler Brock
+  - Ustin Zarubin
+  - Vadim Chernysh
+  - Varun Rau
+  - Vasiliy Loginevskiy
+  - Victor Alvarez
+  - Victor Koenders
+  - Ville Immonen
+  - Vincent Riemer
+  - Vincent Siao
+  - Vipul A M
+  - Vitaly Kramskikh
+  - Vjeux
+  - Volkan Unsal
+  - Wayne Larsen
+  - WickyNilliams
+  - Wincent Colaiuta
+  - Wout Mertens
+  - Xavier Morel
+  - XuefengWu
+  - Yakov Dalinchuk
+  - Yasar icli
+  - YouBao Nong
+  - Yuichi Hagio
+  - Yuriy Dybskiy
+  - Yuval Dekel
+  - Zach Bruggeman
+  - Zacharias
+  - arush
+  - brafdlog
+  - chen
+  - clariroid
+  - claudiopro
+  - cutbko
+  - davidxi
+  - dongmeng.ldm
+  - iamchenxin
+  - iamdoron
+  - imagentleman
+  - laiso
+  - li.li
+  - sugarshin
+  - wali-s
+  - yiminghe
+  - youmoo
+  - zhangjg
+  - Árni Hermann Reynisson
+  - 凌恒
+  - 张敏

docs/_data/authors.yml

@@ -0,0 +1,58 @@
+# Map of short name to more information. `name` will be used but if you don't
+# want to use your real name, just use whatever. If url is included, your name
+# will be a link to the provided url.
+billandjing:
+  name: Bill Fisher and Jing Chen
+chenglou:
+  name: Cheng Lou
+  url: https://twitter.com/_chenglou
+Daniel15:
+  name: Daniel Lo Nigro
+  url: http://dan.cx/
+fisherwebdev:
+  name: Bill Fisher
+  url: https://twitter.com/fisherwebdev
+jaredly:
+  name: Jared Forsyth
+  url: https://twitter.com/jaredforsyth
+jgebhardt:
+  name: Jonas Gebhardt
+  url: https://twitter.com/jonasgebhardt
+jimandsebastian:
+  name: Jim Sproch and Sebastian Markbåge
+josephsavona:
+  name: Joseph Savona
+  url: https://twitter.com/en_JS
+kmeht:
+  name: Kunal Mehta
+  url: https://github.com/kmeht
+LoukaN:
+  name: Lou Husson
+  url: https://twitter.com/loukan42
+matthewjohnston4:
+  name: Matthew Johnston
+  url: https://github.com/matthewathome
+petehunt:
+  name: Pete Hunt
+  url: https://twitter.com/floydophone
+schrockn:
+  name: Nick Schrock
+  url: https://twitter.com/schrockn
+sebmarkbage:
+  name: Sebastian Markbåge
+  url: https://twitter.com/sebmarkbage
+spicyj:
+  name: Ben Alpert
+  url: http://benalpert.com
+steveluscher:
+  name: Steven Luscher
+  url: https://twitter.com/steveluscher
+vjeux:
+  name: Vjeux
+  url: https://twitter.com/vjeux
+wincent:
+  name: Greg Hurrell
+  url: https://twitter.com/wincent
+zpao:
+  name: Paul O’Shannessy
+  url: https://twitter.com/zpao

docs/_data/nav_docs.yml

@@ -4,12 +4,18 @@
     title: Getting Started
   - id: tutorial
     title: Tutorial
+  - id: thinking-in-react
+    title: Thinking in React
+- title: Community Resources
+  items:
+  - id: conferences
+    title: Conferences
   - id: videos
     title: Videos
   - id: complementary-tools
-    title: Complementary tools
-  - id: example-apps
-    title: Example apps
+    title: Complementary Tools
+  - id: examples
+    title: Examples
 - title: Guides
   items:
   - id: why-react
@@ -19,6 +25,8 @@
     subitems:
     - id: jsx-in-depth
       title: JSX in Depth
+    - id: jsx-spread
+      title: JSX Spread Attributes
     - id: jsx-gotchas
       title: JSX Gotchas
   - id: interactivity-and-dynamic-uis
@@ -27,13 +35,15 @@
     title: Multiple Components
   - id: reusable-components
     title: Reusable Components
+  - id: transferring-props
+    title: Transferring Props
   - id: forms
     title: Forms
   - id: working-with-the-browser
     title: Working With the Browser
     subitems:
     - id: more-about-refs
-      title: More About Refs
+      title: Refs to Components
   - id: tooling-integration
     title: Tooling Integration
   - id: addons
@@ -43,10 +53,20 @@
       title: Animation
     - id: two-way-binding-helpers
       title: Two-Way Binding Helpers
-    - id: class-name-manipulation
-      title: Class Name Manipulation
-  - id: examples
-    title: Examples
+    - id: test-utils
+      title: Test Utilities
+    - id: clone-with-props
+      title: Cloning Elements
+    - id: create-fragment
+      title: Keyed Fragments
+    - id: update
+      title: Immutability Helpers
+    - id: pure-render-mixin
+      title: PureRenderMixin
+    - id: perf
+      title: Performance Tools
+  - id: advanced-performance
+    title: Advanced Performance
 - title: Reference
   items:
   - id: top-level-api
@@ -62,6 +82,16 @@
   - id: dom-differences
     title: DOM Differences
   - id: special-non-dom-attributes
-    title: Special Non-DOM attributes
+    title: Special Non-DOM Attributes
   - id: reconciliation
     title: Reconciliation
+  - id: glossary
+    title: React (Virtual) DOM Terminology
+- title: Flux
+  items:
+  - id: flux-overview
+    title: Flux Overview
+    href: https://facebook.github.io/flux/docs/overview.html
+  - id: flux-todo-list
+    title: Flux TodoMVC Tutorial
+    href: https://facebook.github.io/flux/docs/todo-list.html

docs/_data/nav_tips.yml

@@ -30,3 +30,9 @@
     title: Communicate Between Components
   - id: expose-component-functions
     title: Expose Component Functions
+  - id: children-undefined
+    title: this.props.children undefined
+  - id: use-react-with-other-libraries
+    title: Use React with Other Libraries
+  - id: dangerously-set-inner-html
+    title: Dangerously Set innerHTML

docs/_includes/blog_post.html

@@ -1,10 +1,29 @@
-<h1><a href="/react{{ page.url }}">{{ page.title }}</a></h1>
-<p class="meta">{{ page.date | date_to_string }} by {{ page.author }}</p>
+{% assign page = include.page %}
 
-<div id="post">
-{% if content != '' %}
-  {{ page.excerpt }}
+<h1>
+{% if include.isPermalink %}
+  {{ page.title }}
 {% else %}
-  {{ page.content }}
+  <a href="/react{{ page.url }}">{{ page.title }}</a>
 {% endif %}
+</h1>
+
+<p class="meta">
+  {{ page.date | date: "%B %e, %Y" }}
+  by
+  {% if page.author.url %}
+    <a href="{{page.author.url}}">{{ page.author.name }}</a>
+  {% else %}
+    {{ page.author.name }}
+  {% endif %}
+</p>
+
+<hr>
+
+<div class="post">
+  {{ include.content }}
 </div>
+
+{% if include.isPermalink %}
+  <div class="fb-like" data-send="true" data-width="650" data-show-faces="false"></div>
+{% endif %}

docs/_includes/nav_docs.html

@@ -6,16 +6,12 @@
       <ul>
         {% for item in section.items %}
           <li>
-            <a href="/react/docs/{{ item.id }}.html"{% if page.id == item.id %} class="active"{% endif %}>
-              {{ item.title }}
-            </a>
+            {{ item | sidebar_item_link}}
             {% if item.subitems %}
               <ul>
                 {% for subitem in item.subitems %}
                   <li>
-                    <a href="/react/docs/{{ subitem.id }}.html"{% if page.id == subitem.id %} class="active"{% endif %}>
-                      {{ subitem.title }}
-                    </a>
+                    {{ subitem | sidebar_item_link}}
                   </li>
                 {% endfor %}
               </ul>

docs/_js/examples/.eslintrc

@@ -0,0 +1,7 @@
+---
+rules:
+  block-scoped-var: 0
+  no-undef: 0
+  strict: 0
+  react/react-in-jsx-scope: 0
+  react/jsx-no-undef: 0

docs/_js/examples/hello.js

@@ -1,19 +1,14 @@
-/**
- * @jsx React.DOM
- */
+var HELLO_COMPONENT = `
+var HelloMessage = React.createClass({
+  render: function() {
+    return <div>Hello {this.props.name}</div>;
+  }
+});
 
-var HELLO_COMPONENT = "\
-/** @jsx React.DOM */\n\
-var HelloMessage = React.createClass({\n\
-  render: function() {\n\
-    return <div>Hello {this.props.name}</div>;\n\
-  }\n\
-});\n\
-\n\
-React.renderComponent(<HelloMessage name=\"John\" />, mountNode);\
-";
+ReactDOM.render(<HelloMessage name="John" />, mountNode);
+`;
 
-React.renderComponent(
+ReactDOM.render(
   <ReactPlayground codeText={HELLO_COMPONENT} />,
   document.getElementById('helloExample')
 );

docs/_js/examples/markdown.js

@@ -1,43 +1,36 @@
-/**
- * @jsx React.DOM
- */
+var MARKDOWN_COMPONENT = `
+var MarkdownEditor = React.createClass({
+  getInitialState: function() {
+    return {value: 'Type some *markdown* here!'};
+  },
+  handleChange: function() {
+    this.setState({value: this.refs.textarea.value});
+  },
+  rawMarkup: function() {
+    return { __html: marked(this.state.value, {sanitize: true}) };
+  },
+  render: function() {
+    return (
+      <div className="MarkdownEditor">
+        <h3>Input</h3>
+        <textarea
+          onChange={this.handleChange}
+          ref="textarea"
+          defaultValue={this.state.value} />
+        <h3>Output</h3>
+        <div
+          className="content"
+          dangerouslySetInnerHTML={this.rawMarkup()}
+        />
+      </div>
+    );
+  }
+});
 
-var MARKDOWN_COMPONENT = "\
-/** @jsx React.DOM */\n\
-\n\
-var converter = new Showdown.converter();\n\
-\n\
-var MarkdownEditor = React.createClass({\n\
-  getInitialState: function() {\n\
-    return {value: 'Type some *markdown* here!'};\n\
-  },\n\
-  handleChange: function() {\n\
-    this.setState({value: this.refs.textarea.getDOMNode().value});\n\
-  },\n\
-  render: function() {\n\
-    return (\n\
-      <div className=\"MarkdownEditor\">\n\
-        <h3>Input</h3>\n\
-        <textarea\n\
-          onChange={this.handleChange}\n\
-          ref=\"textarea\"\n\
-          defaultValue={this.state.value} />\n\
-        <h3>Output</h3>\n\
-        <div\n\
-          className=\"content\"\n\
-          dangerouslySetInnerHTML={{\n\
-            __html: converter.makeHtml(this.state.value)\n\
-          }}\n\
-        />\n\
-      </div>\n\
-    );\n\
-  }\n\
-});\n\
-\n\
-React.renderComponent(<MarkdownEditor />, mountNode);\
-";
+ReactDOM.render(<MarkdownEditor />, mountNode);
+`;
 
-React.renderComponent(
+ReactDOM.render(
   <ReactPlayground codeText={MARKDOWN_COMPONENT} />,
   document.getElementById('markdownExample')
 );

docs/_js/examples/timer.js

@@ -1,33 +1,28 @@
-/**
- * @jsx React.DOM
- */
+var TIMER_COMPONENT = `
+var Timer = React.createClass({
+  getInitialState: function() {
+    return {secondsElapsed: 0};
+  },
+  tick: function() {
+    this.setState({secondsElapsed: this.state.secondsElapsed + 1});
+  },
+  componentDidMount: function() {
+    this.interval = setInterval(this.tick, 1000);
+  },
+  componentWillUnmount: function() {
+    clearInterval(this.interval);
+  },
+  render: function() {
+    return (
+      <div>Seconds Elapsed: {this.state.secondsElapsed}</div>
+    );
+  }
+});
 
-var TIMER_COMPONENT = "\
-/** @jsx React.DOM */\n\
-var Timer = React.createClass({\n\
-  getInitialState: function() {\n\
-    return {secondsElapsed: 0};\n\
-  },\n\
-  tick: function() {\n\
-    this.setState({secondsElapsed: this.state.secondsElapsed + 1});\n\
-  },\n\
-  componentDidMount: function() {\n\
-    this.interval = setInterval(this.tick, 1000);\n\
-  },\n\
-  componentWillUnmount: function() {\n\
-    clearInterval(this.interval);\n\
-  },\n\
-  render: function() {\n\
-    return (\n\
-      <div>Seconds Elapsed: {this.state.secondsElapsed}</div>\n\
-    );\n\
-  }\n\
-});\n\
-\n\
-React.renderComponent(<Timer />, mountNode);\
-";
+ReactDOM.render(<Timer />, mountNode);
+`;
 
-React.renderComponent(
+ReactDOM.render(
   <ReactPlayground codeText={TIMER_COMPONENT} />,
   document.getElementById('timerExample')
 );

docs/_js/examples/todo.js

@@ -1,47 +1,43 @@
-/**
- * @jsx React.DOM
- */
+var TODO_COMPONENT = `
+var TodoList = React.createClass({
+  render: function() {
+    var createItem = function(itemText, index) {
+      return <li key={index + itemText}>{itemText}</li>;
+    };
+    return <ul>{this.props.items.map(createItem)}</ul>;
+  }
+});
+var TodoApp = React.createClass({
+  getInitialState: function() {
+    return {items: [], text: ''};
+  },
+  onChange: function(e) {
+    this.setState({text: e.target.value});
+  },
+  handleSubmit: function(e) {
+    e.preventDefault();
+    var nextItems = this.state.items.concat([this.state.text]);
+    var nextText = '';
+    this.setState({items: nextItems, text: nextText});
+  },
+  render: function() {
+    return (
+      <div>
+        <h3>TODO</h3>
+        <TodoList items={this.state.items} />
+        <form onSubmit={this.handleSubmit}>
+          <input onChange={this.onChange} value={this.state.text} />
+          <button>{'Add #' + (this.state.items.length + 1)}</button>
+        </form>
+      </div>
+    );
+  }
+});
 
-var TODO_COMPONENT = "\
-/** @jsx React.DOM */\n\
-var TodoList = React.createClass({\n\
-  render: function() {\n\
-    var createItem = function(itemText) {\n\
-      return <li>{itemText}</li>;\n\
-    };\n\
-    return <ul>{this.props.items.map(createItem)}</ul>;\n\
-  }\n\
-});\n\
-var TodoApp = React.createClass({\n\
-  getInitialState: function() {\n\
-    return {items: [], text: ''};\n\
-  },\n\
-  onChange: function(e) {\n\
-    this.setState({text: e.target.value});\n\
-  },\n\
-  handleSubmit: function(e) {\n\
-    e.preventDefault();\n\
-    var nextItems = this.state.items.concat([this.state.text]);\n\
-    var nextText = '';\n\
-    this.setState({items: nextItems, text: nextText});\n\
-  },\n\
-  render: function() {\n\
-    return (\n\
-      <div>\n\
-        <h3>TODO</h3>\n\
-        <TodoList items={this.state.items} />\n\
-        <form onSubmit={this.handleSubmit}>\n\
-          <input onChange={this.onChange} value={this.state.text} />\n\
-          <button>{'Add #' + (this.state.items.length + 1)}</button>\n\
-        </form>\n\
-      </div>\n\
-    );\n\
-  }\n\
-});\n\
-React.renderComponent(<TodoApp />, mountNode);\
-";
+ReactDOM.render(<TodoApp />, mountNode);
+`;
 
-React.renderComponent(
+ReactDOM.render(
   <ReactPlayground codeText={TODO_COMPONENT} />,
   document.getElementById('todoExample')
 );

docs/_js/html-jsx-lib.js

@@ -1,482 +1,7 @@
-/**
- * Copyright 2013 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This is a very simple HTML to JSX converter. It turns out that browsers 
- * have good HTML parsers (who would have thought?) so we utilise this by 
- * inserting the HTML into a temporary DOM node, and then do a breadth-first
- * traversal of the resulting DOM tree.
- */
-;(function(global) {
-  'use strict';
-  
-  // https://developer.mozilla.org/en-US/docs/Web/API/Node.nodeType
-  var NODE_TYPE = {
-    ELEMENT: 1,
-    TEXT: 3,
-    COMMENT: 8
-  };
-  var ATTRIBUTE_MAPPING = {
-    'for': 'htmlFor',
-    'class': 'className'
-  };
-
-  /**
-   * Repeats a string a certain number of times.
-   * Also: the future is bright and consists of native string repetition:
-   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat
-   *
-   * @param {string} string  String to repeat
-   * @param {number} times   Number of times to repeat string. Integer.
-   * @see http://jsperf.com/string-repeater/2 
-   */
-  function repeatString(string, times) {
-    if (times === 1) {
-      return string;
-    }
-    if (times < 0) { throw new Error(); }
-    var repeated = '';
-    while (times) {
-      if (times & 1) {
-        repeated += string;
-      }
-      if (times >>= 1) {
-        string += string;
-      }
-    }
-    return repeated;
-  }
-
-  /**
-   * Determine if the string ends with the specified substring.
-   *
-   * @param {string} haystack String to search in
-   * @param {string} needle   String to search for
-   * @return {boolean}
-   */
-  function endsWith(haystack, needle) {
-    return haystack.slice(-needle.length) === needle;
-  }
-
-  /**
-   * Trim the specified substring off the string. If the string does not end 
-   * with the specified substring, this is a no-op.
-   *
-   * @param {string} haystack String to search in
-   * @param {string} needle   String to search for
-   * @return {string}
-   */
-  function trimEnd(haystack, needle) {
-    return endsWith(haystack, needle)
-      ? haystack.slice(0, -needle.length)
-      : haystack;
-  }
-
-  /**
-   * Convert a hyphenated string to camelCase.
-   */
-  function hyphenToCamelCase(string) {
-    return string.replace(/-(.)/g, function(match, chr) {
-      return chr.toUpperCase();
-    });
-  }
-
-  /**
-   * Determines if the specified string consists entirely of whitespace.
-   */
-  function isEmpty(string) {
-     return !/[^\s]/.test(string);
-  }
-
-  /**
-   * Determines if the specified string consists entirely of numeric characters.
-   */
-  function isNumeric(input) {
-    return input !== undefined 
-      && input !== null 
-      && (typeof input === 'number' || parseInt(input, 10) == input);
-  }
-
-  var HTMLtoJSX = function(config) {
-    this.config = config || {};
-
-    if (this.config.createClass === undefined) {
-      this.config.createClass = true;
-    }
-    if (!this.config.indent) {
-      this.config.indent = '  ';  
-    }
-    if (!this.config.outputClassName) {
-      this.config.outputClassName = 'NewComponent';
-    }
-  };
-  HTMLtoJSX.prototype = {
-    /**
-     * Reset the internal state of the converter
-     */
-    reset: function() {
-      this.output = '';
-      this.level = 0;
-    },
-    /**
-     * Main entry point to the converter. Given the specified HTML, returns a
-     * JSX object representing it.
-     * @param {string} html HTML to convert
-     * @return {string} JSX
-     */
-    convert: function(html) {
-      this.reset();
-
-      // It turns out browsers have good HTML parsers (imagine that). 
-      // Let's take advantage of it.
-      var containerEl = document.createElement('div');
-      containerEl.innerHTML = '\n' + this._cleanInput(html) + '\n';
-
-      if (this.config.createClass) {
-        if (this.config.outputClassName) {
-          this.output = 'var ' + this.config.outputClassName + ' = React.createClass({\n';
-        } else {
-          this.output = 'React.createClass({\n';
-        }
-        this.output += this.config.indent + 'render: function() {' + "\n";
-        this.output += this.config.indent + this.config.indent + 'return (\n';
-      }
-
-      if (this._onlyOneTopLevel(containerEl)) {
-        // Only one top-level element, the component can return it directly
-        // No need to actually visit the container element
-        this._traverse(containerEl);
-      } else {
-        // More than one top-level element, need to wrap the whole thing in a 
-        // container.
-        this.output += this.config.indent + this.config.indent + this.config.indent;
-        this.level++;
-        this._visit(containerEl);
-      }
-      this.output = this.output.trim() + '\n';
-      if (this.config.createClass) {
-        this.output += this.config.indent + this.config.indent + ');\n';
-        this.output += this.config.indent + '}\n';
-        this.output += '});';
-      }
-      return this.output;
-    },
-
-    /**
-     * Cleans up the specified HTML so it's in a format acceptable for 
-     * converting.
-     *
-     * @param {string} html HTML to clean
-     * @return {string} Cleaned HTML
-     */
-    _cleanInput: function(html) {
-      // Remove unnecessary whitespace
-      html = html.trim();
-      // Ugly method to strip script tags. They can wreak havoc on the DOM nodes
-      // so let's not even put them in the DOM.
-      html = html.replace(/<script(.*?)<\/script>/g, '');
-      return html;
-    },
-
-    /**
-     * Determines if there's only one top-level node in the DOM tree. That is,
-     * all the HTML is wrapped by a single HTML tag.
-     *
-     * @param {DOMElement} containerEl Container element
-     * @return {boolean}
-     */
-    _onlyOneTopLevel: function(containerEl) {
-      // Only a single child element
-      if (
-        containerEl.childNodes.length === 1 
-        && containerEl.childNodes[0].nodeType === NODE_TYPE.ELEMENT
-      ) {
-        return true;
-      }
-      // Only one element, and all other children are whitespace
-      var foundElement = false;
-      for (var i = 0, count = containerEl.childNodes.length; i < count; i++) {
-        var child = containerEl.childNodes[i];
-        if (child.nodeType === NODE_TYPE.ELEMENT) {
-          if (foundElement) {
-            // Encountered an element after already encountering another one
-            // Therefore, more than one element at root level
-            return false;
-          } else {
-            foundElement = true;
-          }
-        } else if (child.nodeType === NODE_TYPE.TEXT && !isEmpty(child.textContent)) {
-          // Contains text content
-          return false;
-        }
-      }
-      return true;
-    },
-
-    /**
-     * Gets a newline followed by the correct indentation for the current
-     * nesting level
-     *
-     * @return {string}
-     */
-    _getIndentedNewline: function() {
-      return '\n' + repeatString(this.config.indent, this.level + 2);
-    },
-
-    /**
-     * Handles processing the specified node
-     * 
-     * @param {Node} node
-     */
-    _visit: function(node) {
-      this._beginVisit(node);
-      this._traverse(node);
-      this._endVisit(node);
-    },
-
-    /**
-     * Traverses all the children of the specified node
-     *
-     * @param {Node} node
-     */
-    _traverse: function(node) {
-      this.level++;
-      for (var i = 0, count = node.childNodes.length; i < count; i++) {
-        this._visit(node.childNodes[i]);
-      }
-      this.level--;
-    },
-
-    /**
-     * Handle pre-visit behaviour for the specified node.
-     *
-     * @param {Node} node
-     */
-    _beginVisit: function(node) {
-      switch (node.nodeType) {
-        case NODE_TYPE.ELEMENT:
-          this._beginVisitElement(node);
-          break;
-
-        case NODE_TYPE.TEXT:
-          this._visitText(node);
-          break;
-
-        case NODE_TYPE.COMMENT:
-          this._visitComment(node);
-          break;
-
-        default:
-          console.warn('Unrecognised node type: ' + node.nodeType);
-      }
-    },
-
-    /**
-     * Handles post-visit behaviour for the specified node.
-     *
-     * @param {Node} node
-     */
-    _endVisit: function(node) {
-      switch (node.nodeType) {
-        case NODE_TYPE.ELEMENT:
-          this._endVisitElement(node);
-          break;
-        // No ending tags required for these types
-        case NODE_TYPE.TEXT:
-        case NODE_TYPE.COMMENT:
-          break;
-      }
-    },
-
-    /**
-     * Handles pre-visit behaviour for the specified element node
-     *
-     * @param {DOMElement} node
-     */
-    _beginVisitElement: function(node) {
-      var tagName = node.tagName.toLowerCase();
-      var attributes = [];
-      for (var i = 0, count = node.attributes.length; i < count; i++) {
-        attributes.push(this._getElementAttribute(node, node.attributes[i]));
-      }
-
-      this.output += '<' + tagName;
-      if (attributes.length > 0) {
-        this.output += ' ' + attributes.join(' ');
-      }
-      if (node.firstChild) {
-        this.output += '>';
-      }
-    },
-
-    /**
-     * Handles post-visit behaviour for the specified element node
-     *
-     * @param {Node} node
-     */
-    _endVisitElement: function(node) {
-      // De-indent a bit
-      // TODO: It's inefficient to do it this way :/
-      this.output = trimEnd(this.output, this.config.indent);
-      if (node.firstChild) {
-        this.output += '</' + node.tagName.toLowerCase() + '>';
-      } else {
-        this.output += ' />';
-      }
-    },
-
-    /**
-     * Handles processing of the specified text node
-     *
-     * @param {TextNode} node
-     */
-    _visitText: function(node) {
-      var text = node.textContent;
-      // If there's a newline in the text, adjust the indent level
-      if (text.indexOf('\n') > -1) {
-        text = node.textContent.replace(/\n\s*/g, this._getIndentedNewline());
-      }
-      this.output += text;
-    },
-
-    /**
-     * Handles processing of the specified text node
-     *
-     * @param {Text} node
-     */
-    _visitComment: function(node) {
-      // Do not render the comment
-      // Since we remove comments, we also need to remove the next line break so we
-      // don't end up with extra whitespace after every comment
-      //if (node.nextSibling && node.nextSibling.nodeType === NODE_TYPE.TEXT) {
-      //  node.nextSibling.textContent = node.nextSibling.textContent.replace(/\n\s*/, '');
-      //}
-      this.output += '{/*' + node.textContent.replace('*/', '* /') + '*/}';
-    },
-
-    /**
-     * Gets a JSX formatted version of the specified attribute from the node
-     *
-     * @param {DOMElement} node
-     * @param {object}     attribute
-     * @return {string}
-     */
-    _getElementAttribute: function(node, attribute) {
-      switch (attribute.name) {
-        case 'style':
-          return this._getStyleAttribute(attribute.value);
-        default:
-          var name = ATTRIBUTE_MAPPING[attribute.name] || attribute.name;
-          var result = name + '=';
-          // Numeric values should be output as {123} not "123"
-          if (isNumeric(attribute.value)) {
-            result += '{' + attribute.value + '}';
-          } else {
-            result += '"' + attribute.value.replace('"', '&quot;') + '"';
-          }
-          return result;
-      }
-    },
-
-    /**
-     * Gets a JSX formatted version of the specified element styles
-     *
-     * @param {string} styles
-     * @return {string}
-     */
-    _getStyleAttribute: function(styles) {
-      var jsxStyles = new StyleParser(styles).toJSXString();
-      return 'style={{' + jsxStyles + '}}';
-    }
-  };
-
-  /**
-   * Handles parsing of inline styles
-   * 
-   * @param {string} rawStyle Raw style attribute
-   * @constructor
-   */
-  var StyleParser = function(rawStyle) {
-    this.parse(rawStyle);
-  };
-  StyleParser.prototype = {
-    /**
-     * Parse the specified inline style attribute value
-     * @param {string} rawStyle Raw style attribute
-     */
-    parse: function(rawStyle) {
-      this.styles = {};
-      rawStyle.split(';').forEach(function(style) {
-        style = style.trim();
-        var firstColon = style.indexOf(':');
-        var key = style.substr(0, firstColon);
-        var value = style.substr(firstColon + 1).trim();
-        if (key !== '') {
-          this.styles[key] = value;  
-        }
-      }, this);
-    },
-
-    /**
-     * Convert the style information represented by this parser into a JSX
-     * string
-     *
-     * @return {string}
-     */
-    toJSXString: function() {
-      var output = [];
-      for (var key in this.styles) {
-        if (!this.styles.hasOwnProperty(key)) {
-          continue;
-        }
-        output.push(this.toJSXKey(key) + ': ' + this.toJSXValue(this.styles[key]));
-      }
-      return output.join(', ');
-    },
-
-    /**
-     * Convert the CSS style key to a JSX style key
-     *
-     * @param {string} key CSS style key
-     * @return {string} JSX style key
-     */
-    toJSXKey: function(key) {
-      return hyphenToCamelCase(key);
-    },
-
-    /**
-     * Convert the CSS style value to a JSX style value
-     *
-     * @param {string} value CSS style value
-     * @return {string} JSX style value
-     */
-    toJSXValue: function(value) {
-      if (isNumeric(value)) {
-        // If numeric, no quotes
-        return value;
-      } else if (endsWith(value, 'px')) {
-        // "500px" -> 500
-        return trimEnd(value, 'px');
-      } else {
-        // Proably a string, wrap it in quotes
-        return '\'' + value.replace(/'/g, '"') + '\'';
-      }
-    }
-  };
-
-  // Expose public API
-  global.HTMLtoJSX = HTMLtoJSX;
-}(window));
+// Ideally it would be nice to just redirect, but Github Pages is very basic and
+// lacks that functionality.
+console.warn(
+  'html-jsx-lib.js has moved to http://reactjs.github.io/react-magic/' +
+  'htmltojsx.min.js. If using React-Magic, you are no longer required to ' +
+  'link to this file. Please delete its <script> tag.'
+);

docs/_js/html-jsx.js

@@ -1,23 +1,14 @@
 /**
- * Copyright 2013 Facebook, Inc.
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @jsx React.DOM
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 /**
- * This is a web interface for the HTML to JSX converter contained in 
+ * This is a web interface for the HTML to JSX converter contained in
  * `html-jsx-lib.js`.
  */
 ;(function() {
@@ -79,11 +70,13 @@ var HELLO_COMPONENT = "\
             codeText={HELLO_COMPONENT}
             renderCode={true}
             transformer={this.convertToJSX}
+            showCompiledJSTab={false}
+            editorTabTitle="Live HTML Editor"
             />
         </div>
       );
     }
   });
 
-  React.renderComponent(<HTMLtoJSXComponent />, document.getElementById('jsxCompiler'));
-}());
+  ReactDOM.render(<HTMLtoJSXComponent />, document.getElementById('jsxCompiler'));
+}());

docs/_js/jsfiddle-integration.js

@@ -0,0 +1,11 @@
+(function() {
+  var tag = document.querySelector(
+    'script[type="application/javascript;version=1.7"]'
+  );
+  if (!tag || tag.textContent.indexOf('window.onload=function(){') !== -1) {
+    alert('Bad JSFiddle configuration, please fork the original React JSFiddle');
+  }
+  tag.setAttribute('type', 'text/jsx;harmony=true');
+  tag.textContent = tag.textContent.replace(/^\/\/<!\[CDATA\[/, '');
+})();
+

docs/_js/jsx-compiler.js

@@ -1,26 +0,0 @@
-/**
- * @jsx React.DOM
- */
-
-var HELLO_COMPONENT = "\
-/** @jsx React.DOM */\n\
-var HelloMessage = React.createClass({\n\
-  render: function() {\n\
-    return <div>Hello {this.props.name}</div>;\n\
-  }\n\
-});\n\
-\n\
-React.renderComponent(<HelloMessage name=\"John\" />, mountNode);\
-";
-
-var transformer = function(code) {
-  return JSXTransformer.transform(code).code;
-}
-React.renderComponent(
-  <ReactPlayground
-    codeText={HELLO_COMPONENT}
-    renderCode={true}
-    transformer={transformer}
-    />,
-  document.getElementById('jsxCompiler')
-);

docs/_js/live_editor.js

@@ -1,8 +1,3 @@
-/**
- * @jsx React.DOM
- */
-
-
 var IS_MOBILE = (
   navigator.userAgent.match(/Android/i)
     || navigator.userAgent.match(/webOS/i)
@@ -14,17 +9,26 @@ var IS_MOBILE = (
 );
 
 var CodeMirrorEditor = React.createClass({
+  propTypes: {
+    lineNumbers: React.PropTypes.bool,
+    onChange: React.PropTypes.func,
+  },
+  getDefaultProps: function() {
+    return {
+      lineNumbers: false,
+    };
+  },
   componentDidMount: function() {
     if (IS_MOBILE) return;
 
-    this.editor = CodeMirror.fromTextArea(this.refs.editor.getDOMNode(), {
+    this.editor = CodeMirror.fromTextArea(ReactDOM.findDOMNode(this.refs.editor), {
       mode: 'javascript',
-      lineNumbers: false,
+      lineNumbers: this.props.lineNumbers,
       lineWrapping: true,
       smartIndent: false,  // javascript mode does bad things with jsx indents
       matchBrackets: true,
       theme: 'solarized-light',
-      readOnly: this.props.readOnly
+      readOnly: this.props.readOnly,
     });
     this.editor.on('change', this.handleChange);
   },
@@ -56,7 +60,7 @@ var CodeMirrorEditor = React.createClass({
         {editor}
       </div>
     );
-  }
+  },
 });
 
 var selfCleaningTimeout = {
@@ -67,7 +71,7 @@ var selfCleaningTimeout = {
   setTimeout: function() {
     clearTimeout(this.timeoutID);
     this.timeoutID = setTimeout.apply(null, arguments);
-  }
+  },
 };
 
 var ReactPlayground = React.createClass({
@@ -79,13 +83,19 @@ var ReactPlayground = React.createClass({
     codeText: React.PropTypes.string.isRequired,
     transformer: React.PropTypes.func,
     renderCode: React.PropTypes.bool,
+    showCompiledJSTab: React.PropTypes.bool,
+    showLineNumbers: React.PropTypes.bool,
+    editorTabTitle: React.PropTypes.string,
   },
 
   getDefaultProps: function() {
     return {
       transformer: function(code) {
-        return JSXTransformer.transform(code).code;
-      }
+        return babel.transform(code).code;
+      },
+      editorTabTitle: 'Live JSX Editor',
+      showCompiledJSTab: true,
+      showLineNumbers: false,
     };
   },
 
@@ -116,21 +126,23 @@ var ReactPlayground = React.createClass({
       compiledCode = this.compileCode();
     } catch (err) {}
 
-    var jsContent =
+    var JSContent =
       <CodeMirrorEditor
         key="js"
         className="playgroundStage CodeMirror-readonly"
         onChange={this.handleCodeChange}
         codeText={compiledCode}
         readOnly={true}
+        lineNumbers={this.props.showLineNumbers}
       />;
 
-    var jsxContent =
+    var JSXContent =
       <CodeMirrorEditor
         key="jsx"
         onChange={this.handleCodeChange}
         className="playgroundStage"
         codeText={this.state.code}
+        lineNumbers={this.props.showLineNumbers}
       />;
 
     var JSXTabClassName =
@@ -138,22 +150,28 @@ var ReactPlayground = React.createClass({
     var JSTabClassName =
       'playground-tab' + (isJS ? ' playground-tab-active' : '');
 
+    var JSTab =
+      <div
+        className={JSTabClassName}
+        onClick={this.handleCodeModeSwitch.bind(this, this.MODES.JS)}>
+          Compiled JS
+      </div>;
+
+    var JSXTab =
+      <div
+        className={JSXTabClassName}
+        onClick={this.handleCodeModeSwitch.bind(this, this.MODES.JSX)}>
+          {this.props.editorTabTitle}
+      </div>
+
     return (
       <div className="playground">
         <div>
-          <div
-            className={JSXTabClassName}
-            onClick={this.handleCodeModeSwitch.bind(this, this.MODES.JSX)}>
-              Live JSX Editor
-          </div>
-          <div
-            className={JSTabClassName}
-            onClick={this.handleCodeModeSwitch.bind(this, this.MODES.JS)}>
-              Compiled JS
-          </div>
+          {JSXTab}
+          {this.props.showCompiledJSTab && JSTab}
         </div>
         <div className="playgroundCode">
-          {isJS ? jsContent : jsxContent}
+          {isJS ? JSContent : JSXContent}
         </div>
         <div className="playgroundPreview">
           <div ref="mount" />
@@ -166,25 +184,26 @@ var ReactPlayground = React.createClass({
     this.executeCode();
   },
 
-  componentWillUpdate: function(nextProps, nextState) {
+  componentDidUpdate: function(prevProps, prevState) {
     // execute code only when the state's not being updated by switching tab
     // this avoids re-displaying the error, which comes after a certain delay
-    if (this.state.code !== nextState.code) {
+    if (this.props.transformer !== prevProps.transformer ||
+        this.state.code !== prevState.code) {
       this.executeCode();
     }
   },
 
   executeCode: function() {
-    var mountNode = this.refs.mount.getDOMNode();
+    var mountNode = ReactDOM.findDOMNode(this.refs.mount);
 
     try {
-      React.unmountComponentAtNode(mountNode);
+      ReactDOM.unmountComponentAtNode(mountNode);
     } catch (e) { }
 
     try {
       var compiledCode = this.compileCode();
       if (this.props.renderCode) {
-        React.renderComponent(
+        ReactDOM.render(
           <CodeMirrorEditor codeText={compiledCode} readOnly={true} />,
           mountNode
         );
@@ -193,11 +212,11 @@ var ReactPlayground = React.createClass({
       }
     } catch (err) {
       this.setTimeout(function() {
-        React.renderComponent(
+        ReactDOM.render(
           <div className="playgroundError">{err.toString()}</div>,
           mountNode
         );
       }, 500);
     }
-  }
+  },
 });

docs/_layouts/default.html

@@ -4,14 +4,14 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <title>React | {{ page.title }}</title>
+  <title>{{ page.title }} | React</title>
   <meta name="viewport" content="width=device-width">
-  <meta property="og:title" content="React | {{ page.title }}" />
-  <meta property="og:type" content="website" />
-  <meta property="og:url" content="http://facebook.github.io/react{{ page.url }}" />
-  <meta property="og:image" content="http://facebook.github.io/react/img/logo_og.png" />
-  <meta property="og:description" content="A JavaScript library for building user interfaces" />
-  <meta property="fb:app_id" content="623268441017527" />
+  <meta property="og:title" content="{{ page.title }} | React">
+  <meta property="og:type" content="website">
+  <meta property="og:url" content="https://facebook.github.io/react{{ page.url }}">
+  <meta property="og:image" content="https://facebook.github.io/react/img/logo_og.png">
+  <meta property="og:description" content="A JavaScript library for building user interfaces">
+  <meta property="fb:app_id" content="623268441017527">
 
   <link rel="shortcut icon" href="/react/favicon.ico">
   <link rel="alternate" type="application/rss+xml" title="{{ site.name }}" href="{{ site.url }}{{ site.baseurl }}/feed.xml">
@@ -20,20 +20,20 @@
   <link rel="stylesheet" href="/react/css/codemirror.css">
   <link rel="stylesheet" href="/react/css/react.css">
 
-  <script type="text/javascript" src="//use.typekit.net/vqa1hcx.js"></script>
-  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+  <script src="//use.typekit.net/vqa1hcx.js"></script>
+  <script>try{Typekit.load();}catch(e){}</script>
 
   <!--[if lte IE 8]>
-  <script type="text/javascript" src="/react/js/html5shiv.min.js"></script>
-  <script type="text/javascript" src="/react/js/es5-shim.min.js"></script>
-  <script type="text/javascript" src="/react/js/es5-sham.min.js"></script>
+  <script src="/react/js/html5shiv.min.js"></script>
+  <script src="/react/js/es5-shim.min.js"></script>
+  <script src="/react/js/es5-sham.min.js"></script>
   <![endif]-->
-  <script type="text/javascript" src="/react/js/codemirror.js"></script>
-  <script type="text/javascript" src="/react/js/javascript.js"></script>
-  <script type="text/javascript" src="/react/js/react.min.js"></script>
-  <script type="text/javascript" src="/react/js/JSXTransformer.js"></script>
-  <script type="text/javascript" src="/react/js/live_editor.js"></script>
-  <script type="text/javascript" src="/react/js/showdown.js"></script>
+  <script src="/react/js/codemirror.js"></script>
+  <script src="/react/js/javascript.js"></script>
+  <script src="/react/js/react.js"></script>
+  <script src="/react/js/react-dom.js"></script>
+  <script src="/react/js/babel-browser.min.js"></script>
+  <script src="/react/js/live_editor.js"></script>
 </head>
 <body>
 
@@ -42,15 +42,19 @@
     <div class="nav-main">
       <div class="wrap">
         <a class="nav-home" href="/react/index.html">
-          <img class="nav-logo" alt="" src="/react/img/logo_small.png" width="38" height="38">
+          <img class="nav-logo" src="/react/img/logo.svg" width="36" height="36">
           React
         </a>
-        <ul class="nav-site">
-          <li><a href="/react/docs/getting-started.html"{% if page.sectionid == 'docs' %} class="active"{% endif %}>docs</a></li>
-          <li><a href="/react/support.html"{% if page.id == 'support' %} class="active"{% endif %}>support</a></li>
-          <li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>download</a></li>
-          <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>blog</a></li>
-          <li><a href="http://github.com/facebook/react">github</a>
+        <ul class="nav-site nav-site-internal">
+          <li><a href="/react/docs/getting-started.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' %} class="active"{% endif %}>Docs</a></li>
+          <li><a href="/react/support.html"{% if page.id == 'support' %} class="active"{% endif %}>Support</a></li>
+          <li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>Download</a></li>
+          <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
+        </ul>
+
+        <ul class="nav-site nav-site-external">
+          <li><a href="https://github.com/facebook/react">GitHub</a>
+          <li><a href="https://facebook.github.io/react-native/">React Native</a>
         </ul>
       </div>
     </div>
@@ -74,8 +78,14 @@
     {{ content }}
 
     <footer class="wrap">
-      <div class="left">A Facebook &amp; Instagram collaboration.</div>
-      <div class="right">&copy; 2014 Facebook Inc.</div>
+      <div class="left">
+        A Facebook &amp; Instagram collaboration.<br>
+        <a href="/react/acknowledgements.html">Acknowledgements</a>
+      </div>
+      <div class="right">
+        &copy; 2013&ndash;{{ site.time | date: '%Y' }} Facebook Inc.<br>
+        Documentation licensed under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
+      </div>
     </footer>
   </div>
   <div id="fb-root"></div>

docs/_layouts/docs.html

@@ -7,8 +7,12 @@ sectionid: docs
   {% include nav_docs.html %}
 
   <div class="inner-content">
-    <h1>{{ page.title }}</h1>
+    <h1>
+      {{ page.title }}
+      <a class="edit-page-link" href="https://github.com/facebook/react/tree/master/docs/{{ page.path }}" target="_blank">Edit on GitHub</a>
+    </h1>
     <div class="subHeader">{{ page.description }}</div>
+
     {{ content }}
 
     <div class="docs-prevnext">
@@ -19,7 +23,5 @@ sectionid: docs
         <a class="docs-next" href="/react/docs/{{ page.next }}">Next &rarr;</a>
       {% endif %}
     </div>
-
-    <div class="fb-comments" data-width="650" data-num-posts="10" data-href="{{ site.url }}{{ site.baseurl }}{{ page.url }}"></div>
   </div>
 </section>