Skip to content

Commit 2b94e66

Browse files
author
Ives van Hoorne
committed
Use custom build of prettier with only relevant loaders
1 parent d1cf1be commit 2b94e66

File tree

3 files changed

+52
-56
lines changed

3 files changed

+52
-56
lines changed

config/webpack.config.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const babelProd = require('./babel.prod');
1313
const NODE_ENV = JSON.parse(env['process.env.NODE_ENV']);
1414
const __DEV__ = NODE_ENV === 'development'; // eslint-disable-line no-underscore-dangle
1515
const __PROD__ = NODE_ENV === 'production'; // eslint-disable-line no-underscore-dangle
16-
16+
console.log(`Building ${__PROD__ ? 'production' : 'development'} build`);
1717
const babelConfig = __DEV__ ? babelDev : babelProd;
1818

1919
const COMMIT_COUNT = childProcess
@@ -60,10 +60,6 @@ const config = {
6060
},
6161

6262
target: 'web',
63-
node: {
64-
fs: 'empty',
65-
module: 'empty'
66-
},
6763

6864
output: getOutput(),
6965

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"opn": "4.0.2",
5353
"path-exists": "3.0.0",
5454
"postcss-loader": "^1.2.1",
55-
"prettier": "^1.5.0",
55+
"prettier": "CompuIves/custom-prettier-codesandbox",
5656
"promise": "7.1.1",
5757
"raw-loader": "^0.5.1",
5858
"react-hot-loader": "^3.0.0-beta.6",
@@ -63,9 +63,9 @@
6363
"strip-ansi": "3.0.1",
6464
"style-loader": "^0.18.2",
6565
"url-loader": "^0.5.9",
66-
"webpack": "^3.0.0",
67-
"webpack-dev-middleware": "^1.10.2",
68-
"webpack-dev-server": "^2.5.0",
66+
"webpack": "^3.1.0",
67+
"webpack-dev-middleware": "^1.11.0",
68+
"webpack-dev-server": "^2.5.1",
6969
"whatwg-fetch": "^2.0.3"
7070
},
7171
"dependencies": {
@@ -80,7 +80,7 @@
8080
"babel-preset-stage-0": "^6.24.1",
8181
"babel-standalone": "^6.25.0",
8282
"base64-loader": "^1.0.0",
83-
"codemirror": "^5.26.0",
83+
"codemirror": "^5.27.4",
8484
"color": "^0.11.4",
8585
"cssnano": "^3.10.0",
8686
"debug": "^2.6.8",
@@ -111,11 +111,11 @@
111111
"react-router-redux": "next",
112112
"react-split-pane": "^0.1.63",
113113
"react-tippy": "^0.14.0",
114-
"redbox-react": "^1.4.2",
115-
"redux": "^3.7.0",
116-
"reselect": "^3.0.0",
117-
"store": "^2.0.4",
118-
"styled-components": "^2.1.0",
114+
"redbox-react": "^1.4.3",
115+
"redux": "^3.7.1",
116+
"reselect": "^3.0.1",
117+
"store": "^2.0.12",
118+
"styled-components": "^2.1.1",
119119
"tern": "^0.21.0"
120120
},
121121
"scripts": {

yarn.lock

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,9 +1802,9 @@ code-point-at@^1.0.0:
18021802
version "1.1.0"
18031803
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
18041804

1805-
codemirror@^5.26.0:
1806-
version "5.26.0"
1807-
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.26.0.tgz#bcbee86816ed123870c260461c2b5c40b68746e5"
1805+
codemirror@^5.27.4:
1806+
version "5.27.4"
1807+
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.27.4.tgz#0e817c839bfea9959dd16cd48ae14acc0e43c3b6"
18081808

18091809
color-convert@^1.0.0, color-convert@^1.3.0:
18101810
version "1.9.0"
@@ -2483,9 +2483,9 @@ enhanced-resolve@^2.2.2:
24832483
object-assign "^4.0.1"
24842484
tapable "^0.2.3"
24852485

2486-
enhanced-resolve@^3.0.0:
2487-
version "3.1.0"
2488-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
2486+
enhanced-resolve@^3.3.0:
2487+
version "3.3.0"
2488+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
24892489
dependencies:
24902490
graceful-fs "^4.1.2"
24912491
memory-fs "^0.4.0"
@@ -5862,9 +5862,9 @@ preserve@^0.2.0:
58625862
version "0.2.0"
58635863
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
58645864

5865-
prettier@^1.5.0:
5866-
version "1.5.0"
5867-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.5.0.tgz#f3476164f9a532a218a1337b1032638275d82614"
5865+
prettier@CompuIves/custom-prettier-codesandbox:
5866+
version "1.5.2"
5867+
resolved "https://codeload.github.com/CompuIves/custom-prettier-codesandbox/tar.gz/ab9e011b4b7634b06e21d4d05ab55952eb7b4f0e"
58685868

58695869
pretty-error@^2.0.2:
58705870
version "2.1.0"
@@ -6306,9 +6306,9 @@ recursive-readdir@^2.2.1:
63066306
dependencies:
63076307
minimatch "3.0.3"
63086308

6309-
redbox-react@^1.2.5, redbox-react@^1.4.2:
6310-
version "1.4.2"
6311-
resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.4.2.tgz#7fe35d3c567301e97938cc7fd6a10918f424c6b4"
6309+
redbox-react@^1.2.5, redbox-react@^1.4.3:
6310+
version "1.4.3"
6311+
resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.4.3.tgz#51744987867ea4627d58ccb1b0e5df5a5ae40e57"
63126312
dependencies:
63136313
error-stack-parser "^1.3.6"
63146314
object-assign "^4.0.1"
@@ -6336,9 +6336,9 @@ reduce-function-call@^1.0.1:
63366336
dependencies:
63376337
balanced-match "^0.4.2"
63386338

6339-
redux@^3.2.0, redux@^3.7.0:
6340-
version "3.7.0"
6341-
resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.0.tgz#07a623cafd92eee8abe309d13d16538f6707926f"
6339+
redux@^3.2.0, redux@^3.7.1:
6340+
version "3.7.1"
6341+
resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.1.tgz#bfc535c757d3849562ead0af18ac52122cd7268e"
63426342
dependencies:
63436343
lodash "^4.2.1"
63446344
lodash-es "^4.2.1"
@@ -6488,9 +6488,9 @@ [email protected], [email protected]:
64886488
version "1.0.0"
64896489
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
64906490

6491-
reselect@^3.0.0:
6492-
version "3.0.0"
6493-
resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.0.tgz#b2e35977f03048700028eaee3a8c0639e40e8f35"
6491+
reselect@^3.0.1:
6492+
version "3.0.1"
6493+
resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
64946494

64956495
resolve-dir@^0.1.0:
64966496
version "0.1.1"
@@ -6874,9 +6874,9 @@ stackframe@^0.3.1:
68746874
version "1.3.1"
68756875
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
68766876

6877-
store@^2.0.4:
6878-
version "2.0.4"
6879-
resolved "https://registry.yarnpkg.com/store/-/store-2.0.4.tgz#6c6819602a5497166ade85db2442cc64ebcc5761"
6877+
store@^2.0.12:
6878+
version "2.0.12"
6879+
resolved "https://registry.yarnpkg.com/store/-/store-2.0.12.tgz#8c534e2a0b831f72b75fc5f1119857c44ef5d593"
68806880

68816881
stream-browserify@^2.0.1:
68826882
version "2.0.1"
@@ -6991,9 +6991,9 @@ style-loader@^0.18.2:
69916991
loader-utils "^1.0.2"
69926992
schema-utils "^0.3.0"
69936993

6994-
styled-components@^2.1.0:
6995-
version "2.1.0"
6996-
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-2.1.0.tgz#425805fca7efa5880aad2171f986bfd8a2f0808f"
6994+
styled-components@^2.1.1:
6995+
version "2.1.1"
6996+
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-2.1.1.tgz#7e9b5bc319ee3963b47aebb74f4658119ea9d484"
69976997
dependencies:
69986998
buffer "^5.0.3"
69996999
css-to-react-native "^2.0.3"
@@ -7002,12 +7002,12 @@ styled-components@^2.1.0:
70027002
is-function "^1.0.1"
70037003
is-plain-object "^2.0.1"
70047004
prop-types "^15.5.4"
7005-
stylis "^3.0.19"
7005+
stylis "^3.2.1"
70067006
supports-color "^3.2.3"
70077007

7008-
stylis@^3.0.19:
7009-
version "3.1.9"
7010-
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.1.9.tgz#638370451f980437f57c59e58d2e296be29fafb7"
7008+
stylis@^3.2.1:
7009+
version "3.2.3"
7010+
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.2.3.tgz#fed751d792af3f48a247769f55aca05c1a100a09"
70117011

70127012
supports-color@^2.0.0:
70137013
version "2.0.0"
@@ -7256,7 +7256,7 @@ uglify-to-browserify@~1.0.0:
72567256
version "1.0.2"
72577257
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
72587258

7259-
uglifyjs-webpack-plugin@^0.4.4:
7259+
uglifyjs-webpack-plugin@^0.4.6:
72607260
version "0.4.6"
72617261
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
72627262
dependencies:
@@ -7492,18 +7492,18 @@ webidl-conversions@^4.0.0:
74927492
version "4.0.1"
74937493
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
74947494

7495-
webpack-dev-middleware@^1.10.2:
7496-
version "1.10.2"
7497-
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
7495+
webpack-dev-middleware@^1.11.0:
7496+
version "1.11.0"
7497+
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz#09691d0973a30ad1f82ac73a12e2087f0a4754f9"
74987498
dependencies:
74997499
memory-fs "~0.4.1"
75007500
mime "^1.3.4"
75017501
path-is-absolute "^1.0.0"
75027502
range-parser "^1.0.3"
75037503

7504-
webpack-dev-server@^2.5.0:
7505-
version "2.5.0"
7506-
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.5.0.tgz#4d36a728b03b8b2afa48ed302428847cea2840ad"
7504+
webpack-dev-server@^2.5.1:
7505+
version "2.5.1"
7506+
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.5.1.tgz#a02e726a87bb603db5d71abb7d6d2649bf10c769"
75077507
dependencies:
75087508
ansi-html "0.0.7"
75097509
bonjour "^3.5.0"
@@ -7524,7 +7524,7 @@ webpack-dev-server@^2.5.0:
75247524
spdy "^3.4.1"
75257525
strip-ansi "^3.0.0"
75267526
supports-color "^3.1.1"
7527-
webpack-dev-middleware "^1.10.2"
7527+
webpack-dev-middleware "^1.11.0"
75287528
yargs "^6.0.0"
75297529

75307530
webpack-sources@^0.1.0:
@@ -7548,16 +7548,16 @@ webpack-sources@^1.0.1:
75487548
source-list-map "^2.0.0"
75497549
source-map "~0.5.3"
75507550

7551-
webpack@^3.0.0:
7552-
version "3.0.0"
7553-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
7551+
webpack@^3.1.0:
7552+
version "3.1.0"
7553+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.1.0.tgz#ac0675e500db835f9ab2369d29ba096f51ad0731"
75547554
dependencies:
75557555
acorn "^5.0.0"
75567556
acorn-dynamic-import "^2.0.0"
75577557
ajv "^5.1.5"
75587558
ajv-keywords "^2.0.0"
75597559
async "^2.1.2"
7560-
enhanced-resolve "^3.0.0"
7560+
enhanced-resolve "^3.3.0"
75617561
escope "^3.6.0"
75627562
interpret "^1.0.0"
75637563
json-loader "^0.5.4"
@@ -7570,7 +7570,7 @@ webpack@^3.0.0:
75707570
source-map "^0.5.3"
75717571
supports-color "^3.1.0"
75727572
tapable "~0.2.5"
7573-
uglifyjs-webpack-plugin "^0.4.4"
7573+
uglifyjs-webpack-plugin "^0.4.6"
75747574
watchpack "^1.3.1"
75757575
webpack-sources "^1.0.1"
75767576
yargs "^6.0.0"

0 commit comments

Comments
 (0)