Skip to content

Knowing in which file an error has occurred #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickjanssen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Knowing in which file an error has occurred #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/Polestar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class Polestar {
private nextEntryId = 1

options: PolestarOptions

moduleWrappers: {
[id: string]: ModuleWrapper
}
Expand Down Expand Up @@ -161,7 +161,7 @@ export class Polestar {
code: string,
dependencies?: 'umd' | string[],
dependencyVersionRanges?: VersionRanges,
requiredBy: ModuleWrapper[] = [],
requiredBy: ModuleWrapper[] = [],
css?: string,
): Promise<ModuleWrapper> {
if (this.error) {
Expand Down Expand Up @@ -209,7 +209,7 @@ export class Polestar {
if (index !== -1) {
prepareDependencies.splice(index, 1)
}

moduleWrapper = new ModuleWrapper(this, id, dependencyVersionRanges, function(require, module, exports) {
let factoryResult = factory.apply(null, (dependencies as string[]).map(function(dep) { return dep === 'exports' ? exports : require(dep) }))
if (factoryResult !== undefined) {
Expand Down Expand Up @@ -251,7 +251,7 @@ export class Polestar {
return Promise.reject(error)
}
}

private handleUnrequiredPrepared = (moduleWrapper: ModuleWrapper): ModuleWrapper => {
if (!this.hasCalledOnEntry) {
this.options.onEntry!()
Expand Down Expand Up @@ -342,7 +342,14 @@ export class ModuleWrapper {

let requestedWrapper = loader.moduleWrappers[requestedId]
if (!requestedWrapper.module.loaded) {
requestedWrapper.execute()
try {
requestedWrapper.execute()
} catch (e) {
// Attach the module so that onError can
// communicate in which module the error occurred
e.module = requestedWrapper.module;
throw e;
}
}

return requestedWrapper.module.exports
Expand Down