Skip to content

Commit 5723fde

Browse files
committed
fix(build): Fix Webpack ContextReplacementPlugin path resolution for Data worker dynamic imports within external workspaces (#9599)
1 parent e6af733 commit 5723fde

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

buildScripts/webpack/development/webpack.config.appworker.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export default env => {
159159
let con = context.context;
160160

161161
if (!insideNeo && (con.includes('/src/worker') || con.includes('\\src\\worker'))) {
162-
if (!context.request.startsWith('../../') && !context.request.startsWith('..\\..\\')) {
162+
if (!context.request.startsWith('../../') && !context.request.startsWith('..\\..\\') && !context.request.startsWith('../data/') && !context.request.startsWith('..\\data\\')) {
163163
context.request = path.join('../../', context.request);
164164
}
165165
}

buildScripts/webpack/development/webpack.config.worker.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default env => {
3838
let con = context.context;
3939

4040
if (!insideNeo && (con.includes('/src/worker') || con.includes('\\src\\worker'))) {
41-
if (!context.request.startsWith('../../') && !context.request.startsWith('..\\..\\')) {
41+
if (!context.request.startsWith('../../') && !context.request.startsWith('..\\..\\') && !context.request.startsWith('../data/') && !context.request.startsWith('..\\data\\')) {
4242
context.request = path.join('../../', context.request);
4343
}
4444
}

buildScripts/webpack/production/webpack.config.appworker.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export default async function(env) {
166166
let con = context.context;
167167

168168
if (!insideNeo && (con.includes('/src/worker') || con.includes('\\src\\worker'))) {
169-
if (!context.request.startsWith('../../') && !context.request.startsWith('..\\..\\')) {
169+
if (!context.request.startsWith('../../') && !context.request.startsWith('..\\..\\') && !context.request.startsWith('../data/') && !context.request.startsWith('..\\data\\')) {
170170
context.request = path.join('../../', context.request);
171171
}
172172
}

buildScripts/webpack/production/webpack.config.worker.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default env => {
3737
let con = context.context;
3838

3939
if (!insideNeo && (con.includes('/src/worker') || con.includes('\\src\\worker'))) {
40-
if (!context.request.startsWith('../../') && !context.request.startsWith('..\\..\\')) {
40+
if (!context.request.startsWith('../../') && !context.request.startsWith('..\\..\\') && !context.request.startsWith('../data/') && !context.request.startsWith('..\\data\\')) {
4141
context.request = path.join('../../', context.request);
4242
}
4343
}

0 commit comments

Comments
 (0)