<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[55484] trunk/Gruntfile.js: Build/Test Tools: Remove all previously built files when running `clean:files`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/55484">55484</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/55484","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-03-08 01:01:45 +0000 (Wed, 08 Mar 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Remove all previously built files when running `clean:files`.
Cleans old JS, CSS and Webpack files from /src so they are not automatically copied to /build when running `grunt build`. Fixes errors that may be caused by copying outdated files and/or directories to /build.
Props: desrosj, isabel_brison, SergeyBiryukov, ironprogrammer, mukesh27, robinwpdeveloper, razthee007, costdev, peterwilsoncc, azaozz.
Fixes: <a href="https://core.trac.wordpress.org/ticket/47749">#47749</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2023-03-07 20:16:39 UTC (rev 55483)
+++ trunk/Gruntfile.js 2023-03-08 01:01:45 UTC (rev 55484)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-content/plugins/akismet/**',
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-content/themes/twenty*/node_modules/**',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // All built CSS files, in /src or /build.
+ cssFiles = [
+ 'wp-admin/css/*.min.css',
+ 'wp-admin/css/*-rtl*.css',
+ 'wp-includes/css/*.min.css',
+ 'wp-includes/css/*-rtl*.css',
+ 'wp-admin/css/colors/**/*.css',
+ 'wp-includes/blocks/**/*.css',
+ ],
+
+ // All built js files, in /src or /build.
+ jsFiles = [
+ 'wp-admin/js/',
+ 'wp-includes/js/',
+ 'wp-includes/blocks/**/*.js',
+ 'wp-includes/blocks/**/*.js.map',
+ ],
+
+ // All files built by Webpack, in /src or /build.
+ webpackFiles = [
+ 'wp-includes/assets/*',
+ 'wp-includes/css/dist',
+ '!wp-includes/assets/script-loader-packages.min.php',
+ ],
+
+ // Prepend `dir` to `file`, and keep `!` in place.
+ setFilePath = function( dir, file ) {
+ if ( '!' === file.charAt( 0 ) ) {
+ return '!' + dir + file.substring( 1 );
+ }
+
+ return dir + file;
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> changedFiles = {
</span><span class="cx" style="display: block; padding: 0 10px"> php: []
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,30 +141,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clean: {
</span><span class="cx" style="display: block; padding: 0 10px"> plugins: [BUILD_DIR + 'wp-content/plugins'],
</span><span class="cx" style="display: block; padding: 0 10px"> themes: [BUILD_DIR + 'wp-content/themes'],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Clean the files from /build and the JS, CSS, and Webpack files from /src.
</ins><span class="cx" style="display: block; padding: 0 10px"> files: buildFiles.concat( [
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-config.php',
</span><span class="cx" style="display: block; padding: 0 10px"> ] ).map( function( file ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '!' === file.charAt( 0 ) ) {
- return '!' + BUILD_DIR + file.substring( 1 );
- }
- return BUILD_DIR + file;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return setFilePath( BUILD_DIR, file );
+ } ).concat(
+ cssFiles.map( function( file ) {
+ return setFilePath( SOURCE_DIR, file );
+ } )
+ ).concat(
+ jsFiles.map( function( file ) {
+ return setFilePath( SOURCE_DIR, file );
+ } )
+ ).concat(
+ webpackFiles.map( function( file ) {
+ return setFilePath( SOURCE_DIR, file );
+ } )
+ ),
+
+ // Clean built JS, CSS, and Webpack files from either /src or /build.
+ css: cssFiles.map( function( file ) {
+ return setFilePath( WORKING_DIR, file );
</ins><span class="cx" style="display: block; padding: 0 10px"> } ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- css: [
- WORKING_DIR + 'wp-admin/css/*.min.css',
- WORKING_DIR + 'wp-admin/css/*-rtl*.css',
- WORKING_DIR + 'wp-includes/css/*.min.css',
- WORKING_DIR + 'wp-includes/css/*-rtl*.css',
- WORKING_DIR + 'wp-admin/css/colors/**/*.css'
- ],
- js: [
- WORKING_DIR + 'wp-admin/js/',
- WORKING_DIR + 'wp-includes/js/'
- ],
- 'webpack-assets': [
- WORKING_DIR + 'wp-includes/assets/*',
- WORKING_DIR + 'wp-includes/css/dist/',
- '!' + WORKING_DIR + 'wp-includes/assets/script-loader-packages.min.php'
- ],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ js: jsFiles.map( function( file ) {
+ return setFilePath( WORKING_DIR, file );
+ } ),
+ 'webpack-assets': webpackFiles.map( function( file ) {
+ return setFilePath( WORKING_DIR, file );
+ } ),
</ins><span class="cx" style="display: block; padding: 0 10px"> dynamic: {
</span><span class="cx" style="display: block; padding: 0 10px"> dot: true,
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,15 +277,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'suggest*'
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> dest: WORKING_DIR + 'wp-includes/js/jquery/'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
- {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ ].concat(
+ // Copy tinymce.js only when building to /src.
+ WORKING_DIR === SOURCE_DIR ? {
</ins><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: SOURCE_DIR + 'js/_enqueues/vendor/tinymce/',
</span><span class="cx" style="display: block; padding: 0 10px"> src: 'tinymce.js',
</span><span class="cx" style="display: block; padding: 0 10px"> dest: SOURCE_DIR + 'wp-includes/js/tinymce/'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
-
- ]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } : []
+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin-js': {
</span><span class="cx" style="display: block; padding: 0 10px"> files: {
</span></span></pre>
</div>
</div>
</body>
</html>