Merge branch 'master' into fixes/textProcessingBugs

readme.md

@@ -3,13 +3,11 @@
 <br />
 [![NuGet](https://img.shields.io/nuget/v/Avalonia.svg)](https://www.nuget.org/packages/Avalonia) [![downloads](https://img.shields.io/nuget/dt/avalonia)](https://www.nuget.org/packages/Avalonia) [![MyGet](https://img.shields.io/myget/avalonia-ci/vpre/Avalonia.svg?label=myget)](https://www.myget.org/gallery/avalonia-ci) ![Size](https://img.shields.io/github/repo-size/avaloniaui/avalonia.svg) 
 
-## 📖 About AvaloniaUI 
+## 📖 About 
 
-Avalonia is a cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of Operating Systems such as Windows via .NET Framework and .NET Core, Linux via Xorg, macOS. Avalonia is ready for **General-Purpose Desktop App Development**. However, there may be some bugs and breaking changes as we continue along into this project's development. 
+Avalonia is a cross-platform UI framework for dotnet, providing a flexible styling system and supporting a wide range of Operating Systems such as Windows, Linux, MacOs. Avalonia is mature and production ready. We also have in beta release support for iOS, Andriod and in early stages support for browser via WASM.
 
-<img src="https://user-images.githubusercontent.com/6759207/84751662-7c79da00-afc5-11ea-8780-dda28db70b76.png" width="700" />
-
-([Xaml Control Gallery](https://github.com/AvaloniaUI/xamlcontrolsgallery))
+![image](https://user-images.githubusercontent.com/4672627/152126443-932966cf-57e7-4e77-9be6-62463a66b9f8.png)
 
 To see the status of some of our features, please see our [Roadmap](https://github.com/AvaloniaUI/Avalonia/issues/2239). You can also see what [breaking changes](https://github.com/AvaloniaUI/Avalonia/issues/3538) we have planned and what our [past breaking changes](https://github.com/AvaloniaUI/Avalonia/wiki/Breaking-Changes) have been. [Awesome Avalonia](https://github.com/AvaloniaCommunity/awesome-avalonia) is community-curated list of awesome Avalonia UI tools, libraries, projects and resources. Go and see what people are building with Avalonia!
 

src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/package.json

@@ -5,37 +5,36 @@
   "main": "index.js",
   "scripts": {
     "webpack-ver": "cross-env NODE_ENV=production webpack --version",
-    "dist": "cross-env NODE_ENV=production webpack --display-error-details",
-    "watch": "cross-env NODE_ENV=development webpack --watch --display-error-details"
+    "dist": "cross-env NODE_ENV=production webpack",
+    "watch": "cross-env NODE_ENV=development webpack --watch"
   },
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "awesome-typescript-loader": "^5.0.0",
-    "clean-webpack-plugin": "^0.1.19",
-    "compression-webpack-plugin": "^2.0.0",
-    "copy-webpack-plugin": "^4.6.0",
-    "cross-env": "^5.1.6",
-    "css-loader": "^1.0.0",
-    "file-loader": "^1.1.11",
-    "html-webpack-plugin": "^3.2.0",
-    "mini-css-extract-plugin": "^0.4.1",
-    "source-map-loader": "^0.2.3",
-    "style-loader": "^0.21.0",
-    "to-string-loader": "^1.1.5",
-    "tsconfig-paths-webpack-plugin": "^3.2.0",
-    "typescript": "^2.9.2",
-    "url-loader": "^1.0.1",
-    "webpack": "~4.16.3",
-    "webpack-cli": "~2.1.3",
-    "webpack-livereload-plugin": "~2.1.1"
+    "clean-webpack-plugin": "^4.0.0",
+    "compression-webpack-plugin": "^9.2.0",
+    "cross-env": "^7.0.3",
+    "css-loader": "^6.5.1",
+    "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^5.5.0",
+    "mini-css-extract-plugin": "^2.5.3",
+    "source-map-loader": "^3.0.1",
+    "style-loader": "^3.3.1",
+    "to-string-loader": "^1.2.0",
+    "ts-loader": "^9.2.6",
+    "tsconfig-paths-webpack-plugin": "^3.5.2",
+    "typescript": "^4.5.5",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.68.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-livereload-plugin": "^3.0.2"
   },
   "dependencies": {
-    "@types/react": "^16.3.14",
-    "@types/react-dom": "^16.0.5",
-    "mobx": "4.3.0",
-    "mobx-react": "^5.1.2",
-    "react": "^16.3.2",
-    "react-dom": "^16.3.2"
+    "@types/react": "^17.0.38",
+    "@types/react-dom": "^17.0.11",
+    "mobx": "^6.3.13",
+    "mobx-react": "^7.2.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   }
 }

src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js

@@ -3,10 +3,9 @@ const path = require('path');
 const LiveReloadPlugin = require('webpack-livereload-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
-const CleanWebpackPlugin = require('clean-webpack-plugin');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
 const prod = process.env.NODE_ENV == 'production';
 
 class Printer {
@@ -17,6 +16,9 @@ class Printer {
 }
 
 const config = {
+    stats: {
+        errorDetails: true
+    },
     entry: {
             bundle: './src/index.tsx'
         },
@@ -42,7 +44,7 @@ const config = {
                     {
                         test: /\.(ts|tsx)$/,
                         exclude: /node_modules/,
-                        use: 'awesome-typescript-loader'
+                        use: 'ts-loader'
                     },
                     {
                         test: /\.css$/,
@@ -93,7 +95,9 @@ const config = {
     plugins:
         [
         new Printer(),
-        new CleanWebpackPlugin([path.resolve(__dirname, 'build')], { verbose: false }),
+        new CleanWebpackPlugin({
+            cleanAfterEveryBuildPatterns: ['dist']
+        }),
         new MiniCssExtractPlugin({
             filename: "[name].[chunkhash]h" +
             ".css",
@@ -104,11 +108,6 @@ const config = {
             template: path.resolve(__dirname, './src/index.html'),
             filename: 'index.html' //relative to root of the application
         }),
-        new CopyWebpackPlugin([
-            // relative path from src
-            //{ from: './src/favicon.ico' },
-            //{ from: './src/assets' }
-        ]),
         new CompressionPlugin({
             test: /(\?.*)?$/i
         })