Commit e1a9febe authored by Arunoda Susiripala's avatar Arunoda Susiripala Committed by GitHub

Get latest master into v3 (#2139)

* Merge branch 'master' into v3-beta

* Add send back to v3-beta.
parent fbb242a9
...@@ -82,8 +82,9 @@ ...@@ -82,8 +82,9 @@
"path-match": "1.2.4", "path-match": "1.2.4",
"pkg-up": "2.0.0", "pkg-up": "2.0.0",
"prop-types": "15.5.10", "prop-types": "15.5.10",
"recursive-copy": "^2.0.6",
"react-hot-loader": "3.0.0-beta.7", "react-hot-loader": "3.0.0-beta.7",
"recursive-copy": "^2.0.6",
"send": "^0.15.3",
"source-map-support": "0.4.15", "source-map-support": "0.4.15",
"strip-ansi": "3.0.1", "strip-ansi": "3.0.1",
"styled-jsx": "1.0.3", "styled-jsx": "1.0.3",
...@@ -91,11 +92,11 @@ ...@@ -91,11 +92,11 @@
"unfetch": "2.1.2", "unfetch": "2.1.2",
"url": "0.11.0", "url": "0.11.0",
"uuid": "3.0.1", "uuid": "3.0.1",
"walk": "^2.3.9",
"webpack": "2.6.0", "webpack": "2.6.0",
"webpack-dev-middleware": "1.10.2", "webpack-dev-middleware": "1.10.2",
"webpack-hot-middleware": "2.18.0", "webpack-hot-middleware": "2.18.0",
"write-file-webpack-plugin": "4.0.2", "write-file-webpack-plugin": "4.0.2"
"walk": "^2.3.9"
}, },
"devDependencies": { "devDependencies": {
"babel-eslint": "7.2.3", "babel-eslint": "7.2.3",
...@@ -107,9 +108,8 @@ ...@@ -107,9 +108,8 @@
"cheerio": "0.22.0", "cheerio": "0.22.0",
"chromedriver": "2.29.0", "chromedriver": "2.29.0",
"coveralls": "2.13.1", "coveralls": "2.13.1",
"cross-env": "4.0.0",
"express": "4.15.2",
"cross-env": "5.0.0", "cross-env": "5.0.0",
"express": "4.15.2",
"fly": "2.0.6", "fly": "2.0.6",
"fly-babel": "2.1.1", "fly-babel": "2.1.1",
"fly-clear": "1.0.1", "fly-clear": "1.0.1",
......
...@@ -772,6 +772,11 @@ module.exports = { ...@@ -772,6 +772,11 @@ module.exports = {
### Customizing webpack config ### Customizing webpack config
<p><details>
<summary><b>Examples</b></summary>
<ul><li><a href="./examples/with-webpack-bundle-analyzer">Custom webpack bundle analyzer</a></li></ul>
</details></p>
In order to extend our usage of `webpack`, you can define a function that extends its config via `next.config.js`. In order to extend our usage of `webpack`, you can define a function that extends its config via `next.config.js`.
```js ```js
......
...@@ -33,7 +33,7 @@ export default function ({ app }, suiteName, render) { ...@@ -33,7 +33,7 @@ export default function ({ app }, suiteName, render) {
const styleId = $('#blue-box').attr('data-jsx') const styleId = $('#blue-box').attr('data-jsx')
const style = $(`#__jsx-style-${styleId}`) const style = $(`#__jsx-style-${styleId}`)
expect(style.text()).toMatch(/color: blue/) expect(style.text()).toMatch(/color:blue/)
}) })
test('renders properties populated asynchronously', async () => { test('renders properties populated asynchronously', async () => {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment