Skip to content

Commit 3e7daf4

Browse files
committed
Merge branch 'trunk' into guideline-collapsible-card-heading
2 parents d818fe5 + e20ec71 commit 3e7daf4

452 files changed

Lines changed: 25098 additions & 7424 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ engine-strict = true
33
legacy-peer-deps = true
44
prefer-dedupe = true
55
lockfile-version = 3
6+
min-release-age = 1

backport-changelog/7.0/11564.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11564

backport-changelog/7.0/11660.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11660
2+
3+
* https://github.com/WordPress/gutenberg/pull/77675
4+
* https://github.com/WordPress/gutenberg/pull/78053

backport-changelog/7.0/11691.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11691
2+
3+
* https://github.com/WordPress/gutenberg/pull/77865

backport-changelog/7.0/11701.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11701
2+
3+
* https://github.com/WordPress/gutenberg/pull/77897

backport-changelog/7.0/11716.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11716
2+
3+
* https://github.com/WordPress/gutenberg/pull/77980
4+
* https://github.com/WordPress/gutenberg/pull/77986

backport-changelog/7.0/11779.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11779
2+
3+
* https://github.com/WordPress/gutenberg/pull/77521

backport-changelog/7.1/11323.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
https://github.com/WordPress/wordpress-develop/pull/11323
22

33
* https://github.com/WordPress/gutenberg/pull/76731
4+
* https://github.com/WordPress/gutenberg/pull/78128

backport-changelog/7.1/11712.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11712
2+
3+
* https://github.com/WordPress/gutenberg/pull/77911

bin/dev.mjs

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* External dependencies
55
*/
6-
import { spawn } from 'child_process';
6+
import { execSync, spawn } from 'child_process';
77
import { fileURLToPath } from 'url';
88
import path from 'path';
99
import fs from 'fs';
@@ -259,4 +259,60 @@ async function dev() {
259259
}
260260
}
261261

262+
/**
263+
* Warn if a webpack process is watching this checkout. A stale webpack
264+
* dev server (e.g. left over from a previous setup) can clobber the
265+
* non-minified index.js files in build/scripts/ with webpack chunk
266+
* format, breaking the editor when SCRIPT_DEBUG is enabled.
267+
*
268+
* Best-effort and intentionally non-fatal: webpack processes that
269+
* happen to be running for an unrelated project shouldn't block
270+
* `npm run dev`. Match against this checkout's path (with trailing /)
271+
* to avoid false positives on sibling directories.
272+
*/
273+
function checkForConflictingProcesses() {
274+
try {
275+
const ps = execSync( 'ps aux', { encoding: 'utf-8' } );
276+
const repoPathPrefix = ROOT_DIR + '/';
277+
const webpackLines = ps
278+
.split( '\n' )
279+
.filter(
280+
( line ) =>
281+
/webpack/.test( line ) &&
282+
! /grep/.test( line ) &&
283+
! line.includes( String( process.pid ) ) &&
284+
line.includes( repoPathPrefix )
285+
);
286+
287+
if ( webpackLines.length === 0 ) {
288+
return;
289+
}
290+
291+
const pids = webpackLines
292+
.map( ( line ) => line.trim().split( /\s+/ )[ 1 ] )
293+
.filter( Boolean );
294+
295+
console.warn(
296+
`\n⚠️ Found ${ pids.length } webpack process(es) that look like they may be watching this checkout:\n`
297+
);
298+
for ( const line of webpackLines ) {
299+
console.warn( ` ${ line.trim() }` );
300+
}
301+
console.warn(
302+
`\nA stale webpack dev server can overwrite esbuild output in build/scripts/`
303+
);
304+
console.warn(
305+
`with webpack chunk format, breaking the editor when SCRIPT_DEBUG is enabled.`
306+
);
307+
console.warn(
308+
`If things look wrong, kill them with: kill -9 ${ pids.join(
309+
' '
310+
) }\n`
311+
);
312+
} catch {
313+
// If ps fails, just continue — this is a best-effort check.
314+
}
315+
}
316+
317+
checkForConflictingProcesses();
262318
dev();

0 commit comments

Comments
 (0)