From 50a19bb6e76013822f6221b5a479a6d08aa3586c Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Thu, 21 Feb 2019 21:22:50 +0000 Subject: [PATCH] Script Loader: Load fakejshint as jshint due to "good and evil". Backports [44762] from trunk to 5.1. Devreviewed by Pento. Originally fixed in [42547]. Broken in [44163]. We've been here before. I recognize that tree. Fixes #46299 Built from https://develop.svn.wordpress.org/branches/5.1@44763 git-svn-id: http://core.svn.wordpress.org/branches/5.1@44595 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/script-loader.php | 3 ++- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index b02dfdda27..9e75261959 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -1256,7 +1256,8 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' ); $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); - $scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5.999' ); + $scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.0' ); + $scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 1cfb0c8713..eb353a2664 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-RC2-44761'; +$wp_version = '5.1-RC2-44763'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.