Skip to content

Commit

Permalink
Merge branch 'main' into cypress-RHOAIENG-14369
Browse files Browse the repository at this point in the history
  • Loading branch information
manosnoam authored Nov 13, 2024
2 parents 49278ca + 4ce7e5b commit 67e4c03
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 0 additions & 2 deletions frontend/config/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
const CopyPlugin = require('copy-webpack-plugin');
const { setupWebpackDotenvFilesForEnv } = require('./dotenv');
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');

const RELATIVE_DIRNAME = process.env._ODH_RELATIVE_DIRNAME;
const IS_PROJECT_ROOT_DIR = process.env._ODH_IS_PROJECT_ROOT_DIR;
Expand Down Expand Up @@ -179,7 +178,6 @@ module.exports = (env) => {
publicPath: PUBLIC_PATH,
},
plugins: [
new ForkTsCheckerWebpackPlugin(),
...setupWebpackDotenvFilesForEnv({
directory: RELATIVE_DIRNAME,
isRoot: IS_PROJECT_ROOT_DIR,
Expand Down
6 changes: 5 additions & 1 deletion frontend/config/webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const { execSync } = require('child_process');
const path = require('path');
const { merge } = require('webpack-merge');
const { setupWebpackDotenvFilesForEnv, setupDotenvFilesForEnv } = require('./dotenv');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');

Expand Down Expand Up @@ -146,7 +147,10 @@ module.exports = smp.wrap(
},
],
},
plugins: [new ReactRefreshWebpackPlugin({ overlay: false })],
plugins: [
new ForkTsCheckerWebpackPlugin(),
new ReactRefreshWebpackPlugin({ overlay: false }),
],
},
),
);

0 comments on commit 67e4c03

Please sign in to comment.