Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable per-root module imports #386

Merged
merged 3 commits into from
Apr 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/components/toolbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down
2 changes: 1 addition & 1 deletion editor/header/mode-switcher/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { connect } from 'react-redux';
* Internal dependencies
*/
import './style.scss';
import Dashicon from '../../components/dashicon';
import Dashicon from 'components/dashicon';

class ModeSwitcher extends wp.element.Component {
constructor() {
Expand Down
2 changes: 1 addition & 1 deletion editor/inserter/button.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion editor/inserter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions editor/layout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion editor/modes/visual-editor/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion editor/modes/visual-editor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } ) {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -55,6 +56,7 @@ const config = {
]
},
plugins: [
new ResolveEntryModulesPlugin(),
new ExtractTextPlugin( {
filename: './[name]/build/style.css'
} ),
Expand Down