Revert "Compat: Upgrade admin notices to use Notices module at runtime"

docs/designers-developers/developers/data/data-core-notices.md

@@ -32,11 +32,6 @@ Yields action objects used in signalling that a notice is to be created.
  * options.isDismissible: Whether the notice can
                                                       be dismissed by user.
                                                       Defaults to `true`.
- * options.speak: Whether the notice
-                                                      content should be
-                                                      announced to screen
-                                                      readers. Defaults to
-                                                      `true`.
  * options.actions: User actions to be
                                                       presented with notice.
 

lib/packages-dependencies.php

@@ -124,7 +124,6 @@
 		'wp-embed',
 		'wp-i18n',
 		'wp-keycodes',
-		'wp-notices',
 		'wp-nux',
 		'wp-plugins',
 		'wp-url',

packages/components/src/notice/index.js

@@ -8,7 +8,6 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { RawHTML } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -22,16 +21,11 @@ function Notice( {
 	onRemove = noop,
 	isDismissible = true,
 	actions = [],
-	__unstableHTML,
 } ) {
 	const classes = classnames( className, 'components-notice', 'is-' + status, {
 		'is-dismissible': isDismissible,
 	} );
 
-	if ( __unstableHTML ) {
-		children = <RawHTML>{ children }</RawHTML>;
-	}
-
 	return (
 		<div className={ classes }>
 			<div className="components-notice__content">

packages/components/src/notice/list.js

@@ -25,11 +25,7 @@ function NoticeList( { notices, onRemove = noop, className = 'components-notice-
 		<div className={ className }>
 			{ children }
 			{ [ ...notices ].reverse().map( ( notice ) => (
-				<Notice
-					{ ...omit( notice, [ 'content' ] ) }
-					key={ notice.id }
-					onRemove={ removeNotice( notice.id ) }
-				>
+				<Notice { ...omit( notice, 'content' ) } key={ notice.id } onRemove={ removeNotice( notice.id ) }>
 					{ notice.content }
 				</Notice>
 			) ) }

packages/edit-post/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.0.0 (Unreleased)
+
+### Breaking Change
+
+- Revert: The `AdminNotices` component added in 3.1.0 has been removed.
+
 ## 3.1.2 (2018-11-22)
 
 ## 3.1.1 (2018-11-21)

packages/edit-post/src/components/layout/index.js

@@ -37,7 +37,6 @@ import Sidebar from '../sidebar';
 import PluginPostPublishPanel from '../sidebar/plugin-post-publish-panel';
 import PluginPrePublishPanel from '../sidebar/plugin-pre-publish-panel';
 import FullscreenMode from '../fullscreen-mode';
-import AdminNotices from '../admin-notices';
 
 function Layout( {
 	mode,
@@ -71,7 +70,6 @@ function Layout( {
 			<BrowserURL />
 			<UnsavedChangesWarning />
 			<AutosaveMonitor />
-			<AdminNotices />
 			<Header />
 			<div
 				className="edit-post-layout__content"

packages/edit-post/src/index.js

@@ -5,7 +5,6 @@ import '@wordpress/core-data';
 import '@wordpress/editor';
 import '@wordpress/nux';
 import '@wordpress/viewport';
-import '@wordpress/notices';
 import { registerCoreBlocks } from '@wordpress/block-library';
 import { render, unmountComponentAtNode } from '@wordpress/element';
 import { dispatch } from '@wordpress/data';

packages/notices/CHANGELOG.md

@@ -1,8 +1,13 @@
+## 2.0.0 (Unreleased)
+
+### Breaking Change
+
+- Revert: The `speak` option added in v1.1.0 has been removed.
+
 ## 1.1.0 (2018-11-20)
 
 ### New Feature
 
-- The `createNotice` can now optionally accept a WPNotice object as the sole argument.
 - New option `speak` enables control as to whether the notice content is announced to screen readers (defaults to `true`)
 
 ### Bug Fixes

packages/notices/src/store/actions.js

@@ -6,7 +6,7 @@ import { uniqueId } from 'lodash';
 /**
  * Internal dependencies
  */
-import { DEFAULT_CONTEXT, DEFAULT_STATUS } from './constants';
+import { DEFAULT_CONTEXT } from './constants';
 
 /**
  * Yields action objects used in signalling that a notice is to be created.
@@ -23,32 +23,23 @@ import { DEFAULT_CONTEXT, DEFAULT_STATUS } from './constants';
  * @param {?boolean}               options.isDismissible Whether the notice can
  *                                                       be dismissed by user.
  *                                                       Defaults to `true`.
- * @param {?boolean}               options.speak         Whether the notice
- *                                                       content should be
- *                                                       announced to screen
- *                                                       readers. Defaults to
- *                                                       `true`.
  * @param {?Array<WPNoticeAction>} options.actions       User actions to be
  *                                                       presented with notice.
  */
-export function* createNotice( status = DEFAULT_STATUS, content, options = {} ) {
+export function* createNotice( status = 'info', content, options = {} ) {
 	const {
-		speak = true,
 		isDismissible = true,
 		context = DEFAULT_CONTEXT,
 		id = uniqueId( context ),
 		actions = [],
-		__unstableHTML,
 	} = options;
 
 	// The supported value shape of content is currently limited to plain text
 	// strings. To avoid setting expectation that e.g. a WPElement could be
 	// supported, cast to a string.
 	content = String( content );
 
-	if ( speak ) {
-		yield { type: 'SPEAK', message: content };
-	}
+	yield { type: 'SPEAK', message: content };
 
 	yield {
 		type: 'CREATE_NOTICE',
@@ -57,7 +48,6 @@ export function* createNotice( status = DEFAULT_STATUS, content, options = {} )
 			id,
 			status,
 			content,
-			__unstableHTML,
 			isDismissible,
 			actions,
 		},

packages/notices/src/store/constants.js

@@ -6,10 +6,3 @@
  * @type {string}
  */
 export const DEFAULT_CONTEXT = 'global';
-
-/**
- * Default notice status.
- *
- * @type {string}
- */
-export const DEFAULT_STATUS = 'info';

packages/notices/src/store/selectors.js

@@ -22,16 +22,11 @@ const DEFAULT_NOTICES = [];
  *                                      `info`, `error`, or `warning`. Defaults
  *                                      to `info`.
  * @property {string}  content          Notice message.
- * @property {string}  __unstableHTML   Notice message as raw HTML. Intended to
- *                                      serve primarily for compatibility of
- *                                      server-rendered notices, and SHOULD NOT
- *                                      be used for notices. It is subject to
- *                                      removal without notice.
  * @property {boolean} isDismissible    Whether the notice can be dismissed by
  *                                      user. Defaults to `true`.
  * @property {WPNoticeAction[]} actions User actions to present with notice.
  *
- * @typedef {WPNotice}
+ * @typedef {Notice}
  */
 
 /**
@@ -53,7 +48,7 @@ const DEFAULT_NOTICES = [];
  * @param {Object}  state   Notices state.
  * @param {?string} context Optional grouping context.
  *
- * @return {WPNotice[]} Array of notices.
+ * @return {Notice[]} Array of notices.
  */
 export function getNotices( state, context = DEFAULT_CONTEXT ) {
 	return state[ context ] || DEFAULT_NOTICES;