Merge pull request #18 from brocessing/dev

0.7.0

README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
   <!-- Version -->
-  <a href="https://github.com/brocessing/kirby-webpack/releases"><img src="https://img.shields.io/badge/version-0.6.2-green.svg?style=flat-square" alt="Version"/></a>
+  <a href="https://github.com/brocessing/kirby-webpack/releases"><img src="https://img.shields.io/badge/version-0.7.0-green.svg?style=flat-square" alt="Version"/></a>
   <!-- License -->
   <a href="https://raw.githubusercontent.com/brocessing/kirby-webpack/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square" alt="License" /></a>
 </div>

main.config.js

@@ -4,12 +4,11 @@ const path = require('path')
  * BUNDLE ENTRY FILES
  * All file will be passed to your webpack config.
  * Formatted as { input: output }
- * input path are relative to paths.src
- * output path are relative to paths.build
+ * paths are relative to your project root (__dirname)
  */
 const entries = {
-  'index.js': 'assets/bundle.js',
-  'index.less': 'assets/bundle.css'
+  'src/index.js': 'www/assets/bundle.js',
+  'src/index.less': 'www/assets/bundle.css'
 }
 
 /**
@@ -51,37 +50,31 @@ const devServer = {
  * All paths used in kirby-webpack.
  * change them if you want to customize the folder architecture.
  */
-const paths = {
-  // source folder for js / css
-  src: path.join(__dirname, 'src'),
+const paths = {}
 
-  // folder where webpack bundle files
-  build: path.join(__dirname, 'www'),
+// public folder to deploy to your server
+// if you use a proxy, this is often the document root of the server used
+paths.www = path.join(__dirname, 'www')
 
-  // public folder to deploy to your server
-  // if you use a proxy, this is often the document root of the server used
-  www: path.join(__dirname, 'www'),
-
-  // public baseUrl of your site, generally '/'.
-  // it often change depending on your environment,
-  // the correct one will be chosen from the value of appEnv.
-  basepaths: {
-    development: '/',
-    preprod: '/',
-    production: '/'
-  },
+// public baseUrl of your site, generally '/'.
+// it often change depending on your environment,
+// the correct one will be chosen from the value of appEnv.
+paths.basepaths = {
+  development: '/',
+  preprod: '/',
+  production: '/'
+}
 
-  // all kirby paths
-  kirby: {
-    core: path.join(__dirname, 'www', 'kirby'),
-    panel: path.join(__dirname, 'www', 'panel'),
-    assets: path.join(__dirname, 'www', 'assets'),
-    cache: path.join(__dirname, 'www', 'site', 'cache'),
-    fields: path.join(__dirname, 'www', 'site', 'fields'),
-    tags: path.join(__dirname, 'www', 'site', 'tags'),
-    plugins: path.join(__dirname, 'www', 'site', 'plugins'),
-    widgets: path.join(__dirname, 'www', 'site', 'widgets')
-  }
+// all kirby paths
+paths.kirby = {
+  core: path.join(paths.www, 'kirby'),
+  panel: path.join(paths.www, 'panel'),
+  assets: path.join(paths.www, 'assets'),
+  cache: path.join(paths.www, 'site', 'cache'),
+  fields: path.join(paths.www, 'site', 'fields'),
+  tags: path.join(paths.www, 'site', 'tags'),
+  plugins: path.join(paths.www, 'site', 'plugins'),
+  widgets: path.join(paths.www, 'site', 'widgets')
 }
 
 // the appEnv variable can be used to create environment-specific behaviours

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kirby-webpack",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "A kirby starter-kit with modern frontend tools",
   "main": "index.js",
   "scripts": {
@@ -38,11 +38,11 @@
     "browser-sync": "^2.18.13",
     "cross-env": "^5.0.5",
     "css-loader": "^0.28.7",
-    "eslint": "^4.8.0",
+    "eslint": "^4.9.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.5.0",
+    "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
     "extract-text-webpack-plugin": "^3.0.1",
     "file-loader": "^1.1.5",
@@ -51,7 +51,7 @@
     "kool-shell": "^1.5.0",
     "less": "^3.0.0-alpha.3",
     "less-loader": "^4.0.5",
-    "postcss-loader": "^2.0.7",
+    "postcss-loader": "^2.0.8",
     "progress-bar-webpack-plugin": "^1.10.0",
     "resolve-url-loader": "^2.1.1",
     "style-loader": "^0.19.0",

scripts/utils/format-config.js

@@ -1,4 +1,6 @@
 const path = require('path')
+const sh = require('kool-shell')()
+  .use(require('kool-shell/plugins/log'))
 
 const PREPROC_LOADER = {
   less: 'less-loader',
@@ -19,9 +21,24 @@ function formatConfig (config) {
 
   // format entries for webpack
   const nEntries = {}
+  const projectRoot = path.join(__dirname, '..', '..')
   for (let k in config.entries) {
-    const src = path.join(config.paths.src, k)
-    const dist = config.entries[k]
+    const relativeWww = path.relative(projectRoot, config.paths.www)
+    const src = path.join(projectRoot, k)
+    const dist = path.relative(relativeWww, config.entries[k])
+    if (
+      dist.length >= 2 &&
+      dist.substr(0, 2) === '..' &&
+      config.appEnv === 'development'
+    ) {
+      sh.log()
+      sh.warn(
+        '\n' + k + ' will not be bundled in development.\n' +
+        'Its destination is outside the public folder.'
+      )
+      continue
+    }
+
     if (!nEntries[dist]) {
       nEntries[dist] = (config.appEnv === 'development')
         ? [src, 'webpack-hot-middleware/client?reload=true']

scripts/webpack-serve.js

@@ -164,16 +164,20 @@ function ready () {
 }
 
 function logPhpError () {
-  fs.ensureFile(LOGPATH)
+  Promise.resolve()
+    .then(() => fs.remove(LOGPATH))
+    .then(() => fs.ensureFile(LOGPATH))
     .then(() => {
       const tail = new Tail(LOGPATH, {
         useWatchFile: true,
         fsWatchOptions: { interval: 300 }
       })
       tail.on('line', (data) => {
-        data = data.toString('utf8').split(']')
-        const date = sh.colors.gray(data.shift() + ']')
-        data = date + data.join(']')
+        if (/^\[[a-zA-Z0-9: -]+\] .+/g.test(data)) {
+          data = data.toString('utf8').split(']')
+          const date = sh.colors.gray(data.shift() + ']')
+          data = date + data.join(']')
+        }
         sh.log(sh.colors.red('[PHP]') + data)
       })
       tail.on('error', err => sh.error(err))

webpack.config.common.js

@@ -31,7 +31,9 @@ if (user.css.preprocessorLoader) {
 const webpack = {
   output: {
     publicPath: user.paths.basepath,
-    path: user.paths.build,
+    // we bundle from the www folder to avoid messing with the webpack dev middleware
+    // all entries src/dest path are converted through scripts/utils/format-config.js
+    path: user.paths.www,
     filename: '[name]',
     chunkFilename: '[name].[id].chunk.js'
   },
@@ -43,7 +45,7 @@ const webpack = {
       {
         test: /\.(js)$/,
         loader: 'babel-loader',
-        include: user.paths.src
+        exclude: /(node_modules|bower_components)/
       }
     ]
   },