Skip to content

Commit 292cf5b

Browse files
markphillips100MarkPieszak
authored andcommitted
Replaced raw-loader with css-loader to resolve url dependencies (TrilonIO#164)
Closes TrilonIO#152 * added vendor webpack * Use css-loader to resolve sass url dependencies * Removed vendor webpack config * Removed duplicate folder items * Removed dist folders
1 parent 4751a0a commit 292cf5b

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

Client/app/app.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $light-orange: #ff8c00;
33
$navbar-default-color: $light-orange;
44

55
/* Import Bootstrap & Fonts */
6-
$icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap';
6+
$icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/';
77
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
88

99

Views/Home/Index.cshtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@Html.Raw(ViewData["SpaHtml"])
22

3-
@*<script src="~/dist/vendor.js" asp-append-version="true"></script>*@
43
@section scripts {
54
<script src="~/dist/main-browser.js" asp-append-version="true"></script>
65
}

Views/Shared/_Layout.cshtml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
@Html.Raw(ViewData["Meta"])
1010
@Html.Raw(ViewData["Links"])
1111

12-
<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
13-
1412
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/0.8.2/css/flag-icon.min.css" />
1513

1614
@Html.Raw(ViewData["Styles"])

webpack/webpack.common.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ module.exports = {
1515
module: {
1616
rules: [
1717
{ test: /\.ts$/, loader: '@ngtools/webpack' },
18-
{ test: /\.css$/, loader: 'raw-loader' },
19-
{ test: /\.html$/, loader: 'raw-loader' },
20-
{ test: /\.scss$/, loaders: ['raw-loader', 'sass-loader'] },
18+
{ test: /\.css$/, loader: ['to-string-loader', 'css-loader'] },
19+
{ test: /\.html$/, loader: 'html-loader' },
20+
{ test: /\.scss$/, loaders: ['to-string-loader', 'css-loader', 'sass-loader'] },
2121
{ test: /\.(woff2?|ttf|eot|svg)$/, loader: 'url-loader?limit=10000' }
2222
]
2323
},

0 commit comments

Comments
 (0)