Skip to content

Commit 32a2ab8

Browse files
committed
don't serve global styles
1 parent 2539472 commit 32a2ab8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

packages/@angular/cli/plugins/karma-context.html

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<!-- Dynamically replaced with <script> tags -->
3232
%SCRIPTS%
3333
<script type="text/javascript" src="_karma_webpack_/scripts.bundle.js" crossorigin="anonymous"></script>
34-
<script type="text/javascript" src="_karma_webpack_/styles.bundle.js" crossorigin="anonymous"></script>
3534
<script type="text/javascript" src="_karma_webpack_/vendor.bundle.js" crossorigin="anonymous"></script>
3635
<script type="text/javascript" src="_karma_webpack_/main.bundle.js" crossorigin="anonymous"></script>
3736
<script type="text/javascript">

packages/@angular/cli/plugins/karma-debug.html

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<!-- Dynamically replaced with <script> tags -->
3434
%SCRIPTS%
3535
<script type="text/javascript" src="_karma_webpack_/scripts.bundle.js" crossorigin="anonymous"></script>
36-
<script type="text/javascript" src="_karma_webpack_/styles.bundle.js" crossorigin="anonymous"></script>
3736
<script type="text/javascript" src="_karma_webpack_/vendor.bundle.js" crossorigin="anonymous"></script>
3837
<script type="text/javascript" src="_karma_webpack_/main.bundle.js" crossorigin="anonymous"></script>
3938
<script type="text/javascript">

packages/@angular/cli/plugins/karma.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
138138
config.beforeMiddleware = config.beforeMiddleware || [];
139139
config.beforeMiddleware.push('angularCliBlocker');
140140

141+
// Delete global styles entry, we don't want to load them.
142+
delete webpackConfig.entry.styles;
143+
141144
// The webpack tier owns the watch behavior so we want to force it in the config.
142145
webpackConfig.watch = true;
143146
// Files need to be served from a custom path for Karma.
@@ -188,7 +191,6 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
188191
'/_karma_webpack_/inline.bundle.js',
189192
'/_karma_webpack_/polyfills.bundle.js',
190193
'/_karma_webpack_/scripts.bundle.js',
191-
'/_karma_webpack_/styles.bundle.js',
192194
'/_karma_webpack_/vendor.bundle.js',
193195
];
194196
if (alwaysServe.indexOf(req.url) != -1) {

0 commit comments

Comments
 (0)