Skip to content

Commit c20ccb2

Browse files
committed
fix: add noop resolve and load script
1 parent b3e0163 commit c20ccb2

File tree

2 files changed

+28
-20
lines changed

2 files changed

+28
-20
lines changed

apps/tester-app/index.js

+18-10
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ ScriptManager.shared.hooks.beforeResolve.tapAsync(
6767
}
6868
);
6969

70-
// ScriptManager.shared.hooks.resolve.tapAsync(
71-
// 'test-during',
72-
// ({ scriptId, caller, error }, callback) => {
73-
// if (!error) {
74-
// console.log('During resolving:', scriptId, caller);
75-
// }
76-
// console.log('ScriptManager.shared.hooks.resolve', scriptId, caller, error);
77-
// callback();
78-
// }
79-
// );
70+
ScriptManager.shared.hooks.resolve.tapAsync(
71+
'test-during',
72+
({ scriptId, caller, error }, callback) => {
73+
if (!error) {
74+
console.log('During resolving:', scriptId, caller);
75+
}
76+
console.log('ScriptManager.shared.hooks.resolve', scriptId, caller, error);
77+
callback();
78+
}
79+
);
8080

8181
ScriptManager.shared.hooks.afterResolve.tapAsync(
8282
'test-after',
@@ -123,6 +123,14 @@ ScriptManager.shared.hooks.beforeLoad.tapAsync(
123123
}
124124
);
125125

126+
ScriptManager.shared.hooks.load.tapAsync(
127+
'test-load',
128+
({ scriptId, caller, error }, callback) => {
129+
console.log('ScriptManager.shared.hooks.load', scriptId, caller, error);
130+
callback();
131+
}
132+
);
133+
126134
ScriptManager.shared.hooks.afterLoad.tapAsync(
127135
'test-after-load',
128136
({ scriptId, caller, error }, callback) => {

packages/repack/src/modules/ScriptManager/ScriptManager.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ export class ScriptManager extends EventEmitter {
295295
this.emit('resolving', { scriptId, caller });
296296

297297
// Check if there are any taps in the resolve hook
298-
const hasResolveHooks = this.hooks.resolve.taps.length > 0;
298+
const _hasResolveHooks = this.hooks.resolve.taps.length > 0;
299299

300300
let locator: ScriptLocator | undefined;
301301

@@ -359,9 +359,9 @@ export class ScriptManager extends EventEmitter {
359359
}
360360

361361
// Only call resolve hook if it wasn't called during resolution
362-
if (!hasResolveHooks) {
363-
await this.hooks.resolve.promise({ scriptId, caller });
364-
}
362+
// if (!hasResolveHooks) {
363+
await this.hooks.resolve.promise({ scriptId, caller });
364+
// }
365365
await this.hooks.afterResolve.promise({ scriptId, caller });
366366
this.emit('resolved', script.toObject());
367367

@@ -430,12 +430,12 @@ export class ScriptManager extends EventEmitter {
430430
await this.hooks.beforeLoad.promise({ scriptId, caller });
431431
this.emit('loading', script.toObject());
432432

433-
const hasLoadHooks = this.hooks.load.taps.length > 0;
434-
if (hasLoadHooks) {
435-
await this.hooks.load.promise({ scriptId, caller });
436-
} else {
437-
await this.loadScriptWithRetry(scriptId, script.locator);
438-
}
433+
const _hasLoadHooks = this.hooks.load.taps.length > 0;
434+
// if (hasLoadHooks) {
435+
await this.hooks.load.promise({ scriptId, caller });
436+
// } else {
437+
await this.loadScriptWithRetry(scriptId, script.locator);
438+
// }
439439

440440
await this.hooks.afterLoad.promise({ scriptId, caller });
441441
this.emit('loaded', script.toObject());

0 commit comments

Comments
 (0)