Skip to content

Commit ccf1530

Browse files
committed
Merge branch 'master' of github.com:builderbook/builderbook
2 parents ca347a1 + 8460f72 commit ccf1530

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+33453
-35511
lines changed

boilerplate/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,33 @@
1010
"lint": "eslint components pages lib server"
1111
},
1212
"dependencies": {
13-
"@material-ui/core": "3.2.2",
14-
"connect-mongo": "2.0.1",
15-
"dotenv": "6.1.0",
13+
"@material-ui/core": "3.9.3",
14+
"connect-mongo": "2.0.3",
15+
"dotenv": "7.0.0",
1616
"express": "4.16.4",
1717
"express-session": "1.15.6",
18-
"googleapis": "34.0.0",
18+
"googleapis": "39.2.0",
1919
"lodash": "4.17.11",
20-
"mongoose": "5.3.4",
21-
"next": "7.0.2",
20+
"mongoose": "5.4.22",
21+
"next": "8.0.4",
2222
"nprogress": "0.2.0",
2323
"passport": "0.4.0",
2424
"passport-google-oauth": "2.0.0",
25-
"prop-types": "15.6.2",
26-
"react": "16.5.2",
27-
"react-dom": "16.5.2",
25+
"prop-types": "15.7.2",
26+
"react": "16.8.6",
27+
"react-dom": "16.8.6",
2828
"react-jss": "8.6.1"
2929
},
3030
"devDependencies": {
3131
"babel-eslint": "10.0.1",
32-
"eslint": "5.7.0",
32+
"eslint": "5.16.0",
3333
"eslint-config-airbnb": "17.1.0",
34-
"eslint-config-prettier": "3.3.0",
35-
"eslint-plugin-import": "2.14.0",
36-
"eslint-plugin-jsx-a11y": "6.1.2",
37-
"eslint-plugin-prettier": "3.0.0",
38-
"eslint-plugin-react": "7.11.1",
39-
"nodemon": "1.18.4",
40-
"prettier": "1.15.3"
34+
"eslint-config-prettier": "4.1.0",
35+
"eslint-plugin-import": "2.16.0",
36+
"eslint-plugin-jsx-a11y": "6.2.1",
37+
"eslint-plugin-prettier": "3.0.1",
38+
"eslint-plugin-react": "7.12.4",
39+
"nodemon": "1.18.10",
40+
"prettier": "1.16.4"
4141
}
4242
}

boilerplate/yarn.lock

Lines changed: 1174 additions & 1348 deletions
Large diffs are not rendered by default.

book/1-end/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
"lint": "eslint components pages lib"
1010
},
1111
"dependencies": {
12-
"@material-ui/core": "3.9.1",
13-
"next": "7.0.2",
14-
"prop-types": "15.6.2",
15-
"react": "16.6.0",
16-
"react-dom": "16.6.0",
12+
"@material-ui/core": "3.9.3",
13+
"next": "8.1.0",
14+
"prop-types": "15.7.2",
15+
"react": "16.8.6",
16+
"react-dom": "16.8.6",
1717
"react-jss": "8.6.1"
1818
},
1919
"devDependencies": {
2020
"babel-eslint": "10.0.1",
21-
"eslint": "5.7.0",
21+
"eslint": "5.16.0",
2222
"eslint-config-airbnb": "17.1.0",
23-
"eslint-plugin-import": "2.14.0",
24-
"eslint-plugin-jsx-a11y": "6.1.2",
25-
"eslint-plugin-react": "7.11.1",
26-
"eslint-config-prettier": "3.3.0",
27-
"eslint-plugin-prettier": "3.0.0",
28-
"prettier": "1.15.3"
23+
"eslint-plugin-import": "2.17.2",
24+
"eslint-plugin-jsx-a11y": "6.2.1",
25+
"eslint-plugin-react": "7.12.4",
26+
"eslint-config-prettier": "4.1.0",
27+
"eslint-plugin-prettier": "3.0.1",
28+
"prettier": "1.17.0"
2929
}
3030
}

book/1-end/yarn.lock

Lines changed: 1086 additions & 1251 deletions
Large diffs are not rendered by default.

book/1-start/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ npm-debug.log
1111
node_modules/
1212
.coverage
1313
.env
14-
.next

book/1-start/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"lint": "eslint components pages lib"
1010
},
1111
"dependencies": {
12-
"@material-ui/core": "^3.9.1",
13-
"next": "^7.0.2",
14-
"prop-types": "^15.6.2",
15-
"react": "^16.6.0",
16-
"react-dom": "^16.6.0",
12+
"@material-ui/core": "^3.9.3",
13+
"next": "^8.1.0",
14+
"prop-types": "^15.7.2",
15+
"react": "^16.8.6",
16+
"react-dom": "^16.8.6",
1717
"react-jss": "^8.6.1"
1818
},
1919
"devDependencies": {}

0 commit comments

Comments
 (0)