Browse Source

Attempt to fix build.

pull/303/head
Sebastian 8 years ago
parent
commit
bdb7b7493c
  1. 8
      src/Squidex/app-config/webpack.config.js
  2. 6
      src/Squidex/app-config/webpack.run.dev.js
  3. 6
      src/Squidex/app-config/webpack.run.prod.js
  4. 8
      src/Squidex/app-config/webpack.test.coverage.js
  5. 2
      src/Squidex/package.json

8
src/Squidex/app-config/webpack.config.js

@ -44,13 +44,12 @@ module.exports = {
*
* See: https://webpack.js.org/configuration/module/#module-rules
*/
rules: [
{
rules: [{
test: /\.ts$/,
use: [{
loader: 'awesome-typescript-loader'
}, {
loader: 'angular2-router-loader'
loader: 'angular-router-loader'
}, {
loader: 'angular2-template-loader'
}, {
@ -99,8 +98,7 @@ module.exports = {
loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] }
}],
exclude: helpers.root('app', 'theme')
}
]
}]
},
plugins: [

6
src/Squidex/app-config/webpack.run.dev.js

@ -27,8 +27,7 @@ module.exports = webpackMerge(runConfig, {
*
* See: https://webpack.js.org/configuration/module/#module-rules
*/
rules: [
{
rules: [{
test: /\.scss$/,
use: [{
loader: 'style-loader'
@ -38,8 +37,7 @@ module.exports = webpackMerge(runConfig, {
loader: 'sass-loader?sourceMap', options: { includePaths: [helpers.root('app', 'theme')] }
}],
include: helpers.root('app', 'theme')
}
]
}]
},
devServer: {

6
src/Squidex/app-config/webpack.run.prod.js

@ -54,8 +54,7 @@ module.exports = webpackMerge(runConfig, {
*
* See: https://webpack.js.org/configuration/module/#module-rules
*/
rules: [
{
rules: [{
test: /\.scss$/,
/*
* Extract the content from a bundle to a file
@ -86,8 +85,7 @@ module.exports = webpackMerge(runConfig, {
use: [{
loader: '@ngtools/webpack'
}]
}
]
}]
},
plugins: [

8
src/Squidex/app-config/webpack.test.coverage.js

@ -13,8 +13,7 @@ module.exports = webpackMerge(testConfig, {
*
* See: https://webpack.js.org/configuration/module/#module-rules
*/
rules: [
{
rules: [{
test: /\.ts$/,
use: [{
loader: 'awesome-typescript-loader'
@ -28,12 +27,11 @@ module.exports = webpackMerge(testConfig, {
},{
loader: 'awesome-typescript-loader'
}, {
loader: 'angular2-router-loader'
loader: 'angular-router-loader'
}, {
loader: 'angular2-template-loader'
}],
exclude: [/\.(e2e|spec)\.ts$/]
}
]
}]
}
});

2
src/Squidex/package.json

@ -55,7 +55,7 @@
"@types/node": "10.1.2",
"@types/react": "16.3.16",
"@types/react-dom": "16.0.5",
"angular2-router-loader": "0.3.5",
"angular-router-loader": "0.8.5",
"angular2-template-loader": "0.6.2",
"awesome-typescript-loader": "5.0.0",
"codelyzer": "4.3.0",

Loading…
Cancel
Save