Changeset 44159 for trunk/src/wp-includes

Timestamp:

12/14/2018 04:10:26 AM (7 years ago)

Author:

pento

Message:

Build Tools: Copy package JavaScript and CSS into wp-includes.

• grunt webpack:dev now copies packages JS into /src/wp-includes/js/dist, and CSS into /src/wp-includes/css/dist.
• grunt webpack:prod does the same, but into /build instead of /src.
• grunt build now runs the webpack:prod task.

Merges [43760] from the 5.0 branch to trunk.

Props atimmer, pento.
Fixes #45119.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes (modified) (1 prop)
• src/wp-includes/css (modified) (1 prop)
• src/wp-includes/script-loader.php (modified) (4 diffs)

trunk/src/wp-includes/script-loader.php

@@ -97 +97 @@
         }
 
-        $path = "/js/dist/vendor/$handle$dev_suffix.js";
+        $path = "/wp-includes/js/dist/vendor/$handle$dev_suffix.js";
 
         $scripts->add( $handle, $path, $dependencies, false, 1 );
@@ -337 +337 @@
 
     foreach ( $packages_dependencies as $package => $dependencies ) {
-        $handle = 'wp-' . $package;
-        $path   = "/js/dist/$package$suffix.js";
+        $handle  = 'wp-' . $package;
+        $path    = "/wp-includes/js/dist/$package$suffix.js";
 
         $scripts->add( $handle, $path, $dependencies, false, 1 );
@@ -1801 +1801 @@
     $styles->add( 'wp-editor-font', $fonts_url );
 
-    $styles->add( 'wp-block-library-theme', '/styles/dist/block-library/theme.css' );
+    $styles->add( 'wp-block-library-theme', '/wp-includes/css/dist/block-library/theme.css' );
     $styles->add_data( 'wp-block-library-theme', 'rtl', 'replace' );
 
     $styles->add(
         'wp-edit-blocks',
-        '/styles/dist/block-library/editor.css',
+        '/wp-includes/css/dist/block-library/editor.css',
         array(
             'wp-components',
@@ -1826 +1826 @@
 
     foreach ( $package_styles as $package => $dependencies ) {
-        $handle = 'wp-' . $package;
-        $path   = '/styles/dist/' . $package . '/style.css';
+        $handle  = 'wp-' . $package;
+        $path     = '/wp-includes/css/dist/' . $package . '/style.css';
 
         $styles->add( $handle, $path, $dependencies );