Changeset 45445

Timestamp:

05/26/2019 07:34:24 PM (6 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Remove the dependency on a globally installed Grunt.

The existing "grunt": "grunt" script in package.json allows for the use of npm run grunt ... which uses the local grunt binary in the project's node_modules.

Fixes #47380

Location:

trunk

Files:

• .travis.yml (modified) (2 diffs)
• appveyor.yml (modified) (2 diffs)
• package.json (modified) (3 diffs)
• src/index.php (modified) (2 diffs)
• src/wp-includes/embed.php (modified) (3 diffs)
• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/includes/bootstrap.php (modified) (1 diff)
• tests/phpunit/tests/oembed/template.php (modified) (1 diff)

trunk/.travis.yml

@@ -90 +90 @@
 - node --version
 - nvm install 10.13.0
-- npm install -g grunt-cli
 - npm install
 - npm prune
@@ -102 +101 @@
 - phpunit --version
 - curl --version
-- grunt --version
 - git --version
 - svn --version
 - locale -a
-script: grunt $WP_TRAVISCI
+script: npm run grunt $WP_TRAVISCI
 after_script:
 - |

trunk/appveyor.yml

@@ -12 +12 @@
   - ps: Install-Product node $env:nodejs_version
   - npm install npm -g
-  - npm install grunt-cli -g
   - npm install
 
@@ -20 +19 @@
 
 build_script:
-  - cmd: "grunt build"
+  - cmd: "npm run build"
 
 test: off

trunk/package.json

@@ -20 +20 @@
         "copy-webpack-plugin": "^4.6.0",
         "cssnano": "4.1.8",
-        "grunt": "~1.0.3",
+        "grunt": "1.0.4",
         "grunt-banner": "^0.6.0",
         "grunt-contrib-clean": "~2.0.0",
@@ -47 +47 @@
         "node-sass": "~4.12.0",
         "source-map-loader": "^0.2.4",
-        "uglify-js": "^3.4.9",
+        "uglify-js": "3.5.15",
         "uglifyjs-webpack-plugin": "2.1.1",
         "webpack": "4.29.2",
@@ -114 +114 @@
     },
     "scripts": {
+        "build": "grunt build",
+        "dev": "grunt build --dev",
+        "test": "grunt test",
+        "watch": "grunt watch",
         "grunt": "grunt"
     }

trunk/src/index.php

@@ -35 +35 @@
 $die .= '<p>' . 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.' ),
+    __( 'Before running any build tasks you need to make sure the dependencies are installed. You can install these by running %s.' ),
     '<code style="color: green;">npm install</code>'
 ) . '</p>';
@@ -41 +41 @@
 $die .= '<ul>';
 $die .= '<li>' . __( 'To build WordPress while developing, run:' ) . '<br /><br />';
-$die .= '<code style="color: green;">grunt build --dev</code></li>';
+$die .= '<code style="color: green;">npm run dev</code></li>';
 $die .= '<li>' . __( 'To build files automatically when changing the source files, run:' ) . '<br /><br />';
-$die .= '<code style="color: green;">grunt watch</code></li>';
+$die .= '<code style="color: green;">npm run watch</code></li>';
 $die .= '<li>' . __( 'To create a production build of WordPress, run:' ) . '<br /><br />';
-$die .= '<code style="color: green;">grunt build</code></li>';
+$die .= '<code style="color: green;">npm run build</code></li>';
 $die .= '</ul>';
 
 $die .= '<p>' . sprintf(
-    /* translators: 1: NPM URL, 2: Grunt URL, 3: Handbook 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>.' ),
+    /* translators: 1: NPM URL, 2: Handbook URL */
+    __( 'This requires <a href="%1$s">NPM</a>. <a href="%2$s">Read more about setting up your local development environment</a>.' ),
     'https://www.npmjs.com/get-npm',
-    'https://gruntjs.com/getting-started',
     __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
 ) . '</p>';

trunk/src/wp-includes/embed.php

@@ -447 +447 @@
         /*
          * If you're looking at a src version of this file, you'll see an "include"
-         * statement below. This is used by the `grunt build` process to directly
+         * statement below. This is used by the `npm run build` process to directly
          * include a minified version of wp-embed.js, instead of using the
          * file_get_contents() method from above.
@@ -1009 +1009 @@
         /*
          * If you're looking at a src version of this file, you'll see an "include"
-         * statement below. This is used by the `grunt build` process to directly
+         * statement below. This is used by the `npm run build` process to directly
          * include a minified version of wp-oembed-embed.css, instead of using the
          * readfile() method from above.
@@ -1040 +1040 @@
         /*
          * If you're looking at a src version of this file, you'll see an "include"
-         * statement below. This is used by the `grunt build` process to directly
+         * statement below. This is used by the `npm run build` process to directly
          * include a minified version of wp-embed-template.js, instead of using the
          * readfile() method from above.

trunk/src/wp-includes/formatting.php

@@ -5521 +5521 @@
         /*
          * If you're looking at a src version of this file, you'll see an "include"
-         * statement below. This is used by the `grunt build` process to directly
+         * statement below. This is used by the `npm run build` process to directly
          * include a minified version of wp-emoji-loader.js, instead of using the
          * readfile() method from above.
@@ -5737 +5737 @@
  *
  * These arrays are automatically built from the regex in twemoji.js - if they need to be updated,
- * you should update the regex there, then run the `grunt precommit:emoji` job.
+ * you should update the regex there, then run the `npm run grunt precommit:emoji` job.
  *
  * @since 4.9.0

trunk/tests/phpunit/includes/bootstrap.php

@@ -48 +48 @@
 
 if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) {
-    echo "ERROR: The /build/ directory is missing! Please run `grunt build` prior to running PHPUnit.\n";
+    echo "ERROR: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
     exit( 1 );
 }

trunk/tests/phpunit/tests/oembed/template.php

@@ -310 +310 @@
      * In many cases, this file will not exist; in those cases, we simply skip the test.
      *
-     * So when would it be run? We have Travis CI run `grunt test` which then runs, in order,
+     * So when would it be run? We have Travis CI run `npm run test` which then runs, in order,
      * `qunit:compiled` (which runs the build) and then `phpunit`. Thus, this test will at least be
      * run during continuous integration.