Skip to content

Commit

Permalink
chore: upgrade to next.js 5
Browse files Browse the repository at this point in the history
re #75
  • Loading branch information
Jesse R Weigel committed Feb 6, 2018
1 parent 454bbcc commit e7d694a
Show file tree
Hide file tree
Showing 4 changed files with 341 additions and 1,017 deletions.
15 changes: 13 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,28 @@
"presets": "next/babel"
},
"test": {
"presets": [["env", { "modules": "commonjs" }], "next/babel"]
"presets": [
[
"env",
{
"modules": "commonjs"
}
],
"next/babel"
]
}
},
"plugins": [
[
"module-resolver",
{
"root": [
"./src"
],
"alias": {
"^react-apollo$": "react-apollo/index"
}
}
]
]
}
}
9 changes: 9 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
webpack: function (c) {
if (c.resolve.alias) {
delete c.resolve.alias['react']
delete c.resolve.alias['react-dom']
}
return c
}
}
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "franciscan-university-react",
"description":
"The main website for Franciscan University of Steubenville. Built with React, NextJS, and MaterialUI.",
"description": "The main website for Franciscan University of Steubenville. Built with React, NextJS, and MaterialUI.",
"version": "1.0.0",
"author": "Jesse Weigel <jesseweigel@gmail.com>",
"dependencies": {
Expand All @@ -16,21 +15,22 @@
"lru-cache": "^4.1.1",
"material-ui": "^1.0.0-beta.29",
"material-ui-icons": "^1.0.0-beta.17",
"next": "^4.2.3",
"next": "^5.0.0",
"react": "^16.2.0",
"react-apollo": "^2.1.0-beta.0",
"react-dom": "^16.2.0",
"react-masonry-component": "^6.0.2"
},
"keywords": ["next"],
"keywords": [
"next"
],
"license": "MIT",
"main": "n/a",
"scripts": {
"dev": "./node_modules/.bin/nodemon --watch server.js server.js",
"build": "next build",
"start": "NODE_ENV=production node server.js",
"format":
"prettier --trailing-comma es5 --no-semi --single-quote --write \"src/**/*.js\"",
"format": "prettier --trailing-comma es5 --no-semi --single-quote --write \"src/**/*.js\"",
"cm": "git-cz",
"precommit": "lint-staged && npm run test",
"unit": "jest test.js",
Expand Down Expand Up @@ -69,7 +69,9 @@
]
},
"jest": {
"setupFiles": ["<rootDir>/shim.js"]
"setupFiles": [
"<rootDir>/shim.js"
]
},
"config": {
"commitizen": {
Expand Down
Loading

0 comments on commit e7d694a

Please sign in to comment.