From fe70e90c41cfe468ad971ff62091bcf73d15a2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Ventura?= Date: Wed, 12 Apr 2017 11:32:53 +0200 Subject: [PATCH 1/3] Move "components" to top level. Reorganize editor specific ones. --- {editor/components => components}/button/index.js | 0 {editor/components => components}/button/style.scss | 0 {editor/components => components}/dashicon/index.js | 0 {editor/components => components}/icon-button/index.js | 0 {editor/components => components}/icon-button/style.scss | 0 editor/{components/toolbar => editor-toolbar}/index.js | 0 editor/{components/toolbar => editor-toolbar}/style.scss | 0 editor/{components => }/inserter/index.js | 0 editor/{components => }/inserter/menu.js | 0 editor/{components => }/inserter/style.scss | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {editor/components => components}/button/index.js (100%) rename {editor/components => components}/button/style.scss (100%) rename {editor/components => components}/dashicon/index.js (100%) rename {editor/components => components}/icon-button/index.js (100%) rename {editor/components => components}/icon-button/style.scss (100%) rename editor/{components/toolbar => editor-toolbar}/index.js (100%) rename editor/{components/toolbar => editor-toolbar}/style.scss (100%) rename editor/{components => }/inserter/index.js (100%) rename editor/{components => }/inserter/menu.js (100%) rename editor/{components => }/inserter/style.scss (100%) diff --git a/editor/components/button/index.js b/components/button/index.js similarity index 100% rename from editor/components/button/index.js rename to components/button/index.js diff --git a/editor/components/button/style.scss b/components/button/style.scss similarity index 100% rename from editor/components/button/style.scss rename to components/button/style.scss diff --git a/editor/components/dashicon/index.js b/components/dashicon/index.js similarity index 100% rename from editor/components/dashicon/index.js rename to components/dashicon/index.js diff --git a/editor/components/icon-button/index.js b/components/icon-button/index.js similarity index 100% rename from editor/components/icon-button/index.js rename to components/icon-button/index.js diff --git a/editor/components/icon-button/style.scss b/components/icon-button/style.scss similarity index 100% rename from editor/components/icon-button/style.scss rename to components/icon-button/style.scss diff --git a/editor/components/toolbar/index.js b/editor/editor-toolbar/index.js similarity index 100% rename from editor/components/toolbar/index.js rename to editor/editor-toolbar/index.js diff --git a/editor/components/toolbar/style.scss b/editor/editor-toolbar/style.scss similarity index 100% rename from editor/components/toolbar/style.scss rename to editor/editor-toolbar/style.scss diff --git a/editor/components/inserter/index.js b/editor/inserter/index.js similarity index 100% rename from editor/components/inserter/index.js rename to editor/inserter/index.js diff --git a/editor/components/inserter/menu.js b/editor/inserter/menu.js similarity index 100% rename from editor/components/inserter/menu.js rename to editor/inserter/menu.js diff --git a/editor/components/inserter/style.scss b/editor/inserter/style.scss similarity index 100% rename from editor/components/inserter/style.scss rename to editor/inserter/style.scss From 8993b67027e83f53bdb2024c1dafbee96b0c26e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Ventura?= Date: Wed, 12 Apr 2017 11:35:07 +0200 Subject: [PATCH 2/3] Move "modes" to root of editor. --- {editor/editor-toolbar => components/block-toolbar}/index.js | 0 {editor/editor-toolbar => components/block-toolbar}/style.scss | 0 editor/{modes => }/text-editor/index.js | 0 editor/{modes => }/text-editor/style.scss | 0 editor/{modes => }/visual-editor/block.js | 0 editor/{modes => }/visual-editor/index.js | 0 editor/{modes => }/visual-editor/style.scss | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename {editor/editor-toolbar => components/block-toolbar}/index.js (100%) rename {editor/editor-toolbar => components/block-toolbar}/style.scss (100%) rename editor/{modes => }/text-editor/index.js (100%) rename editor/{modes => }/text-editor/style.scss (100%) rename editor/{modes => }/visual-editor/block.js (100%) rename editor/{modes => }/visual-editor/index.js (100%) rename editor/{modes => }/visual-editor/style.scss (100%) diff --git a/editor/editor-toolbar/index.js b/components/block-toolbar/index.js similarity index 100% rename from editor/editor-toolbar/index.js rename to components/block-toolbar/index.js diff --git a/editor/editor-toolbar/style.scss b/components/block-toolbar/style.scss similarity index 100% rename from editor/editor-toolbar/style.scss rename to components/block-toolbar/style.scss diff --git a/editor/modes/text-editor/index.js b/editor/text-editor/index.js similarity index 100% rename from editor/modes/text-editor/index.js rename to editor/text-editor/index.js diff --git a/editor/modes/text-editor/style.scss b/editor/text-editor/style.scss similarity index 100% rename from editor/modes/text-editor/style.scss rename to editor/text-editor/style.scss diff --git a/editor/modes/visual-editor/block.js b/editor/visual-editor/block.js similarity index 100% rename from editor/modes/visual-editor/block.js rename to editor/visual-editor/block.js diff --git a/editor/modes/visual-editor/index.js b/editor/visual-editor/index.js similarity index 100% rename from editor/modes/visual-editor/index.js rename to editor/visual-editor/index.js diff --git a/editor/modes/visual-editor/style.scss b/editor/visual-editor/style.scss similarity index 100% rename from editor/modes/visual-editor/style.scss rename to editor/visual-editor/style.scss From 251adb321ca5e0ae05f400af0b5e581fdd15c422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Ventura?= Date: Wed, 12 Apr 2017 12:06:35 +0200 Subject: [PATCH 3/3] Update import paths. --- components/block-toolbar/index.js | 2 +- components/index.js | 0 editor/header/mode-switcher/index.js | 2 +- editor/header/saved-state/index.js | 2 +- editor/header/tools/index.js | 8 ++++---- editor/inserter/index.js | 2 +- editor/inserter/menu.js | 2 +- editor/layout/index.js | 4 ++-- editor/visual-editor/block.js | 2 +- editor/visual-editor/index.js | 2 +- languages/gutenberg.pot | 16 ++++++++-------- webpack.config.js | 1 + 12 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 components/index.js diff --git a/components/block-toolbar/index.js b/components/block-toolbar/index.js index 48b97f385f9968..a17a18b09e63b0 100644 --- a/components/block-toolbar/index.js +++ b/components/block-toolbar/index.js @@ -7,7 +7,7 @@ import classNames from 'classnames'; * Internal dependencies */ import './style.scss'; -import Dashicon from 'components/dashicon'; +import Dashicon from 'dashicon'; function Toolbar( { controls } ) { if ( ! controls || ! controls.length ) { diff --git a/components/index.js b/components/index.js new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/editor/header/mode-switcher/index.js b/editor/header/mode-switcher/index.js index 0c4e0d893eb442..b2807c85ae99a6 100644 --- a/editor/header/mode-switcher/index.js +++ b/editor/header/mode-switcher/index.js @@ -7,7 +7,7 @@ import { connect } from 'react-redux'; * Internal dependencies */ import './style.scss'; -import Dashicon from 'components/dashicon'; +import Dashicon from '../../../components/dashicon'; /** * Set of available mode options. diff --git a/editor/header/saved-state/index.js b/editor/header/saved-state/index.js index 904981a8d3cc48..a41db5ea951931 100644 --- a/editor/header/saved-state/index.js +++ b/editor/header/saved-state/index.js @@ -2,7 +2,7 @@ * Internal dependencies */ import './style.scss'; -import Dashicon from '../../components/dashicon'; +import Dashicon from '../../../components/dashicon'; function SavedState() { return ( diff --git a/editor/header/tools/index.js b/editor/header/tools/index.js index eef3a987382f6f..c42945c101c5ef 100644 --- a/editor/header/tools/index.js +++ b/editor/header/tools/index.js @@ -2,10 +2,10 @@ * Internal dependencies */ import './style.scss'; -import Dashicon from '../../components/dashicon'; -import IconButton from '../../components/icon-button'; -import Inserter from '../../components/inserter'; -import Button from '../../components/button'; +import Dashicon from '../../../components/dashicon'; +import IconButton from '../../../components/icon-button'; +import Inserter from 'inserter'; +import Button from '../../../components/button'; function Tools() { return ( diff --git a/editor/inserter/index.js b/editor/inserter/index.js index 691516f1884a6d..bd4758d4735c88 100644 --- a/editor/inserter/index.js +++ b/editor/inserter/index.js @@ -2,7 +2,7 @@ * Internal dependencies */ import InserterMenu from './menu'; -import IconButton from 'components/icon-button'; +import IconButton from '../../components/icon-button'; class Inserter extends wp.element.Component { constructor() { diff --git a/editor/inserter/menu.js b/editor/inserter/menu.js index 2a8a746c0bf0e6..099a1e902afa39 100644 --- a/editor/inserter/menu.js +++ b/editor/inserter/menu.js @@ -2,7 +2,7 @@ * Internal dependencies */ import './style.scss'; -import Dashicon from 'components/dashicon'; +import Dashicon from '../../components/dashicon'; function InserterMenu() { const blocks = wp.blocks.getBlocks(); diff --git a/editor/layout/index.js b/editor/layout/index.js index 47af35cda025f3..c772b4de748d54 100644 --- a/editor/layout/index.js +++ b/editor/layout/index.js @@ -7,8 +7,8 @@ import { connect } from 'react-redux'; * Internal dependencies */ import Header from 'header'; -import TextEditor from 'modes/text-editor'; -import VisualEditor from 'modes/visual-editor'; +import TextEditor from 'text-editor'; +import VisualEditor from 'visual-editor'; function Layout( { mode } ) { return ( diff --git a/editor/visual-editor/block.js b/editor/visual-editor/block.js index b4f19e1a80b10b..a42f29a5002bca 100644 --- a/editor/visual-editor/block.js +++ b/editor/visual-editor/block.js @@ -7,7 +7,7 @@ import classnames from 'classnames'; /** * Internal dependencies */ -import Toolbar from 'components/toolbar'; +import Toolbar from '../../components/block-toolbar'; function VisualEditorBlock( props ) { const { block } = props; diff --git a/editor/visual-editor/index.js b/editor/visual-editor/index.js index fa63f1f66dd6b9..d212a1fce0f828 100644 --- a/editor/visual-editor/index.js +++ b/editor/visual-editor/index.js @@ -7,7 +7,7 @@ import { connect } from 'react-redux'; * Internal dependencies */ import './style.scss'; -import Inserter from 'components/inserter'; +import Inserter from 'inserter'; import VisualEditorBlock from './block'; function VisualEditor( { blocks } ) { diff --git a/languages/gutenberg.pot b/languages/gutenberg.pot index e221c87c3e883e..4510330fbf9233 100644 --- a/languages/gutenberg.pot +++ b/languages/gutenberg.pot @@ -38,14 +38,6 @@ msgstr "" msgid "Justify" msgstr "" -#: editor/components/inserter/index.js:29 -msgid "Insert block" -msgstr "" - -#: editor/components/inserter/menu.js:40 -msgid "Search…" -msgstr "" - #: editor/header/mode-switcher/index.js:20 msgid "Visual" msgstr "" @@ -78,4 +70,12 @@ msgstr "" #: editor/header/tools/index.js:27 msgid "Publish" +msgstr "" + +#: editor/inserter/index.js:29 +msgid "Insert block" +msgstr "" + +#: editor/inserter/menu.js:40 +msgid "Search…" msgstr "" \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index e54eaed0f13119..6ceef5757f67f6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,6 +11,7 @@ const config = { entry: { i18n: './i18n/index.js', blocks: './blocks/index.js', + components: './components/index.js', editor: './editor/index.js', element: './element/index.js' },