Skip to content
This repository was archived by the owner on Sep 24, 2020. It is now read-only.

Commit 4357405

Browse files
committed
Uplift npm packages
* Remove phantomjs
1 parent 4971c97 commit 4357405

File tree

8 files changed

+8269
-49
lines changed

8 files changed

+8269
-49
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change log
22

3+
## [v0.8.0] (2017-08-24)
4+
5+
**Features**
6+
7+
* Uplift npm packages - Vue 2.4, Webpack 3.5, Typescript 2.4
8+
* Remove PhantomJS
9+
310
## [v0.7.1] (2017-06-30)
411

512
**Fixes**
@@ -94,6 +101,7 @@
94101
[#3]: https://github.com/ducksoupdev/vue-webpack-typescript/pull/3
95102
[#2]: https://github.com/ducksoupdev/vue-webpack-typescript/pull/2
96103
[#1]: https://github.com/ducksoupdev/vue-webpack-typescript/pull/1
104+
[v0.8.0]: https://github.com/ducksoupdev/vue-webpack-typescript/compare/v0.7.1...v0.8.0
97105
[v0.7.1]: https://github.com/ducksoupdev/vue-webpack-typescript/compare/v0.7.0...v0.7.1
98106
[v0.7.0]: https://github.com/ducksoupdev/vue-webpack-typescript/compare/v0.6.0...v0.7.0
99107
[v0.6.0]: https://github.com/ducksoupdev/vue-webpack-typescript/compare/v0.5.1...v0.6.0

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# webpack-typescript
22

3-
> A Vue 2.2 Webpack and Typescript setup with hot reload, unit testing, code coverage, sass and bundling/minification.
3+
> A Vue, Webpack and Typescript setup with hot reload, unit testing, code coverage, sass and bundling/minification.
44
5-
> This template is for Vue 2.2
5+
> This template is for Vue 2.4. See the [changelog](CHANGELOG.md) for updates.
66
77
### Usage
88

@@ -18,7 +18,7 @@ $ npm run dev
1818

1919
### What's Included
2020

21-
- `npm run dev`: Webpack + Typescript with proper config for source maps & hot-reload.
21+
- `npm run dev`: Webpack + Typescript with config for source maps & hot-reload
2222
- `npm test`: Mocha unit tests
2323
- `npm run test:debug`: Debug Mocha unit tests in Chrome
2424
- `npm run test:watch`: Fast feedback Mocha unit tests with hot-reload

template/config/webpack.config.coverage.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const webpackConfig = require("./webpack.config.base")
22
DefinePlugin = require('webpack/lib/DefinePlugin'),
3+
SourceMapDevToolPlugin = require('webpack/lib/SourceMapDevToolPlugin'),
34
env = require('../environment/dev.env');
45

56
webpackConfig.module.rules[1].query = {
@@ -24,12 +25,16 @@ webpackConfig.module.rules = [...webpackConfig.module.rules,
2425
}
2526
];
2627

27-
webpackConfig.devtool = "inline-source-map";
28-
2928
webpackConfig.plugins = [...webpackConfig.plugins,
29+
new SourceMapDevToolPlugin({
30+
filename: null, // if no value is provided the sourcemap is inlined
31+
test: /\.(ts|js)($|\?)/i
32+
}),
3033
new DefinePlugin({
3134
'process.env': env
3235
})
3336
];
3437

38+
webpackConfig.devtool = "inline-source-map";
39+
3540
module.exports = webpackConfig;

template/config/webpack.config.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var webpack = require('webpack'),
22
webpackConfig = require('./webpack.config.base'),
33
DefinePlugin = require('webpack/lib/DefinePlugin'),
4+
SourceMapDevToolPlugin = require('webpack/lib/SourceMapDevToolPlugin'),
45
env = require('../environment/dev.env');
56

67
webpackConfig.module.rules = [{
@@ -22,7 +23,7 @@ webpackConfig.module.rules = [{
2223
];
2324

2425
webpackConfig.plugins = [...webpackConfig.plugins,
25-
new webpack.SourceMapDevToolPlugin({
26+
new SourceMapDevToolPlugin({
2627
filename: null, // if no value is provided the sourcemap is inlined
2728
test: /\.(ts|js)($|\?)/i
2829
}),

template/karma.coverage.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ module.exports = function (config) {
3030
preprocessors: {
3131
'src/test.ts': ['webpack']
3232
},
33-
webpack: {
34-
devtool: 'inline-source-map',
35-
resolve: webpackConfig.resolve,
36-
module: webpackConfig.module
37-
},
33+
webpack: webpackConfig,
3834
webpackServer: {
3935
noInfo: true
4036
},
@@ -52,7 +48,10 @@ module.exports = function (config) {
5248
colors: true,
5349
logLevel: config.LOG_INFO,
5450
autoWatch: false,
55-
browsers: ['PhantomJS'],
51+
browsers: ['Chrome'],
52+
mime: {
53+
'text/x-typescript': ['ts']
54+
},
5655
singleRun: true,
5756
concurrency: Infinity
5857
});

0 commit comments

Comments
 (0)