Skip to content

Commit ecdcbfa

Browse files
authored
Improved SCSS and TypeScript build (#986)
* Upgraded to .NET 8 + Improved build * Fixed missing cases * Upgraded NuGet version number * Updated doc * Rollback to .NET 7.0 * Reverted some changes
1 parent f640364 commit ecdcbfa

28 files changed

+2739
-37
lines changed

.gitignore

-12
Original file line numberDiff line numberDiff line change
@@ -417,15 +417,6 @@ $RECYCLE.BIN/
417417
package-lock.json
418418
!AppManifest.js
419419

420-
# JavaScript and CSS generated files
421-
*.g.css
422-
*.g.js
423-
*.g.js.map
424-
*.js.map
425-
src/app/dev/DevToys.Blazor/Assets/**/*.js
426-
src/app/dev/DevToys.Blazor/Assets/**/*.css
427-
src/app/dev/DevToys.Blazor/Components/**/*.razor.js
428-
429420
# Nuke Build
430421
.nuke/temp/
431422

@@ -435,9 +426,6 @@ mono_crash.*
435426
# Monaco Dependency (Download from https://microsoft.github.io/monaco-editor/)
436427
src/app/dev/DevToys.Blazor/wwwroot/lib/monaco-editor
437428

438-
# Highlight.js dependency https://highlightjs.org/
439-
!highlight.min.js
440-
441429
# Build results
442430
[Dd]ebug/
443431
[Dd]ebugPublic/

.vscode/extensions.json

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"christian-kohler.path-intellisense",
99
"kevin-chatham.aspnetcorerazor-html-css-class-completion",
1010
"vscode-icons-team.vscode-icons",
11-
"nromanov.dotnet-meteor",
1211
"tintoy.msbuild-project-tools",
1312
"ms-azure-devops.azure-pipelines",
1413
"spmeesseman.vscode-taskexplorer"

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can contribute to DevToys app by:
4545
1. **.NET SDK**. This is required to build the app itself.
4646
* [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/7.0) (**version 7.0 (SDK 7.0.110)** or later). If you're on a [Mac computer with Apple silicon processor](https://support.apple.com/en-us/HT211814), you need to install the Arm64 version of the SDK.
4747
> Use `dotnet --version` from the terminal to get the version installed.
48-
1. [Node.js](https://nodejs.org/). This is required to build Monaco Editor.
48+
1. [Node.js](https://nodejs.org/) **14.0 or later**. This is required to build Monaco Editor.
4949
2. If you're using an [Mac computer with Apple silicon processor](https://support.apple.com/en-us/HT211814), install [Rosetta 2](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) using the following command in a Terminal:
5050
```
5151
softwareupdate --install-rosetta
@@ -90,7 +90,7 @@ Most of the `DevToys.MacOS` app runs in a web browser (Safari). In order to acce
9090
1. **.NET SDK**. This is required to build the app itself.
9191
* [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/7.0) (**version 7.0 (SDK 7.0.110)** or later).
9292
> Use `dotnet --version` from the terminal to get the version installed.
93-
1. [Node.js](https://nodejs.org/). This is required to build Monaco Editor.
93+
1. [Node.js](https://nodejs.org/) **14.0 or later**. This is required to build Monaco Editor.
9494
9595
### Finalize your environment
9696
1. Clone this repository.

src/Directory.Packages.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" />
2727
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" />
2828
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
29-
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.1.5" />
29+
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.3.2" />
3030
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta" />
3131
<PackageVersion Include="Moq" Version="4.18.4" />
3232
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
33-
<PackageVersion Include="NuGet.Packaging" Version="6.6.1" />
33+
<PackageVersion Include="NuGet.Packaging" Version="6.8.0" />
3434
<PackageVersion Include="Nuke.Common" Version="7.0.2" />
3535
<PackageVersion Include="OneOf" Version="3.0.263" />
3636
<PackageVersion Include="SixLabors.ImageSharp" Version="3.0.2" />

src/app/dev/DevToys.Blazor/Assets/javascript/dom.js

+65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/dev/DevToys.Blazor/Assets/javascript/dom.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/dev/DevToys.Blazor/Assets/javascript/index.esm.js

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/dev/DevToys.Blazor/Assets/javascript/index.esm.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)