Merge pull request #386 from WordPress/add/per-module-root

Enable per-root module imports
WordPress · Apr 10, 2017 · 7fdb9f5 · 7fdb9f5
2 parents 2bcf5ba + c8e8a5d
commit 7fdb9f5
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 9 deletions.
diff --git a/editor/components/toolbar/index.js b/editor/components/toolbar/index.js
@@ -7,7 +7,7 @@ import classNames from 'classnames';
  * Internal dependencies
  */
 import './style.scss';
-import Dashicon from '../dashicon';
+import Dashicon from 'components/dashicon';
 
 function Toolbar( { controls } ) {
 	if ( ! controls || ! controls.length ) {

diff --git 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/inserter/button.js b/editor/inserter/button.js
@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 import Inserter from './';
-import Dashicon from '../components/dashicon';
+import Dashicon from 'components/dashicon';
 
 class InserterButton extends wp.element.Component {
 	constructor() {

diff --git a/editor/inserter/index.js b/editor/inserter/index.js
@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 import './style.scss';
-import Dashicon from '../components/dashicon';
+import Dashicon from 'components/dashicon';
 
 function Inserter() {
 	const blocks = wp.blocks.getBlocks();

diff --git a/editor/layout/index.js b/editor/layout/index.js
@@ -6,9 +6,9 @@ import { connect } from 'react-redux';
 /**
  * Internal dependencies
  */
-import Header from '../header';
-import TextEditor from '../modes/text-editor';
-import VisualEditor from '../modes/visual-editor';
+import Header from 'header';
+import TextEditor from 'modes/text-editor';
+import VisualEditor from 'modes/visual-editor';
 
 function Layout( { mode } ) {
 	return (

diff --git a/editor/modes/visual-editor/block.js b/editor/modes/visual-editor/block.js
@@ -7,7 +7,7 @@ import classnames from 'classnames';
 /**
  * Internal dependencies
  */
-import Toolbar from '../../components/toolbar';
+import Toolbar from 'components/toolbar';
 
 function VisualEditorBlock( props ) {
 	const { block } = props;

diff --git a/editor/modes/visual-editor/index.js b/editor/modes/visual-editor/index.js
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
  * Internal dependencies
  */
 import './style.scss';
-import InserterButton from '../../inserter/button';
+import InserterButton from 'inserter/button';
 import VisualEditorBlock from './block';
 
 function VisualEditor( { blocks } ) {

diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "raw-loader": "^0.5.1",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
+    "resolve-entry-modules-webpack-plugin": "^1.0.0",
     "sass-loader": "^6.0.3",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.9.0",

diff --git a/webpack.config.js b/webpack.config.js
@@ -5,6 +5,7 @@
 const glob = require( 'glob' );
 const webpack = require( 'webpack' );
 const ExtractTextPlugin = require( 'extract-text-webpack-plugin' );
+const ResolveEntryModulesPlugin = require( 'resolve-entry-modules-webpack-plugin' );
 
 const config = {
 	entry: {
@@ -55,6 +56,7 @@ const config = {
 		]
 	},
 	plugins: [
+		new ResolveEntryModulesPlugin(),
 		new ExtractTextPlugin( {
 			filename: './[name]/build/style.css'
 		} ),