From b7794e63ce60c112a9fef6bce04bc957ceb60b47 Mon Sep 17 00:00:00 2001
From: Gary Pendergast
Date: Mon, 21 Jan 2019 04:59:55 +0000
Subject: [PATCH] Dev Tools: Load the `wp-admin` build instructions from `src`.
This de-duplicates the content, so it only needs to be modified in one place.
Additionally, we now link to the NPM/Grunt install guides on the build instructions page.
Props pento, ocean90.
Fixes #43732.
git-svn-id: https://develop.svn.wordpress.org/trunk@44664 602fd350-edb4-49c9-b593-d223f7449a82
---
src/index.php | 4 ++--
src/wp-admin/index.php | 46 +-----------------------------------------
2 files changed, 3 insertions(+), 47 deletions(-)
diff --git a/src/index.php b/src/index.php
index 379d063f60..b7a223bead 100644
--- a/src/index.php
+++ b/src/index.php
@@ -50,8 +50,8 @@ $die .= '';
$die .= '' . sprintf(
/* translators: 1: NPM URL, 2: Grunt URL, 3: Handbook URL */
__( 'This requires NPM and Grunt. Read more about setting up your local development environment.' ),
- 'https://www.npmjs.com/',
- 'https://gruntjs.com/',
+ 'https://www.npmjs.com/get-npm',
+ 'https://gruntjs.com/getting-started',
__( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
) . '
';
diff --git a/src/wp-admin/index.php b/src/wp-admin/index.php
index 190b85db2f..6db93a9df4 100644
--- a/src/wp-admin/index.php
+++ b/src/wp-admin/index.php
@@ -11,48 +11,4 @@ if ( file_exists( dirname( __FILE__ ) . '/../wp-includes/js/dist/edit-post.js' )
return;
}
-/** Define ABSPATH as this file's directory */
-if ( ! defined( 'ABSPATH' ) ) {
- define( 'ABSPATH', dirname( __FILE__ ) . '/../' );
-}
-
-define( 'WPINC', 'wp-includes' );
-require_once( ABSPATH . WPINC . '/load.php' );
-
-// Standardize $_SERVER variables across setups.
-wp_fix_server_vars();
-
-require_once( ABSPATH . WPINC . '/functions.php' );
-define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
-require_once( ABSPATH . WPINC . '/version.php' );
-
-wp_check_php_mysql_versions();
-wp_load_translations_early();
-
-// Die with an error message
-$die = __( 'You are running WordPress without JavaScript and CSS files. These need to be built.' ) . '
';
-
-$die .= '' . sprintf(
- /* translators: %s: npm install */
- __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running %s.' ),
- 'npm install
'
-) . '
';
-
-$die .= '';
-$die .= '- ' . __( 'To build WordPress while developing, run:' ) . '
';
-$die .= 'grunt build --dev
';
-$die .= '- ' . __( 'To build files automatically when changing the source files, run:' ) . '
';
-$die .= 'grunt watch
';
-$die .= '- ' . __( 'To create a production build of WordPress, run:' ) . '
';
-$die .= 'grunt build
';
-$die .= '
';
-
-$die .= '' . sprintf(
- /* translators: 1: NPM URL, 2: Grunt URL, 3: Handbook URL */
- __( 'This requires NPM and Grunt. Read more about setting up your local development environment.' ),
- 'https://www.npmjs.com/',
- 'https://gruntjs.com/',
- __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
-) . '
';
-
-wp_die( $die, __( 'WordPress › Error' ) );
+require_once dirname( dirname( __FILE__ ) ) . '/index.php';