Merge pull request #2172 from WordPress/update/wordpress-scoped-depen…

…dencies

Add npm org scope to WordPress dependencies

blocks/alignment-toolbar/index.js

@@ -1,8 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
-import { Toolbar } from 'components';
+import { __ } from '@wordpress/i18n';
+import { Toolbar } from '@wordpress/components';
 
 const ALIGNMENT_CONTROLS = [
  {

blocks/api/categories.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Block categories.

blocks/api/paste.js

@@ -3,17 +3,23 @@
  */
 import { find, get, flowRight as compose } from 'lodash';
 
+/**
+ * WordPress dependencies
+ */
+import { nodetypes } from '@wordpress/utils';
+
 /**
  * Internal dependencies
  */
 import { createBlock } from './factory';
 import { getBlockTypes, getUnknownTypeHandler } from './registration';
 import { parseBlockAttributes } from './parser';
-import { ELEMENT_NODE, TEXT_NODE } from 'utils/nodetypes';
 import convertTables from './paste/convert-tables';
 import stripAttributes from './paste/strip-attributes';
 import removeSpans from './paste/remove-spans';
 
+const { ELEMENT_NODE, TEXT_NODE } = nodetypes;
+
 /**
  * Normalises array nodes of any node type to an array of block level nodes.
  * @param {Array} nodes Array of Nodes.

blocks/api/paste/remove-spans.js

@@ -1,4 +1,9 @@
-import { ELEMENT_NODE } from 'utils/nodetypes';
+/**
+ * WordPress dependencies
+ */
+import { nodetypes } from '@wordpress/utils';
+
+const { ELEMENT_NODE } = nodetypes;
 
 /**
  *

blocks/api/query.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createElement } from 'element';
+import { createElement } from '@wordpress/element';
 
 /**
  * External dependencies

blocks/api/serializer.js

@@ -8,7 +8,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { Component, createElement, renderToString, cloneElement, Children } from 'element';
+import { Component, createElement, renderToString, cloneElement, Children } from '@wordpress/element';
 
 /**
  * Internal dependencies

blocks/api/test/query.js

@@ -6,7 +6,7 @@ import { parse } from 'hpq';
 /**
  * WordPress dependencies
  */
-import { renderToString } from 'element';
+import { renderToString } from '@wordpress/element';
 
 /**
  * Internal dependencies

blocks/api/test/serializer.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createElement, Component } from 'element';
+import { createElement, Component } from '@wordpress/element';
 
 /**
  * Internal dependencies

blocks/block-alignment-toolbar/index.js

@@ -1,8 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
-import { Toolbar } from 'components';
+import { __ } from '@wordpress/i18n';
+import { Toolbar } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/block-controls/index.js

@@ -6,7 +6,7 @@ import { Fill } from 'react-slot-fill';
 /**
  * WordPress dependencies
  */
-import { Toolbar } from 'components';
+import { Toolbar } from '@wordpress/components';
 
 export default function BlockControls( { controls, children } ) {
  return (

blocks/block-icon/index.js

@@ -1,8 +1,8 @@
 /**
  * WordPress dependencies
  */
-import Dashicon from 'components/dashicon';
-import { createElement, Component } from 'element';
+import { Dashicon } from '@wordpress/components';
+import { createElement, Component } from '@wordpress/element';
 
 export default function BlockIcon( { icon } ) {
  if ( 'string' === typeof icon ) {

blocks/block-icon/test/index.js

@@ -6,7 +6,7 @@ import { shallow } from 'enzyme';
 /**
  * WordPress dependencies
  */
-import { Component } from 'element';
+import { Component } from '@wordpress/element';
 
 /**
  * Internal dependencies

blocks/editable/format-toolbar/index.js

@@ -6,17 +6,19 @@ import { isUndefined } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
-import { Component } from 'element';
-import { IconButton, Toolbar } from 'components';
-import { ESCAPE } from 'utils/keycodes';
+import { __ } from '@wordpress/i18n';
+import { Component } from '@wordpress/element';
+import { IconButton, Toolbar } from '@wordpress/components';
+import { keycodes } from '@wordpress/utils';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
 import UrlInput from '../../url-input';
 
+const { ESCAPE } = keycodes;
+
 const FORMATTING_CONTROLS = [
  {
  icon: 'editor-bold',

blocks/editable/index.js

@@ -21,18 +21,20 @@ import 'element-closest';
 /**
  * WordPress dependencies
  */
-import { createElement, Component, renderToString } from 'element';
-import { parse, pasteHandler } from '../api';
-import { BACKSPACE, DELETE, ENTER } from 'utils/keycodes';
+import { createElement, Component, renderToString } from '@wordpress/element';
+import { keycodes } from '@wordpress/utils';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
+import { parse, pasteHandler } from '../api';
 import FormatToolbar from './format-toolbar';
 import TinyMCE from './tinymce';
 import patterns from './patterns';
 
+const { BACKSPACE, DELETE, ENTER } = keycodes;
+
 function createTinyMCEElement( type, props, ...children ) {
  if ( props[ 'data-mce-bogus' ] === 'all' ) {
  return null;

blocks/editable/patterns.js

@@ -7,7 +7,7 @@ import { endsWith, find, get, escapeRegExp, partition, drop } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { ESCAPE, ENTER, SPACE, BACKSPACE } from 'utils/keycodes';
+import { keycodes } from '@wordpress/utils';
 
 /**
  * Internal dependencies
@@ -19,6 +19,8 @@ import { getBlockTypes } from '../api/registration';
  */
 const { setTimeout } = window;
 
+const { ESCAPE, ENTER, SPACE, BACKSPACE } = keycodes;
+
 export default function( editor ) {
  const getContent = this.getContent.bind( this );
  const { onReplace } = this.props;

blocks/editable/provider.js

@@ -6,7 +6,7 @@ import { pick, noop } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { Component } from 'element';
+import { Component } from '@wordpress/element';
 
 /**
  * The Editable Provider allows a rendering context to define global behaviors

blocks/editable/tinymce.js

@@ -8,7 +8,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { Component, Children, createElement } from 'element';
+import { Component, Children, createElement } from '@wordpress/element';
 
 export default class TinyMCE extends Component {
  componentDidMount() {

blocks/inspector-controls/checkbox-control/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { withInstanceId } from 'components';
+import { withInstanceId } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/inspector-controls/radio-control/index.js

@@ -6,7 +6,7 @@ import { isEmpty } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { withInstanceId } from 'components';
+import { withInstanceId } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/inspector-controls/range-control/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { withInstanceId } from 'components';
+import { withInstanceId } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/inspector-controls/select-control/index.js

@@ -6,7 +6,7 @@ import { isEmpty } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { withInstanceId } from 'components';
+import { withInstanceId } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/inspector-controls/text-control/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { withInstanceId } from 'components';
+import { withInstanceId } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/inspector-controls/textarea-control/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { withInstanceId } from 'components';
+import { withInstanceId } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/inspector-controls/toggle-control/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { withInstanceId, FormToggle } from 'components';
+import { withInstanceId, FormToggle } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/library/button/index.js

@@ -6,8 +6,8 @@ import { CirclePicker } from 'react-color';
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
-import { IconButton } from 'components';
+import { __ } from '@wordpress/i18n';
+import { IconButton } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/library/code/index.js

@@ -6,7 +6,7 @@ import TextareaAutosize from 'react-autosize-textarea';
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies

blocks/library/cover-image/index.js

@@ -1,8 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { Placeholder, Toolbar, Dashicon } from 'components';
-import { __ } from 'i18n';
+import { Placeholder, Toolbar, Dashicon } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
 import classnames from 'classnames';
 
 /**

blocks/library/cover-text/index.js

@@ -6,8 +6,8 @@ import { CirclePicker } from 'react-color';
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
-import { concatChildren } from 'element';
+import { __ } from '@wordpress/i18n';
+import { concatChildren } from '@wordpress/element';
 
 /**
  * Internal dependencies

blocks/library/embed/index.js

@@ -7,10 +7,12 @@ import { includes } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { __, sprintf } from 'i18n';
-import { Component } from 'element';
-import { Button, Placeholder, Spinner, SandBox } from 'components';
-import { addQueryArgs } from 'editor/utils/url';
+import { __, sprintf } from '@wordpress/i18n';
+import { Component } from '@wordpress/element';
+import { Button, Placeholder, Spinner, SandBox } from '@wordpress/components';
+// TODO: This is a circular dependency between editor and blocks. This must be
+// updated, eventually to depend on published `@wordpress/url`
+import { addQueryArgs } from '../../../editor/utils/url';
 
 /**
  * Internal dependencies

blocks/library/freeform/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies

blocks/library/freeform/old-editor.js

@@ -1,8 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { Component } from 'element';
-import { __ } from 'i18n';
+import { Component } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
 
 export default class OldEditor extends Component {
  constructor( props ) {

blocks/library/gallery/index.js

@@ -1,8 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
-import { Toolbar, Placeholder } from 'components';
+import { __ } from '@wordpress/i18n';
+import { Toolbar, Placeholder } from '@wordpress/components';
 import { pick } from 'lodash';
 
 /**

blocks/library/heading/index.js

@@ -6,9 +6,9 @@ import { isObject } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { __, sprintf } from 'i18n';
-import { concatChildren } from 'element';
-import { Toolbar } from 'components';
+import { __, sprintf } from '@wordpress/i18n';
+import { concatChildren } from '@wordpress/element';
+import { Toolbar } from '@wordpress/components';
 
 /**
  * Internal dependencies

blocks/library/html/index.js

@@ -6,8 +6,8 @@ import TextareaAutosize from 'react-autosize-textarea';
 /**
  * WordPress dependencies
  */
-import { __ } from 'i18n';
-import { Component } from 'element';
+import { __ } from '@wordpress/i18n';
+import { Component } from '@wordpress/element';
 
 /**
  * Internal dependencies