Skip to content

Commit

Permalink
Merge branch 'greenkeeper/webpack-4.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisguttandin committed Feb 25, 2018
2 parents 7445702 + e03dfee commit d93c58f
Show file tree
Hide file tree
Showing 5 changed files with 950 additions and 520 deletions.
11 changes: 6 additions & 5 deletions config/karma/config.js
Expand Up @@ -33,13 +33,14 @@ module.exports = (config) => {
singleRun: true,

webpack: {
mode: 'development',
module: {
loaders: [
{
loader: 'ts-loader',
test: /\.ts?$/
rules: [ {
test: /\.ts?$/,
use: {
loader: 'ts-loader'
}
]
} ]
},
resolve: {
extensions: [ '.js', '.ts' ]
Expand Down
11 changes: 6 additions & 5 deletions config/karma/expectation.js
Expand Up @@ -14,13 +14,14 @@ module.exports = (config) => {
singleRun: true,

webpack: {
mode: 'development',
module: {
loaders: [
{
loader: 'ts-loader',
test: /\.ts?$/
rules: [ {
test: /\.ts?$/,
use: {
loader: 'ts-loader'
}
]
} ]
},
resolve: {
extensions: [ '.js', '.ts' ]
Expand Down
11 changes: 6 additions & 5 deletions config/karma/integration.js
Expand Up @@ -43,13 +43,14 @@ module.exports = (config) => {
singleRun: true,

webpack: {
mode: 'development',
module: {
loaders: [
{
loader: 'ts-loader',
test: /\.ts?$/
rules: [ {
test: /\.ts?$/,
use: {
loader: 'ts-loader'
}
]
} ]
},
resolve: {
extensions: [ '.js', '.ts' ]
Expand Down

0 comments on commit d93c58f

Please sign in to comment.