Skip to content

Commit f5c771a

Browse files
HintonHinton
authored
[PM-10261] Migrate from gulp to webpack (#4569)
* Migrate from gulp to bootstrap * Remove auto build since it breaks tests
1 parent 3cccb6f commit f5c771a

File tree

14 files changed

+2932
-9658
lines changed

14 files changed

+2932
-9658
lines changed

‎.github/renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"reviewers": ["team:team-auth-dev"]
4242
},
4343
{
44-
"matchPackageNames": ["bootstrap", "del", "gulp"],
44+
"matchPackageNames": ["bootstrap"],
4545
"matchUpdateTypes": ["major"],
46-
"description": "Lock bootstrap, del, and gulp major versions due to ASP.NET conflicts",
46+
"description": "Lock bootstrap major versions due to ASP.NET conflicts",
4747
"enabled": false
4848
},
4949
{

‎.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,10 @@ mail_dist/
205205
src/Core/Properties/launchSettings.json
206206
*.override.env
207207
**/*.DS_Store
208-
src/Admin/wwwroot/lib
209-
src/Admin/wwwroot/css
208+
src/Admin/wwwroot/assets
210209
.vscode/*
211210
**/.vscode/*
212-
bitwarden_license/src/Sso/wwwroot/lib
213-
bitwarden_license/src/Sso/wwwroot/css
211+
bitwarden_license/src/Sso/wwwroot/assets
214212
.github/test/build.secrets
215213
**/CoverageOutput/
216214
.idea/*

‎bitwarden_license/src/Sso/Views/Shared/_Layout.cshtml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>@ViewData["Title"] - SSO</title>
99

10-
<link rel="stylesheet" href="~/css/webfonts.css" />
11-
<environment include="Development">
12-
<link rel="stylesheet" href="~/lib/font-awesome/css/font-awesome.css" />
13-
<link rel="stylesheet" href="~/css/site.css" />
14-
</environment>
15-
<environment exclude="Development">
16-
<link rel="stylesheet" href="~/lib/font-awesome/css/font-awesome.min.css" asp-append-version="true" />
17-
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
18-
</environment>
10+
<link rel="stylesheet" href="~/assets/site.css" asp-append-version="true" />
1911
@RenderSection("Head", required: false)
2012
</head>
2113
<body>
@@ -43,18 +35,7 @@
4335
</div>
4436
</div>
4537

46-
<environment include="Development">
47-
<script src="~/lib/jquery/jquery.slim.js"></script>
48-
<script src="~/lib/popper/popper.js"></script>
49-
<script src="~/lib/bootstrap/js/bootstrap.js"></script>
50-
</environment>
51-
<environment exclude="Development">
52-
<script src="~/lib/jquery/jquery.slim.min.js" asp-append-version="true"></script>
53-
<script src="~/lib/popper/popper.min.js" asp-append-version="true"></script>
54-
<script src="~/lib/bootstrap/js/bootstrap.min.js" asp-append-version="true"></script>
55-
</environment>
56-
57-
<script src="~/js/site.js" asp-append-version="true"></script>
38+
<script src="~/assets/site.js" asp-append-version="true"></script>
5839
@RenderSection("Scripts", required: false)
5940
</body>
6041
</html>

‎bitwarden_license/src/Sso/gulpfile.js

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

0 commit comments

Comments
 (0)