Skip to content

Commit

Permalink
Use watchpack version directly
Browse files Browse the repository at this point in the history
  • Loading branch information
timneutkens committed Jun 5, 2023
1 parent 04988f7 commit 4ea9575
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 12 deletions.
3 changes: 2 additions & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
"caniuse-lite": "^1.0.30001406",
"postcss": "8.4.14",
"styled-jsx": "5.1.1",
"zod": "3.21.4"
"zod": "3.21.4",
"watchpack": "2.4.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/cli/next-dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { findPagesDir } from '../lib/find-pages-dir'
import { findRootDir } from '../lib/find-root'
import { fileExists, FileType } from '../lib/file-exists'
import { getNpxCommand } from '../lib/helpers/get-npx-command'
import Watchpack from 'next/dist/compiled/watchpack'
import Watchpack from 'watchpack'
import stripAnsi from 'next/dist/compiled/strip-ansi'
import { getPossibleInstrumentationHookFilenames } from '../build/worker'

Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/server/dev/next-dev-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import fs from 'fs'
import { Worker } from 'next/dist/compiled/jest-worker'
import findUp from 'next/dist/compiled/find-up'
import { join as pathJoin, relative, resolve as pathResolve, sep } from 'path'
import Watchpack from 'next/dist/compiled/watchpack'
import Watchpack from 'watchpack'
import { ampValidation } from '../../build/output'
import {
INSTRUMENTATION_HOOK_FILENAME,
Expand Down
9 changes: 1 addition & 8 deletions packages/next/taskfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -591,13 +591,7 @@ export async function ncc_next_font(task, opts) {
}

// eslint-disable-next-line camelcase
externals['watchpack'] = 'next/dist/compiled/watchpack'
export async function ncc_watchpack(task, opts) {
await task
.source(relative(__dirname, require.resolve('watchpack')))
.ncc({ packageName: 'watchpack', externals, minify: false })
.target('src/compiled/watchpack')
}
externals['watchpack'] = 'watchpack'

// eslint-disable-next-line camelcase
externals['jest-worker'] = 'next/dist/compiled/jest-worker'
Expand Down Expand Up @@ -2195,7 +2189,6 @@ export async function ncc(task, opts) {
.parallel(
[
'ncc_node_html_parser',
'ncc_watchpack',
'ncc_chalk',
'ncc_napirs_triples',
'ncc_p_limit',
Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4ea9575

Please sign in to comment.