Skip to content

Commit c683f54

Browse files
committed
AMP-31085: Webpack js issue
1 parent 35aa856 commit c683f54

8 files changed

Lines changed: 24 additions & 16 deletions

File tree

amp/TEMPLATE/reampv2/packages/ampoffline/scripts/overrides/webpack.dev.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
const { ModuleFederationPlugin } = require('webpack').container;
22
const packageJson = require('../../package.json');
33

4-
const webpackConfigPath = 'react-scripts/config/webpack.config';
4+
// Use require.resolve to find react-scripts regardless of workspace hoisting
5+
const webpackConfigPath = require.resolve('react-scripts/config/webpack.config');
56
// eslint-disable-next-line import/no-dynamic-require
67
const webpackDev = require(webpackConfigPath);
78

@@ -48,7 +49,7 @@ const override = config => {
4849
return config;
4950
};
5051

51-
require.cache[require.resolve(webpackConfigPath)].exports = env => override(webpackDev(env));
52+
require.cache[webpackConfigPath].exports = env => override(webpackDev(env));
5253

5354
// eslint-disable-next-line import/no-dynamic-require
5455
module.exports = require(webpackConfigPath);

amp/TEMPLATE/reampv2/packages/ampoffline/scripts/overrides/webpack.prod.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const {ModuleFederationPlugin} = require('webpack').container;
22

3-
const webpackConfigPath = 'react-scripts/config/webpack.config';
3+
// Use require.resolve to find react-scripts regardless of workspace hoisting
4+
const webpackConfigPath = require.resolve('react-scripts/config/webpack.config');
45
// eslint-disable-next-line import/no-dynamic-require
56
const webpackConfig = require(webpackConfigPath);
67
const packageJson = require("../../package.json");
@@ -55,7 +56,7 @@ const override = config => {
5556
return config;
5657
};
5758

58-
require.cache[require.resolve(webpackConfigPath)].exports = env => override(webpackConfig(env));
59+
require.cache[webpackConfigPath].exports = env => override(webpackConfig(env));
5960

6061
// eslint-disable-next-line import/no-dynamic-require
6162
module.exports = require(webpackConfigPath);

amp/TEMPLATE/reampv2/packages/container/scripts/overrides/webpack.dev.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
const {ModuleFederationPlugin} = require('webpack').container;
22
const packageJson = require('../../package.json');
33

4-
const webpackConfigPath = 'react-scripts/config/webpack.config';
4+
// Use require.resolve to find react-scripts regardless of workspace hoisting
5+
const webpackConfigPath = require.resolve('react-scripts/config/webpack.config');
56
// eslint-disable-next-line import/no-dynamic-require
67
const webpackDev = require(webpackConfigPath);
78

@@ -57,7 +58,7 @@ const override = config => {
5758
return config;
5859
};
5960

60-
require.cache[require.resolve(webpackConfigPath)].exports = env => override(webpackDev(env));
61+
require.cache[webpackConfigPath].exports = env => override(webpackDev(env));
6162

6263
// eslint-disable-next-line import/no-dynamic-require
6364
module.exports = require(webpackConfigPath);

amp/TEMPLATE/reampv2/packages/container/scripts/overrides/webpack.prod.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
const {ModuleFederationPlugin} = require('webpack').container;
22
const Dotenv = require('dotenv-webpack');
33

4-
const webpackConfigPath = 'react-scripts/config/webpack.config';
4+
// Use require.resolve to find react-scripts regardless of workspace hoisting
5+
const webpackConfigPath = require.resolve('react-scripts/config/webpack.config');
56
// eslint-disable-next-line import/no-dynamic-require
67
const webpackConfig = require(webpackConfigPath);
78
const ppackageJson = require("../../package.json");
@@ -76,7 +77,7 @@ const override = config => {
7677
return config;
7778
};
7879

79-
require.cache[require.resolve(webpackConfigPath)].exports = env => override(webpackConfig(env));
80+
require.cache[webpackConfigPath].exports = env => override(webpackConfig(env));
8081

8182
// eslint-disable-next-line import/no-dynamic-require
8283
module.exports = require(webpackConfigPath);

amp/TEMPLATE/reampv2/packages/reampv2-app/scripts/overrides/webpack.dev.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
const { ModuleFederationPlugin } = require('webpack').container;
22
const packageJson = require('../../package.json');
33

4-
const webpackConfigPath = 'react-scripts/config/webpack.config';
4+
// Use require.resolve to find react-scripts regardless of workspace hoisting
5+
const webpackConfigPath = require.resolve('react-scripts/config/webpack.config');
56
// eslint-disable-next-line import/no-dynamic-require
67
const webpackDev = require(webpackConfigPath);
78

@@ -79,7 +80,7 @@ const override = (config) => {
7980
return config;
8081
};
8182

82-
require.cache[require.resolve(webpackConfigPath)].exports = (env) => override(webpackDev(env));
83+
require.cache[webpackConfigPath].exports = (env) => override(webpackDev(env));
8384

8485
// eslint-disable-next-line import/no-dynamic-require
8586
module.exports = require(webpackConfigPath);

amp/TEMPLATE/reampv2/packages/reampv2-app/scripts/overrides/webpack.prod.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const {ModuleFederationPlugin} = require('webpack').container;
22

3-
const webpackConfigPath = 'react-scripts/config/webpack.config';
3+
// Use require.resolve to find react-scripts regardless of workspace hoisting
4+
const webpackConfigPath = require.resolve('react-scripts/config/webpack.config');
45
// eslint-disable-next-line import/no-dynamic-require
56
const webpackConfig = require(webpackConfigPath);
67
const packageJson = require("../../package.json");
@@ -83,7 +84,7 @@ const override = config => {
8384
return config;
8485
};
8586

86-
require.cache[require.resolve(webpackConfigPath)].exports = env => override(webpackConfig(env));
87+
require.cache[webpackConfigPath].exports = env => override(webpackConfig(env));
8788

8889
// eslint-disable-next-line import/no-dynamic-require
8990
module.exports = require(webpackConfigPath);

amp/TEMPLATE/reampv2/packages/user-manager/scripts/overrides/webpack.dev.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
const { ModuleFederationPlugin } = require('webpack').container;
22
const packageJson = require('../../package.json');
33

4-
const webpackConfigPath = 'react-scripts/config/webpack.config';
4+
// Use require.resolve to find react-scripts regardless of workspace hoisting
5+
const webpackConfigPath = require.resolve('react-scripts/config/webpack.config');
56
// eslint-disable-next-line import/no-dynamic-require
67
const webpackDev = require(webpackConfigPath);
78

@@ -74,7 +75,7 @@ const override = (config) => {
7475
return config;
7576
};
7677

77-
require.cache[require.resolve(webpackConfigPath)].exports = (env) => override(webpackDev(env));
78+
require.cache[webpackConfigPath].exports = (env) => override(webpackDev(env));
7879

7980
// eslint-disable-next-line import/no-dynamic-require
8081
module.exports = require(webpackConfigPath);

amp/TEMPLATE/reampv2/packages/user-manager/scripts/overrides/webpack.prod.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const { ModuleFederationPlugin } = require('webpack').container;
22

3-
const webpackConfigPath = 'react-scripts/config/webpack.config';
3+
// Use require.resolve to find react-scripts regardless of workspace hoisting
4+
const webpackConfigPath = require.resolve('react-scripts/config/webpack.config');
45
// eslint-disable-next-line import/no-dynamic-require
56
const webpackConfig = require(webpackConfigPath);
67
const packageJson = require('../../package.json');
@@ -81,7 +82,7 @@ const override = (config) => {
8182
return config;
8283
};
8384

84-
require.cache[require.resolve(webpackConfigPath)].exports = (env) => override(webpackConfig(env));
85+
require.cache[webpackConfigPath].exports = (env) => override(webpackConfig(env));
8586

8687
// eslint-disable-next-line import/no-dynamic-require
8788
module.exports = require(webpackConfigPath);

0 commit comments

Comments
 (0)