Skip to content

Commit 4887f00

Browse files
committed
Get rid of NPM
1 parent 54e0660 commit 4887f00

File tree

9 files changed

+17
-314
lines changed

9 files changed

+17
-314
lines changed

.dockerignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
*/bin/
22
*/obj/
3-
4-
/node_modules/

.github/workflows/main.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,9 @@ jobs:
2020
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
2121
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2222
NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
23-
NPM_CACHE: ${{ github.workspace }}/.github/npm-cache
2423
steps:
2524
- uses: actions/checkout@v2
2625

27-
# Frontend
28-
- name: NPM Cache
29-
uses: actions/cache@v1
30-
with:
31-
path: ${{ env.NPM_CACHE }}
32-
key: ${{ runner.os }}.npm.${{ hashFiles('**/npm-shrinkwrap.json') }}
33-
- name: NPM Cache Setup
34-
run: npm config set cache ${{ env.NPM_CACHE }}
35-
- name: NPM Clean Install
36-
run: npm ci
37-
- name: Frontend Build
38-
run: npm run build
39-
4026
# Backend
4127
- name: Setup .NET Core SDK
4228
uses: actions/setup-dotnet@v1

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/.idea/
22
/.vs/
33
/Codingteam.Site/wwwroot/images/
4-
/node_modules/
54

65
bin/
76
obj/

Codingteam.Site/Codingteam.Site.fsproj

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<Version>1.0.2</Version>
66
</PropertyGroup>
7+
8+
<Target Name="DownloadLogo" BeforeTargets="Build"
9+
Inputs="$(MSBuildThisFile)"
10+
Outputs="wwwroot\images\logo-transparent-dark.svg">
11+
<Message Text="Downloading logo…" Importance="high" />
12+
<DownloadFile SourceUrl="https://raw.githubusercontent.com/codingteam/logo/1.0.0/logo-transparent-dark.svg"
13+
DestinationFolder="wwwroot\images"
14+
DestinationFileName="logo-transparent-dark.svg" />
15+
<Message Text="Verifying logo…" Importance="high" />
16+
<VerifyFileHash File="wwwroot\images\logo-transparent-dark.svg"
17+
Hash="D46E4BAB19D15F209307B5AAA9CA65BEC7CCDF1EBDA039365D2D24C05FCC15E88BD6ABBE701B445DDC596516C4EA6BB9CB97396E44813BCC5FDBAB7AB0A734F3"
18+
Algorithm="SHA512"/>
19+
</Target>
20+
721
<ItemGroup>
822
<Compile Include="CtorSettings.fs" />
923
<Compile Include="Clock.fs" />

Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
2-
RUN apt-get update && apt-get install -y git nodejs npm
3-
RUN npm install npm@6.14.6 -g
42

53
WORKDIR /app
64

7-
COPY *.json ./
8-
RUN npm ci
9-
RUN npm run build
10-
11-
COPY Codingteam.Site/*.fsproj ./Codingteam.Site
5+
COPY Codingteam.Site/*.fsproj ./Codingteam.Site/
126
RUN dotnet restore Codingteam.Site
137

14-
COPY Codingteam.Site ./Codingteam.Site
8+
COPY Codingteam.Site ./Codingteam.Site/
159
RUN dotnet build --no-restore --configuration Release Codingteam.Site
1610
RUN dotnet publish --no-build --configuration Release --output publish Codingteam.Site
1711

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ This is the code that services [codingteam.org.ru][] website.
66
Prerequisites
77
-------------
88

9-
To build the application, you'll need to install [.NET Core SDK][dotnet]
10-
3.1.201+ and [NPM][npm] 6.14+.
9+
To build the application, you'll need to install [.NET Core SDK][dotnet] 3.1.201+.
1110

1211
To run the application, [.NET Core Runtime][dotnet] 3.1 is required.
1312

@@ -129,4 +128,3 @@ Documentation
129128
[docker-hub]: https://hub.docker.com/r/codingteam/codingteam.org.ru
130129
[dotnet]: https://dot.net/
131130
[license]: LICENSE.md
132-
[npm]: https://npmjs.com

codingteam.org.ru.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Codingteam.Site.Tests", "Co
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A11DCC5B-EC24-4A69-B6BB-FA2F0043D0F3}"
1111
ProjectSection(SolutionItems) = preProject
12-
package.json = package.json
1312
Dockerfile = Dockerfile
1413
.dockerignore = .dockerignore
1514
NuGet.Config = NuGet.Config

npm-shrinkwrap.json

Lines changed: 0 additions & 259 deletions
This file was deleted.

package.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)