diff --git a/package.json b/package.json index ce743633..538a60f1 100644 --- a/package.json +++ b/package.json @@ -82,8 +82,9 @@ "path-match": "1.2.4", "pkg-up": "2.0.0", "prop-types": "15.5.10", - "recursive-copy": "^2.0.6", "react-hot-loader": "3.0.0-beta.7", + "recursive-copy": "^2.0.6", + "send": "^0.15.3", "source-map-support": "0.4.15", "strip-ansi": "3.0.1", "styled-jsx": "1.0.3", @@ -91,11 +92,11 @@ "unfetch": "2.1.2", "url": "0.11.0", "uuid": "3.0.1", + "walk": "^2.3.9", "webpack": "2.6.0", "webpack-dev-middleware": "1.10.2", "webpack-hot-middleware": "2.18.0", - "write-file-webpack-plugin": "4.0.2", - "walk": "^2.3.9" + "write-file-webpack-plugin": "4.0.2" }, "devDependencies": { "babel-eslint": "7.2.3", @@ -107,9 +108,8 @@ "cheerio": "0.22.0", "chromedriver": "2.29.0", "coveralls": "2.13.1", - "cross-env": "4.0.0", - "express": "4.15.2", "cross-env": "5.0.0", + "express": "4.15.2", "fly": "2.0.6", "fly-babel": "2.1.1", "fly-clear": "1.0.1", diff --git a/readme.md b/readme.md index 8c1457b3..c6d4bd1e 100644 --- a/readme.md +++ b/readme.md @@ -772,6 +772,11 @@ module.exports = { ### Customizing webpack config +

+ Examples + +

+ In order to extend our usage of `webpack`, you can define a function that extends its config via `next.config.js`. ```js diff --git a/test/integration/basic/test/rendering.js b/test/integration/basic/test/rendering.js index 65d81f3b..f2d50bf5 100644 --- a/test/integration/basic/test/rendering.js +++ b/test/integration/basic/test/rendering.js @@ -33,7 +33,7 @@ export default function ({ app }, suiteName, render) { const styleId = $('#blue-box').attr('data-jsx') const style = $(`#__jsx-style-${styleId}`) - expect(style.text()).toMatch(/color: blue/) + expect(style.text()).toMatch(/color:blue/) }) test('renders properties populated asynchronously', async () => { diff --git a/yarn.lock b/yarn.lock index 349e9972..5e625b95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -815,9 +815,9 @@ babel-plugin-transform-strict-mode@^6.24.1: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-preset-env@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.0.tgz#6e5452f7c8742afe3b9a917883ccf3f7a4f340c5" +babel-preset-env@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.1.tgz#d2eca6af179edf27cdc305a84820f601b456dd0b" dependencies: babel-plugin-check-es2015-constants "^6.22.0" babel-plugin-syntax-trailing-function-commas "^6.22.0" @@ -3014,13 +3014,13 @@ istanbul-reports@^1.1.0, istanbul-reports@^1.1.1: dependencies: handlebars "^4.0.3" -jest-changed-files@^20.0.2: +jest-changed-files@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8" -jest-cli@20.0.2: - version "20.0.2" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.2.tgz#98316e8eb45b4aee817395f38c3d08b7e13ca5b2" +jest-cli@20.0.4: + version "20.0.4" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.4.tgz#e532b19d88ae5bc6c417e8b0593a6fe954b1dc93" dependencies: ansi-escapes "^1.4.0" callsites "^2.0.0" @@ -3031,18 +3031,18 @@ jest-cli@20.0.2: istanbul-lib-coverage "^1.0.1" istanbul-lib-instrument "^1.4.2" istanbul-lib-source-maps "^1.1.0" - jest-changed-files "^20.0.2" - jest-config "^20.0.2" - jest-docblock "^20.0.2" - jest-environment-jsdom "^20.0.2" - jest-haste-map "^20.0.2" - jest-jasmine2 "^20.0.2" - jest-message-util "^20.0.2" - jest-regex-util "^20.0.2" - jest-resolve-dependencies "^20.0.2" - jest-runtime "^20.0.2" - jest-snapshot "^20.0.2" - jest-util "^20.0.2" + jest-changed-files "^20.0.3" + jest-config "^20.0.4" + jest-docblock "^20.0.3" + jest-environment-jsdom "^20.0.3" + jest-haste-map "^20.0.4" + jest-jasmine2 "^20.0.4" + jest-message-util "^20.0.3" + jest-regex-util "^20.0.3" + jest-resolve-dependencies "^20.0.3" + jest-runtime "^20.0.4" + jest-snapshot "^20.0.3" + jest-util "^20.0.3" micromatch "^2.3.11" node-notifier "^5.0.2" pify "^2.3.0" @@ -3053,7 +3053,7 @@ jest-cli@20.0.2: worker-farm "^1.3.1" yargs "^7.0.2" -jest-config@^20.0.2, jest-config@^20.0.4: +jest-config@^20.0.4: version "20.0.4" resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-20.0.4.tgz#e37930ab2217c913605eff13e7bd763ec48faeea" dependencies: @@ -3077,11 +3077,11 @@ jest-diff@^20.0.3: jest-matcher-utils "^20.0.3" pretty-format "^20.0.3" -jest-docblock@^20.0.2, jest-docblock@^20.0.3: +jest-docblock@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712" -jest-environment-jsdom@^20.0.2, jest-environment-jsdom@^20.0.3: +jest-environment-jsdom@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz#048a8ac12ee225f7190417713834bb999787de99" dependencies: @@ -3096,7 +3096,7 @@ jest-environment-node@^20.0.3: jest-mock "^20.0.3" jest-util "^20.0.3" -jest-haste-map@^20.0.2, jest-haste-map@^20.0.4: +jest-haste-map@^20.0.4: version "20.0.4" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.4.tgz#653eb55c889ce3c021f7b94693f20a4159badf03" dependencies: @@ -3107,7 +3107,7 @@ jest-haste-map@^20.0.2, jest-haste-map@^20.0.4: sane "~1.6.0" worker-farm "^1.3.1" -jest-jasmine2@^20.0.2, jest-jasmine2@^20.0.4: +jest-jasmine2@^20.0.4: version "20.0.4" resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-20.0.4.tgz#fcc5b1411780d911d042902ef1859e852e60d5e1" dependencies: @@ -3137,7 +3137,7 @@ jest-matchers@^20.0.3: jest-message-util "^20.0.3" jest-regex-util "^20.0.3" -jest-message-util@^20.0.2, jest-message-util@^20.0.3: +jest-message-util@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-20.0.3.tgz#6aec2844306fcb0e6e74d5796c1006d96fdd831c" dependencies: @@ -3149,11 +3149,11 @@ jest-mock@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-20.0.3.tgz#8bc070e90414aa155c11a8d64c869a0d5c71da59" -jest-regex-util@^20.0.2, jest-regex-util@^20.0.3: +jest-regex-util@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-20.0.3.tgz#85bbab5d133e44625b19faf8c6aa5122d085d762" -jest-resolve-dependencies@^20.0.2: +jest-resolve-dependencies@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-20.0.3.tgz#6e14a7b717af0f2cb3667c549de40af017b1723a" dependencies: @@ -3167,7 +3167,7 @@ jest-resolve@^20.0.4: is-builtin-module "^1.0.0" resolve "^1.3.2" -jest-runtime@^20.0.2: +jest-runtime@^20.0.4: version "20.0.4" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-20.0.4.tgz#a2c802219c4203f754df1404e490186169d124d8" dependencies: @@ -3187,7 +3187,7 @@ jest-runtime@^20.0.2: strip-bom "3.0.0" yargs "^7.0.2" -jest-snapshot@^20.0.2, jest-snapshot@^20.0.3: +jest-snapshot@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-20.0.3.tgz#5b847e1adb1a4d90852a7f9f125086e187c76566" dependencies: @@ -3198,7 +3198,7 @@ jest-snapshot@^20.0.2, jest-snapshot@^20.0.3: natural-compare "^1.4.0" pretty-format "^20.0.3" -jest-util@^20.0.2, jest-util@^20.0.3: +jest-util@^20.0.3: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-20.0.3.tgz#0c07f7d80d82f4e5a67c6f8b9c3fe7f65cfd32ad" dependencies: @@ -3662,14 +3662,10 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7: dependencies: mime-db "~1.27.0" -mime@1.3.4: +mime@1.3.4, mime@^1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" -mime@^1.3.4: - version "1.3.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" - min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -3698,9 +3694,9 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" -mitt@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.1.1.tgz#14881478496dfa56750ea41af13a7ecb5b69a7c2" +mitt@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.1.2.tgz#380e61480d6a615b660f07abb60d51e0a4e4bed6" mkdirp-then@1.2.0: version "1.2.0" @@ -3763,9 +3759,9 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" -node-fetch@1.6.3, node-fetch@^1.0.1: - version "1.6.3" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04" +node-fetch@1.7.0, node-fetch@^1.0.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.0.tgz#3ff6c56544f9b7fb00682338bb55ee6f54a8a0ef" dependencies: encoding "^0.1.11" is-stream "^1.0.1" @@ -4301,8 +4297,10 @@ randomatic@^1.1.3: kind-of "^3.0.2" randombytes@^2.0.0, randombytes@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec" + version "2.0.4" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.4.tgz#9551df208422c8f80eb58e2326dd0b840ff22efd" + dependencies: + safe-buffer "^5.0.1" range-parser@^1.0.3, range-parser@~1.2.0: version "1.2.0" @@ -4676,6 +4674,24 @@ send@0.15.1: range-parser "~1.2.0" statuses "~1.3.1" +send@^0.15.3: + version "0.15.3" + resolved "https://registry.yarnpkg.com/send/-/send-0.15.3.tgz#5013f9f99023df50d1bd9892c19e3defd1d53309" + dependencies: + debug "2.6.7" + depd "~1.1.0" + destroy "~1.0.4" + encodeurl "~1.0.1" + escape-html "~1.0.3" + etag "~1.8.0" + fresh "0.5.0" + http-errors "~1.6.1" + mime "1.3.4" + ms "2.0.0" + on-finished "~2.3.0" + range-parser "~1.2.0" + statuses "~1.3.1" + serve-static@1.12.1: version "1.12.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.1.tgz#7443a965e3ced647aceb5639fa06bf4d1bbe0039" @@ -4957,9 +4973,9 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -styled-jsx@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-1.0.2.tgz#84b4855e19ac49238e0b6bea3d3af3aaf296cb22" +styled-jsx@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-1.0.3.tgz#3d8e2eda09fffccc131d321a02ae6d6f9f79da53" dependencies: babel-plugin-syntax-jsx "6.18.0" babel-traverse "6.21.0" @@ -5154,7 +5170,7 @@ ua-parser-js@^0.7.9: version "0.7.12" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" -uglify-js@^2.6, uglify-js@^2.8.5: +uglify-js@^2.6, uglify-js@^2.8.27: version "2.8.27" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.27.tgz#47787f912b0f242e5b984343be8e35e95f694c9c" dependencies: @@ -5322,9 +5338,9 @@ webpack-sources@^0.2.3: source-list-map "^1.1.1" source-map "~0.5.3" -webpack@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.5.1.tgz#61742f0cf8af555b87460a9cd8bba2f1e3ee2fce" +webpack@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.0.tgz#7e650a92816abff5db5f43316b0b8b19b13d76c1" dependencies: acorn "^5.0.0" acorn-dynamic-import "^2.0.0" @@ -5343,7 +5359,7 @@ webpack@2.5.1: source-map "^0.5.3" supports-color "^3.1.0" tapable "~0.2.5" - uglify-js "^2.8.5" + uglify-js "^2.8.27" watchpack "^1.3.1" webpack-sources "^0.2.3" yargs "^6.0.0"