Skip to content

Commit ffa8cf9

Browse files
Hari KiranHari Kiran
authored andcommitted
Resolved yarn.lock merge conflict
1 parent d7449ae commit ffa8cf9

File tree

4 files changed

+563
-725
lines changed

4 files changed

+563
-725
lines changed

craco.config.js

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
module.exports = {
2-
webpack: {
3-
configure: (webpackConfig) => {
4-
webpackConfig.resolve.fallback = {
5-
...webpackConfig.resolve.fallback,
6-
path: require.resolve("path-browserify"),
7-
};
2+
webpack: {
3+
configure: (webpackConfig) => {
4+
webpackConfig.resolve.fallback = {
5+
...webpackConfig.resolve.fallback,
6+
path: require.resolve("path-browserify"),
7+
};
88

9-
webpackConfig.module.rules.push({
10-
test: /\.js$/,
11-
parser: {
12-
requireEnsure: false, // Prevents Webpack from complaining about dynamic requires
13-
},
14-
});
9+
webpackConfig.module.rules.push({
10+
test: /\.js$/,
11+
parser: {
12+
requireEnsure: false, // Prevents Webpack from treating require() as a critical dependency
13+
},
14+
});
1515

16-
// ✅ This suppresses the "Critical dependency" warning explicitly
1716
webpackConfig.ignoreWarnings = [/the request of a dependency is an expression/];
18-
return webpackConfig;
19-
},
17+
18+
return webpackConfig;
2019
},
21-
};
22-
20+
},
21+
};

0 commit comments

Comments
 (0)