Merge pull request #72 from t-hamano/fix/typo-and-build-dir

Fix some typos and change the directory where Monaco Editor is built
t-hamano · Jul 26, 2023 · 20376f1 · 20376f1
2 parents fa2b31d + 8ab686b
commit 20376f1
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/.distignore b/.distignore
@@ -12,6 +12,7 @@
 .eslintrc.js
 .gitignore
 .npmrc
+.nvmrc
 .prettierrc.js
 .stylelintrc.js
 .wp-env.json

diff --git a/bin/delete-sourcemaps.js b/bin/delete-sourcemaps.js
@@ -33,4 +33,4 @@ function deleteMaps( dir ) {
 	} );
 }
 
-[ './build/lib/' ].map( deleteMaps );
+[ './build/vendor/' ].map( deleteMaps );
diff --git a/custom-html-block-extension.php b/custom-html-block-extension.php
@@ -4,7 +4,7 @@
  * Description: Extend Custom HTML block to evolve into the advanced code editor.
  * Requires at least: 6.1
  * Requires PHP: 7.4
- * Version: 3.3.0
+ * Version: 3.3.1
  * Author: Aki Hamano
  * Author URI: https://github.com/t-hamano
  * License: GPL2 or later

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
 		"stop": "wp-env stop",
 		"start": "wp-scripts start src/admin src/block-editor src/classic-editor src/theme-plugin-editor --output-path build",
 		"build": "npm run clean && wp-scripts build src/admin src/block-editor src/classic-editor src/theme-plugin-editor --output-path build && npm run copy-lib",
-		"copy-lib": "cpx -C \"node_modules/monaco-editor/min/**\" \"build/lib/monaco-editor/min\" && node bin/delete-sourcemaps.js",
+		"copy-lib": "cpx -C \"node_modules/monaco-editor/min/**\" \"build/vendor/monaco-editor/min\" && node bin/delete-sourcemaps.js",
 		"clean": "rimraf build",
 		"lint": "npm run lint:php && npm run lint:style && npm run lint:js",
 		"lint:php": "composer lint",

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: gutenberg, block, html, highlighting, emmet
 Donate link: https://www.paypal.me/thamanoJP
 Requires at least: 6.1
 Tested up to: 6.3
-Stable tag: 3.3.0
+Stable tag: 3.3.1
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -69,6 +69,10 @@ Source: https://www.marksimonson.com/fonts/view/anonymous-pro
 
 == Changelog ==
 
+= 3.3.1 =
+
+* Fix: some typos
+
 = 3.3.0 =
 * Tested to WordPress 6.3
 * Enhancement: Add filtering function for settings

diff --git a/src/admin/editor-config/editor-options/suggest/show-icons.js b/src/admin/editor-config/editor-options/suggest/show-icons.js
@@ -46,7 +46,7 @@ export default function SuggestShowIcons() {
 					title={ title }
 					items={ [
 						{
-							label: __( 'Enabl', 'custom-html-block-extension' ),
+							label: __( 'Enable', 'custom-html-block-extension' ),
 							image: 'editor-options/suggest/show-icons_1.jpg',
 							value: true,
 							isDefault: true,

diff --git a/src/admin/options/components/permission-editor/index.js b/src/admin/options/components/permission-editor/index.js
@@ -36,7 +36,7 @@ export default function PermissionEditor() {
 
 	return (
 		<PanelBody
-			title={ __( 'Editors roles allowed to use this extension', 'custom-html-block-extension' ) }
+			title={ __( 'Editors allowed to use this extension', 'custom-html-block-extension' ) }
 		>
 			<ToggleControl
 				label={ __( 'Block editor', 'custom-html-block-extension' ) }

diff --git a/src/lib/loader.js b/src/lib/loader.js
@@ -5,7 +5,7 @@ import { __ } from '@wordpress/i18n';
 
 const config = {
 	paths: {
-		vs: `${ window.chbeObj.pluginUrl }/build/lib/monaco-editor/min/vs`,
+		vs: `${ window.chbeObj.pluginUrl }/build/vendor/monaco-editor/min/vs`,
 	},
 };