Skip to content

Commit febf816

Browse files
committed
ci: working on cypress issues
1 parent 1c3a671 commit febf816

File tree

2 files changed

+7
-36
lines changed

2 files changed

+7
-36
lines changed

configs/webpack.config.js

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,13 @@ module.exports = {
4646
ENV: require(path.join(__dirname, './env/', process.env.BUILD_ENV)),
4747
}),
4848
new webpack.NormalModuleReplacementPlugin(/..\/input\/frame_grabber/, '../input/frame_grabber_browser.js'),
49-
new webpack.NormalModuleReplacementPlugin(/input_stream\/input_stream$/, (resource) => {
49+
new webpack.NormalModuleReplacementPlugin(/input_stream[/\\]input_stream$/, (resource) => {
5050
console.log('=== WEBPACK REPLACEMENT DEBUG ===');
5151
console.log('Original request:', resource.request);
5252
console.log('Context:', resource.context);
5353
resource.request = resource.request.replace(/input_stream$/, 'input_stream_browser');
5454
console.log('Replaced with:', resource.request);
5555
}),
56-
new webpack.NormalModuleReplacementPlugin(/\.\/input_stream$/, (resource) => {
57-
console.log('=== WEBPACK REPLACEMENT DEBUG (relative) ===');
58-
console.log('Original request:', resource.request);
59-
console.log('Context:', resource.context);
60-
resource.request = resource.request.replace(/input_stream$/, 'input_stream_browser');
61-
console.log('Replaced with:', resource.request);
62-
}),
63-
new webpack.NormalModuleReplacementPlugin(/\.\.\/input\/input_stream\/input_stream$/, (resource) => {
64-
console.log('=== WEBPACK REPLACEMENT DEBUG (full path) ===');
65-
console.log('Original request:', resource.request);
66-
console.log('Context:', resource.context);
67-
resource.request = resource.request.replace(/input_stream$/, 'input_stream_browser');
68-
console.log('Replaced with:', resource.request);
69-
}),
7056
],
7157
optimization: {
7258
minimize: false,

cypress/plugins/index.js

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,18 @@ module.exports = (on, config) => {
2323

2424
// Always apply webpack config for Cypress (both development and test environments)
2525
if (process.env.NODE_ENV === 'test' || process.env.NODE_ENV === 'development') {
26-
const baseWebpackConfig = require('../../configs/webpack.config');
27-
28-
// Create a specific webpack config for Cypress tests that ensures browser modules
29-
const cypressWebpackConfig = {
30-
...baseWebpackConfig,
31-
resolve: {
32-
...baseWebpackConfig.resolve,
33-
alias: {
34-
// Force browser module resolution for Cypress tests
35-
'../input/input_stream/input_stream': '../input/input_stream/input_stream_browser',
36-
'./input_stream': './input_stream_browser',
37-
'input_stream/input_stream': 'input_stream/input_stream_browser',
38-
}
39-
}
40-
};
41-
26+
const webpackConfig = require('../../configs/webpack.config');
4227
console.log('=== CYPRESS WEBPACK CONFIG DEBUG ===');
43-
console.log('Number of plugins:', cypressWebpackConfig.plugins ? cypressWebpackConfig.plugins.length : 0);
44-
console.log('Resolve aliases:', cypressWebpackConfig.resolve.alias);
45-
if (cypressWebpackConfig.plugins) {
46-
cypressWebpackConfig.plugins.forEach((plugin, i) => {
28+
console.log('Number of plugins:', webpackConfig.plugins ? webpackConfig.plugins.length : 0);
29+
console.log('Has plugins:', !!webpackConfig.plugins);
30+
if (webpackConfig.plugins) {
31+
webpackConfig.plugins.forEach((plugin, i) => {
4732
console.log(`Plugin ${i}:`, plugin.constructor.name);
4833
});
4934
}
5035

5136
const webpackOptions = {
52-
webpackOptions: cypressWebpackConfig,
37+
webpackOptions: webpackConfig,
5338
watchOptions: {},
5439
};
5540
on('file:preprocessor', webpack(webpackOptions));

0 commit comments

Comments
 (0)