sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build tools: Allow building WordPress to `src`. 

After the JavaScript reorganization in [43309], it was no longer possible to test WordPress from the `src` folder. That meant a build step was required to test PHP modifications. That is suboptimal as even a simple copy is slower than a web server just serving the new file.

We achieve building to `src` by setting a `WORKING_DIR` constant in the Gruntfile that is `build` by default, but changes to `src` when the `--dev` flag is present on any Grunt command. We provide sensible defaults so some commands, such as copying `version.php`, always build to `build`.

Because testing from `build` is no longer required, we change the messages present in `index.php` and `wp-admin/index.php` to be more broadly about building WordPress.

We also change the webpack config to have more straightforward behavior based on the `buildTarget` argument. It only determines the build target now and has no implicit behavior anymore. `grunt build` still works as it worked before, to make sure that the build server produces the same `wordpress.zip` we are used to.

We do all this instead of a symlink setup because symlinks don't work on every platform.

Props omarreiss, netweb, flixos90, SergeyBiryukov.
Fixes #44492.


git-svn-id: https://develop.svn.wordpress.org/trunk@44359 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Anton Timmermans 2018-12-24 13:28:22 +00:00
parent 29cb0f5ad5
commit d2d7243e80
9 changed files with 345 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -21,6 +21,10 @@ wp-tests-config.php
/jsdoc
/src/wp-includes/js
/src/wp-includes/css/dist
/src/wp-admin/css/*.min.css
/src/wp-admin/css/*-rtl.css
/src/wp-includes/css/*.min.css
/src/wp-admin/css/colors/*/*.css
# Files and folders that get created in wp-content
/src/wp-content/blogs.dir

394
Gruntfile.js
View File

@ -8,6 +8,7 @@ module.exports = function(grunt) {
spawn = require( 'child_process' ).spawnSync,
SOURCE_DIR = 'src/',
BUILD_DIR = 'build/',
WORKING_DIR = grunt.option( 'dev' ) ? SOURCE_DIR : BUILD_DIR,
BANNER_TEXT = '/*! This file is auto-generated */',
autoprefixer = require( 'autoprefixer' ),
nodesass = require( 'node-sass' ),
@ -24,15 +25,7 @@ module.exports = function(grunt) {
'wp-content/plugins/index.php',
'wp-content/plugins/hello.php',
'wp-content/plugins/akismet/**'
],
cleanFiles = [],
changedFiles = {
php: []
};
buildFiles.forEach( function( buildFile ) {
cleanFiles.push( BUILD_DIR + buildFile );
} );
];
if ( 'watch:phpunit' === grunt.cli.tasks[ 0 ] && ! phpUnitWatchGroup ) {
grunt.log.writeln();
@ -81,8 +74,8 @@ module.exports = function(grunt) {
},
colors: {
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
cwd: WORKING_DIR,
dest: WORKING_DIR,
src: [
'wp-admin/css/colors/*/colors.css'
]
@ -96,25 +89,33 @@ module.exports = function(grunt) {
},
files: {
src: [
BUILD_DIR + 'wp-admin/css/*.min.css',
BUILD_DIR + 'wp-includes/css/*.min.css',
BUILD_DIR + 'wp-admin/css/colors/*/*.css'
WORKING_DIR + 'wp-admin/css/*.min.css',
WORKING_DIR + 'wp-includes/css/*.min.css',
WORKING_DIR + 'wp-admin/css/colors/*/*.css'
]
}
},
clean: {
plugins: [BUILD_DIR + 'wp-content/plugins'],
themes: [BUILD_DIR + 'wp-content/themes'],
all: [
cleanFiles,
SOURCE_DIR + 'wp-includes/js/dist',
SOURCE_DIR + 'wp-includes/css/dist'
files: buildFiles.map( function( file ) {
return BUILD_DIR + file;
}),
css: [
WORKING_DIR + 'wp-admin/css/*.min.css',
WORKING_DIR + 'wp-admin/css/*rtl*',
WORKING_DIR + 'wp-includes/css/*.min.css',
WORKING_DIR + 'wp-includes/css/*rtl*',
WORKING_DIR + 'wp-admin/css/colors/**/*.css'
],
js: [
WORKING_DIR + 'wp-admin/js/',
WORKING_DIR + 'wp-includes/js/'
],
js: [BUILD_DIR + 'wp-admin/js/', BUILD_DIR + 'wp-includes/js/'],
dynamic: {
dot: true,
expand: true,
cwd: BUILD_DIR,
cwd: WORKING_DIR,
src: []
},
tinymce: ['<%= concat.tinymce.dest %>'],
@ -125,8 +126,8 @@ module.exports = function(grunt) {
files: [
{
append: 'jQuery.noConflict();',
input: './build/wp-includes/js/jquery/jquery.js',
output: './build/wp-includes/js/jquery/jquery.js'
input: WORKING_DIR + 'wp-includes/js/jquery/jquery.js',
output: WORKING_DIR + 'wp-includes/js/jquery/jquery.js'
}
]
}
@ -153,24 +154,24 @@ module.exports = function(grunt) {
dest: BUILD_DIR
},
{
'build/index.php': ['src/_index.php'],
'build/wp-admin/index.php': ['src/wp-admin/_index.php']
[BUILD_DIR + 'index.php']: ['src/_index.php'],
[BUILD_DIR + 'wp-admin/index.php']: ['src/wp-admin/_index.php']
}
]
},
'npm-packages': {
files: {
'build/wp-includes/js/backbone.js': ['./node_modules/backbone/backbone.js'],
'build/wp-includes/js/hoverIntent.js': ['./node_modules/jquery-hoverintent/jquery.hoverIntent.js'],
'build/wp-includes/js/imagesloaded.min.js': ['./node_modules/imagesloaded/imagesloaded.pkgd.min.js'],
'build/wp-includes/js/jquery/jquery-migrate.js': ['./node_modules/jquery-migrate/dist/jquery-migrate.js'],
'build/wp-includes/js/jquery/jquery-migrate.min.js': ['./node_modules/jquery-migrate/dist/jquery-migrate.min.js'],
'build/wp-includes/js/jquery/jquery.form.js': ['./node_modules/jquery-form/src/jquery.form.js'],
'build/wp-includes/js/jquery/jquery.form.min.js': ['./node_modules/jquery-form/dist/jquery.form.min.js'],
'build/wp-includes/js/jquery/jquery.js': ['./node_modules/jquery/dist/jquery.min.js'],
'build/wp-includes/js/masonry.min.js': ['./node_modules/masonry-layout/dist/masonry.pkgd.min.js'],
'build/wp-includes/js/twemoji.js': ['./node_modules/twemoji/2/twemoji.js'],
'build/wp-includes/js/underscore.min.js': ['./node_modules/underscore/underscore-min.js']
[ WORKING_DIR + 'wp-includes/js/backbone.js' ]: [ './node_modules/backbone/backbone.js' ],
[ WORKING_DIR + 'wp-includes/js/hoverIntent.js' ]: [ './node_modules/jquery-hoverintent/jquery.hoverIntent.js' ],
[ WORKING_DIR + 'wp-includes/js/imagesloaded.min.js' ]: [ './node_modules/imagesloaded/imagesloaded.pkgd.min.js' ],
[ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.js' ],
[ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.min.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.min.js' ],
[ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ],
[ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.min.js' ]: [ './node_modules/jquery-form/dist/jquery.form.min.js' ],
[ WORKING_DIR + 'wp-includes/js/jquery/jquery.js' ]: [ './node_modules/jquery/dist/jquery.min.js' ],
[ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ],
[ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/2/twemoji.js' ],
[ WORKING_DIR + 'wp-includes/js/underscore.min.js' ]: [ './node_modules/underscore/underscore-min.js' ]
}
},
'vendor-js': {
@ -188,7 +189,7 @@ module.exports = function(grunt) {
'!jquery/jquery.masonry.js',
'!tinymce/tinymce.js'
],
dest: 'build/wp-includes/js/'
dest: WORKING_DIR + 'wp-includes/js/'
},
{
expand: true,
@ -197,7 +198,7 @@ module.exports = function(grunt) {
'farbtastic.js',
'iris.min.js'
],
dest: 'build/wp-admin/js/'
dest: WORKING_DIR + 'wp-admin/js/'
},
{
expand: true,
@ -205,102 +206,102 @@ module.exports = function(grunt) {
src: [
'suggest*'
],
dest: 'build/wp-includes/js/jquery/'
dest: WORKING_DIR + 'wp-includes/js/jquery/'
}
]
},
'admin-js': {
files: {
'build/wp-admin/js/accordion.js': ['./src/js/_enqueues/lib/accordion.js'],
'build/wp-admin/js/code-editor.js': ['./src/js/_enqueues/wp/code-editor.js'],
'build/wp-admin/js/color-picker.js': ['./src/js/_enqueues/lib/color-picker.js'],
'build/wp-admin/js/comment.js': ['./src/js/_enqueues/admin/comment.js'],
'build/wp-admin/js/common.js': ['./src/js/_enqueues/admin/common.js'],
'build/wp-admin/js/custom-background.js': ['./src/js/_enqueues/admin/custom-background.js'],
'build/wp-admin/js/custom-header.js': ['./src/js/_enqueues/admin/custom-header.js'],
'build/wp-admin/js/customize-controls.js': ['./src/js/_enqueues/wp/customize/controls.js'],
'build/wp-admin/js/customize-nav-menus.js': ['./src/js/_enqueues/wp/customize/nav-menus.js'],
'build/wp-admin/js/customize-widgets.js': ['./src/js/_enqueues/wp/customize/widgets.js'],
'build/wp-admin/js/dashboard.js': ['./src/js/_enqueues/wp/dashboard.js'],
'build/wp-admin/js/edit-comments.js': ['./src/js/_enqueues/admin/edit-comments.js'],
'build/wp-admin/js/editor-expand.js': ['./src/js/_enqueues/wp/editor/dfw.js'],
'build/wp-admin/js/editor.js': ['./src/js/_enqueues/wp/editor/base.js'],
'build/wp-admin/js/gallery.js': ['./src/js/_enqueues/lib/gallery.js'],
'build/wp-admin/js/image-edit.js': ['./src/js/_enqueues/lib/image-edit.js'],
'build/wp-admin/js/inline-edit-post.js': ['./src/js/_enqueues/admin/inline-edit-post.js'],
'build/wp-admin/js/inline-edit-tax.js': ['./src/js/_enqueues/admin/inline-edit-tax.js'],
'build/wp-admin/js/language-chooser.js': ['./src/js/_enqueues/lib/language-chooser.js'],
'build/wp-admin/js/link.js': ['./src/js/_enqueues/admin/link.js'],
'build/wp-admin/js/media-gallery.js': ['./src/js/_enqueues/deprecated/media-gallery.js'],
'build/wp-admin/js/media-upload.js': ['./src/js/_enqueues/admin/media-upload.js'],
'build/wp-admin/js/media.js': ['./src/js/_enqueues/admin/media.js'],
'build/wp-admin/js/nav-menu.js': ['./src/js/_enqueues/lib/nav-menu.js'],
'build/wp-admin/js/password-strength-meter.js': ['./src/js/_enqueues/wp/password-strength-meter.js'],
'build/wp-admin/js/plugin-install.js': ['./src/js/_enqueues/admin/plugin-install.js'],
'build/wp-admin/js/post.js': ['./src/js/_enqueues/admin/post.js'],
'build/wp-admin/js/postbox.js': ['./src/js/_enqueues/admin/postbox.js'],
'build/wp-admin/js/revisions.js': ['./src/js/_enqueues/wp/revisions.js'],
'build/wp-admin/js/set-post-thumbnail.js': ['./src/js/_enqueues/admin/set-post-thumbnail.js'],
'build/wp-admin/js/svg-painter.js': ['./src/js/_enqueues/wp/svg-painter.js'],
'build/wp-admin/js/tags-box.js': ['./src/js/_enqueues/admin/tags-box.js'],
'build/wp-admin/js/tags-suggest.js': ['./src/js/_enqueues/admin/tags-suggest.js'],
'build/wp-admin/js/tags.js': ['./src/js/_enqueues/admin/tags.js'],
'build/wp-admin/js/theme-plugin-editor.js': ['./src/js/_enqueues/wp/theme-plugin-editor.js'],
'build/wp-admin/js/theme.js': ['./src/js/_enqueues/wp/theme.js'],
'build/wp-admin/js/updates.js': ['./src/js/_enqueues/wp/updates.js'],
'build/wp-admin/js/user-profile.js': ['./src/js/_enqueues/admin/user-profile.js'],
'build/wp-admin/js/user-suggest.js': ['./src/js/_enqueues/lib/user-suggest.js'],
'build/wp-admin/js/widgets/custom-html-widgets.js': ['./src/js/_enqueues/wp/widgets/custom-html.js'],
'build/wp-admin/js/widgets/media-audio-widget.js': ['./src/js/_enqueues/wp/widgets/media-audio.js'],
'build/wp-admin/js/widgets/media-gallery-widget.js': ['./src/js/_enqueues/wp/widgets/media-gallery.js'],
'build/wp-admin/js/widgets/media-image-widget.js': ['./src/js/_enqueues/wp/widgets/media-image.js'],
'build/wp-admin/js/widgets/media-video-widget.js': ['./src/js/_enqueues/wp/widgets/media-video.js'],
'build/wp-admin/js/widgets/media-widgets.js': ['./src/js/_enqueues/wp/widgets/media.js'],
'build/wp-admin/js/widgets/text-widgets.js': ['./src/js/_enqueues/wp/widgets/text.js'],
'build/wp-admin/js/widgets.js': ['./src/js/_enqueues/admin/widgets.js'],
'build/wp-admin/js/word-count.js': ['./src/js/_enqueues/wp/utils/word-count.js'],
'build/wp-admin/js/wp-fullscreen-stub.js': ['./src/js/_enqueues/deprecated/fullscreen-stub.js'],
'build/wp-admin/js/xfn.js': ['./src/js/_enqueues/admin/xfn.js']
[ WORKING_DIR + 'wp-admin/js/accordion.js' ]: [ './src/js/_enqueues/lib/accordion.js' ],
[ WORKING_DIR + 'wp-admin/js/code-editor.js' ]: [ './src/js/_enqueues/wp/code-editor.js' ],
[ WORKING_DIR + 'wp-admin/js/color-picker.js' ]: [ './src/js/_enqueues/lib/color-picker.js' ],
[ WORKING_DIR + 'wp-admin/js/comment.js' ]: [ './src/js/_enqueues/admin/comment.js' ],
[ WORKING_DIR + 'wp-admin/js/common.js' ]: [ './src/js/_enqueues/admin/common.js' ],
[ WORKING_DIR + 'wp-admin/js/custom-background.js' ]: [ './src/js/_enqueues/admin/custom-background.js' ],
[ WORKING_DIR + 'wp-admin/js/custom-header.js' ]: [ './src/js/_enqueues/admin/custom-header.js' ],
[ WORKING_DIR + 'wp-admin/js/customize-controls.js' ]: [ './src/js/_enqueues/wp/customize/controls.js' ],
[ WORKING_DIR + 'wp-admin/js/customize-nav-menus.js' ]: [ './src/js/_enqueues/wp/customize/nav-menus.js' ],
[ WORKING_DIR + 'wp-admin/js/customize-widgets.js' ]: [ './src/js/_enqueues/wp/customize/widgets.js' ],
[ WORKING_DIR + 'wp-admin/js/dashboard.js' ]: [ './src/js/_enqueues/wp/dashboard.js' ],
[ WORKING_DIR + 'wp-admin/js/edit-comments.js' ]: [ './src/js/_enqueues/admin/edit-comments.js' ],
[ WORKING_DIR + 'wp-admin/js/editor-expand.js' ]: [ './src/js/_enqueues/wp/editor/dfw.js' ],
[ WORKING_DIR + 'wp-admin/js/editor.js' ]: [ './src/js/_enqueues/wp/editor/base.js' ],
[ WORKING_DIR + 'wp-admin/js/gallery.js' ]: [ './src/js/_enqueues/lib/gallery.js' ],
[ WORKING_DIR + 'wp-admin/js/image-edit.js' ]: [ './src/js/_enqueues/lib/image-edit.js' ],
[ WORKING_DIR + 'wp-admin/js/inline-edit-post.js' ]: [ './src/js/_enqueues/admin/inline-edit-post.js' ],
[ WORKING_DIR + 'wp-admin/js/inline-edit-tax.js' ]: [ './src/js/_enqueues/admin/inline-edit-tax.js' ],
[ WORKING_DIR + 'wp-admin/js/language-chooser.js' ]: [ './src/js/_enqueues/lib/language-chooser.js' ],
[ WORKING_DIR + 'wp-admin/js/link.js' ]: [ './src/js/_enqueues/admin/link.js' ],
[ WORKING_DIR + 'wp-admin/js/media-gallery.js' ]: [ './src/js/_enqueues/deprecated/media-gallery.js' ],
[ WORKING_DIR + 'wp-admin/js/media-upload.js' ]: [ './src/js/_enqueues/admin/media-upload.js' ],
[ WORKING_DIR + 'wp-admin/js/media.js' ]: [ './src/js/_enqueues/admin/media.js' ],
[ WORKING_DIR + 'wp-admin/js/nav-menu.js' ]: [ './src/js/_enqueues/lib/nav-menu.js' ],
[ WORKING_DIR + 'wp-admin/js/password-strength-meter.js' ]: [ './src/js/_enqueues/wp/password-strength-meter.js' ],
[ WORKING_DIR + 'wp-admin/js/plugin-install.js' ]: [ './src/js/_enqueues/admin/plugin-install.js' ],
[ WORKING_DIR + 'wp-admin/js/post.js' ]: [ './src/js/_enqueues/admin/post.js' ],
[ WORKING_DIR + 'wp-admin/js/postbox.js' ]: [ './src/js/_enqueues/admin/postbox.js' ],
[ WORKING_DIR + 'wp-admin/js/revisions.js' ]: [ './src/js/_enqueues/wp/revisions.js' ],
[ WORKING_DIR + 'wp-admin/js/set-post-thumbnail.js' ]: [ './src/js/_enqueues/admin/set-post-thumbnail.js' ],
[ WORKING_DIR + 'wp-admin/js/svg-painter.js' ]: [ './src/js/_enqueues/wp/svg-painter.js' ],
[ WORKING_DIR + 'wp-admin/js/tags-box.js' ]: [ './src/js/_enqueues/admin/tags-box.js' ],
[ WORKING_DIR + 'wp-admin/js/tags-suggest.js' ]: [ './src/js/_enqueues/admin/tags-suggest.js' ],
[ WORKING_DIR + 'wp-admin/js/tags.js' ]: [ './src/js/_enqueues/admin/tags.js' ],
[ WORKING_DIR + 'wp-admin/js/theme-plugin-editor.js' ]: [ './src/js/_enqueues/wp/theme-plugin-editor.js' ],
[ WORKING_DIR + 'wp-admin/js/theme.js' ]: [ './src/js/_enqueues/wp/theme.js' ],
[ WORKING_DIR + 'wp-admin/js/updates.js' ]: [ './src/js/_enqueues/wp/updates.js' ],
[ WORKING_DIR + 'wp-admin/js/user-profile.js' ]: [ './src/js/_enqueues/admin/user-profile.js' ],
[ WORKING_DIR + 'wp-admin/js/user-suggest.js' ]: [ './src/js/_enqueues/lib/user-suggest.js' ],
[ WORKING_DIR + 'wp-admin/js/widgets/custom-html-widgets.js' ]: [ './src/js/_enqueues/wp/widgets/custom-html.js' ],
[ WORKING_DIR + 'wp-admin/js/widgets/media-audio-widget.js' ]: [ './src/js/_enqueues/wp/widgets/media-audio.js' ],
[ WORKING_DIR + 'wp-admin/js/widgets/media-gallery-widget.js' ]: [ './src/js/_enqueues/wp/widgets/media-gallery.js' ],
[ WORKING_DIR + 'wp-admin/js/widgets/media-image-widget.js' ]: [ './src/js/_enqueues/wp/widgets/media-image.js' ],
[ WORKING_DIR + 'wp-admin/js/widgets/media-video-widget.js' ]: [ './src/js/_enqueues/wp/widgets/media-video.js' ],
[ WORKING_DIR + 'wp-admin/js/widgets/media-widgets.js' ]: [ './src/js/_enqueues/wp/widgets/media.js' ],
[ WORKING_DIR + 'wp-admin/js/widgets/text-widgets.js' ]: [ './src/js/_enqueues/wp/widgets/text.js' ],
[ WORKING_DIR + 'wp-admin/js/widgets.js' ]: [ './src/js/_enqueues/admin/widgets.js' ],
[ WORKING_DIR + 'wp-admin/js/word-count.js' ]: [ './src/js/_enqueues/wp/utils/word-count.js' ],
[ WORKING_DIR + 'wp-admin/js/wp-fullscreen-stub.js' ]: [ './src/js/_enqueues/deprecated/fullscreen-stub.js' ],
[ WORKING_DIR + 'wp-admin/js/xfn.js' ]: [ './src/js/_enqueues/admin/xfn.js' ]
}
},
'includes-js': {
files: {
'build/wp-includes/js/admin-bar.js': ['./src/js/_enqueues/lib/admin-bar.js'],
'build/wp-includes/js/api-request.js': ['./src/js/_enqueues/wp/api-request.js'],
'build/wp-includes/js/autosave.js': ['./src/js/_enqueues/wp/autosave.js'],
'build/wp-includes/js/comment-reply.js': ['./src/js/_enqueues/lib/comment-reply.js'],
'build/wp-includes/js/customize-base.js': ['./src/js/_enqueues/wp/customize/base.js'],
'build/wp-includes/js/customize-loader.js': ['./src/js/_enqueues/wp/customize/loader.js'],
'build/wp-includes/js/customize-models.js': ['./src/js/_enqueues/wp/customize/models.js'],
'build/wp-includes/js/customize-preview-nav-menus.js': ['./src/js/_enqueues/wp/customize/preview-nav-menus.js'],
'build/wp-includes/js/customize-preview-widgets.js': ['./src/js/_enqueues/wp/customize/preview-widgets.js'],
'build/wp-includes/js/customize-preview.js': ['./src/js/_enqueues/wp/customize/preview.js'],
'build/wp-includes/js/customize-selective-refresh.js': ['./src/js/_enqueues/wp/customize/selective-refresh.js'],
'build/wp-includes/js/customize-views.js': ['./src/js/_enqueues/wp/customize/views.js'],
'build/wp-includes/js/heartbeat.js': ['./src/js/_enqueues/wp/heartbeat.js'],
'build/wp-includes/js/mce-view.js': ['./src/js/_enqueues/wp/mce-view.js'],
'build/wp-includes/js/media-editor.js': ['./src/js/_enqueues/wp/media/editor.js'],
'build/wp-includes/js/quicktags.js': ['./src/js/_enqueues/lib/quicktags.js'],
'build/wp-includes/js/shortcode.js': ['./src/js/_enqueues/wp/shortcode.js'],
'build/wp-includes/js/utils.js': ['./src/js/_enqueues/lib/cookies.js'],
'build/wp-includes/js/wp-a11y.js': ['./src/js/_enqueues/wp/a11y.js'],
'build/wp-includes/js/wp-ajax-response.js': ['./src/js/_enqueues/lib/ajax-response.js'],
'build/wp-includes/js/wp-api.js': ['./src/js/_enqueues/wp/api.js'],
'build/wp-includes/js/wp-auth-check.js': ['./src/js/_enqueues/lib/auth-check.js'],
'build/wp-includes/js/wp-backbone.js': ['./src/js/_enqueues/wp/backbone.js'],
'build/wp-includes/js/wp-custom-header.js': ['./src/js/_enqueues/wp/custom-header.js'],
'build/wp-includes/js/wp-embed-template.js': ['./src/js/_enqueues/lib/embed-template.js'],
'build/wp-includes/js/wp-embed.js': ['./src/js/_enqueues/wp/embed.js'],
'build/wp-includes/js/wp-emoji-loader.js': ['./src/js/_enqueues/lib/emoji-loader.js'],
'build/wp-includes/js/wp-emoji.js': ['./src/js/_enqueues/wp/emoji.js'],
'build/wp-includes/js/wp-list-revisions.js': ['./src/js/_enqueues/lib/list-revisions.js'],
'build/wp-includes/js/wp-lists.js': ['./src/js/_enqueues/lib/lists.js'],
'build/wp-includes/js/wp-pointer.js': ['./src/js/_enqueues/lib/pointer.js'],
'build/wp-includes/js/wp-sanitize.js': ['./src/js/_enqueues/wp/sanitize.js'],
'build/wp-includes/js/wp-util.js': ['./src/js/_enqueues/wp/util.js'],
'build/wp-includes/js/wpdialog.js': ['./src/js/_enqueues/lib/dialog.js'],
'build/wp-includes/js/wplink.js': ['./src/js/_enqueues/lib/link.js'],
'build/wp-includes/js/zxcvbn-async.js': ['./src/js/_enqueues/lib/zxcvbn-async.js']
[ WORKING_DIR + 'wp-includes/js/admin-bar.js' ]: [ './src/js/_enqueues/lib/admin-bar.js' ],
[ WORKING_DIR + 'wp-includes/js/api-request.js' ]: [ './src/js/_enqueues/wp/api-request.js' ],
[ WORKING_DIR + 'wp-includes/js/autosave.js' ]: [ './src/js/_enqueues/wp/autosave.js' ],
[ WORKING_DIR + 'wp-includes/js/comment-reply.js' ]: [ './src/js/_enqueues/lib/comment-reply.js' ],
[ WORKING_DIR + 'wp-includes/js/customize-base.js' ]: [ './src/js/_enqueues/wp/customize/base.js' ],
[ WORKING_DIR + 'wp-includes/js/customize-loader.js' ]: [ './src/js/_enqueues/wp/customize/loader.js' ],
[ WORKING_DIR + 'wp-includes/js/customize-models.js' ]: [ './src/js/_enqueues/wp/customize/models.js' ],
[ WORKING_DIR + 'wp-includes/js/customize-preview-nav-menus.js' ]: [ './src/js/_enqueues/wp/customize/preview-nav-menus.js' ],
[ WORKING_DIR + 'wp-includes/js/customize-preview-widgets.js' ]: [ './src/js/_enqueues/wp/customize/preview-widgets.js' ],
[ WORKING_DIR + 'wp-includes/js/customize-preview.js' ]: [ './src/js/_enqueues/wp/customize/preview.js' ],
[ WORKING_DIR + 'wp-includes/js/customize-selective-refresh.js' ]: [ './src/js/_enqueues/wp/customize/selective-refresh.js' ],
[ WORKING_DIR + 'wp-includes/js/customize-views.js' ]: [ './src/js/_enqueues/wp/customize/views.js' ],
[ WORKING_DIR + 'wp-includes/js/heartbeat.js' ]: [ './src/js/_enqueues/wp/heartbeat.js' ],
[ WORKING_DIR + 'wp-includes/js/mce-view.js' ]: [ './src/js/_enqueues/wp/mce-view.js' ],
[ WORKING_DIR + 'wp-includes/js/media-editor.js' ]: [ './src/js/_enqueues/wp/media/editor.js' ],
[ WORKING_DIR + 'wp-includes/js/quicktags.js' ]: [ './src/js/_enqueues/lib/quicktags.js' ],
[ WORKING_DIR + 'wp-includes/js/shortcode.js' ]: [ './src/js/_enqueues/wp/shortcode.js' ],
[ WORKING_DIR + 'wp-includes/js/utils.js' ]: [ './src/js/_enqueues/lib/cookies.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-a11y.js' ]: [ './src/js/_enqueues/wp/a11y.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-ajax-response.js' ]: [ './src/js/_enqueues/lib/ajax-response.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-api.js' ]: [ './src/js/_enqueues/wp/api.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-auth-check.js' ]: [ './src/js/_enqueues/lib/auth-check.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-backbone.js' ]: [ './src/js/_enqueues/wp/backbone.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-custom-header.js' ]: [ './src/js/_enqueues/wp/custom-header.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-embed-template.js' ]: [ './src/js/_enqueues/lib/embed-template.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-embed.js' ]: [ './src/js/_enqueues/wp/embed.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-emoji-loader.js' ]: [ './src/js/_enqueues/lib/emoji-loader.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-emoji.js' ]: [ './src/js/_enqueues/wp/emoji.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-list-revisions.js' ]: [ './src/js/_enqueues/lib/list-revisions.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-lists.js' ]: [ './src/js/_enqueues/lib/lists.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-pointer.js' ]: [ './src/js/_enqueues/lib/pointer.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-sanitize.js' ]: [ './src/js/_enqueues/wp/sanitize.js' ],
[ WORKING_DIR + 'wp-includes/js/wp-util.js' ]: [ './src/js/_enqueues/wp/util.js' ],
[ WORKING_DIR + 'wp-includes/js/wpdialog.js' ]: [ './src/js/_enqueues/lib/dialog.js' ],
[ WORKING_DIR + 'wp-includes/js/wplink.js' ]: [ './src/js/_enqueues/lib/link.js' ],
[ WORKING_DIR + 'wp-includes/js/zxcvbn-async.js' ]: [ './src/js/_enqueues/lib/zxcvbn-async.js' ]
}
},
'wp-admin-css-compat-rtl': {
@ -310,7 +311,7 @@ module.exports = function(grunt) {
}
},
src: SOURCE_DIR + 'wp-admin/css/wp-admin.css',
dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css'
dest: WORKING_DIR + 'wp-admin/css/wp-admin-rtl.css'
},
'wp-admin-css-compat-min': {
options: {
@ -321,11 +322,11 @@ module.exports = function(grunt) {
files: [
{
src: SOURCE_DIR + 'wp-admin/css/wp-admin.css',
dest: BUILD_DIR + 'wp-admin/css/wp-admin.min.css'
dest: WORKING_DIR + 'wp-admin/css/wp-admin.min.css'
},
{
src: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css',
dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.min.css'
src: WORKING_DIR + 'wp-admin/css/wp-admin-rtl.css',
dest: WORKING_DIR + 'wp-admin/css/wp-admin-rtl.min.css'
}
]
},
@ -350,7 +351,7 @@ module.exports = function(grunt) {
dot: true,
expand: true,
cwd: SOURCE_DIR,
dest: BUILD_DIR,
dest: WORKING_DIR,
src: []
},
'dynamic-js': {
@ -373,7 +374,7 @@ module.exports = function(grunt) {
colors: {
expand: true,
cwd: SOURCE_DIR,
dest: BUILD_DIR,
dest: WORKING_DIR,
ext: '.css',
src: ['wp-admin/css/colors/*/colors.scss'],
options: {
@ -388,8 +389,8 @@ module.exports = function(grunt) {
},
core: {
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
cwd: WORKING_DIR,
dest: WORKING_DIR,
ext: '.min.css',
src: [
'wp-admin/css/*.css',
@ -398,19 +399,10 @@ module.exports = function(grunt) {
'wp-includes/js/mediaelement/wp-mediaelement.css'
]
},
dist: {
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
ext: '.min.css',
src: [
'wp-includes/css/dist/*/*.css'
]
},
rtl: {
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
cwd: WORKING_DIR,
dest: WORKING_DIR,
ext: '.min.css',
src: [
'wp-admin/css/*-rtl.css',
@ -420,8 +412,8 @@ module.exports = function(grunt) {
},
colors: {
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
cwd: WORKING_DIR,
dest: WORKING_DIR,
ext: '.min.css',
src: [
'wp-admin/css/colors/*/*.css'
@ -484,7 +476,7 @@ module.exports = function(grunt) {
core: {
expand: true,
cwd: SOURCE_DIR,
dest: BUILD_DIR,
dest: WORKING_DIR,
ext: '-rtl.css',
src: [
'wp-admin/css/*.css',
@ -498,8 +490,8 @@ module.exports = function(grunt) {
},
colors: {
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
cwd: WORKING_DIR,
dest: WORKING_DIR,
ext: '-rtl.css',
src: [
'wp-admin/css/colors/*/colors.css'
@ -508,7 +500,7 @@ module.exports = function(grunt) {
dynamic: {
expand: true,
cwd: SOURCE_DIR,
dest: BUILD_DIR,
dest: WORKING_DIR,
ext: '-rtl.css',
src: []
}
@ -662,8 +654,8 @@ module.exports = function(grunt) {
},
core: {
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
cwd: WORKING_DIR,
dest: WORKING_DIR,
ext: '.min.js',
src: [
'wp-admin/js/**/*.js',
@ -690,8 +682,8 @@ module.exports = function(grunt) {
}
},
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
cwd: WORKING_DIR,
dest: WORKING_DIR,
ext: '.min.js',
src: ['wp-includes/js/wp-embed.js']
},
@ -702,26 +694,25 @@ module.exports = function(grunt) {
},
expand: true,
cwd: 'node_modules/jquery-ui/ui/',
dest: BUILD_DIR + 'wp-includes/js/jquery/ui/',
dest: WORKING_DIR + 'wp-includes/js/jquery/ui/',
ext: '.min.js',
src: ['*.js']
},
imgareaselect: {
src: BUILD_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.js',
dest: BUILD_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.min.js'
src: WORKING_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.js',
dest: WORKING_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.min.js'
},
dynamic: {
expand: true,
cwd: BUILD_DIR,
dest: BUILD_DIR,
cwd: WORKING_DIR,
dest: WORKING_DIR,
ext: '.min.js',
src: []
}
},
webpack: {
prod: webpackConfig( { environment: 'production' } ),
devProdTarget: webpackConfig( { environment: 'development', forceBuildTarget: 'build/wp-includes' } ),
dev: webpackConfig( { environment: 'development' } ),
prod: webpackConfig( { environment: 'production', buildTarget: WORKING_DIR } ),
dev: webpackConfig( { environment: 'development', buildTarget: WORKING_DIR } ),
watch: webpackConfig( { environment: 'development', watch: true } )
},
concat: {
@ -729,28 +720,28 @@ module.exports = function(grunt) {
options: {
separator: '\n',
process: function( src, filepath ) {
return '// Source: ' + filepath.replace( BUILD_DIR, '' ) + '\n' + src;
return '// Source: ' + filepath.replace( WORKING_DIR, '' ) + '\n' + src;
}
},
src: [
BUILD_DIR + 'wp-includes/js/tinymce/tinymce.min.js',
BUILD_DIR + 'wp-includes/js/tinymce/themes/modern/theme.min.js',
BUILD_DIR + 'wp-includes/js/tinymce/plugins/*/plugin.min.js'
WORKING_DIR + 'wp-includes/js/tinymce/tinymce.min.js',
WORKING_DIR + 'wp-includes/js/tinymce/themes/modern/theme.min.js',
WORKING_DIR + 'wp-includes/js/tinymce/plugins/*/plugin.min.js'
],
dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js'
dest: WORKING_DIR + 'wp-includes/js/tinymce/wp-tinymce.js'
},
emoji: {
options: {
separator: '\n',
process: function( src, filepath ) {
return '// Source: ' + filepath.replace( BUILD_DIR, '' ) + '\n' + src;
return '// Source: ' + filepath.replace( WORKING_DIR, '' ) + '\n' + src;
}
},
src: [
BUILD_DIR + 'wp-includes/js/twemoji.min.js',
BUILD_DIR + 'wp-includes/js/wp-emoji.min.js'
WORKING_DIR + 'wp-includes/js/twemoji.min.js',
WORKING_DIR + 'wp-includes/js/wp-emoji.min.js'
],
dest: BUILD_DIR + 'wp-includes/js/wp-emoji-release.min.js'
dest: WORKING_DIR + 'wp-includes/js/wp-emoji-release.min.js'
}
},
compress: {
@ -760,7 +751,7 @@ module.exports = function(grunt) {
level: 9
},
src: '<%= concat.tinymce.dest %>',
dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz'
dest: WORKING_DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz'
}
},
patch:{
@ -961,9 +952,9 @@ module.exports = function(grunt) {
build: {
files: {
src: [
BUILD_DIR + 'wp-{admin,includes}/**/*.js',
BUILD_DIR + 'wp-content/themes/twenty*/**/*.js',
'!' + BUILD_DIR + 'wp-includes/js/dist/vendor/*.js'
WORKING_DIR + 'wp-{admin,includes}/**/*.js',
WORKING_DIR + 'wp-content/themes/twenty*/**/*.js',
'!' + WORKING_DIR + 'wp-includes/js/dist/vendor/*.js',
]
}
},
@ -1344,6 +1335,7 @@ module.exports = function(grunt) {
grunt.registerTask( 'build:js', [
'clean:js',
'webpack:prod',
'webpack:dev',
'copy:js',
'file_append',
@ -1353,35 +1345,41 @@ module.exports = function(grunt) {
'jsvalidate:build'
] );
grunt.registerTask( 'copy:all', [
'copy:files',
grunt.registerTask( 'build:css', [
'clean:css',
'copy:wp-admin-css-compat-rtl',
'copy:wp-admin-css-compat-min',
'copy:version',
'copy:js'
] );
grunt.registerTask( 'build', [
'clean:all',
'copy:all',
'file_append',
'cssmin:core',
'colors',
'rtl',
'cssmin:rtl',
'cssmin:colors',
'uglify:all',
'build:tinymce',
'concat:emoji',
'includes:emoji',
'includes:embed',
'usebanner',
'webpack:prod',
'webpack:devProdTarget',
'cssmin:dist',
'jsvalidate:build'
'usebanner'
] );
grunt.registerTask( 'build:files', [
'clean:files',
'copy:files',
'copy:version',
] );
grunt.registerTask( 'build', function() {
if ( grunt.option( 'dev' ) ) {
grunt.task.run( [
'build:js',
'build:css',
] );
} else {
grunt.task.run( [
'build:files',
'build:js',
'build:css',
'includes:emoji',
'includes:embed',
] );
}
} );
grunt.registerTask( 'prerelease', [
'format:php:error',
'precommit:php',
@ -1469,7 +1467,7 @@ module.exports = function(grunt) {
if ( minimatch.match( config.src, relative, {} ) ) {
dest = config.dest + relative;
src = [ path.relative( BUILD_DIR, dest ) ];
src = [ path.relative( WORKING_DIR, dest ) ];
files[ dest ] = [ filepath ];
break;
}
@ -1485,7 +1483,7 @@ module.exports = function(grunt) {
// If a file in the mapping matches then set the variables for our dynamic tasks.
if ( dest && configs.hasOwnProperty( dest ) && configs[ dest ][0] === './' + filepath ) {
files[ dest ] = configs[ dest ];
src = [ path.relative( BUILD_DIR, dest ) ];
src = [ path.relative( WORKING_DIR, dest ) ];
break;
}
}
@ -1523,11 +1521,11 @@ module.exports = function(grunt) {
// For javascript also minify and validate the changed file.
if ( target === 'js-enqueues' ) {
grunt.config( [ 'uglify', 'dynamic', 'src' ], src );
grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return BUILD_DIR + dir; } ) );
grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return WORKING_DIR + dir; } ) );
}
// For webpack only validate the file, minification is handled by webpack itself.
if ( target === 'js-webpack' ) {
grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return BUILD_DIR + dir; } ) );
grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return WORKING_DIR + dir; } ) );
}
// For css run the rtl task on just the changed file.
if ( target === 'rtl' ) {

14
package-lock.json generated
View File

@ -2508,7 +2508,7 @@
},
"browserify-rsa": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
"resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"dev": true,
"requires": {
@ -2841,7 +2841,7 @@
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
@ -5049,7 +5049,7 @@
},
"events": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
"resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
"dev": true
},
@ -11120,7 +11120,7 @@
},
"onetime": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
"dev": true
},
@ -11200,7 +11200,7 @@
},
"os-locale": {
"version": "1.4.0",
"resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true,
"requires": {
@ -12997,7 +12997,7 @@
},
"regjsgen": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
"resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
},
"regjsparser": {
@ -13579,7 +13579,7 @@
"dependencies": {
"source-map": {
"version": "0.4.4",
"resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"dev": true,
"requires": {

45
src/index.php
View File

@ -1,8 +1,8 @@
<?php
/**
* Note: this file exists only to remind developers to run WordPress from the
* build directory. For the real index.php that gets built and boots WordPress,
* Note: this file exists only to remind developers to build the assets.
* For the real index.php that gets built and boots WordPress,
* please refer to _index.php.
*/
@ -11,6 +11,11 @@ if ( ! defined( 'ABSPATH' ) ) {
define( 'ABSPATH', dirname( __FILE__ ) . '/' );
}
if ( file_exists( ABSPATH . 'wp-includes/js/dist/edit-post.js' ) ) {
require_once ABSPATH . '/_index.php';
return;
}
define( 'WPINC', 'wp-includes' );
require_once( ABSPATH . WPINC . '/load.php' );
@ -26,18 +31,34 @@ wp_load_translations_early();
// Die with an error message
$die = sprintf(
/* translators: %1$s: WordPress, %2$s: src, %3$s: build */
__( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
'WordPress',
'<code>src</code>',
'<code>build</code>'
) . '</p>';
$die .= '<p>' . sprintf(
/* translators: %s: WordPress */
__( 'You can build %s by running:' ),
/* translators: %1$s: WordPress */
__( 'You are running %1$s without JavaScript and CSS files. These need to be built.' ),
'WordPress'
) . '</p>';
$die .= '<p><code>npm install && grunt build</code></p>';
$die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running ');
$die .= '<code style="color: green;">npm install</code>.</p>';
$die .= '<ul>';
$die .= '<li>' . sprintf(
/* translators: %s: WordPress */
__( 'To build %s while developing run:' ),
'WordPress'
) . '<br /><br />';
$die .= '<code style="color: green;">grunt build --dev</code></li>';
$die .= '<li>' . sprintf(
__( 'To build files automatically when changing the source files run:' ),
'WordPress'
) . '<br /><br />';
$die .= '<code style="color: green;">grunt watch</code></li>';
$die .= '<li>' . sprintf(
__( 'To create a production build of %s run:' ),
'WordPress'
) . '<br /><br />';
$die .= '<code style="color: green;">grunt build</code></li>';
$die .= '</ul>';
$die .= '<p>' . sprintf(
/* translators: %1$s: NPM URL, %2$s: Grunt URL */
__( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),

57
src/wp-admin/index.php
View File

@ -1,11 +1,16 @@
<?php
/**
* Note: this file exists only to remind developers to run WordPress from the
* build directory. For the real wp-admin/index.php that gets built and boots
* the WordPress admin, please refer to wp-admin/_index.php.
* Note: this file exists only to remind developers to build the assets.
* For the real wp-admin/index.php that gets built and boots WordPress,
* please refer to wp-admin/_index.php.
*/
if ( file_exists( dirname( __FILE__ ) . '/../wp-includes/js/dist/edit-post.js' ) ) {
require_once dirname( __FILE__ ) . '/_index.php';
return;
}
/** Define ABSPATH as this file's directory */
if ( ! defined( 'ABSPATH' ) ) {
define( 'ABSPATH', dirname( __FILE__ ) . '/../' );
@ -26,24 +31,40 @@ wp_load_translations_early();
// Die with an error message
$die = sprintf(
/* translators: %1$s: WordPress, %2$s: src, %3$s: build */
__( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ),
'WordPress',
'<code>src</code>',
'<code>build</code>'
) . '</p>';
$die .= '<p>' . sprintf(
/* translators: %s: WordPress */
__( 'You can build %s by running:' ),
/* translators: %1$s: WordPress */
__( 'You are running %1$s without JavaScript and CSS files. These need to be built.' ),
'WordPress'
) . '</p>';
$die .= '<p><code>npm install && grunt build</code></p>';
$die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running ');
$die .= '<code style="color: green;">npm install</code>.</p>';
$die .= '<ul>';
$die .= '<li>' . sprintf(
/* translators: %s: WordPress */
__( 'To build %s while developing run:' ),
'WordPress'
) . '<br /><br />';
$die .= '<code style="color: green;">grunt build --dev</code></li>';
$die .= '<li>' . sprintf(
__( 'To build files automatically when changing the source files run:' ),
'WordPress'
) . '<br /><br />';
$die .= '<code style="color: green;">grunt watch</code></li>';
$die .= '<li>' . sprintf(
__( 'To create a production build of %s run:' ),
'WordPress'
) . '<br /><br />';
$die .= '<code style="color: green;">grunt build</code></li>';
$die .= '</ul>';
$die .= '<p>' . sprintf(
/* translators: %1$s: NPM URL, %2$s: Grunt URL */
__( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
'https://www.npmjs.com/',
'https://gruntjs.com/',
__( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
) . '</p>';
__( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
'https://www.npmjs.com/',
'https://gruntjs.com/',
__( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
) . '</p>';
wp_die( $die, __( 'WordPress &rsaquo; Error' ) );

85
src/wp-includes/class-wp-block-parser.php
View File

@ -63,10 +63,10 @@ class WP_Block_Parser_Block {
public $innerContent;
function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
$this->blockName = $name;
$this->attrs = $attrs;
$this->innerBlocks = $innerBlocks;
$this->innerHTML = $innerHTML;
$this->blockName = $name;
$this->attrs = $attrs;
$this->innerBlocks = $innerBlocks;
$this->innerHTML = $innerHTML;
$this->innerContent = $innerContent;
}
}
@ -269,17 +269,15 @@ class WP_Block_Parser {
*/
if ( 0 === $stack_depth ) {
if ( isset( $leading_html_start ) ) {
$this->output[] = (array) self::freeform(
substr(
$this->document,
$leading_html_start,
$start_offset - $leading_html_start
)
);
$this->output[] = (array) self::freeform( substr(
$this->document,
$leading_html_start,
$start_offset - $leading_html_start
) );
}
$this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() );
$this->offset = $start_offset + $token_length;
$this->offset = $start_offset + $token_length;
return true;
}
@ -294,16 +292,13 @@ class WP_Block_Parser {
case 'block-opener':
// track all newly-opened blocks on the stack
array_push(
$this->stack,
new WP_Block_Parser_Frame(
new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
$start_offset,
$token_length,
$start_offset + $token_length,
$leading_html_start
)
);
array_push( $this->stack, new WP_Block_Parser_Frame(
new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
$start_offset,
$token_length,
$start_offset + $token_length,
$leading_html_start
) );
$this->offset = $start_offset + $token_length;
return true;
@ -334,11 +329,11 @@ class WP_Block_Parser {
* otherwise we're nested and we have to close out the current
* block and add it as a new innerBlock to the parent
*/
$stack_top = array_pop( $this->stack );
$html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
$stack_top->block->innerHTML .= $html;
$stack_top = array_pop( $this->stack );
$html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
$stack_top->block->innerHTML .= $html;
$stack_top->block->innerContent[] = $html;
$stack_top->prev_offset = $start_offset + $token_length;
$stack_top->prev_offset = $start_offset + $token_length;
$this->add_inner_block(
$stack_top->block,
@ -396,22 +391,22 @@ class WP_Block_Parser {
return array( 'no-more-tokens', null, null, null, null );
}
list( $match, $started_at ) = $matches[0];
list( $match, $started_at ) = $matches[ 0 ];
$length = strlen( $match );
$is_closer = isset( $matches['closer'] ) && -1 !== $matches['closer'][1];
$is_void = isset( $matches['void'] ) && -1 !== $matches['void'][1];
$namespace = $matches['namespace'];
$namespace = ( isset( $namespace ) && -1 !== $namespace[1] ) ? $namespace[0] : 'core/';
$name = $namespace . $matches['name'][0];
$has_attrs = isset( $matches['attrs'] ) && -1 !== $matches['attrs'][1];
$is_closer = isset( $matches[ 'closer' ] ) && -1 !== $matches[ 'closer' ][ 1 ];
$is_void = isset( $matches[ 'void' ] ) && -1 !== $matches[ 'void' ][ 1 ];
$namespace = $matches[ 'namespace' ];
$namespace = ( isset( $namespace ) && -1 !== $namespace[ 1 ] ) ? $namespace[ 0 ] : 'core/';
$name = $namespace . $matches[ 'name' ][ 0 ];
$has_attrs = isset( $matches[ 'attrs' ] ) && -1 !== $matches[ 'attrs' ][ 1 ];
/*
* Fun fact! It's not trivial in PHP to create "an empty associative array" since all arrays
* are associative arrays. If we use `array()` we get a JSON `[]`
*/
$attrs = $has_attrs
? json_decode( $matches['attrs'][0], /* as-associative */ true )
? json_decode( $matches[ 'attrs' ][ 0 ], /* as-associative */ true )
: $this->empty_attrs;
/*
@ -476,17 +471,17 @@ class WP_Block_Parser {
* @param int|null $last_offset last byte offset into document if continuing form earlier output
*/
function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
$parent = $this->stack[ count( $this->stack ) - 1 ];
$parent = $this->stack[ count( $this->stack ) - 1 ];
$parent->block->innerBlocks[] = (array) $block;
$html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
$html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
if ( ! empty( $html ) ) {
$parent->block->innerHTML .= $html;
$parent->block->innerHTML .= $html;
$parent->block->innerContent[] = $html;
}
$parent->block->innerContent[] = null;
$parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length;
$parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length;
}
/**
@ -505,18 +500,16 @@ class WP_Block_Parser {
: substr( $this->document, $prev_offset );
if ( ! empty( $html ) ) {
$stack_top->block->innerHTML .= $html;
$stack_top->block->innerHTML .= $html;
$stack_top->block->innerContent[] = $html;
}
if ( isset( $stack_top->leading_html_start ) ) {
$this->output[] = (array) self::freeform(
substr(
$this->document,
$stack_top->leading_html_start,
$stack_top->token_start - $stack_top->leading_html_start
)
);
$this->output[] = (array) self::freeform( substr(
$this->document,
$stack_top->leading_html_start,
$stack_top->token_start - $stack_top->leading_html_start
) );
}
$this->output[] = (array) $stack_top->block;

26
tools/webpack/media.js
View File

@ -1,23 +1,21 @@
const UglifyJsPlugin = require( 'uglifyjs-webpack-plugin' );
var path = require( 'path' ),
admin_files = {},
include_files = {};
include_files = {
'build/wp-includes/js/media-audiovideo.js': ['./src/js/_enqueues/wp/media/audiovideo.js'],
'build/wp-includes/js/media-audiovideo.min.js': ['./src/js/_enqueues/wp/media/audiovideo.js'],
'build/wp-includes/js/media-grid.js': ['./src/js/_enqueues/wp/media/grid.js'],
'build/wp-includes/js/media-grid.min.js': ['./src/js/_enqueues/wp/media/grid.js'],
'build/wp-includes/js/media-models.js': ['./src/js/_enqueues/wp/media/models.js'],
'build/wp-includes/js/media-models.min.js': ['./src/js/_enqueues/wp/media/models.js'],
'build/wp-includes/js/media-views.js': ['./src/js/_enqueues/wp/media/views.js'],
'build/wp-includes/js/media-views.min.js': ['./src/js/_enqueues/wp/media/views.js'],
};
admin_files = {};
const baseDir = path.join( __dirname, '../../' );
module.exports = function( env = { environment: 'production', watch: false } ) {
module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
const include_files = {
[ env.buildTarget + 'wp-includes/js/media-audiovideo.js' ]: ['./src/js/_enqueues/wp/media/audiovideo.js'],
[ env.buildTarget + 'wp-includes/js/media-audiovideo.min.js' ]: ['./src/js/_enqueues/wp/media/audiovideo.js'],
[ env.buildTarget + 'wp-includes/js/media-grid.js' ]: ['./src/js/_enqueues/wp/media/grid.js'],
[ env.buildTarget + 'wp-includes/js/media-grid.min.js' ]: ['./src/js/_enqueues/wp/media/grid.js'],
[ env.buildTarget + 'wp-includes/js/media-models.js' ]: ['./src/js/_enqueues/wp/media/models.js'],
[ env.buildTarget + 'wp-includes/js/media-models.min.js' ]: ['./src/js/_enqueues/wp/media/models.js'],
[ env.buildTarget + 'wp-includes/js/media-views.js' ]: ['./src/js/_enqueues/wp/media/views.js'],
[ env.buildTarget + 'wp-includes/js/media-views.min.js' ]: ['./src/js/_enqueues/wp/media/views.js'],
};
const mediaConfig = {
mode: "production",

16
tools/webpack/packages.js
View File

@ -49,10 +49,11 @@ function mapVendorCopies( vendors, buildTarget ) {
} ) );
}
module.exports = function( env = { environment: 'production', watch: false, forceBuildTarget: false } ) {
module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
const mode = env.environment;
const suffix = mode === 'production' ? '.min' : '';
const buildTarget = env.forceBuildTarget ? env.forceBuildTarget : ( mode === 'production' ? 'build' : 'src' ) + '/wp-includes';
let buildTarget = env.buildTarget ? env.buildTarget : ( mode === 'production' ? 'build' : 'src' );
buildTarget = buildTarget + '/wp-includes';
const packages = [
'api-fetch',
@ -165,7 +166,7 @@ module.exports = function( env = { environment: 'production', watch: false, forc
to: join( baseDir, `${ buildTarget }/css/dist/${ packageName }/` ),
flatten: true,
transform: ( content ) => {
if ( config.mode === 'production' && ! env.forceBuildTarget ) {
if ( mode === 'production' ) {
return postcss( [
require( 'cssnano' )( {
preset: 'default',
@ -176,6 +177,13 @@ module.exports = function( env = { environment: 'production', watch: false, forc
}
return content;
},
transformPath: ( targetPath, sourcePath ) => {
if ( mode === 'production' ) {
return targetPath.replace( /\.css$/, '.min.css' );
}
return targetPath;
}
} ) );
@ -268,7 +276,7 @@ module.exports = function( env = { environment: 'production', watch: false, forc
config.devtool = process.env.SOURCEMAP || 'source-map';
}
if ( env.forceBuildTarget ) {
if ( mode === 'development' && env.buildTarget === 'build/' ) {
delete config.devtool;
config.mode = 'production';
config.optimization = {

6
webpack.config.js
View File

@ -1,13 +1,13 @@
const mediaConfig = require( './tools/webpack/media' );
const packagesConfig = require( './tools/webpack/packages' );
module.exports = function( env = { environment: "production", watch: false, forceBuildTarget: false } ) {
module.exports = function( env = { environment: "production", watch: false, buildTarget: false } ) {
if ( ! env.watch ) {
env.watch = false;
}
if ( ! env.forceBuildTarget ) {
env.forceBuildTarget = false;
if ( ! env.buildTarget ) {
env.buildTarget = ( env.mode === 'production' ? 'build/' : 'src/' );
}
const config = [