Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved SCSS and TypeScript build #986

Merged
merged 6 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -417,15 +417,6 @@ $RECYCLE.BIN/
package-lock.json
!AppManifest.js

# JavaScript and CSS generated files
*.g.css
*.g.js
*.g.js.map
*.js.map
src/app/dev/DevToys.Blazor/Assets/**/*.js
src/app/dev/DevToys.Blazor/Assets/**/*.css
src/app/dev/DevToys.Blazor/Components/**/*.razor.js

# Nuke Build
.nuke/temp/

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

# Highlight.js dependency https://highlightjs.org/
!highlight.min.js

# Build results
[Dd]ebug/
[Dd]ebugPublic/
Expand Down
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"christian-kohler.path-intellisense",
"kevin-chatham.aspnetcorerazor-html-css-class-completion",
"vscode-icons-team.vscode-icons",
"nromanov.dotnet-meteor",
"tintoy.msbuild-project-tools",
"ms-azure-devops.azure-pipelines",
"spmeesseman.vscode-taskexplorer"
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ You can contribute to DevToys app by:
1. **.NET SDK**. This is required to build the app itself.
* [.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.
> Use `dotnet --version` from the terminal to get the version installed.
1. [Node.js](https://nodejs.org/). This is required to build Monaco Editor.
1. [Node.js](https://nodejs.org/) **14.0 or later**. This is required to build Monaco Editor.
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:
```
softwareupdate --install-rosetta
Expand Down Expand Up @@ -90,7 +90,7 @@ Most of the `DevToys.MacOS` app runs in a web browser (Safari). In order to acce
1. **.NET SDK**. This is required to build the app itself.
* [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/7.0) (**version 7.0 (SDK 7.0.110)** or later).
> Use `dotnet --version` from the terminal to get the version installed.
1. [Node.js](https://nodejs.org/). This is required to build Monaco Editor.
1. [Node.js](https://nodejs.org/) **14.0 or later**. This is required to build Monaco Editor.

### Finalize your environment
1. Clone this repository.
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.1.5" />
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.3.2" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NuGet.Packaging" Version="6.6.1" />
<PackageVersion Include="NuGet.Packaging" Version="6.8.0" />
<PackageVersion Include="Nuke.Common" Version="7.0.2" />
<PackageVersion Include="OneOf" Version="3.0.263" />
<PackageVersion Include="SixLabors.ImageSharp" Version="3.0.2" />
Expand Down
65 changes: 65 additions & 0 deletions src/app/dev/DevToys.Blazor/Assets/javascript/dom.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/app/dev/DevToys.Blazor/Assets/javascript/dom.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/app/dev/DevToys.Blazor/Assets/javascript/index.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading