Merge branch 'fix/cleanup' into develop

washingtonstateuniversity · Sep 9, 2022 · acb2694 · acb2694
2 parents e3626ee + f59e43d
commit acb2694
Show file tree

Hide file tree

Showing 27 changed files with 62 additions and 65 deletions.
diff --git a/src/blocks/accordion-heading/icon.js b/src/blocks/accordion-heading/icon.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { SVG, Path } from '@wordpress/primitives';
+import { Path, SVG } from '@wordpress/components';
 
 const icon = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

diff --git a/src/blocks/button/deprecated.js b/src/blocks/button/deprecated.js
@@ -7,16 +7,16 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-const {
+import {
 	RichText,
 	getColorClassName,
 	useBlockProps,
 	__experimentalGetGradientClass,
-	__experimentalGetBorderClassesAndStyles: getBorderClassesAndStyles,
-	__experimentalGetColorClassesAndStyles: getColorClassesAndStyles,
-	__experimentalGetSpacingClassesAndStyles: getSpacingClassesAndStyles,
-} = wp.blockEditor;
-const { compose } = wp.compose;
+	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
+	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
+	__experimentalGetSpacingClassesAndStyles as getSpacingClassesAndStyles,
+} from '@wordpress/block-editor';
+import { compose } from '@wordpress/compose';
 
 /**
  * Internal dependencies

diff --git a/src/blocks/button/edit.js b/src/blocks/button/edit.js
@@ -6,22 +6,28 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-const { __ } = wp.i18n;
-const { useCallback, useEffect, useState, useRef } = wp.element;
-const { Button, ButtonGroup, PanelBody, TextControl, ToolbarButton, Popover } =
-	wp.components;
-const {
+import { __ } from '@wordpress/i18n';
+import { useCallback, useEffect, useState, useRef } from '@wordpress/element';
+import {
+	Button,
+	ButtonGroup,
+	PanelBody,
+	TextControl,
+	ToolbarButton,
+	Popover,
+} from '@wordpress/components';
+import {
 	BlockControls,
 	InspectorControls,
 	RichText,
 	useBlockProps,
-	__experimentalUseBorderProps: useBorderProps,
-	__experimentalUseColorProps: useColorProps,
-	__experimentalGetSpacingClassesAndStyles: useSpacingProps,
-	__experimentalLinkControl: LinkControl,
-} = wp.blockEditor;
-const { displayShortcut, isKeyboardEvent } = wp.keycodes;
-const { createBlock } = wp.blocks;
+	__experimentalUseBorderProps as useBorderProps,
+	__experimentalUseColorProps as useColorProps,
+	__experimentalGetSpacingClassesAndStyles as useSpacingProps,
+	__experimentalLinkControl as LinkControl,
+} from '@wordpress/block-editor';
+import { displayShortcut, isKeyboardEvent } from '@wordpress/keycodes';
+import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies

diff --git a/src/blocks/button/icons.js b/src/blocks/button/icons.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { Path, SVG } = wp.primitives;
+import { Path, SVG } from '@wordpress/components';
 
 export const icon = (
 	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

diff --git a/src/blocks/button/index.js b/src/blocks/button/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { __ } = wp.i18n;
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies

diff --git a/src/blocks/button/save.js b/src/blocks/button/save.js
@@ -6,13 +6,13 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-const {
+import {
 	RichText,
 	useBlockProps,
-	__experimentalGetBorderClassesAndStyles: getBorderClassesAndStyles,
-	__experimentalGetColorClassesAndStyles: getColorClassesAndStyles,
-	__experimentalGetSpacingClassesAndStyles: getSpacingClassesAndStyles,
-} = wp.blockEditor;
+	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
+	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
+	__experimentalGetSpacingClassesAndStyles as getSpacingClassesAndStyles,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes, className } ) {
 	const { fontSize, linkTarget, rel, style, text, title, url, width } =

diff --git a/src/blocks/button/style.css b/src/blocks/button/style.css
@@ -1,4 +1,3 @@
-/* stylelint-disable selector-class-pattern */
 .wp-block-hrswp-button {
 	box-sizing: border-box;
 }
@@ -139,4 +138,3 @@ main input[type="reset"] {
 		box-shadow: 0 1px 5px 2px rgba(0, 0, 0, 0.1);
 	}
 }
-/* stylelint-enable selector-class-pattern */
diff --git a/src/blocks/buttons/deprecated.js b/src/blocks/buttons/deprecated.js
@@ -5,7 +5,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-const { InnerBlocks, useBlockProps } = wp.blockEditor;
+import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
 
 /**
  * @param {Object} attributes Block's attributes.

diff --git a/src/blocks/buttons/edit.js b/src/blocks/buttons/edit.js
@@ -6,12 +6,12 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-const {
+import {
 	useBlockProps,
 	useInnerBlocksProps,
-	store: blockEditorStore,
-} = wp.blockEditor;
-const { useSelect } = wp.data;
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies

diff --git a/src/blocks/buttons/editor.css b/src/blocks/buttons/editor.css
@@ -12,11 +12,9 @@
 	align-items: center;
 }
 
-/* stylelint-disable selector-class-pattern */
 .wp-block-hrswp-buttons.is-vertical > .block-list-appender .block-list-appender__toggle {
 	justify-content: flex-start;
 }
-/* stylelint-enable selector-class-pattern */
 
 .wp-block-hrswp-buttons > .wp-block-hrswp-button:focus {
 	box-shadow: none;

diff --git a/src/blocks/buttons/icons.js b/src/blocks/buttons/icons.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { Path, SVG } = wp.primitives;
+import { Path, SVG } from '@wordpress/components';
 
 export const buttons = (
 	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

diff --git a/src/blocks/buttons/index.js b/src/blocks/buttons/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { __ } = wp.i18n;
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies

diff --git a/src/blocks/buttons/save.js b/src/blocks/buttons/save.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-const { useBlockProps, useInnerBlocksProps } = wp.blockEditor;
+import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
 
 export default function save( props ) {
 	const {

diff --git a/src/blocks/buttons/transforms.js b/src/blocks/buttons/transforms.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { createBlock } = wp.blocks;
+import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies

diff --git a/src/blocks/callout/icon.js b/src/blocks/callout/icon.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { Path, SVG } = wp.components;
+import { Path, SVG } from '@wordpress/components';
 
 export default (
 	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

diff --git a/src/blocks/filter-section/block.json b/src/blocks/filter-section/block.json
@@ -1,8 +1,12 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "hrswp/filter-section",
+	"title": "Filter Section",
 	"category": "widgets",
+	"description": "A single section of content to search within.",
 	"parent": [ "hrswp/filter" ],
+	"textdomain": "default",
 	"supports": {
 		"reusable": false
 	},

diff --git a/src/blocks/filter-section/edit.js b/src/blocks/filter-section/edit.js
@@ -1,14 +1,14 @@
 /**
  * WordPress dependencies
  */
-const { sprintf, __ } = wp.i18n;
-const { useSelect } = wp.data;
-const {
+import { sprintf, __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import {
 	InnerBlocks,
 	useBlockProps,
 	useInnerBlocksProps,
-	store: blockEditorStore,
-} = wp.blockEditor;
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
 
 function SearchFilterSectionEdit( { clientId } ) {
 	const { searchSectionIds, hasChildBlocks } = useSelect(

diff --git a/src/blocks/filter-section/icon.js b/src/blocks/filter-section/icon.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { Path, SVG } = wp.components;
+import { Path, SVG } from '@wordpress/components';
 
 const search = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

diff --git a/src/blocks/filter-section/index.js b/src/blocks/filter-section/index.js
@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-const { __, _x } = wp.i18n;
-
 /**
  * Internal dependencies
  */
@@ -16,8 +11,6 @@ const { name } = metadata;
 export { metadata, name };
 
 export const settings = {
-	title: _x( 'Filter Section', 'block title' ),
-	description: __( 'A single section of content to search within.' ),
 	icon,
 	edit,
 	save,

diff --git a/src/blocks/filter-section/save.js b/src/blocks/filter-section/save.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { useInnerBlocksProps, useBlockProps } = wp.blockEditor;
+import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 
 export default function save() {
 	const blockProps = useBlockProps.save();

diff --git a/src/blocks/filter/block.json b/src/blocks/filter/block.json
@@ -1,7 +1,12 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "hrswp/filter",
+	"title": "Filter",
 	"category": "widgets",
+	"description": "Search and filter a section of content by full text.",
+	"keywords": [ "filter", "search" ],
+	"textdomain": "default",
 	"attributes": {
 		"retainHeadings": {
 			"type": "boolean",

diff --git a/src/blocks/filter/index.js b/src/blocks/filter/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { __, _x } = wp.i18n;
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -15,10 +15,7 @@ const { name } = metadata;
 export { metadata, name };
 
 export const settings = {
-	title: _x( 'Filter', 'block title' ),
 	icon: 'filter',
-	description: __( 'Search and filter a section of content by full text.' ),
-	keywords: [ __( 'filter search' ) ],
 	example: {
 		innerBlocks: [
 			{

diff --git a/src/blocks/notification/icon.js b/src/blocks/notification/icon.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { Path, SVG, Circle } = wp.components;
+import { Path, SVG, Circle } from '@wordpress/components';
 
 export default (
 	<SVG viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">

diff --git a/src/blocks/posts-list/editor.css b/src/blocks/posts-list/editor.css
@@ -1,4 +1,3 @@
-/* stylelint-disable selector-class-pattern */
 .components-panel__body.hrswp-block-posts-list.taxonomy-filter {
 
 	& .taxonomy-filter--body {
@@ -72,4 +71,3 @@
 	}
 
 }
-/* stylelint-enable selector-class-pattern */
diff --git a/src/blocks/posts-list/icons.js b/src/blocks/posts-list/icons.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { SVG, Path } from '@wordpress/primitives';
+import { Path, SVG } from '@wordpress/components';
 
 export const icon = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">

diff --git a/src/blocks/posts-list/style.css b/src/blocks/posts-list/style.css
@@ -1,4 +1,3 @@
-/* stylelint-disable selector-class-pattern */
 .hrswp-block-posts-list__list-item {
 	margin-bottom: 0.7rem;
 	position: relative;
@@ -337,4 +336,3 @@
 	}
 
 }
-/* stylelint-enable selector-class-pattern */
diff --git a/src/blocks/sidebar/transforms.js b/src/blocks/sidebar/transforms.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-const { createBlock } = wp.blocks;
+import { createBlock } from '@wordpress/blocks';
 
 const transforms = {
 	from: [