Unverified Commit afb0dbac authored by Jimmy Miller's avatar Jimmy Miller Committed by GitHub

Adds .resolve to loaders api (#98361)

This fully fixes handlebars loader in my tests and a number of other
loaders depend on this as well. The implementation for getResolve is a
bit different in turbopack, but this should be semantically the same.
parent 74d9f775
...@@ -88,7 +88,6 @@ Turbopack uses the [`loader-runner`](https://github.com/webpack/loader-runner) l ...@@ -88,7 +88,6 @@ Turbopack uses the [`loader-runner`](https://github.com/webpack/loader-runner) l
**Utilities:** **Utilities:**
- [`utils`](https://webpack.js.org/api/loaders/#thisutils) - No support - [`utils`](https://webpack.js.org/api/loaders/#thisutils) - No support
- [`resolve`](https://webpack.js.org/api/loaders/#thisresolve) - No support (use [`getResolve`](https://webpack.js.org/api/loaders/#thisgetresolve) instead)
If you have a loader that is critically dependent upon one of these features please file an issue. If you have a loader that is critically dependent upon one of these features please file an issue.
......
import resolved from './input.resolve-test'
export default function Page() {
return <p id="resolved">{resolved}</p>
}
...@@ -8,6 +8,10 @@ const nextConfig = { ...@@ -8,6 +8,10 @@ const nextConfig = {
'*.no-options.ts': [ '*.no-options.ts': [
require.resolve('./get-resolve-no-options-loader.js'), require.resolve('./get-resolve-no-options-loader.js'),
], ],
'*.resolve-test.js': {
loaders: [require.resolve('./resolve-loader.js')],
as: '*.js',
},
}, },
}, },
webpack(config) { webpack(config) {
...@@ -19,6 +23,10 @@ const nextConfig = { ...@@ -19,6 +23,10 @@ const nextConfig = {
test: /\.no-options\.ts/, test: /\.no-options\.ts/,
use: require.resolve('./get-resolve-no-options-loader.js'), use: require.resolve('./get-resolve-no-options-loader.js'),
}) })
config.module.rules.push({
test: /\.resolve-test\.js$/,
use: require.resolve('./resolve-loader.js'),
})
return config return config
}, },
} }
......
const path = require('path')
module.exports = function () {
const callback = this.async()
this.resolve(this.context, './resolved-value.js', (err, result) => {
if (err) return callback(err)
callback(null, `export default ${JSON.stringify(path.basename(result))}`)
})
}
...@@ -21,4 +21,9 @@ describe('webpack-loader-resolve', () => { ...@@ -21,4 +21,9 @@ describe('webpack-loader-resolve', () => {
const $ = await next.render$('/no-options') const $ = await next.render$('/no-options')
expect($('#no-options').text()).toBe('xyz') expect($('#no-options').text()).toBe('xyz')
}) })
it('should support callback-style loader resolve', async () => {
const $ = await next.render$('/callback')
expect($('#resolved').text()).toBe('resolved-value.js')
})
}) })
...@@ -215,6 +215,13 @@ const transform = ( ...@@ -215,6 +215,13 @@ const transform = (
) )
}, },
}, },
resolve(
lookupPath: string,
request: string,
callback: (err?: Error, result?: string) => void
) {
return this.getResolve()(lookupPath, request, callback)
},
getResolve: (options: ResolveOptions = {}) => { getResolve: (options: ResolveOptions = {}) => {
const rustOptions = { const rustOptions = {
aliasFields: undefined as undefined | string[], aliasFields: undefined as undefined | string[],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment