Changeset 61679

Timestamp:

02/18/2026 08:12:50 PM (2 weeks ago)

Author:

youknowriad

Message:

Build: Fix Gutenberg build base-url argument passing across platforms.

When building Gutenberg, the --base-url argument was forwarded through
npm run build --, which passes arguments through a shell layer. The
argument value includes_url( 'build/' ) contains spaces, parentheses,
and single quotes that could be mangled by shell parsing on some
platforms, causing the generated constants.php to lose the trailing
slash in build_url.

This invokes node bin/build.mjs directly instead, bypassing npm's
shell forwarding entirely. The argument is passed as a single array
element via spawn, so it arrives intact regardless of platform.

Props youknowriad, desrosj.
See #64656.

File:

• trunk/tools/gutenberg/build-gutenberg.js (modified) (1 diff)

trunk/tools/gutenberg/build-gutenberg.js

@@ -142 +142 @@
 
     try {
-        // On Windows, shell mode is used and needs the argument wrapped in quotes
-        // On Unix, arguments are passed directly without shell parsing
-        const baseUrlArg =
-            process.platform === 'win32'
-                ? '--base-url="includes_url( \'build/\' )"'
-                : "--base-url=includes_url( 'build/' )";
-
-        await exec( 'npm', [ 'run', 'build', '--', '--skip-types', baseUrlArg ], {
+        // Invoke the build script directly with node instead of going through
+        // `npm run build --` to avoid shell argument mangling of the base-url
+        // value (which contains spaces, parentheses, and single quotes).
+        // The PATH is extended with node_modules/.bin so that bin commands
+        // like `wp-build` are found, matching what npm would normally provide.
+        const binPath = path.join( gutenbergDir, 'node_modules', '.bin' );
+        await exec( 'node', [
+            'bin/build.mjs',
+            '--skip-types',
+            "--base-url=includes_url( 'build/' )",
+        ], {
             cwd: gutenbergDir,
+            env: {
+                ...process.env,
+                PATH: binPath + path.delimiter + process.env.PATH,
+            },
         } );