```
-A full example is available in [the ReactJS.NET repository](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack).
+A full example is available in [the ReactJS.NET repository](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack).
### 💡 Beta feature: Asset manifest handling
diff --git a/site/jekyll/dev/contributing.md b/site/jekyll/dev/contributing.md
index 2cd2761e5..ff9bb920c 100644
--- a/site/jekyll/dev/contributing.md
+++ b/site/jekyll/dev/contributing.md
@@ -8,7 +8,7 @@ title: Contributing
We actively welcome your pull requests on the
[ReactJS.NET project on GitHub](http://github.com/reactjs/React.NET):
-1. Fork the repo and create your branch from `master`.
+1. Fork the repo and create your branch from `main`.
2. If you've added code that should be tested, add tests
3. If you've changed APIs, update the documentation.
4. Ensure the test suite passes.
diff --git a/site/jekyll/features/css-in-js.md b/site/jekyll/features/css-in-js.md
index d6501c94d..9beba66ea 100644
--- a/site/jekyll/features/css-in-js.md
+++ b/site/jekyll/features/css-in-js.md
@@ -3,7 +3,7 @@ layout: docs
title: CSS-in-JS
---
-Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack).
+Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack).
CSS-in-JS is a technique for declaring styles within components. ReactJS.NET supports server-rendered stylesheets for several libraries (pull requests welcome to add support for more!). Your project must be using a Javascript bundler such as webpack already.
@@ -13,7 +13,7 @@ If you're using more than one CSS-in-JS library in your project, we've got you c
### [Styled Components](https://github.com/styled-components/styled-components)
-#### ⚠️ This may break when styled-components publishes a major update, please look at the [webpack sample](https://github.com/reactjs/React.NET/blob/master/src/React.Template/reactnet-webpack/package.json) for the currently known compatible version.
+#### ⚠️ This may break when styled-components publishes a major update, please look at the [webpack sample](https://github.com/reactjs/React.NET/blob/main/src/React.Template/reactnet-webpack/package.json) for the currently known compatible version.
Expose styled-components in your server bundle:
@@ -93,7 +93,7 @@ export function StyledComponentsDemo() {
### [React-JSS](https://github.com/cssinjs/react-jss)
-#### ⚠️ This may break when react-jss publishes a major update, please look at the [webpack sample](https://github.com/reactjs/React.NET/blob/master/src/React.Template/reactnet-webpack/package.json) for the currently known compatible version.
+#### ⚠️ This may break when react-jss publishes a major update, please look at the [webpack sample](https://github.com/reactjs/React.NET/blob/main/src/React.Template/reactnet-webpack/package.json) for the currently known compatible version.
Expose react-jss in your server bundle:
@@ -183,7 +183,7 @@ export class ReactJssDemo extends React.Component {
### Emotion
-#### ⚠️ This may break when emotion publishes a major update, please look at the [webpack sample](https://github.com/reactjs/React.NET/blob/master/src/React.Template/reactnet-webpack/package.json) for the currently known compatible version.
+#### ⚠️ This may break when emotion publishes a major update, please look at the [webpack sample](https://github.com/reactjs/React.NET/blob/main/src/React.Template/reactnet-webpack/package.json) for the currently known compatible version.
Emotion's integration with ReactJS.NET only supports rendering inline styles (instead of rendering them in the document head).
diff --git a/site/jekyll/features/es6.md b/site/jekyll/features/es6.md
index c18c4a660..8b0b6c245 100644
--- a/site/jekyll/features/es6.md
+++ b/site/jekyll/features/es6.md
@@ -3,7 +3,7 @@ layout: docs
title: Babel compilation (ES6+)
---
-Just want to see the code? Check out the [webpack](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack) and [on-the-fly JSX compliation](https://github.com/reactjs/React.NET/tree/master/src/React.Sample.Mvc4) sample projects.
+Just want to see the code? Check out the [webpack](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack) and [on-the-fly JSX compliation](https://github.com/reactjs/React.NET/tree/main/src/React.Sample.Mvc4) sample projects.
ReactJS.NET supports the use of ES6+ features, thanks to [Babel](http://babeljs.io/). These features include:
diff --git a/site/jekyll/features/react-helmet.md b/site/jekyll/features/react-helmet.md
index 2250e478d..46c58dc69 100644
--- a/site/jekyll/features/react-helmet.md
+++ b/site/jekyll/features/react-helmet.md
@@ -3,7 +3,7 @@ layout: docs
title: React Helmet
---
-Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack).
+Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack).
React Helmet is a library that allows setting elements inside the `
` tag from anywhere in the render tree.
diff --git a/site/jekyll/features/react-router.md b/site/jekyll/features/react-router.md
index d6eeb05d7..b12d77d1c 100644
--- a/site/jekyll/features/react-router.md
+++ b/site/jekyll/features/react-router.md
@@ -3,7 +3,7 @@ layout: docs
title: React Router
---
-Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack).
+Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack).
[React Router](https://github.com/ReactTraining/react-router) is a Javascript routing library. By using the `React.Router` package, you can add server-side route resolution by deferring to React Router.
diff --git a/site/jekyll/features/server-side-rendering.md b/site/jekyll/features/server-side-rendering.md
index eea3fe797..9b63e3484 100644
--- a/site/jekyll/features/server-side-rendering.md
+++ b/site/jekyll/features/server-side-rendering.md
@@ -3,7 +3,7 @@ layout: docs
title: Server-Side Rendering
---
-Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack).
+Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack).
Server-side rendering allows you to pre-render the initial state of your React
components server-side. This speeds up initial page loads as users do not need
diff --git a/site/jekyll/features/typescript.md b/site/jekyll/features/typescript.md
index defdfd077..1668e8d60 100644
--- a/site/jekyll/features/typescript.md
+++ b/site/jekyll/features/typescript.md
@@ -3,7 +3,7 @@ layout: docs
title: Typescript compilation
---
-Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Sample.Mvc4).
+Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Sample.Mvc4).
Typescript is a library for writing type-safe Javascript. Starting with version 5, ReactJS.NET supports stripping out type definitions from `.TS` and .`TSX` files, powered by Babel.
@@ -12,8 +12,8 @@ Note that just using the library will compile your Typescript to Javascript, but
1. Install a supported version of [Node](https://nodejs.org/en/download/) (either LTS or Current is fine)
1. Create an empty `package.json` to your project root by running `npm init`. Optionally fill out the questions asked by `npm`, or press Enter to accept the defaults.
1. Run `npm i typescript --save-dev`, which will update the freshly generated `package.json`. It's important that the Typescript version is declared in this file so every developer on your project has the same type checking rules.
-1. Copy the [tsconfig.json](https://github.com/reactjs/react.net/blob/master/src/React.Sample.Mvc4/tsconfig.json) file from the Mvc sample to your project root. If your components are not located in `Content`, change that path to the appropriate directory.
-1. Typescript needs to be informed of the libraries available on the global scope. To do this, create [types/index.d.ts](https://github.com/reactjs/react.net/blob/master/src/React.Sample.Mvc4/types/index.d.ts) in your project root:
+1. Copy the [tsconfig.json](https://github.com/reactjs/react.net/blob/main/src/React.Sample.Mvc4/tsconfig.json) file from the Mvc sample to your project root. If your components are not located in `Content`, change that path to the appropriate directory.
+1. Typescript needs to be informed of the libraries available on the global scope. To do this, create [types/index.d.ts](https://github.com/reactjs/react.net/blob/main/src/React.Sample.Mvc4/types/index.d.ts) in your project root:
```ts
import _React from 'react';
@@ -27,7 +27,7 @@ declare global {
}
```
-Libraries imported in `types/index.d.ts` must be listed in `package.json` before typescript will load their type definitions. Types for `react` are defined by the `@types/react` library in the [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/react) repo, so install the types package with `npm i --save-dev @types/react`. Sometimes libraries will ship with typescript support; if so, install the package directly via `npm i --save-dev ` to make the types resolve. If a library you're using does not ship with types, chances are there will be community-provided types in DefinitelyTyped.
+Libraries imported in `types/index.d.ts` must be listed in `package.json` before typescript will load their type definitions. Types for `react` are defined by the `@types/react` library in the [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/main/types/react) repo, so install the types package with `npm i --save-dev @types/react`. Sometimes libraries will ship with typescript support; if so, install the package directly via `npm i --save-dev ` to make the types resolve. If a library you're using does not ship with types, chances are there will be community-provided types in DefinitelyTyped.
To check that everything works at this point, run `node_modules/.bin/tsc` from your project's working directory. You'll see empty output from `tsc` if the type checking succeeds.
@@ -41,4 +41,4 @@ Finally, add a compile-time step to your project file to get type checking with
You're done! Introduce a type error in your project to verify things are working as expected. For example, you will see a message similar to `6>C:\code\react.net\src\React.Sample.Mvc4\Content/Sample.tsx(27,19): error TS2551: Property 'initialCommentss' does not exist on type 'CommentsBoxProps'. Did you mean 'initialComments'?`
-Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Sample.Mvc4) for the completed integration.
+Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Sample.Mvc4) for the completed integration.
diff --git a/site/jekyll/getting-started/aspnet.md b/site/jekyll/getting-started/aspnet.md
index 9bd2160fb..3c6ca685e 100644
--- a/site/jekyll/getting-started/aspnet.md
+++ b/site/jekyll/getting-started/aspnet.md
@@ -4,7 +4,7 @@ layout: docs
title: Getting Started (ASP.NET 4.x)
---
-#### 👀 Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Sample.Mvc4).
+#### 👀 Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Sample.Mvc4).
This guide covers enabling server-side rendering and Babel compilation. If you want a step-by-step guide on configuring a brand new site, see [the ReactJS.NET tutorial for ASP.NET](/tutorials/aspnet4.html).
@@ -58,4 +58,4 @@ You're done! You can now call `Html.React` from within Razor files:
You can also use [webpack](/guides/webpack.html) or [System.Web.Optimization](/guides/weboptimizer.html) to bundle your scripts together.
-Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Sample.Mvc4) for a working demo.
+Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Sample.Mvc4) for a working demo.
diff --git a/site/jekyll/getting-started/aspnetcore.md b/site/jekyll/getting-started/aspnetcore.md
index 3bf34f1c9..9e2626e39 100644
--- a/site/jekyll/getting-started/aspnetcore.md
+++ b/site/jekyll/getting-started/aspnetcore.md
@@ -4,7 +4,7 @@ layout: docs
title: Getting Started (ASP.NET Core)
---
-#### 👀 Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack).
+#### 👀 Just want to see the code? Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack).
## For new projects:
@@ -102,4 +102,4 @@ You're done! You can now call `Html.React` from within Razor files:
If you need support for non-Windows platforms, please see the [Linux/macOS guide](/getting-started/chakracore.html)
-Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack) for a working demo.
+Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack) for a working demo.
diff --git a/site/jekyll/getting-started/chakracore.md b/site/jekyll/getting-started/chakracore.md
index 585d38c0e..0bde5940a 100644
--- a/site/jekyll/getting-started/chakracore.md
+++ b/site/jekyll/getting-started/chakracore.md
@@ -5,7 +5,7 @@ title: macOS/Linux
ReactJS.NET supports running on non-Windows platforms via both Mono and .NET Core. This guide focuses on Linux / macOS support via the ChakraCore engine and .NET Core, which uses precompiled binaries. To use the full .NET Framework with Mono, please see the [Mono guide](/guides/mono.html).
-Add `React.AspNet` as a dependency to your .NET Core project. Check out the [sample project](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-webpack) or the [documentation](https://reactjs.net/getting-started/aspnetcore.html) if you need more details on that.
+Add `React.AspNet` as a dependency to your .NET Core project. Check out the [sample project](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-webpack) or the [documentation](https://reactjs.net/getting-started/aspnetcore.html) if you need more details on that.
Next, install the `JavascriptEngineSwitcher.ChakraCore` and `JavaScriptEngineSwitcher.Extensions.MsDependencyInjection` NuGet packages. Depending on the platform(s) you want to support, also install one or more of these NuGet packages:
diff --git a/site/jekyll/tutorials/aspnetcore.md b/site/jekyll/tutorials/aspnetcore.md
index 23316a620..478686691 100644
--- a/site/jekyll/tutorials/aspnetcore.md
+++ b/site/jekyll/tutorials/aspnetcore.md
@@ -38,7 +38,7 @@ It'll also have a few neat features:
## Want to skip all this and see the source?
-[It's all on GitHub](https://github.com/reactjs/React.NET/tree/master/src/React.Template/reactnet-vanilla).
+[It's all on GitHub](https://github.com/reactjs/React.NET/tree/main/src/React.Template/reactnet-vanilla).
## Getting started
diff --git a/src/React.Web.Mvc4/React.Web.Mvc4.csproj b/src/React.Web.Mvc4/React.Web.Mvc4.csproj
index a60ca7f5e..cf0b00cd1 100644
--- a/src/React.Web.Mvc4/React.Web.Mvc4.csproj
+++ b/src/React.Web.Mvc4/React.Web.Mvc4.csproj
@@ -16,7 +16,7 @@
asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babellogo_64.pnghttps://github.com/reactjs/react.net
- https://github.com/reactjs/React.NET/blob/master/LICENSE
+ https://github.com/reactjs/React.NET/blob/main/LICENSEtruetrue$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
From 369a0c83569afa0ae91f4c061f0b0afccb1dad5e Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Fri, 31 Jul 2020 20:54:13 +0000
Subject: [PATCH 31/74] Update dependency @types/react to v16.9.44
---
src/React.Sample.Mvc4/package-lock.json | 14 +++++++-------
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index eaa74385a..c648c95f9 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,13 +11,13 @@
"dev": true
},
"@types/react": {
- "version": "16.9.43",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.43.tgz",
- "integrity": "sha512-PxshAFcnJqIWYpJbLPriClH53Z2WlJcVZE+NP2etUtWQs2s7yIMj3/LDKZT/5CHJ/F62iyjVCDu2H3jHEXIxSg==",
+ "version": "16.9.44",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.44.tgz",
+ "integrity": "sha512-BtLoJrXdW8DVZauKP+bY4Kmiq7ubcJq+H/aCpRfvPF7RAT3RwR73Sg8szdc2YasbAlWBDrQ6Q+AFM0KwtQY+WQ==",
"dev": true,
"requires": {
"@types/prop-types": "*",
- "csstype": "^2.2.0"
+ "csstype": "^3.0.2"
}
},
"@types/react-dom": {
@@ -40,9 +40,9 @@
}
},
"csstype": {
- "version": "2.6.11",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.11.tgz",
- "integrity": "sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.2.tgz",
+ "integrity": "sha512-ofovWglpqoqbfLNOTBNZLSbMuGrblAf1efvvArGKOZMBrIoJeu5UsAipQolkijtyQx5MtAzT/J9IHj/CEY1mJw==",
"dev": true
},
"popper.js": {
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 08e9b6fe0..683ba5ab9 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.43",
+ "@types/react": "16.9.44",
"@types/react-dom": "16.9.8",
"@types/reactstrap": "8.5.0",
"typescript": "3.9.7"
From a0c15ad9d1c7208e4e955a28859f37b51e78e005 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Sat, 8 Aug 2020 10:53:20 +0000
Subject: [PATCH 32/74] Update dependency @types/react to v16.9.45
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index c648c95f9..75149a89c 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.44",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.44.tgz",
- "integrity": "sha512-BtLoJrXdW8DVZauKP+bY4Kmiq7ubcJq+H/aCpRfvPF7RAT3RwR73Sg8szdc2YasbAlWBDrQ6Q+AFM0KwtQY+WQ==",
+ "version": "16.9.45",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.45.tgz",
+ "integrity": "sha512-vv950slTF5UZ5eDOf13b8qC1SD4rTvkqg3HfaUKzr17U97oeJZAa+dUaIHn0QoOJflNTIt6Pem9MmapULs9dkA==",
"dev": true,
"requires": {
"@types/prop-types": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 683ba5ab9..f55fc5bb9 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.44",
+ "@types/react": "16.9.45",
"@types/react-dom": "16.9.8",
"@types/reactstrap": "8.5.0",
"typescript": "3.9.7"
From fa063fddba95598354d196c1bd8319d262e9403a Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Mon, 10 Aug 2020 15:01:23 +0000
Subject: [PATCH 33/74] Update dependency @types/react to v16.9.46
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index 75149a89c..bccf26b0b 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.45",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.45.tgz",
- "integrity": "sha512-vv950slTF5UZ5eDOf13b8qC1SD4rTvkqg3HfaUKzr17U97oeJZAa+dUaIHn0QoOJflNTIt6Pem9MmapULs9dkA==",
+ "version": "16.9.46",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.46.tgz",
+ "integrity": "sha512-dbHzO3aAq1lB3jRQuNpuZ/mnu+CdD3H0WVaaBQA8LTT3S33xhVBUj232T8M3tAhSWJs/D/UqORYUlJNl/8VQZg==",
"dev": true,
"requires": {
"@types/prop-types": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index f55fc5bb9..6018ef054 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.45",
+ "@types/react": "16.9.46",
"@types/react-dom": "16.9.8",
"@types/reactstrap": "8.5.0",
"typescript": "3.9.7"
From 58d843ad54b3c65da1f41a82f4b5efc48aae9992 Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Mon, 10 Aug 2020 22:21:36 -0700
Subject: [PATCH 34/74] Fix packing dotfiles in reactnet-webpack template
---
src/React.Template/React.Template.csproj | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/React.Template/React.Template.csproj b/src/React.Template/React.Template.csproj
index 6ec90c40c..f774e233f 100644
--- a/src/React.Template/React.Template.csproj
+++ b/src/React.Template/React.Template.csproj
@@ -15,11 +15,12 @@
truefalsecontent
+ true
-
-
+
+
From 67b85d4556a33842008f18b43ffe8a7494e16c18 Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Mon, 10 Aug 2020 22:22:38 -0700
Subject: [PATCH 35/74] 5.2.7
---
build.proj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.proj b/build.proj
index 592da9c3c..1982c07a2 100644
--- a/build.proj
+++ b/build.proj
@@ -11,7 +11,7 @@ of patent rights can be found in the PATENTS file in the same directory.
52
- 6
+ 70http://reactjs.net/packages/$(MSBuildProjectDirectory)\tools\MSBuildTasks
From 105c86f6b2d24dd1f4adbd830376e9a7b639970b Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Tue, 11 Aug 2020 07:13:32 +0000
Subject: [PATCH 36/74] Update React.NET packages to v5.2.7
---
src/React.Template/reactnet-vanilla/tutorial-code.csproj | 2 +-
src/React.Template/reactnet-webpack/SampleApp.csproj | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/React.Template/reactnet-vanilla/tutorial-code.csproj b/src/React.Template/reactnet-vanilla/tutorial-code.csproj
index 4821dadb6..b45f36ac0 100644
--- a/src/React.Template/reactnet-vanilla/tutorial-code.csproj
+++ b/src/React.Template/reactnet-vanilla/tutorial-code.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/src/React.Template/reactnet-webpack/SampleApp.csproj b/src/React.Template/reactnet-webpack/SampleApp.csproj
index 9216035a7..13c634322 100644
--- a/src/React.Template/reactnet-webpack/SampleApp.csproj
+++ b/src/React.Template/reactnet-webpack/SampleApp.csproj
@@ -14,8 +14,8 @@
-
-
+
+
From 700edf5f98b6f1dcd8ed8a97440822a76575783a Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Tue, 11 Aug 2020 22:10:28 -0700
Subject: [PATCH 37/74] Fix template exclude list
---
src/React.Template/React.Template.csproj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/React.Template/React.Template.csproj b/src/React.Template/React.Template.csproj
index f774e233f..0cdb42673 100644
--- a/src/React.Template/React.Template.csproj
+++ b/src/React.Template/React.Template.csproj
@@ -19,8 +19,8 @@
-
-
+
+
From 0da248e34bc8b5f442a7211b55a07e1eebc021b3 Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Tue, 11 Aug 2020 22:10:46 -0700
Subject: [PATCH 38/74] 5.2.8
---
build.proj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.proj b/build.proj
index 1982c07a2..f363140ed 100644
--- a/build.proj
+++ b/build.proj
@@ -11,7 +11,7 @@ of patent rights can be found in the PATENTS file in the same directory.
52
- 7
+ 80http://reactjs.net/packages/$(MSBuildProjectDirectory)\tools\MSBuildTasks
From 407c517cb08c4030e0c91751d7f123b4b66f36fa Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Thu, 13 Aug 2020 19:29:08 +0000
Subject: [PATCH 39/74] Update dependency @types/reactstrap to v8.5.1
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index bccf26b0b..eef49dc77 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -30,9 +30,9 @@
}
},
"@types/reactstrap": {
- "version": "8.5.0",
- "resolved": "https://registry.npmjs.org/@types/reactstrap/-/reactstrap-8.5.0.tgz",
- "integrity": "sha512-Mi+uYf436+PoffI8XbYYxs5O5w+XrLo+PSVGdEsIEMxmLVcNgEpgEaCNKftT4s+0NGT4AGdXCdJnJDLV9aY8OA==",
+ "version": "8.5.1",
+ "resolved": "https://registry.npmjs.org/@types/reactstrap/-/reactstrap-8.5.1.tgz",
+ "integrity": "sha512-oEedcEGoX8EqDymsjrjzTnmaf3FuDY9qKLZMA9cH1ZkkqBc2V4i2sJ6ssXEod+GHQ5XH2r52uvbMkjEkjEZHDQ==",
"dev": true,
"requires": {
"@types/react": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 6018ef054..dddedfca8 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -9,7 +9,7 @@
"devDependencies": {
"@types/react": "16.9.46",
"@types/react-dom": "16.9.8",
- "@types/reactstrap": "8.5.0",
+ "@types/reactstrap": "8.5.1",
"typescript": "3.9.7"
}
}
From 9d099d0deb3d11d519e8897b348085903ddf15a5 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Sun, 16 Aug 2020 17:12:27 +0000
Subject: [PATCH 40/74] Update React.NET packages to v5.2.8
---
src/React.Template/reactnet-vanilla/tutorial-code.csproj | 2 +-
src/React.Template/reactnet-webpack/SampleApp.csproj | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/React.Template/reactnet-vanilla/tutorial-code.csproj b/src/React.Template/reactnet-vanilla/tutorial-code.csproj
index b45f36ac0..e7db40c35 100644
--- a/src/React.Template/reactnet-vanilla/tutorial-code.csproj
+++ b/src/React.Template/reactnet-vanilla/tutorial-code.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/src/React.Template/reactnet-webpack/SampleApp.csproj b/src/React.Template/reactnet-webpack/SampleApp.csproj
index 13c634322..c8049c268 100644
--- a/src/React.Template/reactnet-webpack/SampleApp.csproj
+++ b/src/React.Template/reactnet-webpack/SampleApp.csproj
@@ -14,8 +14,8 @@
-
-
+
+
From 4e62e3c5b90bea5f38438129663b581cbcdd6af0 Mon Sep 17 00:00:00 2001
From: aldrashan
Date: Wed, 26 Aug 2020 06:14:40 +0200
Subject: [PATCH 41/74] Added support for relative paths (non-root
webapplications) (#1141)
Co-authored-by: Kenzo De Ridder
---
src/React.AspNet/HtmlHelperExtensions.cs | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/React.AspNet/HtmlHelperExtensions.cs b/src/React.AspNet/HtmlHelperExtensions.cs
index cb33e4cae..08336eefd 100644
--- a/src/React.AspNet/HtmlHelperExtensions.cs
+++ b/src/React.AspNet/HtmlHelperExtensions.cs
@@ -13,10 +13,12 @@
#if LEGACYASPNET
using System.Web;
using IHtmlHelper = System.Web.Mvc.HtmlHelper;
+using IUrlHelper = System.Web.Mvc.UrlHelper;
#else
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Html;
using IHtmlString = Microsoft.AspNetCore.Html.IHtmlContent;
+using Microsoft.AspNetCore.Mvc;
#endif
#if LEGACYASPNET
@@ -148,7 +150,7 @@ public static IHtmlString ReactWithInit(
{
Environment.ReturnEngineToPool();
}
- }
+ }
///
/// Renders the JavaScript required to initialise all components client-side. This will
@@ -174,26 +176,28 @@ public static IHtmlString ReactInitJavaScript(this IHtmlHelper htmlHelper, bool
/// Returns script tags based on the webpack asset manifest
///
///
+ /// Optional IUrlHelper instance. Enables the use of tilde/relative (~/) paths inside the expose-components.js file.
///
- public static IHtmlString ReactGetScriptPaths(this IHtmlHelper htmlHelper)
+ public static IHtmlString ReactGetScriptPaths(this IHtmlHelper htmlHelper, IUrlHelper urlHelper = null)
{
string nonce = Environment.Configuration.ScriptNonceProvider != null
? $" nonce=\"{Environment.Configuration.ScriptNonceProvider()}\""
: "";
return new HtmlString(string.Join("", Environment.GetScriptPaths()
- .Select(scriptPath => $"")));
+ .Select(scriptPath => $"")));
}
///
/// Returns style tags based on the webpack asset manifest
///
///
+ /// Optional IUrlHelper instance. Enables the use of tilde/relative (~/) paths inside the expose-components.js file.
///
- public static IHtmlString ReactGetStylePaths(this IHtmlHelper htmlHelper)
+ public static IHtmlString ReactGetStylePaths(this IHtmlHelper htmlHelper, IUrlHelper urlHelper = null)
{
return new HtmlString(string.Join("", Environment.GetStylePaths()
- .Select(stylePath => $"")));
+ .Select(stylePath => $"")));
}
private static IHtmlString RenderToString(Action withWriter)
From 7e5c2abff0326e37df41a71642c080f3a0960958 Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Tue, 25 Aug 2020 21:15:32 -0700
Subject: [PATCH 42/74] 5.2.9
---
build.proj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.proj b/build.proj
index f363140ed..6ca30e8ff 100644
--- a/build.proj
+++ b/build.proj
@@ -11,7 +11,7 @@ of patent rights can be found in the PATENTS file in the same directory.
52
- 8
+ 90http://reactjs.net/packages/$(MSBuildProjectDirectory)\tools\MSBuildTasks
From 5ae4b2ea17ddaaa1c46883eb99fe5fc663d7894b Mon Sep 17 00:00:00 2001
From: Adam
Date: Thu, 3 Sep 2020 15:01:38 +0200
Subject: [PATCH 43/74] Changed "Html.ReactInitJavascript" to
"Html.ReactInitJavaScript" (#1198)
Struggled with this for a while, and I couldn't find a reason why "Html.ReactInitJavascript" didn't work.
Saw a post on stackoverflow where "Html.ReactInitJavaScript" was used, and noticed that the S should be uppercase.
---
site/jekyll/bundling/webpack.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/site/jekyll/bundling/webpack.md b/site/jekyll/bundling/webpack.md
index 29b151ebb..0f39b168e 100644
--- a/site/jekyll/bundling/webpack.md
+++ b/site/jekyll/bundling/webpack.md
@@ -91,7 +91,7 @@ Reference the built bundle directly in a script tag at the end of the page in `_
- @Html.ReactInitJavascript()
+ @Html.ReactInitJavaScript()
```
@@ -121,6 +121,6 @@ Then, make calls to `@Html.ReactGetScriptPaths()` and `@Html.ReactGetStylePaths(
@RenderBody()
@Html.ReactGetScriptPaths()
- @Html.ReactInitJavascript()
+ @Html.ReactInitJavaScript()
```
From a55b8c6ff05ea561c49a9b44db44c98e549a8722 Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Thu, 3 Sep 2020 18:25:07 -0700
Subject: [PATCH 44/74] Update azure-pipelines.yml
Use updated sdk
---
azure-pipelines.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 916c5894c..d59257036 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,7 +19,7 @@ steps:
- task: DotNetCoreInstaller@0
inputs:
packageType: 'sdk'
- version: '3.1.100'
+ version: '3.1.401'
- task: VSBuild@1
inputs:
From 495a51163d9a7f6e2e586d47248fe148d93de22d Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Thu, 3 Sep 2020 18:25:47 -0700
Subject: [PATCH 45/74] Update dotnet-core-desktop.yml
Use updated sdk
---
.github/workflows/dotnet-core-desktop.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/dotnet-core-desktop.yml b/.github/workflows/dotnet-core-desktop.yml
index 4ccca5c73..944794f7f 100644
--- a/.github/workflows/dotnet-core-desktop.yml
+++ b/.github/workflows/dotnet-core-desktop.yml
@@ -39,7 +39,7 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v1
with:
- dotnet-version: 3.1.101
+ dotnet-version: 3.1.401
- name: Use Node.js 12
uses: actions/setup-node@v1
From ab7bedfb7ffb7c900132f72dcd11536f554b09de Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Sun, 6 Sep 2020 17:07:40 -0700
Subject: [PATCH 46/74] Update dotnet-core-desktop.yml
Maybe this will fix it?
---
.github/workflows/dotnet-core-desktop.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/dotnet-core-desktop.yml b/.github/workflows/dotnet-core-desktop.yml
index 944794f7f..d23eec528 100644
--- a/.github/workflows/dotnet-core-desktop.yml
+++ b/.github/workflows/dotnet-core-desktop.yml
@@ -39,7 +39,7 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v1
with:
- dotnet-version: 3.1.401
+ dotnet-version: 3.1.x
- name: Use Node.js 12
uses: actions/setup-node@v1
From 7092ae4b89a1fe2741aceead611ceefe478bf5dc Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Sun, 6 Sep 2020 17:08:38 -0700
Subject: [PATCH 47/74] Update azure-pipelines.yml
Fix SDK reference
---
azure-pipelines.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d59257036..4263d1d17 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,7 +19,7 @@ steps:
- task: DotNetCoreInstaller@0
inputs:
packageType: 'sdk'
- version: '3.1.401'
+ version: '3.1.x'
- task: VSBuild@1
inputs:
From 0908329ac61634faf7ea5a40a3e73b65ecc2f3b4 Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Tue, 8 Sep 2020 10:17:28 -0700
Subject: [PATCH 48/74] Ci updates (#1202)
* Azure: Try 3.1 sdk
* Update azure-pipelines.yml
* Target netcoreapp3.1
* Migrate to UseDotNet step
* Update azure-pipelines.yml
picky, picky
* Fix tests
---
azure-pipelines.yml | 4 +++-
.../React.Tests.Benchmarks.csproj | 2 +-
tests/React.Tests.Common/MemoryFileCacheCore.cs | 2 +-
tests/React.Tests.Common/React.Tests.Common.csproj | 4 ++--
.../React.Tests.Integration.csproj | 2 +-
tests/React.Tests/Core/MiddlewareTests.cs | 4 ++--
tests/React.Tests/Core/ReactEnvironmentTest.cs | 2 +-
tests/React.Tests/React.Tests.csproj | 6 +++---
.../Router/ReactEnvironmentExtensionsTest.cs | 2 +-
tests/React.Tests/Router/ReactRouterComponentTest.cs | 10 +++++-----
10 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4263d1d17..2c176e021 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,5 +1,6 @@
trigger:
- main
+ - ci-updates
pool:
vmImage: 'windows-2019'
@@ -16,7 +17,8 @@ steps:
- script: npm install --global npm
- - task: DotNetCoreInstaller@0
+ - task: UseDotNet@2
+ displayName: 'Use .NET Core sdk'
inputs:
packageType: 'sdk'
version: '3.1.x'
diff --git a/tests/React.Tests.Benchmarks/React.Tests.Benchmarks.csproj b/tests/React.Tests.Benchmarks/React.Tests.Benchmarks.csproj
index 0325e491b..6492d7fee 100644
--- a/tests/React.Tests.Benchmarks/React.Tests.Benchmarks.csproj
+++ b/tests/React.Tests.Benchmarks/React.Tests.Benchmarks.csproj
@@ -2,7 +2,7 @@
Exe
- net461;netcoreapp2.0
+ net461;netcoreapp3.1
diff --git a/tests/React.Tests.Common/MemoryFileCacheCore.cs b/tests/React.Tests.Common/MemoryFileCacheCore.cs
index c170ca39a..ef0ebf75b 100644
--- a/tests/React.Tests.Common/MemoryFileCacheCore.cs
+++ b/tests/React.Tests.Common/MemoryFileCacheCore.cs
@@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/
-#if NETCOREAPP2_0
+#if NETCOREAPP
using System;
using System.Collections.Generic;
diff --git a/tests/React.Tests.Common/React.Tests.Common.csproj b/tests/React.Tests.Common/React.Tests.Common.csproj
index d6128f105..a34e36235 100644
--- a/tests/React.Tests.Common/React.Tests.Common.csproj
+++ b/tests/React.Tests.Common/React.Tests.Common.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.0
+ net461;netcoreapp3.1false
@@ -9,7 +9,7 @@
-
+
diff --git a/tests/React.Tests.Integration/React.Tests.Integration.csproj b/tests/React.Tests.Integration/React.Tests.Integration.csproj
index e280eb605..1d28bf8c7 100644
--- a/tests/React.Tests.Integration/React.Tests.Integration.csproj
+++ b/tests/React.Tests.Integration/React.Tests.Integration.csproj
@@ -1,6 +1,6 @@
- net461;netcoreapp2.0
+ net461;netcoreapp3.1false
diff --git a/tests/React.Tests/Core/MiddlewareTests.cs b/tests/React.Tests/Core/MiddlewareTests.cs
index c6a92e797..c7ef81120 100644
--- a/tests/React.Tests/Core/MiddlewareTests.cs
+++ b/tests/React.Tests/Core/MiddlewareTests.cs
@@ -1,4 +1,4 @@
-#if NETCOREAPP2_0
+#if NETCOREAPP
using System.Runtime.InteropServices;
using Microsoft.AspNetCore.Hosting;
@@ -13,7 +13,7 @@ public class MiddlewareTests
[Fact]
public void ForwardSlashesAreTransformed()
{
- var environment = new Mock();
+ var environment = new Mock();
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
environment.Setup(x => x.WebRootPath).Returns("c:\\temp");
diff --git a/tests/React.Tests/Core/ReactEnvironmentTest.cs b/tests/React.Tests/Core/ReactEnvironmentTest.cs
index 9b1242746..5ae496141 100644
--- a/tests/React.Tests/Core/ReactEnvironmentTest.cs
+++ b/tests/React.Tests/Core/ReactEnvironmentTest.cs
@@ -48,7 +48,7 @@ public void ExecuteWithBabelWithNoNewThread()
environment.ExecuteWithBabel("foo");
mocks.Engine.Verify(x => x.CallFunction("foo"), Times.Exactly(1));
}
-#if NET452 || NETCOREAPP2_0
+#if NET452 || NETCOREAPP
[Fact]
public void ExecuteWithBabelWithNewThread()
diff --git a/tests/React.Tests/React.Tests.csproj b/tests/React.Tests/React.Tests.csproj
index a93944cea..00e4990b5 100644
--- a/tests/React.Tests/React.Tests.csproj
+++ b/tests/React.Tests/React.Tests.csproj
@@ -4,7 +4,7 @@
Copyright 2014-Present Facebook, IncReactJS.NET Unit TestsDaniel Lo Nigro
- net452;netcoreapp2.0
+ net452;netcoreapp3.1React.Tests../../src/key.snktrue
@@ -25,11 +25,11 @@
-
+
-
+
diff --git a/tests/React.Tests/Router/ReactEnvironmentExtensionsTest.cs b/tests/React.Tests/Router/ReactEnvironmentExtensionsTest.cs
index a1327f2f8..ad9bd550d 100644
--- a/tests/React.Tests/Router/ReactEnvironmentExtensionsTest.cs
+++ b/tests/React.Tests/Router/ReactEnvironmentExtensionsTest.cs
@@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
-#if NET452 || NETCOREAPP2_0
+#if NET452 || NETCOREAPP
using Moq;
using Xunit;
diff --git a/tests/React.Tests/Router/ReactRouterComponentTest.cs b/tests/React.Tests/Router/ReactRouterComponentTest.cs
index 62f144ec8..f939eaf1d 100644
--- a/tests/React.Tests/Router/ReactRouterComponentTest.cs
+++ b/tests/React.Tests/Router/ReactRouterComponentTest.cs
@@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
-#if NET452 || NETCOREAPP2_0
+#if NET452 || NETCOREAPP
using Moq;
using Xunit;
@@ -39,15 +39,15 @@ public void RenderJavaScriptShouldNotIncludeContextOrPath(bool clientOnly, bool
@"ReactDOM.render(React.createElement(Foo, {""hello"":""World""}), document.getElementById(""container""))",
result
);
- }
- else
+ }
+ else
{
Assert.Equal(
@"ReactDOM.hydrate(React.createElement(Foo, {""hello"":""World""}), document.getElementById(""container""))",
result
);
}
-
+
}
[Theory]
@@ -76,7 +76,7 @@ public void RenderJavaScriptShouldHandleWaitForContentLoad(bool clientOnly, bool
result
);
}
- else
+ else
{
Assert.Equal(
@"window.addEventListener('DOMContentLoaded', function() {ReactDOM.hydrate(React.createElement(Foo, {""hello"":""World""}), document.getElementById(""container""))});",
From 99a94a1363cb237373e6f4d5b79f5edb2ad390f6 Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Sat, 12 Sep 2020 20:53:08 -0700
Subject: [PATCH 49/74] Skip adding to _components during ReactWithInit (#1155)
---
src/React.Core/IReactEnvironment.cs | 3 ++-
src/React.Core/ReactEnvironment.cs | 9 +++++++--
tests/React.Tests/Core/ReactEnvironmentTest.cs | 10 ++++++++++
tests/React.Tests/Mvc/HtmlHelperExtensionsTests.cs | 10 ++++++++--
4 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/React.Core/IReactEnvironment.cs b/src/React.Core/IReactEnvironment.cs
index 2b8d0927d..a62437a5b 100644
--- a/src/React.Core/IReactEnvironment.cs
+++ b/src/React.Core/IReactEnvironment.cs
@@ -82,8 +82,9 @@ public interface IReactEnvironment
/// ID to use for the container HTML tag. Defaults to an auto-generated ID
/// True if server-side rendering will be bypassed. Defaults to false.
/// True if this component only should be rendered server-side. Defaults to false.
+ /// Skip adding to components list, which is used during GetInitJavascript
/// The component
- IReactComponent CreateComponent(string componentName, T props, string containerId = null, bool clientOnly = false, bool serverOnly = false);
+ IReactComponent CreateComponent(string componentName, T props, string containerId = null, bool clientOnly = false, bool serverOnly = false, bool skipLazyInit = false);
///
/// Adds the provided to the list of components to render client side.
diff --git a/src/React.Core/ReactEnvironment.cs b/src/React.Core/ReactEnvironment.cs
index 5dc043562..9ec081d40 100644
--- a/src/React.Core/ReactEnvironment.cs
+++ b/src/React.Core/ReactEnvironment.cs
@@ -273,8 +273,9 @@ public virtual bool HasVariable(string name)
/// ID to use for the container HTML tag. Defaults to an auto-generated ID
/// True if server-side rendering will be bypassed. Defaults to false.
/// True if this component only should be rendered server-side. Defaults to false.
+ /// Skip adding to components list, which is used during GetInitJavascript
/// The component
- public virtual IReactComponent CreateComponent(string componentName, T props, string containerId = null, bool clientOnly = false, bool serverOnly = false)
+ public virtual IReactComponent CreateComponent(string componentName, T props, string containerId = null, bool clientOnly = false, bool serverOnly = false, bool skipLazyInit = false)
{
if (!clientOnly)
{
@@ -287,7 +288,11 @@ public virtual IReactComponent CreateComponent(string componentName, T props,
Props = props,
ServerOnly = serverOnly
};
- _components.Add(component);
+
+ if (!skipLazyInit)
+ {
+ _components.Add(component);
+ }
return component;
}
diff --git a/tests/React.Tests/Core/ReactEnvironmentTest.cs b/tests/React.Tests/Core/ReactEnvironmentTest.cs
index 5ae496141..69ffb234d 100644
--- a/tests/React.Tests/Core/ReactEnvironmentTest.cs
+++ b/tests/React.Tests/Core/ReactEnvironmentTest.cs
@@ -218,6 +218,16 @@ public void StyleTagsReturned()
Assert.Equal("static/css/another-stylesheet.css", styles[1]);
}
+ [Fact]
+ public void SkipLazyInit()
+ {
+ var mocks = new Mocks();
+ var environment = mocks.CreateReactEnvironment();
+
+ environment.CreateComponent("ComponentName", new { }, skipLazyInit: true);
+ Assert.Equal("", environment.GetInitJavaScript());
+ }
+
public class Mocks
{
public Mock Engine { get; private set; }
diff --git a/tests/React.Tests/Mvc/HtmlHelperExtensionsTests.cs b/tests/React.Tests/Mvc/HtmlHelperExtensionsTests.cs
index 4bdfdbace..964b26178 100644
--- a/tests/React.Tests/Mvc/HtmlHelperExtensionsTests.cs
+++ b/tests/React.Tests/Mvc/HtmlHelperExtensionsTests.cs
@@ -49,6 +49,7 @@ public void ReactWithInitShouldReturnHtmlAndScript()
new { },
null,
false,
+ false,
false
)).Returns(component.Object);
@@ -109,6 +110,7 @@ public void ScriptNonceIsReturned()
new { },
null,
false,
+ false,
false
)).Returns(component.Object);
@@ -154,6 +156,7 @@ public void EngineIsReturnedToPoolAfterRender()
new { },
null,
true,
+ false,
false
)).Returns(component.Object);
@@ -184,6 +187,7 @@ public void ReactWithClientOnlyTrueShouldCallRenderHtmlWithTrue()
new { },
null,
true,
+ false,
false
)).Returns(component.Object);
@@ -212,7 +216,8 @@ public void ReactWithServerOnlyTrueShouldCallRenderHtmlWithTrue()
new { },
null,
false,
- true
+ true,
+ false
)).Returns(component.Object);
var result = HtmlHelperExtensions.React(
@@ -250,7 +255,8 @@ public void RenderFunctionsCalledNonLazily()
new { },
null,
false,
- true
+ true,
+ false
)).Returns(component.Object);
var result = HtmlHelperExtensions.React(
From 3285de86b19956555ebfe9f59671054567d2e11e Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Sat, 12 Sep 2020 21:58:16 -0700
Subject: [PATCH 50/74] 5.2.10
---
build.proj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.proj b/build.proj
index 6ca30e8ff..68606ceb4 100644
--- a/build.proj
+++ b/build.proj
@@ -11,7 +11,7 @@ of patent rights can be found in the PATENTS file in the same directory.
52
- 9
+ 100http://reactjs.net/packages/$(MSBuildProjectDirectory)\tools\MSBuildTasks
From 57c8f6e187fabcb816f9cc357e3c632d870aa31a Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Mon, 14 Sep 2020 04:33:47 +0000
Subject: [PATCH 51/74] Update React.NET packages to v5.2.10
---
src/React.Template/reactnet-vanilla/tutorial-code.csproj | 2 +-
src/React.Template/reactnet-webpack/SampleApp.csproj | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/React.Template/reactnet-vanilla/tutorial-code.csproj b/src/React.Template/reactnet-vanilla/tutorial-code.csproj
index e7db40c35..ae7810def 100644
--- a/src/React.Template/reactnet-vanilla/tutorial-code.csproj
+++ b/src/React.Template/reactnet-vanilla/tutorial-code.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/src/React.Template/reactnet-webpack/SampleApp.csproj b/src/React.Template/reactnet-webpack/SampleApp.csproj
index c8049c268..81f0ad509 100644
--- a/src/React.Template/reactnet-webpack/SampleApp.csproj
+++ b/src/React.Template/reactnet-webpack/SampleApp.csproj
@@ -14,8 +14,8 @@
-
-
+
+
From 0c7f4bb1235de13fb1a190e1ab3aa840e6c6d1e8 Mon Sep 17 00:00:00 2001
From: Ryan Johnson
Date: Thu, 17 Sep 2020 13:21:55 -0700
Subject: [PATCH 52/74] Fix typo in file name. (#1206)
---
...thBabelBenchmarks.cs => ComponentRenderWithBabelBenchmarks.cs} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename tests/React.Tests.Benchmarks/{ComponentRenderWIthBabelBenchmarks.cs => ComponentRenderWithBabelBenchmarks.cs} (100%)
diff --git a/tests/React.Tests.Benchmarks/ComponentRenderWIthBabelBenchmarks.cs b/tests/React.Tests.Benchmarks/ComponentRenderWithBabelBenchmarks.cs
similarity index 100%
rename from tests/React.Tests.Benchmarks/ComponentRenderWIthBabelBenchmarks.cs
rename to tests/React.Tests.Benchmarks/ComponentRenderWithBabelBenchmarks.cs
From 351ee5fe10d0abe512ee2ce1d6b621e4958713ed Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Thu, 1 Oct 2020 23:16:32 +0000
Subject: [PATCH 53/74] Update dependency @types/react to v16.9.50
---
src/React.Sample.Mvc4/package-lock.json | 12 ++++++------
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index eef49dc77..c0f6dac24 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.46",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.46.tgz",
- "integrity": "sha512-dbHzO3aAq1lB3jRQuNpuZ/mnu+CdD3H0WVaaBQA8LTT3S33xhVBUj232T8M3tAhSWJs/D/UqORYUlJNl/8VQZg==",
+ "version": "16.9.50",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.50.tgz",
+ "integrity": "sha512-kPx5YsNnKDJejTk1P+lqThwxN2PczrocwsvqXnjvVvKpFescoY62ZiM3TV7dH1T8lFhlHZF+PE5xUyimUwqEGA==",
"dev": true,
"requires": {
"@types/prop-types": "*",
@@ -40,9 +40,9 @@
}
},
"csstype": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.2.tgz",
- "integrity": "sha512-ofovWglpqoqbfLNOTBNZLSbMuGrblAf1efvvArGKOZMBrIoJeu5UsAipQolkijtyQx5MtAzT/J9IHj/CEY1mJw==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.3.tgz",
+ "integrity": "sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag==",
"dev": true
},
"popper.js": {
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index dddedfca8..9aeab5c60 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.46",
+ "@types/react": "16.9.50",
"@types/react-dom": "16.9.8",
"@types/reactstrap": "8.5.1",
"typescript": "3.9.7"
From e4f90da4e2ee5a02687f6cdfc4eea5f298f92292 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Mon, 5 Oct 2020 18:16:07 +0000
Subject: [PATCH 54/74] Update dependency @types/react to v16.9.51
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index c0f6dac24..4fe6652c3 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.50",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.50.tgz",
- "integrity": "sha512-kPx5YsNnKDJejTk1P+lqThwxN2PczrocwsvqXnjvVvKpFescoY62ZiM3TV7dH1T8lFhlHZF+PE5xUyimUwqEGA==",
+ "version": "16.9.51",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.51.tgz",
+ "integrity": "sha512-lQa12IyO+DMlnSZ3+AGHRUiUcpK47aakMMoBG8f7HGxJT8Yfe+WE128HIXaHOHVPReAW0oDS3KAI0JI2DDe1PQ==",
"dev": true,
"requires": {
"@types/prop-types": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 9aeab5c60..ee5669841 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.50",
+ "@types/react": "16.9.51",
"@types/react-dom": "16.9.8",
"@types/reactstrap": "8.5.1",
"typescript": "3.9.7"
From 9f901b7cb502b5017f0b02421d793e21e80313ca Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Sun, 11 Oct 2020 14:34:32 +0000
Subject: [PATCH 55/74] Update dependency @types/react to v16.9.52
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index 4fe6652c3..4c77fc320 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.51",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.51.tgz",
- "integrity": "sha512-lQa12IyO+DMlnSZ3+AGHRUiUcpK47aakMMoBG8f7HGxJT8Yfe+WE128HIXaHOHVPReAW0oDS3KAI0JI2DDe1PQ==",
+ "version": "16.9.52",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.52.tgz",
+ "integrity": "sha512-EHRjmnxiNivwhGdMh9sz1Yw9AUxTSZFxKqdBWAAzyZx3sufWwx6ogqHYh/WB1m/I4ZpjkoZLExF5QTy2ekVi/Q==",
"dev": true,
"requires": {
"@types/prop-types": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index ee5669841..6091016e4 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.51",
+ "@types/react": "16.9.52",
"@types/react-dom": "16.9.8",
"@types/reactstrap": "8.5.1",
"typescript": "3.9.7"
From 0217d301f58c81519618271baad97d2c8f05eaa7 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Fri, 16 Oct 2020 19:00:02 +0000
Subject: [PATCH 56/74] Update dependency @types/react to v16.9.53
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index 4c77fc320..c7ad8b1a4 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.52",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.52.tgz",
- "integrity": "sha512-EHRjmnxiNivwhGdMh9sz1Yw9AUxTSZFxKqdBWAAzyZx3sufWwx6ogqHYh/WB1m/I4ZpjkoZLExF5QTy2ekVi/Q==",
+ "version": "16.9.53",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.53.tgz",
+ "integrity": "sha512-4nW60Sd4L7+WMXH1D6jCdVftuW7j4Za6zdp6tJ33Rqv0nk1ZAmQKML9ZLD4H0dehA3FZxXR/GM8gXplf82oNGw==",
"dev": true,
"requires": {
"@types/prop-types": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 6091016e4..1dd59e8ed 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.52",
+ "@types/react": "16.9.53",
"@types/react-dom": "16.9.8",
"@types/reactstrap": "8.5.1",
"typescript": "3.9.7"
From 2746df6a5d232bcce3d731da23ca7afe76611156 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Fri, 23 Oct 2020 06:46:53 +0000
Subject: [PATCH 57/74] Update dependency @types/reactstrap to v8.5.2
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index c7ad8b1a4..483e007a0 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -30,9 +30,9 @@
}
},
"@types/reactstrap": {
- "version": "8.5.1",
- "resolved": "https://registry.npmjs.org/@types/reactstrap/-/reactstrap-8.5.1.tgz",
- "integrity": "sha512-oEedcEGoX8EqDymsjrjzTnmaf3FuDY9qKLZMA9cH1ZkkqBc2V4i2sJ6ssXEod+GHQ5XH2r52uvbMkjEkjEZHDQ==",
+ "version": "8.5.2",
+ "resolved": "https://registry.npmjs.org/@types/reactstrap/-/reactstrap-8.5.2.tgz",
+ "integrity": "sha512-rmY0YTIivt8nbF9imjqTenuA7QtRwMKT+foETEs96LQhYhsVUeoUCnZiuTipdTa7dRGuXYFMQD7W3XWP3U1WTA==",
"dev": true,
"requires": {
"@types/react": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 1dd59e8ed..6b5daae3f 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -9,7 +9,7 @@
"devDependencies": {
"@types/react": "16.9.53",
"@types/react-dom": "16.9.8",
- "@types/reactstrap": "8.5.1",
+ "@types/reactstrap": "8.5.2",
"typescript": "3.9.7"
}
}
From 2c9ab122c923dff30d5d974f65dd89af0b0e56f4 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Tue, 27 Oct 2020 19:45:56 +0000
Subject: [PATCH 58/74] Update dependency @types/react-dom to v16.9.9
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index 483e007a0..769cf1829 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -21,9 +21,9 @@
}
},
"@types/react-dom": {
- "version": "16.9.8",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.8.tgz",
- "integrity": "sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==",
+ "version": "16.9.9",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.9.tgz",
+ "integrity": "sha512-jE16FNWO3Logq/Lf+yvEAjKzhpST/Eac8EMd1i4dgZdMczfgqC8EjpxwNgEe3SExHYLliabXDh9DEhhqnlXJhg==",
"dev": true,
"requires": {
"@types/react": "*"
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 6b5daae3f..c4c224ddb 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -8,7 +8,7 @@
},
"devDependencies": {
"@types/react": "16.9.53",
- "@types/react-dom": "16.9.8",
+ "@types/react-dom": "16.9.9",
"@types/reactstrap": "8.5.2",
"typescript": "3.9.7"
}
From 275dc078e045df726d9fa42f1c7ac8b5b074c545 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Tue, 27 Oct 2020 20:50:18 +0000
Subject: [PATCH 59/74] Update dependency @types/react to v16.9.54
---
src/React.Sample.Mvc4/package-lock.json | 12 ++++++------
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index 769cf1829..b1e62c565 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.53",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.53.tgz",
- "integrity": "sha512-4nW60Sd4L7+WMXH1D6jCdVftuW7j4Za6zdp6tJ33Rqv0nk1ZAmQKML9ZLD4H0dehA3FZxXR/GM8gXplf82oNGw==",
+ "version": "16.9.54",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.54.tgz",
+ "integrity": "sha512-GhawhYraQZpGFO2hVMArjPrYbnA/6+DS8SubK8IPhhVClmKqANihsRenOm5E0mvqK0m/BKoqVktA1O1+Xvlz9w==",
"dev": true,
"requires": {
"@types/prop-types": "*",
@@ -40,9 +40,9 @@
}
},
"csstype": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.3.tgz",
- "integrity": "sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag==",
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.4.tgz",
+ "integrity": "sha512-xc8DUsCLmjvCfoD7LTGE0ou2MIWLx0K9RCZwSHMOdynqRsP4MtUcLeqh1HcQ2dInwDTqn+3CE0/FZh1et+p4jA==",
"dev": true
},
"popper.js": {
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index c4c224ddb..014f26402 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.53",
+ "@types/react": "16.9.54",
"@types/react-dom": "16.9.9",
"@types/reactstrap": "8.5.2",
"typescript": "3.9.7"
From 7a022bd0713a30fcad12d802e48fdae86ce0849c Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Wed, 28 Oct 2020 19:16:23 +0000
Subject: [PATCH 60/74] Update dependency @types/react to v16.9.55
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index b1e62c565..cbee6ba9f 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.54",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.54.tgz",
- "integrity": "sha512-GhawhYraQZpGFO2hVMArjPrYbnA/6+DS8SubK8IPhhVClmKqANihsRenOm5E0mvqK0m/BKoqVktA1O1+Xvlz9w==",
+ "version": "16.9.55",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.55.tgz",
+ "integrity": "sha512-6KLe6lkILeRwyyy7yG9rULKJ0sXplUsl98MGoCfpteXf9sPWFWWMknDcsvubcpaTdBuxtsLF6HDUwdApZL/xIg==",
"dev": true,
"requires": {
"@types/prop-types": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 014f26402..263950f78 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.54",
+ "@types/react": "16.9.55",
"@types/react-dom": "16.9.9",
"@types/reactstrap": "8.5.2",
"typescript": "3.9.7"
From 844ed84d067c6f66c292b4c630ba7e7de8c92ae3 Mon Sep 17 00:00:00 2001
From: Svante Seleborg
Date: Thu, 29 Oct 2020 06:53:16 +0100
Subject: [PATCH 61/74] Avoid the exception during Dispose by only calling
SetObject() when there is a HttpContext (#1219)
---
src/React.Web/TinyIoCAspNetExtensions.cs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/React.Web/TinyIoCAspNetExtensions.cs b/src/React.Web/TinyIoCAspNetExtensions.cs
index 303749461..584b93f9d 100644
--- a/src/React.Web/TinyIoCAspNetExtensions.cs
+++ b/src/React.Web/TinyIoCAspNetExtensions.cs
@@ -63,9 +63,10 @@ public void ReleaseObject()
var item = GetObject() as IDisposable;
if (item != null)
+ {
item.Dispose();
-
- SetObject(null);
+ SetObject(null);
+ }
}
///
From 751012117318f5b0115069cad721c8384a67617a Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Thu, 29 Oct 2020 11:37:51 -0400
Subject: [PATCH 62/74] 5.2.11
---
build.proj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.proj b/build.proj
index 68606ceb4..f702ce175 100644
--- a/build.proj
+++ b/build.proj
@@ -11,7 +11,7 @@ of patent rights can be found in the PATENTS file in the same directory.
52
- 10
+ 110http://reactjs.net/packages/$(MSBuildProjectDirectory)\tools\MSBuildTasks
From 862b0f4954f91628b9d70da7d71c5c167572bb3f Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Thu, 29 Oct 2020 16:28:16 +0000
Subject: [PATCH 63/74] Update React.NET packages to v5.2.11
---
src/React.Template/reactnet-vanilla/tutorial-code.csproj | 2 +-
src/React.Template/reactnet-webpack/SampleApp.csproj | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/React.Template/reactnet-vanilla/tutorial-code.csproj b/src/React.Template/reactnet-vanilla/tutorial-code.csproj
index ae7810def..26f0680f3 100644
--- a/src/React.Template/reactnet-vanilla/tutorial-code.csproj
+++ b/src/React.Template/reactnet-vanilla/tutorial-code.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/src/React.Template/reactnet-webpack/SampleApp.csproj b/src/React.Template/reactnet-webpack/SampleApp.csproj
index 81f0ad509..e2675751f 100644
--- a/src/React.Template/reactnet-webpack/SampleApp.csproj
+++ b/src/React.Template/reactnet-webpack/SampleApp.csproj
@@ -14,8 +14,8 @@
-
-
+
+
From 0aeb70dfaafb84852c565c1a3c042fb0e59e9603 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Mon, 2 Nov 2020 18:08:22 +0000
Subject: [PATCH 64/74] Update dependency @types/reactstrap to v8.5.3
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index cbee6ba9f..368a105d8 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -30,9 +30,9 @@
}
},
"@types/reactstrap": {
- "version": "8.5.2",
- "resolved": "https://registry.npmjs.org/@types/reactstrap/-/reactstrap-8.5.2.tgz",
- "integrity": "sha512-rmY0YTIivt8nbF9imjqTenuA7QtRwMKT+foETEs96LQhYhsVUeoUCnZiuTipdTa7dRGuXYFMQD7W3XWP3U1WTA==",
+ "version": "8.5.3",
+ "resolved": "https://registry.npmjs.org/@types/reactstrap/-/reactstrap-8.5.3.tgz",
+ "integrity": "sha512-B7okIEXUGUL5Ai1vZyqyz6FmILZQUYCK5RABcVY8Mxj94JrFaRlSPmZx4NTIarX+8jhQ3I1ItR5+/LdpE5c4Uw==",
"dev": true,
"requires": {
"@types/react": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 263950f78..557032a9d 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -9,7 +9,7 @@
"devDependencies": {
"@types/react": "16.9.55",
"@types/react-dom": "16.9.9",
- "@types/reactstrap": "8.5.2",
+ "@types/reactstrap": "8.5.3",
"typescript": "3.9.7"
}
}
From 54e0a96b9340f549b433be750f60fdb0200ddaa2 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Fri, 6 Nov 2020 08:47:19 +0000
Subject: [PATCH 65/74] Update dependency @types/react to v16.9.56
---
src/React.Sample.Mvc4/package-lock.json | 6 +++---
src/React.Sample.Mvc4/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/React.Sample.Mvc4/package-lock.json b/src/React.Sample.Mvc4/package-lock.json
index 368a105d8..b2ba51d45 100644
--- a/src/React.Sample.Mvc4/package-lock.json
+++ b/src/React.Sample.Mvc4/package-lock.json
@@ -11,9 +11,9 @@
"dev": true
},
"@types/react": {
- "version": "16.9.55",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.55.tgz",
- "integrity": "sha512-6KLe6lkILeRwyyy7yG9rULKJ0sXplUsl98MGoCfpteXf9sPWFWWMknDcsvubcpaTdBuxtsLF6HDUwdApZL/xIg==",
+ "version": "16.9.56",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.56.tgz",
+ "integrity": "sha512-gIkl4J44G/qxbuC6r2Xh+D3CGZpJ+NdWTItAPmZbR5mUS+JQ8Zvzpl0ea5qT/ZT3ZNTUcDKUVqV3xBE8wv/DyQ==",
"dev": true,
"requires": {
"@types/prop-types": "*",
diff --git a/src/React.Sample.Mvc4/package.json b/src/React.Sample.Mvc4/package.json
index 557032a9d..eb41f628c 100644
--- a/src/React.Sample.Mvc4/package.json
+++ b/src/React.Sample.Mvc4/package.json
@@ -7,7 +7,7 @@
"lint:ts": "tsc"
},
"devDependencies": {
- "@types/react": "16.9.55",
+ "@types/react": "16.9.56",
"@types/react-dom": "16.9.9",
"@types/reactstrap": "8.5.3",
"typescript": "3.9.7"
From 23222435667e33714363806bd2bb72bf5b4cd5e6 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Mon, 9 Nov 2020 20:42:09 +0000
Subject: [PATCH 66/74] Update dependency Microsoft.NET.Sdk.Functions to
v1.0.38
---
webhooks/React.Site.Hooks.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webhooks/React.Site.Hooks.csproj b/webhooks/React.Site.Hooks.csproj
index 3edeb7d52..fd9214a09 100644
--- a/webhooks/React.Site.Hooks.csproj
+++ b/webhooks/React.Site.Hooks.csproj
@@ -3,7 +3,7 @@
net461
-
+
From ebb05bae7285c605e749304297025fa0218ca365 Mon Sep 17 00:00:00 2001
From: Dustin Masters
Date: Mon, 23 Nov 2020 16:32:04 -0500
Subject: [PATCH 67/74] Revert "Port banner and grayscale filter from
reactjs.org (#1115)"
This reverts commit febf1a408606afb21180010b1d07a0e38f3eb7d3.
---
site/jekyll/_assets/stylesheets/react.scss | 15 ++-------------
site/jekyll/_layouts/default.html | 5 +----
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/site/jekyll/_assets/stylesheets/react.scss b/site/jekyll/_assets/stylesheets/react.scss
index e87a01ccd..36ea1f560 100644
--- a/site/jekyll/_assets/stylesheets/react.scss
+++ b/site/jekyll/_assets/stylesheets/react.scss
@@ -52,17 +52,6 @@ html {
background: $pageBg;
}
-.grayscale {
- filter:grayscale(100%);
- -webkit-filter:grayscale(100%);
-}
-
-.top-banner {
- font-size: 20px;
- height: 60px;
- text-align: center;
- padding: 20px;
-}
.left {
@@ -75,7 +64,7 @@ html {
.container {
- padding-top: 110px;
+ padding-top: $navHeight;
min-width: $contentWidth + (2 * $contentPadding);
}
@@ -131,7 +120,7 @@ h1, h2, h3, h4, h5, h6 {
color: $lightTextColor;
position: fixed;
top: 0;
- height: 110px;
+ height: $navHeight;
box-shadow: 0 0 5px rgba(0, 0, 0, .5);
width: 100%;
z-index: 100;
diff --git a/site/jekyll/_layouts/default.html b/site/jekyll/_layouts/default.html
index d25d19995..d59c8b506 100644
--- a/site/jekyll/_layouts/default.html
+++ b/site/jekyll/_layouts/default.html
@@ -37,8 +37,7 @@