Skip to content

Commit

Permalink
fix: disable ts-loader in legacy server-side bootstrap mode
Browse files Browse the repository at this point in the history
This prevents missing files error from TypeScript / webpack in the IT tests,
which happen when using deprecated Vaadin 14 bootstrapping and not using
TypeScript.
  • Loading branch information
platosha committed Jan 22, 2021
1 parent 85d9b88 commit 2e6e3cf
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions flow-server/src/main/resources/webpack.generated.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,10 @@ module.exports = {
flowFrontendFolder,
...projectStaticAssetsFolders,
],
extensions: ['.ts', '.js'],
extensions: [
useClientSideIndexFileForBootstrapping && '.ts',
'.js'
].filter(Boolean),
alias: {
Frontend: frontendFolder
}
Expand Down Expand Up @@ -230,11 +233,9 @@ module.exports = {

module: {
rules: [
{
useClientSideIndexFileForBootstrapping && {
test: /\.ts$/,
use: [
'ts-loader'
]
loader: 'ts-loader'
},
{
test: /\.css$/i,
Expand Down Expand Up @@ -287,7 +288,7 @@ module.exports = {
}
}],
},
]
].filter(Boolean)
},
performance: {
maxEntrypointSize: 2097152, // 2MB
Expand Down

0 comments on commit 2e6e3cf

Please sign in to comment.