Unverified Commit 89edd34f authored by Kristoffer K's avatar Kristoffer K Committed by GitHub

fix: register webpack hook earlier and use absolute paths (#21877)

parent 26dffdcb
...@@ -2,51 +2,53 @@ ...@@ -2,51 +2,53 @@
// this is in order for userland plugins to attach to the same webpack instance as next.js // this is in order for userland plugins to attach to the same webpack instance as next.js
// the individual compiled modules are as defined for the compilation in bundles/webpack/packages/* // the individual compiled modules are as defined for the compilation in bundles/webpack/packages/*
const hookPropertyMap = new Map([ const hookPropertyMap = new Map(
['webpack', 'next/dist/compiled/webpack/webpack-lib'],
['webpack/package', 'next/dist/compiled/webpack/package'],
['webpack/package.json', 'next/dist/compiled/webpack/package'],
['webpack/lib/webpack', 'next/dist/compiled/webpack/webpack-lib'],
['webpack/lib/webpack.js', 'next/dist/compiled/webpack/webpack-lib'],
[ [
'webpack/lib/node/NodeEnvironmentPlugin', ['webpack', 'next/dist/compiled/webpack/webpack-lib'],
'next/dist/compiled/webpack/NodeEnvironmentPlugin', ['webpack/package', 'next/dist/compiled/webpack/package'],
], ['webpack/package.json', 'next/dist/compiled/webpack/package'],
[ ['webpack/lib/webpack', 'next/dist/compiled/webpack/webpack-lib'],
'webpack/lib/node/NodeEnvironmentPlugin.js', ['webpack/lib/webpack.js', 'next/dist/compiled/webpack/webpack-lib'],
'next/dist/compiled/webpack/NodeEnvironmentPlugin', [
], 'webpack/lib/node/NodeEnvironmentPlugin',
[ 'next/dist/compiled/webpack/NodeEnvironmentPlugin',
'webpack/lib/BasicEvaluatedExpression', ],
'next/dist/compiled/webpack/BasicEvaluatedExpression', [
], 'webpack/lib/node/NodeEnvironmentPlugin.js',
[ 'next/dist/compiled/webpack/NodeEnvironmentPlugin',
'webpack/lib/BasicEvaluatedExpression.js', ],
'next/dist/compiled/webpack/BasicEvaluatedExpression', [
], 'webpack/lib/BasicEvaluatedExpression',
[ 'next/dist/compiled/webpack/BasicEvaluatedExpression',
'webpack/lib/node/NodeTargetPlugin', ],
'next/dist/compiled/webpack/NodeTargetPlugin', [
], 'webpack/lib/BasicEvaluatedExpression.js',
[ 'next/dist/compiled/webpack/BasicEvaluatedExpression',
'webpack/lib/node/NodeTargetPlugin.js', ],
'next/dist/compiled/webpack/NodeTargetPlugin', [
], 'webpack/lib/node/NodeTargetPlugin',
[ 'next/dist/compiled/webpack/NodeTargetPlugin',
'webpack/lib/ModuleFilenameHelpers', ],
'next/dist/compiled/webpack/ModuleFilenameHelpers', [
], 'webpack/lib/node/NodeTargetPlugin.js',
[ 'next/dist/compiled/webpack/NodeTargetPlugin',
'webpack/lib/ModuleFilenameHelpers.js', ],
'next/dist/compiled/webpack/ModuleFilenameHelpers', [
], 'webpack/lib/ModuleFilenameHelpers',
['webpack/lib/GraphHelpers', 'next/dist/compiled/webpack/GraphHelpers'], 'next/dist/compiled/webpack/ModuleFilenameHelpers',
['webpack/lib/GraphHelpers.js', 'next/dist/compiled/webpack/GraphHelpers'], ],
['webpack-sources', 'next/dist/compiled/webpack/sources'], [
['webpack-sources/lib', 'next/dist/compiled/webpack/sources'], 'webpack/lib/ModuleFilenameHelpers.js',
['webpack-sources/lib/index', 'next/dist/compiled/webpack/sources'], 'next/dist/compiled/webpack/ModuleFilenameHelpers',
['webpack-sources/lib/index.js', 'next/dist/compiled/webpack/sources'], ],
]) ['webpack/lib/GraphHelpers', 'next/dist/compiled/webpack/GraphHelpers'],
['webpack/lib/GraphHelpers.js', 'next/dist/compiled/webpack/GraphHelpers'],
['webpack-sources', 'next/dist/compiled/webpack/sources'],
['webpack-sources/lib', 'next/dist/compiled/webpack/sources'],
['webpack-sources/lib/index', 'next/dist/compiled/webpack/sources'],
['webpack-sources/lib/index.js', 'next/dist/compiled/webpack/sources'],
].map(([request, replacement]) => [request, require.resolve(replacement)])
)
const mod = require('module') const mod = require('module')
const resolveFilename = mod._resolveFilename const resolveFilename = mod._resolveFilename
......
declare -a testCases=( declare -a testCases=(
# Tests the webpack require hook
"progressive-web-app"
"with-typescript" "with-typescript"
"with-next-sass" "with-next-sass"
# Tests @next/mdx # Tests @next/mdx
......
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