Unverified Commit 443a9e7a authored by Jimmy Miller's avatar Jimmy Miller Committed by GitHub

More parity for webpack loader build dependencies (#99549)

Track transitive modules, resolution requests, and package directories.
parent 0954164b
......@@ -9967,6 +9967,7 @@ dependencies = [
"turbo-tasks-fs",
"turbo-tasks-hash",
"turbo-tasks-testing",
"turbo-unix-path",
"turbopack-cli-utils",
"turbopack-core",
"turbopack-ecmascript",
......
const path = require('node:path')
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
turbopack: {
resolveAlias: {
'build-dependency-package': './aliased-build-dependency.js',
},
rules: {
'*.ts': {
loaders: [path.resolve(__dirname, './loader.js')],
},
},
},
webpack: (config) => {
config.resolve.alias['build-dependency-package'] = path.resolve(
__dirname,
'./aliased-build-dependency.js'
)
config.module.rules.push({
test: /\.ts$/,
use: [path.resolve(__dirname, './loader.js')],
})
return config
},
}
module.exports = nextConfig
import { utilFn } from '../../utils/dynamic-build-dependency'
export default function Page() {
return <p>{utilFn()}</p>
}
import { utilFn } from '../../utils/external-build-dependency'
export default function Page() {
return <p>{utilFn()}</p>
}
import { utilFn } from '../utils/file-to-transform'
import { utilFn } from '../../utils/native-build-dependency'
export default function Page() {
return <p>{utilFn()}</p>
......
import { utilFn } from '../../utils/package-directory-build-dependency'
export default function Page() {
return <p>{utilFn()}</p>
}
import { utilFn } from '../utils/file-to-transform'
import postcssOutput from '../utils/file.postcss-test'
import stylusOutput from '../utils/file.stylus-test'
export default function Page() {
return (
<>
<p>{utilFn()}</p>
<p id="postcss-output">{postcssOutput}</p>
<p id="stylus-output">{stylusOutput}</p>
</>
)
}
import { utilFn } from '../../utils/tracking-build-dependency'
export default function Page() {
return <p>{utilFn()}</p>
}
import { utilFn } from '../../utils/unresolved-build-dependency'
export default function Page() {
return <p>{utilFn()}</p>
}
module.exports = function (source) {
return `export default ${JSON.stringify(source)}`
}
......@@ -15,9 +15,62 @@ const loader = async function (content) {
)
}
const directoryBuildDependency = this.resourcePath.endsWith(
'directory-build-dependency.ts'
)
const resourceName = path.basename(this.resourcePath)
if (resourceName === 'external-build-dependency.ts') {
const value = require(process.env.EXTERNAL_BUILD_DEPENDENCY)
return this.callback(
null,
`export const utilFn = () => ${JSON.stringify(value)};`
)
}
if (resourceName === 'native-build-dependency.ts') {
// Model a native addon already loaded by Node outside the project's watched roots.
const { Module } = require('node:module')
const filename = process.env.NATIVE_BUILD_DEPENDENCY
const nativeModule = new Module(filename, module)
nativeModule.filename = filename
nativeModule.loaded = true
require.cache[filename] = nativeModule
return this.callback(
null,
`export const utilFn = () => ${JSON.stringify(fs.readFileSync(filename, 'utf8'))};`
)
}
if (resourceName === 'dynamic-build-dependency.ts') {
const dependency = process.env.DYNAMIC_BUILD_DEPENDENCY
this.addBuildDependency(require.resolve(dependency))
const value = require(dependency)
return this.callback(
null,
`export const utilFn = () => ${JSON.stringify(`dynamic: ${value}`)};`
)
}
if (resourceName === 'tracking-build-dependency.ts') {
const cached = require('./tracking/cached')
this.addBuildDependency(path.join(__dirname, 'tracking', 'uncached.mjs'))
const uncached = fs
.readFileSync(
path.join(__dirname, 'tracking', 'uncached-value.js'),
'utf8'
)
.match(/'([^']+)'/)[1]
return this.callback(
null,
`export const utilFn = () => ${JSON.stringify(`${cached}; uncached: ${uncached}`)};`
)
}
if (resourceName === 'unresolved-build-dependency.ts') {
this.addBuildDependency('missing-build-dependency-package/')
this.addBuildDependency('missing-build-dependency-module')
return this.callback(
null,
"export const utilFn = () => 'unresolved dependency warning';"
)
}
const directoryBuildDependency =
resourceName === 'directory-build-dependency.ts'
const packageDirectoryBuildDependency =
resourceName === 'package-directory-build-dependency.ts'
if (directoryBuildDependency) {
const packageDirectory = path.join(__dirname, 'build-dependency-package')
const nestedEntry = path.join(packageDirectory, 'nested', 'value.js')
......@@ -61,6 +114,25 @@ const loader = async function (content) {
)
}
if (packageDirectoryBuildDependency) {
this.addBuildDependency('directory-only-package/')
const value = fs
.readFileSync(
path.join(
__dirname,
'node_modules',
'directory-only-package',
'data.txt'
),
'utf8'
)
.trim()
return this.callback(
null,
`export const utilFn = () => 'package directory build dependency: ${value}';`
)
}
if (!this.resourcePath.endsWith('file-to-transform.ts')) {
return this.callback(null, content)
}
......
const path = require('node:path')
const cssToJsLoader = path.resolve(__dirname, './css-to-js-loader.js')
const postcssLoader = require.resolve('postcss-loader')
const postcssPlugin = path.resolve(
__dirname,
'./postcss-build-dependency-plugin.js'
)
const stylusLoader = require.resolve('stylus-loader')
const stylusPlugin = path.resolve(
__dirname,
'./stylus-build-dependency-plugin.js'
)
const testLoader = './loader.js'
// Check require conditions and application aliases independently in the existing loader chain.
const testLoaders = [
'test-resolution-loader',
'test-resolution-loader/aliased',
testLoader,
]
const postcssLoaders = [
cssToJsLoader,
{
loader: postcssLoader,
options: {
postcssOptions: {
config: false,
plugins: {
[postcssPlugin]: {
dependency: path.resolve(
__dirname,
'./utils/postcss-build-dependency.txt'
),
},
},
},
},
},
]
const stylusLoaders = [
cssToJsLoader,
{
loader: stylusLoader,
options: { stylusOptions: { use: [stylusPlugin] } },
},
]
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: {
turbopackFileSystemCacheForDev: true,
},
turbopack: {
resolveAlias: {
'build-dependency-package': './aliased-build-dependency.js',
'test-resolution-loader/aliased': './resolution-loader/wrong.js',
},
rules: {
'*.ts': {
loaders: testLoaders,
},
'*.postcss-test': {
loaders: postcssLoaders,
as: '*.js',
},
'*.stylus-test': {
loaders: stylusLoaders,
as: '*.js',
},
},
},
webpack: (config) => {
config.resolve.alias['build-dependency-package'] = path.resolve(
__dirname,
'./aliased-build-dependency.js'
)
config.resolve.alias['test-resolution-loader/aliased'] = path.resolve(
__dirname,
'./resolution-loader/wrong.js'
)
config.module.rules.push({
test: /\.ts$/,
use: testLoaders,
})
config.module.rules.push({
test: /\.postcss-test$/,
use: postcssLoaders,
})
config.module.rules.push({
test: /\.stylus-test$/,
use: stylusLoaders,
})
return config
},
}
module.exports = nextConfig
const fs = require('node:fs')
module.exports = function ({ dependency }) {
return {
postcssPlugin: 'build-dependency-test',
Once(root, { result }) {
result.messages.push({ type: 'build-dependency', file: dependency })
const value = fs.readFileSync(dependency, 'utf8').trim()
root.walkDecls((declaration) => {
declaration.value = declaration.value.replace(
'__BUILD_DEPENDENCY__',
value
)
})
},
}
}
module.exports.postcss = true
{
"name": "test-resolution-loader",
"version": "1.0.0",
"exports": {
".": {
"import": "./wrong.js",
"require": "./index.js"
},
"./aliased": "./index.js"
}
}
throw new Error('Application resolution must not be used for webpack loaders')
const stylus = require('stylus')
module.exports = function () {
return function (style) {
style.define(
'buildDependencyValue',
new stylus.nodes.String('stylus-value')
)
}
}
{
"name": "tracking-package",
"version": "1.0.0",
"exports": {
"./value": "./value.js"
}
}
const transitive = require('../tracking-value')
const candidate = require('./candidate')
const packageValue = require('tracking-package/value')
module.exports = `cached: ${transitive}; candidate: ${candidate}; package: ${packageValue}`
import value from './uncached-value.js'
export default value
......@@ -1973,22 +1973,6 @@
"flakey": [],
"runtimeError": false
},
"test/development/app-dir/turbopack-loader-file-dependencies/turbopack-loader-file-dependencies.test.ts": {
"passed": [
"turbopack-loader-file-dependencies should update when a missing dependency is created",
"turbopack-loader-file-dependencies should update when the dependency file changes"
],
"failed": [],
"pending": [
"turbopack-loader-file-dependencies resolves .mjs build dependencies with ESM conditions",
"turbopack-loader-file-dependencies should update when a build dependency changes",
"turbopack-loader-file-dependencies updates when a nested file in a build dependency directory changes",
"turbopack-loader-file-dependencies updates when a package entry added as a build dependency changes",
"turbopack-loader-file-dependencies warns for unsupported build dependency inputs"
],
"flakey": [],
"runtimeError": false
},
"test/development/app-dir/turbopack-reexport-hmr/turbopack-reexport-hmr.test.ts": {
"passed": [
"Turbopack re-export HMR updates forwarded exports and namespace members without stale values"
......@@ -2133,6 +2117,22 @@
"flakey": [],
"runtimeError": false
},
"test/development/app-dir/webpack-loader-file-dependencies/webpack-loader-file-dependencies.test.ts": {
"passed": [
"webpack-loader-file-dependencies should update when a missing dependency is created",
"webpack-loader-file-dependencies should update when the dependency file changes"
],
"failed": [],
"pending": [
"webpack-loader-file-dependencies resolves .mjs build dependencies with ESM conditions",
"webpack-loader-file-dependencies should update when a build dependency changes",
"webpack-loader-file-dependencies updates when a nested file in a build dependency directory changes",
"webpack-loader-file-dependencies updates when a package entry added as a build dependency changes",
"webpack-loader-file-dependencies warns for unsupported build dependency inputs"
],
"flakey": [],
"runtimeError": false
},
"test/development/app-document-add-hmr/app-document-add-hmr.test.ts": {
"passed": [],
"failed": [],
......@@ -46,6 +46,7 @@ turbo-tasks = { workspace = true }
turbo-tasks-env = { workspace = true }
turbo-tasks-fs = { workspace = true }
turbo-tasks-hash = { workspace = true }
turbo-unix-path = { workspace = true }
turbopack-cli-utils = { workspace = true }
turbopack-core = { workspace = true }
turbopack-ecmascript = { workspace = true }
......
......@@ -120,6 +120,7 @@ export default async function transform(
filePaths,
directories,
buildFilePaths,
buildModulePaths: buildFilePaths,
envVariables: getReadEnvVariables(),
})
return {
......
......@@ -6,6 +6,13 @@ import type { Channel as Ipc } from '../types'
import { type StructuredError } from '../error'
import { type StackFrame } from '../compiled/stacktrace-parser'
export type BuildModuleRequest = {
lookupPath: string
request: string
expectedPath: string
bypassExports: boolean
}
export type IpcInfoMessage =
| {
type: 'dependencies'
......@@ -14,6 +21,8 @@ export type IpcInfoMessage =
filePaths?: string[]
buildFilePaths?: string[]
buildDependencyRequests?: Array<[string, boolean]>
buildModulePaths?: string[]
buildModuleRequests?: BuildModuleRequest[]
}
| {
type: 'emittedError'
......@@ -31,6 +40,11 @@ export type IpcInfoMessage =
}
export type IpcRequestMessage =
| {
type: 'resolveLoader'
lookupPaths: string[]
request: string
}
| {
type: 'resolve'
options: any
......
......@@ -559,6 +559,7 @@ impl PostCssTransformedAsset {
context_source_for_issue: self.source,
chunking_context: *chunking_context,
evaluate_context: self.evaluate_context,
build_dependency_context: self.config_tracing_context,
module_graph,
resolve_options_context: None,
asset_context: self.asset_context,
......
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