Skip to content

fix: add error handling to transform for Rspack and webpack #482

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

Merged
sxzz merged 2 commits into from
Mar 21, 2025
Merged

fix: add error handling to transform for Rspack and webpack #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3fe4ca
fix: add error handling to transform for Rspack and webpack
chenjiahan Mar 21, 2025
7e2bf22
fix: improve error handling in transform
chenjiahan Mar 21, 2025
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
39 changes: 25 additions & 14 deletions src/rspack/loaders/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,30 @@ export default async function transform(

const id = this.resource
const context = createContext(this)
const res = await plugin.transform.call(
Object.assign(
{},
this._compilation && createBuildContext(this._compiler, this._compilation, this),
context,
),
source,
id,
)

if (res == null)
callback(null, source, map)
else if (typeof res !== 'string')
callback(null, res.code, map == null ? map : (res.map || map))
else callback(null, res, map)
try {
const res = await plugin.transform.call(
Object.assign(
{},
this._compilation && createBuildContext(this._compiler, this._compilation, this),
context,
),
source,
id,
)

if (res == null)
callback(null, source, map)
else if (typeof res !== 'string')
callback(null, res.code, map == null ? map : (res.map || map))
else callback(null, res, map)
}
catch (error) {
if (error instanceof Error) {
callback(error)
}
else {
callback(new Error(String(error)))
}
}
}
47 changes: 29 additions & 18 deletions src/webpack/loaders/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,34 @@ export default async function transform(this: LoaderContext<any>, source: string
return callback(null, source, map)

const context = createContext(this)
const res = await plugin.transform.call(
Object.assign({}, createBuildContext({
addWatchFile: (file) => {
this.addDependency(file)
},
getWatchFiles: () => {
return this.getDependencies()
},
}, this._compiler!, this._compilation, this), context),
source,
this.resource,
)

if (res == null)
callback(null, source, map)
else if (typeof res !== 'string')
callback(null, res.code, map == null ? map : (res.map || map))
else
callback(null, res, map)
try {
const res = await plugin.transform.call(
Object.assign({}, createBuildContext({
addWatchFile: (file) => {
this.addDependency(file)
},
getWatchFiles: () => {
return this.getDependencies()
},
}, this._compiler!, this._compilation, this), context),
source,
this.resource,
)

if (res == null)
callback(null, source, map)
else if (typeof res !== 'string')
callback(null, res.code, map == null ? map : (res.map || map))
else
callback(null, res, map)
}
catch (error) {
if (error instanceof Error) {
callback(error)
}
else {
callback(new Error(String(error)))
}
}
}