Code

Merge branch 'master' into cn#350

Code

Merged

dear-lizhihua merged 9 commits intodocschina:cndocschina/webpack.js.org:cnfrom dear-lizhihua:cnCopy head branch name to clipboardAug 10, 2017

+272-85

Commits

Commits on Aug 5, 2017

• docs(config): change global to root in externals (#1214)

  Show description for 91b5f3c
  

  dxu

  authored and

  skipjack

  committed
  91b5f3c

  Copy full SHA for 91b5f3c

• docs(config): clarify that HMR plugin can be added via a flag (#1478)

  

  jennings

  authored and

  skipjack

  committed
  fbd32ef

  Copy full SHA for fbd32ef

• fix(markdown): resolve some odd code display bugs (#1486)

  Show description for 1d20561
  

  pierreneter

  authored and

  skipjack

  committed
  1d20561

  Copy full SHA for 1d20561

Commits on Aug 6, 2017

• docs(guides): add note about chunkFilename (#1483)

  

  sudarsangp

  authored and

  skipjack

  committed
  7b9c190

  Copy full SHA for 7b9c190

• docs(config): clarify the meaning of Rule.parser options (#1489)

  Show description for d6f9075
  

  jennings

  authored and

  skipjack

  committed
  d6f9075

  Copy full SHA for d6f9075

• docs(config): improve node documentation (#1368)

  Show description for 1fdd547
  

  Rob--W

  authored and

  skipjack

  committed
  1fdd547

  Copy full SHA for 1fdd547

• docs(config): correct substitutions in output.md (#1487)

  Show description for bdf4dbb
  

  pierreneter

  authored and

  skipjack

  committed
  bdf4dbb

  Copy full SHA for bdf4dbb

• Merge remote-tracking branch 'upstream/master'

  dear-lizhihua

  committed
  34bc9e3

  Copy full SHA for 34bc9e3

• Merge branch 'master' into cn

  Show description for d184128
  dear-lizhihua

  committed
  d184128

  Copy full SHA for d184128