Version bump & changelog update

create-block-theme.php

@@ -5,7 +5,7 @@
  * Plugin Name: Create Block Theme
  * Plugin URI: https://wordpress.org/plugins/create-block-theme
  * Description: Generates a block theme
- * Version: 1.5.0
+ * Version: 1.5.1
  * Author: WordPress.org
  * Author URI: https://wordpress.org/
  * License: GNU General Public License v2 or later

package.json

@@ -1,71 +1,71 @@
 {
-	"name": "create-block-theme",
-	"version": "1.5.0",
-	"private": true,
-	"description": "Create a block-based theme",
-	"author": "The WordPress Contributors",
-	"license": "GPL-2.0-or-later",
-	"keywords": [
-		"WordPress",
-		"block"
-	],
-	"homepage": "https://wordpress.org/plugins/create-block-theme/",
-	"repository": "git+https://github.com/WordPress/create-block-theme.git",
-	"bugs": {
-		"url": "https://wordpress.org/support/plugin/create-block-theme/"
-	},
-	"engines": {
-		"node": ">=16.9.1",
-		"npm": ">=7 <8"
-	},
-	"main": "build/index.js",
-	"dependencies": {
-		"@wordpress/icons": "^9.17.0"
-	},
-	"devDependencies": {
-		"@actions/core": "^1.10.0",
-		"@emotion/babel-plugin": "^11.10.5",
-		"@wordpress/browserslist-config": "^5.8.0",
-		"@wordpress/element": "^5.2.0",
-		"@wordpress/prettier-config": "^2.9.0",
-		"@wordpress/scripts": "^25.2.0",
-		"@wordpress/stylelint-config": "^21.9.0",
-		"babel-plugin-inline-json-import": "^0.3.2",
-		"husky": "^8.0.3",
-		"lint-staged": "^13.1.0",
-		"prettier": "npm:wp-prettier@2.6.2",
-		"semver": "^7.3.8",
-		"simple-git": "^3.14.1"
-	},
-	"scripts": {
-		"build": "wp-scripts build",
-		"format": "wp-scripts format",
-		"lint:css": "wp-scripts lint-style",
-		"lint:css:fix": "npm run lint:css -- --fix",
-		"lint:js": "wp-scripts lint-js",
-		"lint:js:fix": "npm run lint:js -- --fix",
-		"lint:php": "./vendor/bin/phpcs",
-		"lint:php:fix": "./vendor/bin/phpcbf",
-		"packages-update": "wp-scripts packages-update",
-		"start": "wp-scripts start",
-		"update-version": "node update-version-and-changelog.js",
-		"prepare": "husky install"
-	},
-	"lint-staged": {
-		"*.{js,json,yml}": [
-			"wp-scripts format"
-		],
-		"*.js": [
-			"npm run lint:js"
-		],
-		"*.{css,scss}": [
-			"npm run lint:css"
-		],
-		"*.php": [
-			"npm run lint:php"
-		],
-		"package.json": [
-			"wp-scripts lint-pkg-json"
-		]
-	}
-}
+  "name": "create-block-theme",
+  "version": "1.5.1",
+  "private": true,
+  "description": "Create a block-based theme",
+  "author": "The WordPress Contributors",
+  "license": "GPL-2.0-or-later",
+  "keywords": [
+    "WordPress",
+    "block"
+  ],
+  "homepage": "https://wordpress.org/plugins/create-block-theme/",
+  "repository": "git+https://github.com/WordPress/create-block-theme.git",
+  "bugs": {
+    "url": "https://wordpress.org/support/plugin/create-block-theme/"
+  },
+  "engines": {
+    "node": ">=16.9.1",
+    "npm": ">=7 <8"
+  },
+  "main": "build/index.js",
+  "dependencies": {
+    "@wordpress/icons": "^9.17.0"
+  },
+  "devDependencies": {
+    "@actions/core": "^1.10.0",
+    "@emotion/babel-plugin": "^11.10.5",
+    "@wordpress/browserslist-config": "^5.8.0",
+    "@wordpress/element": "^5.2.0",
+    "@wordpress/prettier-config": "^2.9.0",
+    "@wordpress/scripts": "^25.2.0",
+    "@wordpress/stylelint-config": "^21.9.0",
+    "babel-plugin-inline-json-import": "^0.3.2",
+    "husky": "^8.0.3",
+    "lint-staged": "^13.1.0",
+    "prettier": "npm:wp-prettier@2.6.2",
+    "semver": "^7.3.8",
+    "simple-git": "^3.14.1"
+  },
+  "scripts": {
+    "build": "wp-scripts build",
+    "format": "wp-scripts format",
+    "lint:css": "wp-scripts lint-style",
+    "lint:css:fix": "npm run lint:css -- --fix",
+    "lint:js": "wp-scripts lint-js",
+    "lint:js:fix": "npm run lint:js -- --fix",
+    "lint:php": "./vendor/bin/phpcs",
+    "lint:php:fix": "./vendor/bin/phpcbf",
+    "packages-update": "wp-scripts packages-update",
+    "start": "wp-scripts start",
+    "update-version": "node update-version-and-changelog.js",
+    "prepare": "husky install"
+  },
+  "lint-staged": {
+    "*.{js,json,yml}": [
+      "wp-scripts format"
+    ],
+    "*.js": [
+      "npm run lint:js"
+    ],
+    "*.{css,scss}": [
+      "npm run lint:css"
+    ],
+    "*.php": [
+      "npm run lint:php"
+    ],
+    "package.json": [
+      "wp-scripts lint-pkg-json"
+    ]
+  }
+}

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://automattic.com/
 Tags: themes, theme, block-theme
 Requires at least: 6.0
 Tested up to: 6.1
-Stable tag: 1.5.0
+Stable tag: 1.5.1
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -36,6 +36,26 @@ Still in the WordPress dashboard, navigate to "Appearance" -> "Create Block Them
 
 == Changelog ==
 
+= 1.5.1 =
+* # Conflicts:
+#	css/manage-fonts.css
+#	src/font-face.js
+#	src/font-family.js
+#	src/manage-fonts.js
+
+* Merge branch 'trunk' into add/code-linting
+* # Conflicts:
+#	package-lock.json
+#	package.json
+
+* check for DISALLOW_FILE_EDIT and simplify permission check logic
+* Load google fonts data from url
+* Separate styles and templates reset
+* Add spinner while google fonts load instead of showing a blank page
+* Add: code linting scripts
+* Update Google Fonts JSON data from API
+* Avoid pre commit verifications on Github actions to prevent action errors caused by linting problems
+
 = 1.5.0 =
 * Fix: browser console errors
 * Fix: Adding or removing fonts fails in some Windows environments