Merge branch 'main' into use-custom-block-margin-v3

DekodeInteraktiv · Oct 16, 2024 · eb82d73 · eb82d73
2 parents 96c2ee4 + 890c1f9
commit eb82d73
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 162 deletions.
diff --git a/INSTALLATION.md b/INSTALLATION.md
@@ -128,11 +128,11 @@ Run the following commands in the root directory to build the project:
 composer install
 npm ci && npm run build
 ```
-(See `packages/themes/block-theme` or `packages/plugins/blueprint` for more details)
+(See `packages/themes/block-theme` for more details)
 
 ## Extending Builds
 
-Project Base uses [wp-scripts](https://github.com/WordPress/gutenberg/tree/trunk/packages/scripts) out of the box for building front-end/view and editor assets. wp-script will scan all `block.json` files in the `src/` folder to find available entries. This means that if you have a `src` folder with a `view.js` and a `editor.js`, you also need to add a `block.json` file at the same location. Have a look in the `block-theme` theme or the `blueprint` plugin for examples or read up on [wp-script auto discovery for Webpack entry points](https://github.com/WordPress/gutenberg/blob/trunk/packages/scripts/utils/config.js#L198). For a more advanced setup, you can always customize builds by adding your own `webpack.config.js`.
+Project Base uses [wp-scripts](https://github.com/WordPress/gutenberg/tree/trunk/packages/scripts) out of the box for building front-end/view and editor assets. wp-script will scan all `block.json` files in the `src/` folder to find available entries. This means that if you have a `src` folder with a `view.js` and a `editor.js`, you also need to add a `block.json` file at the same location. Have a look in the `block-theme` theme for example or read up on [wp-script auto discovery for Webpack entry points](https://github.com/WordPress/gutenberg/blob/trunk/packages/scripts/utils/config.js#L198). For a more advanced setup, you can always customize builds by adding your own `webpack.config.js`.
 
 ### A quick overview of wp-scripts auto discovery:
 1. Supply entry points manully to the CLI, e.g. `wp-scripts build src/view src/editor src/admin src/some-other-entry`. This will bypass 2 and 3.

diff --git a/composer.json b/composer.json
@@ -7,7 +7,6 @@
 		"boxuk/wp-muplugin-loader": "~2.2.0",
 		"composer/installers": "~2.3.0",
 		"dekode/block-theme": "~1.0.0",
-		"dekode/blueprint": "~1.0.0",
 		"dekodeinteraktiv/dekode-label-environment": "~1.0.0",
 		"inpsyde/wp-translation-downloader": "~2.5.0",
 		"roots/wordpress": "~6.6.2",

diff --git a/composer.lock b/composer.lock
diff --git a/packages/plugins/blueprint/composer.json b/packages/plugins/blueprint/composer.json
diff --git a/packages/plugins/blueprint/package.json b/packages/plugins/blueprint/package.json
diff --git a/packages/plugins/blueprint/plugin.php b/packages/plugins/blueprint/plugin.php
diff --git a/packages/plugins/blueprint/src/block.json b/packages/plugins/blueprint/src/block.json
diff --git a/packages/plugins/blueprint/src/editor.css b/packages/plugins/blueprint/src/editor.css
diff --git a/packages/plugins/blueprint/src/editor.js b/packages/plugins/blueprint/src/editor.js
diff --git a/packages/plugins/blueprint/src/view.css b/packages/plugins/blueprint/src/view.css
diff --git a/packages/plugins/blueprint/src/view.js b/packages/plugins/blueprint/src/view.js
diff --git a/packages/themes/block-theme/functions.php b/packages/themes/block-theme/functions.php
@@ -6,6 +6,7 @@
  */
 
 declare( strict_types = 1 );
+
 defined( 'ABSPATH' ) || exit;
 
 // Autoload package Composer dependencies.
@@ -15,3 +16,6 @@
 
 // Require all files in includes folder.
 \array_map( fn( $f ) => require_once $f, \glob( __DIR__ . '/includes/*.php' ) );
+
+// Require all block.php files in build/ folder.
+\array_map( fn( $f ) => require_once $f, \glob( __DIR__ . '/build/*/block.php' ) );
diff --git a/...ns/blueprint/src/example-block/block.json → .../block-theme/src/example-block/block.json b/...ns/blueprint/src/example-block/block.json → .../block-theme/src/example-block/block.json
@@ -7,7 +7,7 @@
 	"icon": "menu",
 	"description": "Example block",
 	"attributes": {},
-	"textdomain": "blueprint",
+	"textdomain": "block-theme",
 	"supports": {
 		"html": false,
 		"align": ["wide"]

diff --git a/...ins/blueprint/src/example-block/block.php → ...s/block-theme/src/example-block/block.php b/...ins/blueprint/src/example-block/block.php → ...s/block-theme/src/example-block/block.php
diff --git a/...ins/blueprint/src/example-block/editor.js → ...s/block-theme/src/example-block/editor.js b/...ins/blueprint/src/example-block/editor.js → ...s/block-theme/src/example-block/editor.js
diff --git a/...ugins/blueprint/src/example-block/view.js → ...mes/block-theme/src/example-block/view.js b/...ugins/blueprint/src/example-block/view.js → ...mes/block-theme/src/example-block/view.js