Skip to content

Commit 5062b4e

Browse files
Daniel15Daniel15
committed
Upgrade to React 15 and Babel 6.7.4. Closes #252 and #248 
1 parent cbc2f18 commit 5062b4e

File tree

10 files changed

+38
-38
lines changed

10 files changed

+38
-38
lines changed

‎site/jekyll/getting-started/tutorial.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ Replace the contents of the new view file with the following:
6666
</head>
6767
<body>
6868
<div id="content"></div>
69-
<script src="https://fb.me/react-0.14.0.min.js"></script>
70-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
69+
<script src="https://fb.me/react-15.0.1.js"></script>
70+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
7171
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
7272
</body>
7373
</html>
@@ -236,8 +236,8 @@ Markdown is a simple way to format your text inline. For example, surrounding te
236236
First, add the third-party **Showdown** library to your application. This is a JavaScript library which takes Markdown text and converts it to raw HTML. We will add it via NuGet (search for "Showdown" and install it, similar to how you installed ReactJS.NET earlier) and reference the script tag in your view:
237237

238238
```html{3}
239-
<script src="https://fb.me/react-0.14.0.min.js"></script>
240-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
239+
<script src="https://fb.me/react-15.0.1.js"></script>
240+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
241241
<script src="@Url.Content("~/Scripts/showdown.min.js")"></script>
242242
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
243243
```
@@ -853,8 +853,8 @@ Now that the bundle has been registered, we need to reference it from the view:
853853
</head>
854854
<body>
855855
<div id="content"></div>
856-
<script src="https://fb.me/react-0.14.0.min.js"></script>
857-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
856+
<script src="https://fb.me/react-15.0.1.js"></script>
857+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
858858
@Scripts.Render("~/bundles/main")
859859
@Html.ReactInitJavaScript()
860860
</body>
@@ -940,8 +940,8 @@ In the view, we will accept the list of comments as the model, and use `Html.Rea
940940
submitUrl = Url.Action("AddComment"),
941941
pollInterval = 2000,
942942
})
943-
<script src="https://fb.me/react-0.14.0.min.js"></script>
944-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
943+
<script src="https://fb.me/react-15.0.1.js"></script>
944+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
945945
<script src="@Url.Content("~/Scripts/showdown.min.js")"></script>
946946
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
947947
@Html.ReactInitJavaScript()

‎site/jekyll/guides/cassette.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ render from your view using Cassette:
3636
</head>
3737
<body>
3838
...
39-
<script src="https://fb.me/react-0.14.0.min.js"></script>
40-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
39+
<script src="https://fb.me/react-15.0.1.js"></script>
40+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
4141
@Bundles.RenderScripts()
4242
</body>
4343
```

‎site/jekyll/guides/server-side-rendering.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ code.
4747
```html
4848
<!-- Load all your scripts normally before calling ReactInitJavaScript -->
4949
<!-- Assumes minification/combination is configured as per previous section -->
50-
<script src="https://fb.me/react-0.14.0.min.js"></script>
51-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
50+
<script src="https://fb.me/react-15.0.1.js"></script>
51+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
5252
@Scripts.Render("~/bundles/main")
5353
@Html.ReactInitJavaScript()
5454
```
@@ -63,8 +63,8 @@ code.
6363
</div>
6464
</div>
6565

66-
<script src="https://fb.me/react-0.14.0.min.js"></script>
67-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
66+
<script src="https://fb.me/react-15.0.1.js"></script>
67+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
6868
<script src="/Scripts/HelloWorld.js"></script>
6969
<script>ReactDOM.render(HelloWorld({"name":"Daniel"}), document.getElementById("react1"));</script>
7070
```

‎site/jekyll/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ bundles.Add(new JsxBundle("~/bundles/main").Include(
112112
})
113113

114114
<!-- Initialise the component in JavaScript too -->
115-
<script src="https://fb.me/react-0.14.0.min.js"></script>
116-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
115+
<script src="https://fb.me/react-15.0.1.js"></script>
116+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
117117
@Scripts.Render("~/bundles/main")
118118
@Html.ReactInitJavaScript()
119119
```

‎src/React.Core/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"name": "React.Core",
44
"private": true,
55
"devDependencies": {
6-
"babel-core": "^6.3.13",
7-
"babel-loader": "^6.2.0",
8-
"babel-preset-es2015": "^6.3.13",
9-
"babel-preset-stage-0": "^6.3.13",
10-
"babel-standalone": "^1.0.0",
11-
"gulp": "^3.9.0",
12-
"gulp-uglify": "^1.5.1",
13-
"json-loader": "^0.5.4",
14-
"react": "^0.14.3",
15-
"vinyl-named": "^1.1.0",
16-
"webpack": "^1.12.9",
17-
"webpack-stream": "^2.3.0"
6+
"babel-core": "~6.7.6",
7+
"babel-loader": "~6.2.4",
8+
"babel-preset-es2015": "~6.6.0",
9+
"babel-preset-stage-0": "~6.5.0",
10+
"babel-standalone": "~6.7.4",
11+
"gulp": "~3.9.1",
12+
"gulp-uglify": "~1.5.3",
13+
"json-loader": "~0.5.4",
14+
"react": "~15.0.1",
15+
"vinyl-named": "~1.1.0",
16+
"webpack": "~1.12.15",
17+
"webpack-stream": "~3.1.0"
1818
}
1919
}

‎src/React.Sample.Cassette/Views/Home/Index.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
@Html.React("CommentsBox", new { initialComments = Model.Comments })
2121

2222
<!-- Load all required scripts (React + the site's scripts) -->
23-
<script src="https://fb.me/react-0.14.0.min.js"></script>
24-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
23+
<script src="https://fb.me/react-15.0.1.js"></script>
24+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
2525
@Bundles.RenderScripts()
2626
<!-- Render the code to initialise the component -->
2727
@Html.ReactInitJavaScript()

‎src/React.Sample.Mvc4/Views/Home/Index.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
@Html.React("CommentsBox", new { initialComments = Model.Comments, page = Model.Page })
1818

1919
<!-- Load all required scripts (React + the site's scripts) -->
20-
<script src="https://fb.me/react-0.14.0.min.js"></script>
21-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
20+
<script src="https://fb.me/react-15.0.1.js"></script>
21+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
2222
@Scripts.Render("~/bundles/main")
2323
<!-- Render the code to initialise the component -->
2424
@Html.ReactInitJavaScript()

‎src/React.Sample.Mvc6/Views/Home/Index.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
@Html.React("CommentsBox", new { initialComments = Model.Comments })
1818

1919
<!-- Load all required scripts (React + the site's scripts) -->
20-
<script src="https://fb.me/react-0.14.0.min.js"></script>
21-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
20+
<script src="https://fb.me/react-15.0.1.js"></script>
21+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
2222
<script src="~/js/Sample.jsx"></script>
2323
<!-- Render the code to initialise the component -->
2424
@Html.ReactInitJavaScript()

‎src/React.Sample.Owin/Content/Index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</head>
99
<body>
1010
<div id="container"></div>
11-
<script src="https://fb.me/react-0.14.0.min.js"></script>
12-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
11+
<script src="https://fb.me/react-15.0.1.js"></script>
12+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
1313
<script type="text/javascript" src="Sample.jsx"></script>
1414
<script type="text/javascript">
1515
ReactDOM.render(

‎src/React.Sample.Webpack/Views/Home/Index.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
@Html.React("Components.CommentsBox", new { initialComments = Model.Comments })
1717

1818
<!-- Load all required scripts (React + the site's scripts) -->
19-
<script src="https://fb.me/react-0.14.0.min.js"></script>
20-
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
19+
<script src="https://fb.me/react-15.0.1.js"></script>
20+
<script src="https://fb.me/react-dom-15.0.1.js"></script>
2121
<script src="@Url.Content("~/build/client.bundle.js")"></script>
2222
<!-- Render the code to initialise the component -->
2323
@Html.ReactInitJavaScript()

0 commit comments

Comments
 (0)