Skip to content

Commit 5cbcd22

Browse files
Update docs (#548)
* Use crossorigin script tags, per React docs * Update documentation - Update .NET Core docs to React 16 - Clean up a few other documentation pages * Use cdnjs in documentation, for consistency
1 parent 12ff098 commit 5cbcd22

File tree

11 files changed

+330
-303
lines changed

11 files changed

+330
-303
lines changed

Diff for: site/jekyll/getting-started/tutorial.md

+291-265
Large diffs are not rendered by default.

Diff for: site/jekyll/getting-started/tutorial_aspnet4.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ Replace the contents of the new view file with the following:
7171
</head>
7272
<body>
7373
<div id="content"></div>
74-
<script crossorigin src="https://unpkg.com/react@16/umd/react.development.js"></script>
75-
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script>
74+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
75+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
7676
<script src="https://cdnjs.cloudflare.com/ajax/libs/remarkable/1.7.1/remarkable.min.js"></script>
7777
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
7878
</body>
@@ -874,7 +874,7 @@ class CommentBox extends React.Component {
874874
constructor(props) {
875875
super(props);
876876
this.state = { data: [] };
877-
this.handleCommentSubmit = this.handleCommentSubmit.bind(this);
877+
this.handleCommentSubmit = this.handleCommentSubmit.bind(this);
878878
}
879879
loadCommentsFromServer() {
880880
const xhr = new XMLHttpRequest();
@@ -885,15 +885,15 @@ class CommentBox extends React.Component {
885885
};
886886
xhr.send();
887887
}
888-
handleCommentSubmit(comment) {
888+
handleCommentSubmit(comment) {
889889
const comments = this.state.data;
890890
// Optimistically set an id on the new comment. It will be replaced by an
891891
// id generated by the server. In a production application you would likely
892892
// use a more robust system for ID generation.
893893
comment.Id = comments.length + 1;
894894
const newComments = comments.concat([comment]);
895895
this.setState({data: newComments});
896-
896+
897897
const data = new FormData();
898898
data.append('Author', comment.Author);
899899
data.append('Text', comment.Text);
@@ -964,8 +964,8 @@ Now that the bundle has been registered, we need to reference it from the view:
964964
</head>
965965
<body>
966966
<div id="content"></div>
967-
<script crossorigin src="https://unpkg.com/react@16/umd/react.development.js"></script>
968-
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script>
967+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
968+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
969969
@Scripts.Render("~/bundles/main")
970970
@Html.ReactInitJavaScript()
971971
</body>
@@ -992,7 +992,7 @@ class CommentBox extends React.Component {
992992
constructor(props) {
993993
super(props);
994994
this.state = { data: this.props.initialData };
995-
this.handleCommentSubmit = this.handleCommentSubmit.bind(this);
995+
this.handleCommentSubmit = this.handleCommentSubmit.bind(this);
996996
}
997997
loadCommentsFromServer() {
998998
const xhr = new XMLHttpRequest();
@@ -1003,12 +1003,12 @@ class CommentBox extends React.Component {
10031003
};
10041004
xhr.send();
10051005
}
1006-
handleCommentSubmit(comment) {
1006+
handleCommentSubmit(comment) {
10071007
const comments = this.state.data;
10081008
comment.Id = comments.length + 1;
10091009
const newComments = comments.concat([comment]);
10101010
this.setState({data: newComments});
1011-
1011+
10121012
const data = new FormData();
10131013
data.append('Author', comment.Author);
10141014
data.append('Text', comment.Text);
@@ -1074,8 +1074,8 @@ In the view, we will accept the list of comments as the model, and use `Html.Rea
10741074
submitUrl = Url.Action("AddComment"),
10751075
pollInterval = 2000
10761076
})
1077-
<script crossorigin src="https://unpkg.com/react@16/umd/react.development.js"></script>
1078-
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script>
1077+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
1078+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
10791079
<script src="https://cdnjs.cloudflare.com/ajax/libs/remarkable/1.7.1/remarkable.min.js"></script>
10801080
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
10811081
@Html.ReactInitJavaScript()

Diff for: site/jekyll/guides/cassette.md

+2-2
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://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react.js"></script>
40-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react-dom.js"></script>
39+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
40+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
4141
@Bundles.RenderScripts()
4242
</body>
4343
```

Diff for: site/jekyll/guides/server-side-rendering.md

+4-4
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://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react.js"></script>
51-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react-dom.js"></script>
50+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
51+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.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://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react.js"></script>
67-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react-dom.js"></script>
66+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
67+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
6868
<script src="/Scripts/HelloWorld.js"></script>
6969
<script>ReactDOM.render(HelloWorld({"name":"Daniel"}), document.getElementById("react1"));</script>
7070
```

Diff for: site/jekyll/index.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ bundles.Add(new JsxBundle("~/bundles/main").Include(
112112
})
113113

114114
<!-- Initialise the component in JavaScript too -->
115-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react.js"></script>
116-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react-dom.js"></script>
115+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
116+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
117+
117118
@Scripts.Render("~/bundles/main")
118119
@Html.ReactInitJavaScript()
119120
```

Diff for: src/React.Sample.Cassette/Views/Home/Index.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
@Html.React("CommentsBox", new { initialComments = Model.Comments })
2121

2222
<!-- Load all required scripts (React + the site's scripts) -->
23-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
24-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
25-
<script src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
23+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
24+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
25+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
2626
@Bundles.RenderScripts()
2727
<!-- Render the code to initialise the component -->
2828
@Html.ReactInitJavaScript()

Diff for: src/React.Sample.CoreMvc/Views/Home/Index.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
@Html.React("CommentsBox", new { initialComments = Model.Comments, ThrowRenderError = Model.ThrowRenderError })
1818

1919
<!-- Load all required scripts (React + the site's scripts) -->
20-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
21-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
22-
<script src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
20+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
21+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
22+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
2323
<script src="~/js/Sample.jsx"></script>
2424
<!-- Render the code to initialise the component -->
2525
@Html.ReactInitJavaScript()

Diff for: src/React.Sample.Mvc4/Views/Home/Index.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
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://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
21-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
22-
<script src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
20+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
21+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
22+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
2323
@Scripts.Render("~/bundles/main")
2424
<!-- Render the code to initialise the component -->
2525
@Html.ReactInitJavaScript()

Diff for: src/React.Sample.Owin/Content/Index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</head>
99
<body>
1010
<div id="container"></div>
11-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
12-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
13-
<script src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
11+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
12+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
13+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
1414
<script type="text/javascript" src="Sample.jsx"></script>
1515
<script type="text/javascript">
1616
ReactDOM.render(

Diff for: src/React.Sample.Webpack/Views/Home/Index.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
@Html.React("Components.CommentsBox", new { initialComments = Model.Comments })
1717

1818
<!-- Load all required scripts (React + the site's scripts) -->
19-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
20-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
21-
<script src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
19+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
20+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
21+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
2222
<script src="@Url.Content("~/build/client.bundle.js")"></script>
2323
<!-- Render the code to initialise the component -->
2424
@Html.ReactInitJavaScript()

Diff for: tutorial-code/Views/Home/Index.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
submitUrl = Url.Action("AddComment"),
1515
pollInterval = 2000,
1616
})
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
18-
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
19-
<script src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
17+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react/16.4.0/umd/react.development.js"></script>
18+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.4.0/umd/react-dom.development.js"></script>
19+
<script crossorigin src="https://cdnjs.cloudflare.com/ajax/libs/prop-types/15.6.0/prop-types.js"></script>
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/remarkable/1.7.1/remarkable.min.js"></script>
2121
<script src="@Url.Content("~/js/tutorial.jsx")"></script>
2222
@Html.ReactInitJavaScript()

0 commit comments

Comments
 (0)