5.0

.editorconfig

@@ -13,9 +13,12 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab
 
-[{package.json,*.yml}]
+[*.yml]
 indent_style = space
 indent_size = 2
 
+[*.md]
+trim_trailing_whitespace = false
+
 [{*.txt,wp-config-sample.php}]
 end_of_line = crlf

.gitignore

@@ -7,6 +7,8 @@ wp-tests-config.php
 
 # Files and folders related to build/test tools
 /phpunit.xml
+/.phpcs.xml
+/phpcs.xml
 /tests/phpunit/data/plugins/wordpress-importer
 /tests/phpunit/data/.trac-ticket-cache*
 /tests/qunit/compiled.html
@@ -17,6 +19,10 @@ wp-tests-config.php
 /tests/phpunit/build
 /wp-cli.local.yml
 /jsdoc
+/vendor
+/src/wp-includes/js/dist
+/src/wp-includes/css/dist
+/packages
 
 # Files and folders that get created in wp-content
 /src/wp-content/blogs.dir
@@ -57,5 +63,3 @@ wp-tests-config.php
 *.patch
 *.diff
 .svn
-
-vendor

.nvmrc

@@ -0,0 +1 @@
+lts/*

.travis.yml

@@ -12,6 +12,7 @@ env:
     - WP_TRAVISCI=travis:phpunit
 matrix:
   include:
+  - php: 7.3
   - php: 7.1
     env: WP_TRAVISCI=travis:js
   - php: 7.2
@@ -30,6 +31,7 @@ matrix:
   - php: nightly
   allow_failures:
   - php: nightly
+  - php: 7.3
 before_install:
 - |
   if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
@@ -38,7 +40,7 @@ before_install:
       sed -i "s/youremptytestdbnamehere/wordpress_tests/" wp-tests-config.php
       sed -i "s/yourusernamehere/root/" wp-tests-config.php
       sed -i "s/yourpasswordhere//" wp-tests-config.php
-      svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
+      travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
   fi
 - |
   if [[ "$WP_TRAVIS_OBJECT_CACHE" == "true" ]]; then
@@ -63,13 +65,13 @@ before_script:
   # Install the specified version of PHPUnit depending on the PHP version:
   if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
     case "$TRAVIS_PHP_VERSION" in
-      7.2|7.1|7.0|nightly)
+      7.3|7.2|7.1|7.0|nightly)
         echo "Using PHPUnit 6.x"
-        composer global require "phpunit/phpunit:^6"
+        travis_retry composer global require "phpunit/phpunit:^6"
         ;;
       5.6|5.5|5.4|5.3)
         echo "Using PHPUnit 4.x"
-        composer global require "phpunit/phpunit:^4"
+        travis_retry composer global require "phpunit/phpunit:^4"
         ;;
       5.2)
         # Do nothing, use default PHPUnit 3.6.x
@@ -83,7 +85,7 @@ before_script:
   fi
 - npm --version
 - node --version
-- nvm install 6.9.1
+- nvm install 8.9.3
 - npm install -g grunt-cli
 - npm install
 - npm prune

Gruntfile.js

@@ -1,7 +1,7 @@
 /* jshint node:true */
 /* globals Set */
-var webpackConfig = require( './webpack.config.prod' );
-var webpackDevConfig = require( './webpack.config.dev' );
+var webpackConfig = require( './webpack.config' );
+var execSync = require( 'child_process' ).execSync;
 
 module.exports = function(grunt) {
 	var path = require('path'),
@@ -12,6 +12,8 @@ module.exports = function(grunt) {
  		BANNER_TEXT = '/*! This file is auto-generated */',
 		autoprefixer = require( 'autoprefixer' );
 
+	var packageJson = grunt.file.readJSON( 'package.json' );
+
 	// Load tasks.
 	require('matchdep').filterDev(['grunt-*', '!grunt-legacy-util']).forEach( grunt.loadNpmTasks );
 	// Load legacy utils
@@ -544,11 +546,16 @@ module.exports = function(grunt) {
 				},
 				src: SOURCE_DIR + 'wp-includes/js/jquery/jquery.masonry.js',
 				dest: SOURCE_DIR + 'wp-includes/js/jquery/jquery.masonry.min.js'
+			},
+			imgareaselect: {
+				src: SOURCE_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.js',
+				dest: SOURCE_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.min.js'
 			}
 		},
 		webpack: {
-			prod: webpackConfig,
-			dev: webpackDevConfig
+			prod: webpackConfig( { environment: 'production' } ),
+			dev: webpackConfig( { environment: 'development' } ),
+			watch: webpackConfig( { environment: 'development', watch: true } )
 		},
 		concat: {
 			tinymce: {
@@ -599,7 +606,8 @@ module.exports = function(grunt) {
 				files: {
 					src: [
 						BUILD_DIR + 'wp-{admin,includes}/**/*.js',
-						BUILD_DIR + 'wp-content/themes/twenty*/**/*.js'
+						BUILD_DIR + 'wp-content/themes/twenty*/**/*.js',
+						'!' + BUILD_DIR + 'wp-includes/js/dist/vendor/*.js'
 					]
 				}
 			}
@@ -717,7 +725,6 @@ module.exports = function(grunt) {
 			config: {
 				files: [
 					'Gruntfile.js',
-					'webpack-dev.config.js',
 					'webpack.config.js'
 				]
 			},
@@ -780,6 +787,24 @@ module.exports = function(grunt) {
 		'qunit:compiled'
 	] );
 
+	grunt.registerTask( 'download-packages', function() {
+		var directory = 'packages';
+		var version = packageJson.wordpress.packagesVersion;
+
+		if ( ! grunt.file.exists( directory  ) ) {
+			// Clone gutenberg
+			execSync( 'git clone https://github.com/WordPress/gutenberg.git ' + directory, { stdio: 'inherit' } );
+		}
+
+		execSync( 'git fetch --tags', { cwd: directory, stdio: 'inherit' } );
+
+		// Make sure we are on the correct version of Gutenberg.
+		execSync( 'git reset --hard ' + version, { cwd: directory, stdio: 'inherit' } );
+
+		// Install Gutenberg dependencies and build the packages.
+		execSync( 'npm install', { cwd: directory, stdio: 'inherit' } );
+	} );
+
 	grunt.renameTask( 'watch', '_watch' );
 
 	grunt.registerTask( 'watch', function() {
@@ -799,6 +824,7 @@ module.exports = function(grunt) {
 		'webpack:prod',
 		'jshint:corejs',
 		'uglify:masonry',
+		'uglify:imgareaselect',
 		'qunit:compiled'
 	] );
 
@@ -931,6 +957,8 @@ module.exports = function(grunt) {
 		'includes:emoji',
 		'includes:embed',
 		'usebanner',
+		'webpack:prod',
+		'webpack:dev',
 		'jsvalidate:build'
 	] );
 

composer.json

@@ -0,0 +1,20 @@
+{
+	"name": "wordpress/wordpress",
+	"license": "GPL-2.0-or-later",
+	"description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
+	"homepage": "https://wordpress.org",
+	"keywords": [
+		"blog", "cms", "wordpress", "wp"
+	],
+	"support": {
+		"issues": "https://core.trac.wordpress.org/"
+	},
+	"require-dev": {
+		"dealerdirect/phpcodesniffer-composer-installer": "~0.4.4",
+		"wp-coding-standards/wpcs": "~1.0.0"
+	},
+	"scripts": {
+		"format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source",
+		"lint": "phpcs --standard=phpcs.xml.dist --report-summary --report-source"
+	}
+}