Move files

README.md

@@ -360,3 +360,16 @@ See the [example](https://github.com/c8r/x0/tree/master/examples/webpack-config)
 [react-loadable]: https://github.com/thejameskyle/react-loadable
 [webpack-merge]: https://github.com/survivejs/webpack-merge
 [webpack]: https://webpack.js.org
+
+---
+
+## To Do
+
+**REMOVE BEFORE MERGING**
+
+- [ ] deep require context
+- [ ] minimatch
+- [ ] default route sorting
+- [ ] markdown scope
+- [ ] move client modules to src
+- [ ] adjust resolve

lib/build.js

@@ -18,7 +18,7 @@ const getApp = opts => {
   const config = merge(baseConfig, opts.webpack)
 
   config.mode = 'development'
-  config.entry = opts.entry || path.join(__dirname, './entry.js')
+  config.entry = opts.entry || path.join(__dirname, '../src/entry.js')
   config.output= {
     path: opts.tempdir,
     filename: 'App.js',
@@ -191,7 +191,7 @@ module.exports = async (opts) => {
   if (opts.debug) {
     config.stats = 'verbose'
   }
-  config.entry = path.join(__dirname, './entry')
+  config.entry = path.join(__dirname, '../src/entry')
   config.output = {
     path: opts.outDir,
     filename: 'bundle.js',

lib/config.js

@@ -29,7 +29,7 @@ const rules = [
   {
     test: /\.js$/,
     exclude: path.resolve(__dirname, '../node_modules'),
-    include: path.resolve(__dirname),
+    include: path.resolve(__dirname, '..'),
     loader: require.resolve('babel-loader'),
     options: babel
   },

lib/dev.js

@@ -24,7 +24,7 @@ module.exports = async (opts) => {
 
   config.mode = 'development'
   config.context = opts.dirname
-  config.entry = opts.entry || path.join(__dirname, './entry')
+  config.entry = opts.entry || path.join(__dirname, '../src/entry')
   config.output = {
     path: path.join(process.cwd(), 'dev'),
     filename: 'dev.js',

src/entry.js

@@ -1,3 +1,4 @@
+// Main application
 import path from 'path'
 import React from 'react'
 import { render, hydrate } from 'react-dom'