Skip to content

Commit 75db443

Browse files
committed
fix sourcemaps
1 parent 14e4ba8 commit 75db443

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

packages/@angular/cli/models/webpack-configs/test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ export function getTestConfig(testConfig: WebpackTestOptions) {
9393
plugins: [
9494
new webpackBuildLogger({ logEnabled: true }),
9595
new (<any>FileListPlugin)(),
96-
new webpack.SourceMapDevToolPlugin({
97-
filename: null, // if no value is provided the sourcemap is inlined
98-
}),
9996
new KarmaWebpackEmitlessError()
10097
].concat(extraPlugins)
10198
};

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
// All served files with the latest timestamps
2727
%MAPPINGS%
2828
</script>
29-
<script type="text/javascript" src="_karma_webpack_/inline" crossorigin="anonymous"></script>
30-
<script type="text/javascript" src="_karma_webpack_/polyfills" crossorigin="anonymous"></script>
29+
<script type="text/javascript" src="_karma_webpack_/inline.bundle.js" crossorigin="anonymous"></script>
30+
<script type="text/javascript" src="_karma_webpack_/polyfills.bundle.js" crossorigin="anonymous"></script>
3131
<!-- Dynamically replaced with <script> tags -->
3232
%SCRIPTS%
33-
<script type="text/javascript" src="_karma_webpack_/scripts" crossorigin="anonymous"></script>
34-
<script type="text/javascript" src="_karma_webpack_/styles" crossorigin="anonymous"></script>
35-
<script type="text/javascript" src="_karma_webpack_/vendor" crossorigin="anonymous"></script>
36-
<script type="text/javascript" src="_karma_webpack_/main" crossorigin="anonymous"></script>
33+
<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>
35+
<script type="text/javascript" src="_karma_webpack_/vendor.bundle.js" crossorigin="anonymous"></script>
36+
<script type="text/javascript" src="_karma_webpack_/main.bundle.js" crossorigin="anonymous"></script>
3737
<script type="text/javascript">
3838
window.__karma__.loaded();
3939
</script>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
// All served files with the latest timestamps
2929
%MAPPINGS%
3030
</script>
31-
<script type="text/javascript" src="_karma_webpack_/inline" crossorigin="anonymous"></script>
32-
<script type="text/javascript" src="_karma_webpack_/polyfills" crossorigin="anonymous"></script>
31+
<script type="text/javascript" src="_karma_webpack_/inline.bundle.js" crossorigin="anonymous"></script>
32+
<script type="text/javascript" src="_karma_webpack_/polyfills.bundle.js" crossorigin="anonymous"></script>
3333
<!-- Dynamically replaced with <script> tags -->
3434
%SCRIPTS%
35-
<script type="text/javascript" src="_karma_webpack_/scripts" crossorigin="anonymous"></script>
36-
<script type="text/javascript" src="_karma_webpack_/styles" crossorigin="anonymous"></script>
37-
<script type="text/javascript" src="_karma_webpack_/vendor" crossorigin="anonymous"></script>
38-
<script type="text/javascript" src="_karma_webpack_/main" crossorigin="anonymous"></script>
35+
<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>
37+
<script type="text/javascript" src="_karma_webpack_/vendor.bundle.js" crossorigin="anonymous"></script>
38+
<script type="text/javascript" src="_karma_webpack_/main.bundle.js" crossorigin="anonymous"></script>
3939
<script type="text/javascript">
4040
window.__karma__.loaded();
4141
</script>

packages/@angular/cli/plugins/karma-webpack-custom.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ function Plugin(
4848
// https://github.com/webpack/webpack/issues/645
4949
webpackOptions.output.path = '/_karma_webpack_/' + indexPath;
5050
webpackOptions.output.publicPath = '/_karma_webpack_/' + publicPath;
51-
webpackOptions.output.filename = '[name]';
52-
if (includeIndex) {
53-
webpackOptions.output.jsonpFunction = 'webpackJsonp' + index;
54-
}
55-
webpackOptions.output.chunkFilename = '[id].bundle.js';
51+
// webpackOptions.output.filename = '[name]';
52+
// if (includeIndex) {
53+
// webpackOptions.output.jsonpFunction = 'webpackJsonp' + index;
54+
// }
55+
// webpackOptions.output.chunkFilename = '[id].bundle.js';
5656
});
5757

5858
this.emitter = emitter;
@@ -245,8 +245,9 @@ function createPreprocesor( /* config.basePath */basePath, webpackPlugin) {
245245
webpackPlugin.middleware.invalidate();
246246
}
247247

248+
console.log('waiting for', file.path)
248249
// read blocks until bundle is done
249-
webpackPlugin.readFile(path.relative(basePath, file.path), function (err, content) {
250+
webpackPlugin.readFile(path.relative(basePath, file.path + '.bundle.js'), function (err, content) {
250251
if (err) {
251252
throw err;
252253
}

0 commit comments

Comments
 (0)