Simplify Webpack configuration

.eslintignore

@@ -1 +1,2 @@
-modules/*/build
+build
+docs

index.php

@@ -40,8 +40,8 @@ function gutenberg_register_scripts() {
  wp_register_script( 'react-dom', 'https://unpkg.com/react-dom@15/dist/react-dom' . $suffix . '.js', array( 'react' ) );
 
  // Editor
- wp_register_script( 'wp-element', plugins_url( 'modules/element/build/index.js', __FILE__ ), array( 'react', 'react-dom' ) );
- wp_register_script( 'wp-blocks', plugins_url( 'modules/blocks/build/index.js', __FILE__ ), array( 'wp-element' ) );
+ wp_register_script( 'wp-element', plugins_url( 'element/build/index.js', __FILE__ ), array( 'react', 'react-dom' ) );
+ wp_register_script( 'wp-blocks', plugins_url( 'blocks/build/index.js', __FILE__ ), array( 'wp-element' ) );
 }
 add_action( 'init', 'gutenberg_register_scripts' );
 
@@ -58,11 +58,11 @@ function gutenberg_scripts_and_styles( $hook ) {
  if ( 'toplevel_page_gutenberg' === $hook ) {
  // Scripts
  wp_register_script( 'gutenberg-content', plugins_url( 'post-content.js', __FILE__ ) );
- wp_enqueue_script( 'wp-editor', plugins_url( 'modules/editor/build/index.js', __FILE__ ), array( 'wp-blocks', 'wp-element', 'gutenberg-content' ), false, true );
+ wp_enqueue_script( 'wp-editor', plugins_url( 'editor/build/index.js', __FILE__ ), array( 'wp-blocks', 'wp-element', 'gutenberg-content' ), false, true );
  wp_add_inline_script( 'wp-editor', 'wp.editor.createEditorInstance( \'editor\', { content: window.content } );' );
 
  // Styles
- wp_enqueue_style( 'wp-editor', plugins_url( 'modules/editor/build/style.css', __FILE__ ) );
+ wp_enqueue_style( 'wp-editor', plugins_url( 'editor/build/style.css', __FILE__ ) );
  }
 }
 

package.json

@@ -13,7 +13,7 @@
  "scripts": {
  "test-unit": "cross-env NODE_ENV=test webpack && mocha build --require bootstrap-test.js",
  "build": "cross-env NODE_ENV=production webpack",
- "lint": "eslint modules",
+ "lint": "eslint .",
  "dev": "webpack --watch",
  "test": "npm run lint && npm run test-unit"
  },
@@ -47,6 +47,6 @@
  "webpack-node-externals": "^1.5.4"
  },
  "dependencies": {
- "hpq": "^1.1.0"
+ "hpq": "^1.1.1"
  }
 }

webpack.config.js

@@ -3,36 +3,18 @@
  */
 
 const glob = require( 'glob' );
-const path = require( 'path' );
 const webpack = require( 'webpack' );
 const ExtractTextPlugin = require( 'extract-text-webpack-plugin' );
 
-/**
- * Base path from which modules are to be discovered.
- *
- * @type {String}
- */
-const BASE_PATH = './modules';
-
-/**
- * Object of Webpack entry points consisting of modules discovered in the base
- * path subdirectory. Treating each as an independent bundle with a shared
- * configuration for library output provides a consistent authoring environment
- * and exposes each separately on the global scope (window.wp.blocks, etc.).
- *
- * @type {Object}
- */
-const entry = [ 'blocks', 'editor', 'element' ].reduce( ( memo, submodule ) => {
- return Object.assign( memo, {
- [ submodule ]: [ BASE_PATH, submodule, 'index.js' ].join( '/' )
- } );
-}, {} );
-
 const config = {
- entry: entry,
+ entry: {
+ blocks: './blocks/index.js',
+ editor: './editor/index.js',
+ element: './element/index.js'
+ },
  output: {
  filename: '[name]/build/index.js',
- path: path.resolve( BASE_PATH ),
+ path: __dirname,
  library: [ 'wp', '[name]' ],
  libraryTarget: 'this'
  },
@@ -48,10 +30,7 @@ const config = {
  },
  {
  test: /\.js$/,
- include: [
- __dirname + '/modules',
- __dirname + '/node_modules/hpq'
- ],
+ exclude: /node_modules/,
  use: 'babel-loader'
  },
  {
@@ -95,7 +74,7 @@ switch ( process.env.NODE_ENV ) {
 
  case 'test':
  config.target = 'node';
- config.entry = glob.sync( BASE_PATH + '/**/test/*.js' );
+ config.entry = glob.sync( `./{${ Object.keys( config.entry ).join() }}/test/*.js` );
  config.externals = [ require( 'webpack-node-externals' )() ];
  config.output = {
  filename: 'build/test.js',