From b3b934033c971be776d72a59b9d865123dfdfcee Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 27 Aug 2020 17:38:31 +0200 Subject: [PATCH] added klaro exclusion to webpack/tsconfig --- tsconfig.server.json | 2 +- webpack.server.config.js | 8 +++++++- webpack/webpack.prod.ts | 9 +++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tsconfig.server.json b/tsconfig.server.json index 2d23226548..979f5c2743 100644 --- a/tsconfig.server.json +++ b/tsconfig.server.json @@ -15,6 +15,6 @@ "src/**/*.stub.ts", "src/**/testing/*", "src/**/mocks/*", - "node_modules/klaro" + "node_modules/klaro/*" ], } diff --git a/webpack.server.config.js b/webpack.server.config.js index 264ae71939..e762c14cce 100644 --- a/webpack.server.config.js +++ b/webpack.server.config.js @@ -25,7 +25,13 @@ module.exports = { module: { noParse: /polyfills-.*\.js/, rules: [ - { test: /\.ts$/, loader: 'ts-loader', + { + test: /\.js$/, + exclude: [/node_modules\/klaro/], + }, + + { + test: /\.ts$/, loader: 'ts-loader', options: { configFile: "tsconfig.server.json" } }, diff --git a/webpack/webpack.prod.ts b/webpack/webpack.prod.ts index e9fba2e65e..ddb7f03403 100644 --- a/webpack/webpack.prod.ts +++ b/webpack/webpack.prod.ts @@ -18,6 +18,15 @@ module.exports = Object.assign({}, commonExports, { recordsOutputPath: projectRoot('webpack.records.json'), entry: buildRoot('./main.server.ts'), target: 'node', + module: { + rules: [ + ...commonExports.module.rules, + { + test: /\.js$/, + exclude: [/node_modules\/klaro/], + } + ] + }, externals: [nodeExternals({ whitelist: [ /@angular/,