Finish Jekyll 3 Upgrade
- Reverts change to use sectionid on layouts (was unreliable), using config to make sure that's specified on all pages that need it - Adds permalinks to all other pages so that og data is correct - Corrects some permalinks that were in correct (translations)
Paul O’Shannessy committed
Jul 19, 2016 at 15:08 UTC
5e18eb3487c9bd8f0bd48b5df249b3bd35407faf
27 files changed
+63
-31
docs/404.md
+1
@@ -1,6 +1,7 @@
1
---
2
layout: single
3
title: Page Not Found
4
+permalink: 404.html
5
---
6
7
We couldn't find what you were looking for.
docs/Gemfile.lock
+21
-20
@@ -2,9 +2,9 @@ GEM
2
remote: https://rubygems.org/
3
specs:
4
colorator (0.1)
5
- ffi (1.9.10)
6
- ffi (1.9.10-x64-mingw32)
7
- jekyll (3.1.3)
5
+ ffi (1.9.14)
6
+ ffi (1.9.14-x64-mingw32)
7
+ jekyll (3.1.6)
8
colorator (~> 0.1)
9
jekyll-sass-converter (~> 1.0)
10
jekyll-watch (~> 1.1)
@@ -14,39 +14,41 @@ GEM
14
rouge (~> 1.7)
15
safe_yaml (~> 1.0)
16
jekyll-paginate (1.1.0)
17
- jekyll-redirect-from (0.10.0)
17
+ jekyll-redirect-from (0.11.0)
18
jekyll (>= 2.0)
19
jekyll-sass-converter (1.4.0)
20
sass (~> 3.4)
21
- jekyll-watch (1.3.1)
22
- listen (~> 3.0)
23
- json (1.8.3)
24
- kramdown (1.10.0)
21
+ jekyll-watch (1.4.0)
22
+ listen (~> 3.0, < 3.1)
23
+ json (2.0.1)
24
+ kramdown (1.11.1)
25
liquid (3.0.6)
26
- listen (3.1.1)
27
- rb-fsevent (>= 0.9.3)
28
- rb-inotify (>= 0.9.7)
26
+ listen (3.0.8)
27
+ rb-fsevent (~> 0.9, >= 0.9.4)
28
+ rb-inotify (~> 0.9, >= 0.9.7)
29
mercenary (0.3.6)
30
- mini_portile2 (2.0.0)
31
- nokogiri (1.6.7.2)
32
- mini_portile2 (~> 2.0.0.rc2)
33
- nokogiri (1.6.7.2-x64-mingw32)
34
- mini_portile2 (~> 2.0.0.rc2)
30
+ mini_portile2 (2.1.0)
31
+ nokogiri (1.6.8)
32
+ mini_portile2 (~> 2.1.0)
33
+ pkg-config (~> 1.1.7)
34
+ nokogiri (1.6.8-x64-mingw32)
35
+ mini_portile2 (~> 2.1.0)
36
+ pkg-config (~> 1.1.7)
37
+ pkg-config (1.1.7)
38
posix-spawn (0.3.11)
39
pygments.rb (0.6.3)
40
posix-spawn (~> 0.3.6)
41
yajl-ruby (~> 1.2.0)
39
- rake (11.1.2)
42
+ rake (11.2.2)
43
rb-fsevent (0.9.7)
44
rb-inotify (0.9.7)
45
ffi (>= 0.5.0)
46
redcarpet (3.3.4)
44
- rouge (1.10.1)
47
+ rouge (1.11.1)
48
safe_yaml (1.0.4)
49
sanitize (2.1.0)
50
nokogiri (>= 1.4.4)
51
sass (3.4.22)
49
- wdm (0.1.1)
52
yajl-ruby (1.2.1)
53
54
PLATFORMS
@@ -63,7 +65,6 @@ DEPENDENCIES
65
rb-fsevent
66
redcarpet
67
sanitize (~> 2.0)
66
- wdm (>= 0.1.0)
68
69
BUNDLED WITH
70
1.11.2
docs/_config.yml
+17
@@ -14,11 +14,28 @@ defaults:
14
type: posts
15
values:
16
layout: post
17
+ sectionid: blog
18
+- scope:
19
+ path: blog
20
+ type: pages
21
+ values:
22
+ sectionid: blog
23
- scope:
24
path: docs
25
type: pages
26
values:
27
layout: docs
28
+ sectionid: docs
29
+- scope:
30
+ path: tips
31
+ type: pages
32
+ values:
33
+ sectionid: docs
34
+- scope:
35
+ path: contributing
36
+ type: pages
37
+ values:
38
+ sectionid: docs
39
exclude:
40
- Gemfile
41
- Gemfile.lock
docs/_layouts/default.html
+2
-2
@@ -50,10 +50,10 @@
50
React
51
</a>
52
<ul class="nav-site nav-site-internal">
53
- <li><a href="/react/docs/getting-started.html"{% if layout.sectionid == 'docs' or layout.sectionid == 'tips' or layout.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
53
+ <li><a href="/react/docs/getting-started.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
54
<li><a href="/react/support.html"{% if page.id == 'support' %} class="active"{% endif %}>Support</a></li>
55
<li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>Download</a></li>
56
- <li><a href="/react/blog/"{% if layout.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
56
+ <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
57
<li>
58
<input id="algolia-doc-search" type="text" placeholder="Search docs..." />
59
</li>
docs/acknowledgements.md
+1
@@ -2,6 +2,7 @@
2
id: acknowledgements
3
title: Acknowledgements
4
layout: single
5
+permalink: acknowledgements.html
6
---
7
8
We'd like to thank all of our contributors:
docs/contributing/design-principles.md
+1
-1
@@ -2,7 +2,7 @@
2
id: design-principles
3
title: Design Principles
4
layout: contributing
5
-permalink: design-principles.html
5
+permalink: contributing/design-principles.html
6
---
7
8
After using React in a couple of applications, you might be interested in contributing to React. Before [diving into specifics](https://github.com/facebook/react/blob/master/CONTRIBUTING.md), we think it's important to establish a few design principles guiding our decisions about changes in React.
docs/docs/01-why-react.ru-RU.md
+1
-1
@@ -1,7 +1,7 @@
1
---
2
id: why-react-ru-RU
3
title: Почему именно React?
4
-permalink: why-react-ru-RU.html
4
+permalink: docs/why-react-ru-RU.html
5
next: displaying-data-ru-RU.html
6
---
7
React — библиотека JavaScript для создания интерфейсов от команд Facebook и Instagram. Многие ассоциируют React с понятием **View** в паттерне **[MVC](https://ru.wikipedia.org/wiki/Model-View-Controller)**.
docs/docs/01-why-react.zh-TW.md
+1
-1
@@ -1,7 +1,7 @@
1
---
2
id: why-react-zh-TW
3
title: Why React?
4
-permalink: why-react-zh-TW.html
4
+permalink: docs/why-react-zh-TW.html
5
next: displaying-data.html
6
---
7
React是Facebook和Instagram用來建立使用者介面的JavaScript函式庫. 很多人認為React就是處理 **[MVC](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller)**架構中 **V** 的部份.
docs/docs/02-displaying-data.ru-RU.md
+1
-1
@@ -1,7 +1,7 @@
1
---
2
id: displaying-data-ru-RU
3
title: Отображение данных
4
-permalink: displaying-data-ru-RU.html
4
+permalink: docs/displaying-data-ru-RU.html
5
prev: why-react-ru-RU.html
6
next: jsx-in-depth.html
7
---
docs/docs/03-interactivity-and-dynamic-uis.ru-RU.md
+1
-1
@@ -1,7 +1,7 @@
1
---
2
id: interactivity-and-dynamic-uis-ru-RU
3
title: Интерактивные и динамические интерфейсы
4
-permalink: interactivity-and-dynamic-uis-ru-RU.html
4
+permalink: docs/interactivity-and-dynamic-uis-ru-RU.html
5
prev: jsx-gotchas.html
6
next: multiple-components.html
7
---
docs/docs/error-decoder.md
+1
-1
@@ -1,7 +1,7 @@
1
---
2
id: error-decoder
3
title: Error Decoder
4
-permalink: error-decoder.html
4
+permalink: docs/error-decoder.html
5
---
6
7
In the minified production build of React, we avoid sending down full error messages in order to reduce the number of bytes sent over the wire.
docs/docs/getting-started.md
+1
@@ -1,6 +1,7 @@
1
---
2
id: getting-started
3
title: Getting Started
4
+permalink: docs/getting-started.html
5
next: tutorial.html
6
redirect_from: "docs/index.html"
7
---
docs/docs/thinking-in-react.it-IT.md
+1
@@ -1,6 +1,7 @@
1
---
2
id: thinking-in-react-it-IT
3
title: Pensare in React
4
+permalink: docs/thinking-in-react-it-IT.html
5
prev: tutorial-it-IT.html
6
next: conferences-it-IT.html
7
redirect_from: 'blog/2013/11/05/thinking-in-react.html'
docs/docs/thinking-in-react.ja-JP.md
+1
@@ -1,6 +1,7 @@
1
---
2
id: thinking-in-react-ja-JP
3
title: Reactの考え方
4
+permalink: docs/thinking-in-react-ja-JP.html
5
prev: tutorial-ja-JP.html
6
next: conferences.html
7
redirect_from: 'blog/2013/11/05/thinking-in-react.html'
docs/docs/thinking-in-react.md
+1
@@ -1,6 +1,7 @@
1
---
2
id: thinking-in-react
3
title: Thinking in React
4
+permalink: docs/thinking-in-react.html
5
prev: tutorial.html
6
next: conferences.html
7
redirect_from: 'blog/2013/11/05/thinking-in-react.html'
docs/docs/thinking-in-react.zh-CN.md
+1
-1
@@ -1,7 +1,7 @@
1
---
2
id: thinking-in-react-zh-CN
3
title: React 编程思想
4
-permalink: thinking-in-react-zh-CN.html
4
+permalink: docs/thinking-in-react-zh-CN.html
5
prev: tutorial-zh-CN.html
6
next: conferences-zh-CN.html
7
redirect_from: 'blog/2013/11/05/thinking-in-react.html'
docs/docs/tutorial.it-IT.md
+1
@@ -1,6 +1,7 @@
1
---
2
id: tutorial-it-IT
3
title: Tutorial
4
+permalink: docs/tutorial-it-IT.html
5
prev: getting-started-it-IT.html
6
next: thinking-in-react-it-IT.html
7
---
docs/docs/tutorial.md
+1
@@ -1,6 +1,7 @@
1
---
2
id: tutorial
3
title: Tutorial
4
+permalink: docs/tutorial.html
5
prev: getting-started.html
6
next: thinking-in-react.html
7
---
docs/docs/tutorial.zh-CN.md
+1
-1
@@ -1,7 +1,7 @@
1
---
2
id: tutorial-zh-CN
3
title: 教程
4
-permalink: tutorial-zh-CN.html
4
+permalink: docs/tutorial-zh-CN.html
5
prev: getting-started-zh-CN.html
6
next: thinking-in-react-zh-CN.html
7
---
docs/downloads.md
+1
@@ -2,6 +2,7 @@
2
id: downloads
3
title: Downloads
4
layout: single
5
+permalink: downloads.html
6
---
7
Download the starter kit to get everything you need to
8
[get started with React](/react/docs/getting-started.html). The starter kit includes React and some simple example apps.
docs/feed.xml
-1
@@ -1,5 +1,4 @@
1
---
2
-layout: none
2
---
3
<?xml version="1.0" encoding="UTF-8"?>
4
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
docs/jsx-compiler.md
+1
@@ -1,6 +1,7 @@
1
---
2
layout: single
3
title: JSX Compiler Service
4
+permalink: jsx-compiler.html
5
id: jsx-compiler
6
---
7
docs/support.md
+1
@@ -2,6 +2,7 @@
2
title: Need help?
3
layout: single
4
id: support
5
+permalink: support.html
6
---
7
8
**React** is worked on full-time by Facebook's product infrastructure and Instagram's user interface engineering teams. They're often around and available for questions.
docs/warnings/legacy-factories.md
+1
@@ -1,6 +1,7 @@
1
---
2
title: React Element Factories and JSX Warning
3
layout: single
4
+permalink: warnings/legacy-factories.html
5
---
6
7
You probably came here because your code is calling your component as a plain function call. This is now deprecated:
docs/warnings/refs-must-have-owner.md
+1
@@ -1,6 +1,7 @@
1
---
2
title: Refs Must Have Owner Warning
3
layout: single
4
+permalink: warnings/refs-must-have-owner.html
5
---
6
7
You are probably here because you got the following error messages:
docs/warnings/special-props.md
+1
@@ -1,6 +1,7 @@
1
---
2
title: Special Props Warning
3
layout: single
4
+permalink: warnings/special-props.html
5
---
6
7
Most props on a JSX element are passed on to the component, however, there are two special props (`ref` and `key`) which are used by React, and are thus not forwarded to the component.
docs/warnings/unknown-prop.md
+1
@@ -1,6 +1,7 @@
1
---
2
title: Unknown Prop Warning
3
layout: single
4
+permalink: warnings/unknown-prop.html
5
---
6
The unknown-prop warning will fire if you attempt to render a DOM element with a prop that is not recognized by React as a legal DOM attribute/property. You should ensure that your DOM elements do not have spurious props floating around.
7