@wordpress/create-block 2.7.2-next.33ec3857e2.0 → 2.8.0

package/CHANGELOG.md

@@ -2,7 +2,18 @@
 
 ## Unreleased
 
-## 2.7.1-next.0 (2021-12-20)
+## 2.8.0 (2022-01-27)
+
+### New Features
+
+-   Integrated a new `plugin-zip` command to create a zip file for a WordPress plugin ([#37687](https://github.com/WordPress/gutenberg/pull/37687)).
+-   Add support for handling block templates with the `blockTemplatesPath` field in the external template configuration ([#37612](https://github.com/WordPress/gutenberg/pull/37612)).
+-   Add a new field `folderName` for setting the location for the `block.json` file and other optional block files generated from block templates included in the folder set with the `blockTemplatesPath` setting ([#37612](https://github.com/WordPress/gutenberg/pull/37612)).
+
+### Enhancement
+
+-   Speed up scaffolding process by omitting WordPress dependencies in the template ([#37639](https://github.com/WordPress/gutenberg/pull/37639)).
+-   Update link to block registration reference ([#37674](https://github.com/WordPress/gutenberg/pull/37674))
 
 ### Internal
 

package/LICENSE.md

@@ -1,6 +1,6 @@
 ## Gutenberg
 
-    Copyright 2016-2021 by the contributors
+    Copyright 2016-2022 by the contributors
 
 **License for Contributions (on and after April 15, 2021)**
 

package/README.md

@@ -12,7 +12,7 @@ Visit the [Gutenberg handbook](https://developer.wordpress.org/block-editor/deve
 
 ## Quick start
 
-You just need to provide the `slug` which is the target location for scaffolded files and the internal block name.
+You just need to provide the `slug` which is the target location for scaffolded plugin files and the internal block name.
 
 ```bash
 $ npx @wordpress/create-block todo-list
@@ -40,10 +40,10 @@ Options:
 
 ```bash
 -V, --version                output the version number
--t, --template <name>        block template type name, allowed values: "es5", "esnext", the name of an external npm package (default: "esnext"), or the path to a local directory.
+-t, --template <name>        plugin template type name, allowed values: "es5", "esnext", the name of an external npm package (default: "esnext"), or the path to a local directory.
 --namespace <value>          internal namespace for the block name
---title <value>              display title for the block
---short-description <value>  short description for the block
+--title <value>              display title for the plugin/block
+--short-description <value>  short description for the plugin/block
 --category <name>            category name for the block
 --wp-scripts                 enable integration with `@wordpress/scripts` package
 --no-wp-scripts              disable integration with `@wordpress/scripts` package
@@ -131,7 +131,7 @@ It is mandatory to provide the main file (`index.js` by default) for the package
 
 #### `templatesPath`
 
-A mandatory field with the path pointing to the location where template files live (nested folders are also supported). All files without the `.mustache` extension will be ignored.
+A mandatory field with the path pointing to the location where plugin template files live (nested folders are also supported). All files without the `.mustache` extension will be ignored.
 
 _Example:_
 
@@ -139,13 +139,27 @@ _Example:_
 const { join } = require( 'path' );
 
 module.exports = {
-	templatesPath: join( __dirname, 'templates' ),
+	templatesPath: join( __dirname, 'plugin-templates' ),
+};
+```
+
+#### `blockTemplatesPath`
+
+An optional field with the path pointing to the location where template files for the individual block live (nested folders are also supported). All files without the `.mustache` extension will be ignored.
+
+_Example:_
+
+```js
+const { join } = require( 'path' );
+
+module.exports = {
+	blockTemplatesPath: join( __dirname, 'block-templates' ),
 };
 ```
 
 #### `assetsPath`
 
-This setting is useful when your template scaffolds a block that uses static assets like images or fonts, which should not be processed. It provides the path pointing to the location where assets are located. They will be copied to the `assets` subfolder in the generated plugin.
+This setting is useful when your template scaffolds a plugin that uses static assets like images or fonts, which should not be processed. It provides the path pointing to the location where assets are located. They will be copied to the `assets` subfolder in the generated plugin.
 
 _Example:_
 
@@ -153,7 +167,7 @@ _Example:_
 const { join } = require( 'path' );
 
 module.exports = {
-	assetsPath: join( __dirname, 'assets' ),
+	assetsPath: join( __dirname, 'plugin-assets' ),
 };
 ```
 
@@ -193,7 +207,8 @@ The following configurable variables are used with the template files. Template
 -   `version` (default: `'0.1.0'`)
 -   `wpScripts` (default: `true`)
 -   `wpEnv` (default: `false`)
--   `npmDependencies` (default: `[]`) – the list of remote npm packages to be installed in the project with [`npm install`](https://docs.npmjs.com/cli/v6/commands/npm-install).
+-   `npmDependencies` (default: `[]`) – the list of remote npm packages to be installed in the project with [`npm install`](https://docs.npmjs.com/cli/v8/commands/npm-install) when `wpScripts` is enabled.
+-   `folderName` (default: `.`) – the location for the `block.json` file and other optional block files generated from block templates included in the folder set with the `blockTemplatesPath` setting.
 -   `editorScript` (default: `'file:./build/index.js'`)
 -   `editorStyle` (default: `'file:./build/index.css'`)
 -   `style` (default: `'file:./build/style-index.css'`)

package/lib/index.js

@@ -14,7 +14,7 @@ const log = require( './log' );
 const { engines, version } = require( '../package.json' );
 const scaffold = require( './scaffold' );
 const {
-	getBlockTemplate,
+	getPluginTemplate,
 	getDefaultValues,
 	getPrompts,
 } = require( './templates' );
@@ -34,13 +34,16 @@ program
 	.arguments( '[slug]' )
 	.option(
 		'-t, --template <name>',
-		'block template type name, allowed values: "es5", "esnext", or the name of an external npm package',
+		'plugin template type name, allowed values: "es5", "esnext", or the name of an external npm package',
 		'esnext'
 	)
 	.option( '--namespace <value>', 'internal namespace for the block name' )
-	.option( '--title <value>', 'display title for the block' )
+	.option( '--title <value>', 'display title for the plugin/block' )
 	// The name "description" is used internally so it couldn't be used.
-	.option( '--short-description <value>', 'short description for the block' )
+	.option(
+		'--short-description <value>',
+		'short description for the plugin/block'
+	)
 	.option( '--category <name>', 'category name for the block' )
 	.option(
 		'--wp-scripts',
@@ -66,8 +69,8 @@ program
 		) => {
 			await checkSystemRequirements( engines );
 			try {
-				const blockTemplate = await getBlockTemplate( templateName );
-				const defaultValues = getDefaultValues( blockTemplate );
+				const pluginTemplate = await getPluginTemplate( templateName );
+				const defaultValues = getDefaultValues( pluginTemplate );
 				const optionsValues = pickBy(
 					{
 						category,
@@ -88,16 +91,16 @@ program
 						title: startCase( slug ),
 						...optionsValues,
 					};
-					await scaffold( blockTemplate, answers );
+					await scaffold( pluginTemplate, answers );
 				} else {
-					const prompts = getPrompts( blockTemplate ).filter(
+					const prompts = getPrompts( pluginTemplate ).filter(
 						( { name } ) =>
 							! Object.keys( optionsValues ).includes( name )
 					);
 					log.info( '' );
-					log.info( "Let's customize your block:" );
+					log.info( "Let's customize your WordPress plugin:" );
 					const answers = await inquirer.prompt( prompts );
-					await scaffold( blockTemplate, {
+					await scaffold( pluginTemplate, {
 						...defaultValues,
 						...optionsValues,
 						...answers,

package/lib/{init-block-json.js → init-block.js}

@@ -2,15 +2,17 @@
  * External dependencies
  */
 const { omitBy } = require( 'lodash' );
-const { join } = require( 'path' );
+const { dirname, join } = require( 'path' );
+const makeDir = require( 'make-dir' );
 const { writeFile } = require( 'fs' ).promises;
 
 /**
  * Internal dependencies
  */
 const { info } = require( './log' );
+const { writeOutputTemplate } = require( './output' );
 
-module.exports = async ( {
+async function initBlockJSON( {
 	$schema,
 	apiVersion,
 	slug,
@@ -23,13 +25,16 @@ module.exports = async ( {
 	supports,
 	dashicon,
 	textdomain,
+	folderName,
 	editorScript,
 	editorStyle,
 	style,
-} ) => {
-	const outputFile = join( process.cwd(), slug, 'block.json' );
+} ) {
 	info( '' );
 	info( 'Creating a "block.json" file.' );
+
+	const outputFile = join( process.cwd(), slug, folderName, 'block.json' );
+	await makeDir( dirname( outputFile ) );
 	await writeFile(
 		outputFile,
 		JSON.stringify(
@@ -56,4 +61,19 @@ module.exports = async ( {
 			'\t'
 		)
 	);
+}
+
+module.exports = async function ( outputTemplates, view ) {
+	await Promise.all(
+		Object.keys( outputTemplates ).map(
+			async ( outputFile ) =>
+				await writeOutputTemplate(
+					outputTemplates[ outputFile ],
+					join( view.folderName, outputFile ),
+					view
+				)
+		)
+	);
+
+	await initBlockJSON( view );
 };

package/lib/init-package-json.js

@@ -40,15 +40,16 @@ module.exports = async ( {
 					format: 'wp-scripts format',
 					'lint:css': 'wp-scripts lint-style',
 					'lint:js': 'wp-scripts lint-js',
-					start: 'wp-scripts start',
 					'packages-update': 'wp-scripts packages-update',
+					'plugin-zip': 'wp-scripts plugin-zip',
+					start: 'wp-scripts start',
 				},
 			},
 			isEmpty
 		)
 	);
 
-	if ( size( npmDependencies ) ) {
+	if ( wpScripts && size( npmDependencies ) ) {
 		info( '' );
 		info(
 			'Installing npm dependencies. It might take a couple of minutes...'

package/lib/output.js

@@ -0,0 +1,28 @@
+/**
+ * External dependencies
+ */
+const { dirname, join } = require( 'path' );
+const makeDir = require( 'make-dir' );
+const { render } = require( 'mustache' );
+const { writeFile } = require( 'fs' ).promises;
+
+const writeOutputAsset = async ( inputFile, outputFile, view ) => {
+	const outputFilePath = join( view.slug, 'assets', outputFile );
+	await makeDir( dirname( outputFilePath ) );
+	writeFile( outputFilePath, inputFile );
+};
+
+const writeOutputTemplate = async ( inputFile, outputFile, view ) => {
+	// Output files can have names that depend on the slug provided.
+	const outputFilePath = join(
+		view.slug,
+		outputFile.replace( /\$slug/g, view.slug )
+	);
+	await makeDir( dirname( outputFilePath ) );
+	writeFile( outputFilePath, render( inputFile, view ) );
+};
+
+module.exports = {
+	writeOutputAsset,
+	writeOutputTemplate,
+};

package/lib/scaffold.js

@@ -1,23 +1,20 @@
 /**
  * External dependencies
  */
-const { writeFile } = require( 'fs' ).promises;
 const { snakeCase, camelCase, upperFirst } = require( 'lodash' );
-const makeDir = require( 'make-dir' );
-const { render } = require( 'mustache' );
-const { dirname, join } = require( 'path' );
 
 /**
  * Internal dependencies
  */
-const initBlockJSON = require( './init-block-json' );
+const initBlock = require( './init-block' );
 const initPackageJSON = require( './init-package-json' );
 const initWPScripts = require( './init-wp-scripts' );
 const initWPEnv = require( './init-wp-env' );
 const { code, info, success } = require( './log' );
+const { writeOutputAsset, writeOutputTemplate } = require( './output' );
 
 module.exports = async (
-	blockTemplate,
+	{ blockOutputTemplates, outputTemplates, outputAssets },
 	{
 		$schema,
 		apiVersion,
@@ -36,6 +33,7 @@ module.exports = async (
 		wpScripts,
 		wpEnv,
 		npmDependencies,
+		folderName,
 		editorScript,
 		editorStyle,
 		style,
@@ -45,9 +43,8 @@ module.exports = async (
 	namespace = namespace.toLowerCase();
 
 	info( '' );
-	info( `Creating a new WordPress block in "${ slug }" folder.` );
+	info( `Creating a new WordPress plugin in "${ slug }" folder.` );
 
-	const { outputTemplates, outputAssets } = blockTemplate;
 	const view = {
 		$schema,
 		apiVersion,
@@ -69,34 +66,36 @@ module.exports = async (
 		textdomain: slug,
 		wpScripts,
 		npmDependencies,
+		folderName,
 		editorScript,
 		editorStyle,
 		style,
 	};
+
 	await Promise.all(
-		Object.keys( outputTemplates ).map( async ( outputFile ) => {
-			// Output files can have names that depend on the slug provided.
-			const outputFilePath = join(
-				slug,
-				outputFile.replace( /\$slug/g, slug )
-			);
-			await makeDir( dirname( outputFilePath ) );
-			writeFile(
-				outputFilePath,
-				render( outputTemplates[ outputFile ], view )
-			);
-		} )
+		Object.keys( outputTemplates ).map(
+			async ( outputFile ) =>
+				await writeOutputTemplate(
+					outputTemplates[ outputFile ],
+					outputFile,
+					view
+				)
+		)
 	);
 
 	await Promise.all(
-		Object.keys( outputAssets ).map( async ( outputFile ) => {
-			const outputFilePath = join( slug, 'assets', outputFile );
-			await makeDir( dirname( outputFilePath ) );
-			writeFile( outputFilePath, outputAssets[ outputFile ] );
-		} )
+		Object.keys( outputAssets ).map(
+			async ( outputFile ) =>
+				await writeOutputAsset(
+					outputAssets[ outputFile ],
+					outputFile,
+					view
+				)
+		)
 	);
 
-	await initBlockJSON( view );
+	await initBlock( blockOutputTemplates, view );
+
 	await initPackageJSON( view );
 
 	if ( wpScripts ) {

package/lib/templates/es5/readme.txt.mustache

@@ -3,7 +3,7 @@
 Contributors:      {{author}}
 {{/author}}
 Tags:              block
-Tested up to:      5.8.0
+Tested up to:      5.9
 Stable tag:        {{version}}
 {{#license}}
 License:           {{license}}

package/lib/templates/esnext/{$slug.php.mustache → plugin/$slug.php.mustache}

@@ -26,9 +26,9 @@
  * Behind the scenes, it registers also all assets so they can be enqueued
  * through the block editor in the corresponding context.
  *
- * @see https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/writing-your-first-block-type/
+ * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function {{namespaceSnakeCase}}_{{slugSnakeCase}}_block_init() {
-	register_block_type( __DIR__ );
+	register_block_type( __DIR__ . '/build' );
 }
 add_action( 'init', '{{namespaceSnakeCase}}_{{slugSnakeCase}}_block_init' );

package/lib/templates/esnext/{.gitignore.mustache → plugin/.gitignore.mustache}

@@ -20,8 +20,11 @@ node_modules/
 # Optional eslint cache
 .eslintcache
 
-# Output of 'npm pack'
+# Output of `npm pack`
 *.tgz
 
+# Output of `wp-scripts plugin-zip`
+*.zip
+
 # dotenv environment variables file
 .env

package/lib/templates/esnext/{readme.txt.mustache → plugin/readme.txt.mustache}

@@ -3,7 +3,7 @@
 Contributors:      {{author}}
 {{/author}}
 Tags:              block
-Tested up to:      5.8.0
+Tested up to:      5.9
 Stable tag:        {{version}}
 {{#license}}
 License:           {{license}}

package/lib/templates.js

@@ -19,7 +19,7 @@ const CLIError = require( './cli-error' );
 const { info } = require( './log' );
 const prompts = require( './prompts' );
 
-const predefinedBlockTemplates = {
+const predefinedPluginTemplates = {
 	es5: {
 		defaultValues: {
 			slug: 'es5-example',
@@ -44,13 +44,13 @@ const predefinedBlockTemplates = {
 			supports: {
 				html: false,
 			},
-			npmDependencies: [
-				'@wordpress/block-editor',
-				'@wordpress/blocks',
-				'@wordpress/i18n',
-			],
+			folderName: 'src',
+			editorScript: 'file:./index.js',
+			editorStyle: 'file:./index.css',
+			style: 'file:./style-index.css',
 		},
-		templatesPath: join( __dirname, 'templates', 'esnext' ),
+		templatesPath: join( __dirname, 'templates', 'esnext', 'plugin' ),
+		blockTemplatesPath: join( __dirname, 'templates', 'esnext', 'block' ),
 	},
 };
 
@@ -104,6 +104,7 @@ const externalTemplateExists = async ( templateName ) => {
 
 const configToTemplate = async ( {
 	assetsPath,
+	blockTemplatesPath,
 	defaultValues = {},
 	templatesPath,
 } ) => {
@@ -112,16 +113,19 @@ const configToTemplate = async ( {
 	}
 
 	return {
+		blockOutputTemplates: blockTemplatesPath
+			? await getOutputTemplates( blockTemplatesPath )
+			: {},
 		defaultValues,
 		outputAssets: assetsPath ? await getOutputAssets( assetsPath ) : {},
 		outputTemplates: await getOutputTemplates( templatesPath ),
 	};
 };
 
-const getBlockTemplate = async ( templateName ) => {
-	if ( predefinedBlockTemplates[ templateName ] ) {
+const getPluginTemplate = async ( templateName ) => {
+	if ( predefinedPluginTemplates[ templateName ] ) {
 		return await configToTemplate(
-			predefinedBlockTemplates[ templateName ]
+			predefinedPluginTemplates[ templateName ]
 		);
 	}
 
@@ -142,8 +146,8 @@ const getBlockTemplate = async ( templateName ) => {
 
 	if ( ! ( await externalTemplateExists( templateName ) ) ) {
 		throw new CLIError(
-			`Invalid block template type name: "${ templateName }". Allowed values: ` +
-				Object.keys( predefinedBlockTemplates )
+			`Invalid plugin template type name: "${ templateName }". Allowed values: ` +
+				Object.keys( predefinedPluginTemplates )
 					.map( ( name ) => `"${ name }"` )
 					.join( ', ' ) +
 				', or an existing npm package name.'
@@ -173,7 +177,7 @@ const getBlockTemplate = async ( templateName ) => {
 			throw error;
 		} else {
 			throw new CLIError(
-				`Invalid block template downloaded. Error: ${ error.message }`
+				`Invalid plugin template downloaded. Error: ${ error.message }`
 			);
 		}
 	} finally {
@@ -183,7 +187,7 @@ const getBlockTemplate = async ( templateName ) => {
 	}
 };
 
-const getDefaultValues = ( blockTemplate ) => {
+const getDefaultValues = ( pluginTemplate ) => {
 	return {
 		$schema: 'https://schemas.wp.org/trunk/block.json',
 		apiVersion: 2,
@@ -196,15 +200,16 @@ const getDefaultValues = ( blockTemplate ) => {
 		wpScripts: true,
 		wpEnv: false,
 		npmDependencies: [],
+		folderName: '.',
 		editorScript: 'file:./build/index.js',
 		editorStyle: 'file:./build/index.css',
 		style: 'file:./build/style-index.css',
-		...blockTemplate.defaultValues,
+		...pluginTemplate.defaultValues,
 	};
 };
 
-const getPrompts = ( blockTemplate ) => {
-	const defaultValues = getDefaultValues( blockTemplate );
+const getPrompts = ( pluginTemplate ) => {
+	const defaultValues = getDefaultValues( pluginTemplate );
 	return Object.keys( prompts ).map( ( promptName ) => {
 		return {
 			...prompts[ promptName ],
@@ -214,7 +219,7 @@ const getPrompts = ( blockTemplate ) => {
 };
 
 module.exports = {
-	getBlockTemplate,
+	getPluginTemplate,
 	getDefaultValues,
 	getPrompts,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block",
-	"version": "2.7.2-next.33ec3857e2.0",
+	"version": "2.8.0",
 	"description": "Generates PHP, JS and CSS code for registering a block for a WordPress plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -31,7 +31,7 @@
 		"wp-create-block": "./index.js"
 	},
 	"dependencies": {
-		"@wordpress/lazy-import": "^1.3.4-next.33ec3857e2.0",
+		"@wordpress/lazy-import": "^1.4.0",
 		"chalk": "^4.0.0",
 		"check-node-version": "^4.1.0",
 		"commander": "^4.1.0",
@@ -48,5 +48,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "51c7917ea7fac72953702f24d6daac87d99e7617"
+	"gitHead": "d95ccb9366e249133cdb1d7b25c382446b9ee502"
 }