Merge pull request #19 from dora-js/cwd-from-query

add option cwd and fix node@6 issue

Author: soda-x

.eslintrc

@@ -1,4 +1,5 @@
 {
+  "parser": "babel-eslint",
   "extends": "eslint-config-airbnb/base",
   "rules": {
     "no-console": [0]

Makefile

@@ -4,5 +4,5 @@ publish:
 	npm publish
 
 publish-sync: publish
-	cnpm sync dora-plugin-webpack
-	tnpm sync dora-plugin-webpack
+	cnpm sync
+	tnpm sync

README.md

@@ -1,7 +1,7 @@
 # dora-plugin-webpack
 
 
-webpack plugin for dora.
+dora plugin for webpack.
 
 
 [![NPM version](https://img.shields.io/npm/v/dora-plugin-webpack.svg?style=flat)](https://npmjs.org/package/dora-plugin-webpack)
@@ -32,6 +32,7 @@ $ dora --plugins webpack?{"watchOptions":{"poll":true}}
 
 ### Options
 
+- `cwd` -- default from dora
 - `publicPath` -- default '/', http://webpack.github.io/docs/configuration.html#output-publicpath
 - `config` -- default 'webpack.config.js'
 - `verbose` -- more logs

package.json

@@ -1,6 +1,7 @@
 {
   "name": "dora-plugin-webpack",
   "version": "0.6.5",
+  "description": "dora plugin for webpack",
   "repository": {
     "type": "git",
     "url": "https://github.com/dora-js/dora-plugin-webpack"
@@ -11,11 +12,11 @@
   "main": "./lib",
   "scripts": {
     "build": "rm -rf lib && babel src --out-dir lib",
-    "test": "babel-node node_modules/.bin/babel-istanbul cover node_modules/.bin/_mocha --no-timeouts",
-    "debug": "./node_modules/.bin/mocha --require babel-core/register --no-timeouts",
+    "test": "babel-node $(npm bin)/babel-istanbul cover $(npm bin)/_mocha --no-timeouts",
+    "debug": "$(npm bin)/mocha --require babel-core/register --no-timeouts",
     "lint": "eslint --ext .js src",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "pub":"npm run build && npm publish && rm -rf lib && git push origin"
+    "pub": "npm run build && npm publish && rm -rf lib && git push origin"
   },
   "pre-commit": [
     "lint"
@@ -29,9 +30,10 @@
   },
   "devDependencies": {
     "atool-build": "0.x",
-    "babel-cli": "~6.6.0",
-    "babel-core": "~6.6.0",
-    "babel-istanbul": "^0.5.9",
+    "babel-cli": "^6.7.5",
+    "babel-core": "^6.7.6",
+    "babel-eslint": "^6.1.2",
+    "babel-istanbul": "^0.11.0",
     "babel-plugin-add-module-exports": "~0.1.1",
     "babel-preset-es2015": "~6.1.18",
     "babel-preset-stage-0": "~6.1.18",
@@ -62,4 +64,4 @@
     "package.json",
     "README.md"
   ]
-}
+}

src/index.js

@@ -14,7 +14,11 @@ export default {
   name: 'dora-plugin-webpack',
 
   'middleware.before'() {
-    const { cwd, applyPlugins, query } = this;
+    const { applyPlugins, query } = this;
+    let { cwd } = this;
+    if (query.cwd) {
+      cwd = query.cwd;
+    }
     const customConfigPath = resolve(cwd, query.config || 'webpack.config.js');
 
     if (existsSync(customConfigPath)) {
@@ -27,7 +31,7 @@ export default {
       }
     }
 
-    webpackConfig = getWebpackCommonConfig(this);
+    webpackConfig = getWebpackCommonConfig({ ...this, cwd });
     webpackConfig.devtool = '#cheap-module-source-map';
     webpackConfig.plugins = webpackConfig.plugins.concat([
       new ProgressPlugin((percentage, msg) => {
@@ -71,7 +75,11 @@ export default {
   },
 
   'server.after'() {
-    const { cwd, query } = this;
+    const { query } = this;
+    let { cwd } = this;
+    if (query.cwd) {
+      cwd = query.cwd;
+    }
     const pkgPath = join(cwd, 'package.json');
 
     function getEntry() {

test/index-test.js

@@ -16,7 +16,7 @@ describe('index', () => {
       dora({
         port,
         plugins: [
-          '../../../src/index?publicPath=/foo/&verbose'
+          '../../../src/index?{"publicPath": "/foo/", "verbose":true}'
         ],
         cwd: cwd,
         verbose: true,