mirror of
https://github.com/terribleplan/next.js.git
synced 2024-01-19 02:48:18 +00:00
add react and react dom as peer (#1024)
- tackles #997 - add ./idea to gitignore for webstorm users - update all the examples
This commit is contained in:
parent
aa971d6a1c
commit
4a73ccbb00
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -13,3 +13,8 @@ npm-debug.log
|
||||||
# coverage
|
# coverage
|
||||||
.nyc_output
|
.nyc_output
|
||||||
coverage
|
coverage
|
||||||
|
|
||||||
|
# editors
|
||||||
|
.idea/*
|
||||||
|
*.iml
|
||||||
|
*.sublime-*
|
|
@ -7,7 +7,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"express": "^4.14.0",
|
"express": "^4.14.0",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"hapi": "^16.1.0",
|
"hapi": "^16.1.0",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"koa": "^1.2.4",
|
"koa": "^1.2.4",
|
||||||
"koa-router": "^5.4.0",
|
"koa-router": "^5.4.0",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
"start": "NODE_ENV=production node server.js"
|
"start": "NODE_ENV=production node server.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,9 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"isomorphic-fetch": "^2.2.1",
|
"isomorphic-fetch": "^2.2.1",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "*"
|
"next": "*",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "*"
|
"next": "*",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "*"
|
"next": "*",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "*"
|
"next": "*",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
"path-match": "1.2.4"
|
"path-match": "1.2.4",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "latest",
|
"next": "latest",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2",
|
||||||
"react-no-ssr": "1.1.0"
|
"react-no-ssr": "1.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "*"
|
"next": "*",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"express": "^4.14.0",
|
"express": "^4.14.0",
|
||||||
"lru-cache": "^4.0.2",
|
"lru-cache": "^4.0.2",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,9 +7,11 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta",
|
|
||||||
"inferno": "^1.0.7",
|
"inferno": "^1.0.7",
|
||||||
"inferno-compat": "^1.0.7"
|
"inferno-compat": "^1.0.7",
|
||||||
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
|
|
|
@ -9,7 +9,9 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
"preact": "^7.1.0",
|
"preact": "^7.1.0",
|
||||||
"preact-compat": "^3.9.4"
|
"preact-compat": "^3.9.4",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
|
|
|
@ -9,7 +9,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -8,7 +8,9 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"aphrodite": "^1.1.0",
|
"aphrodite": "^1.1.0",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -11,7 +11,9 @@
|
||||||
"graphql": "^0.8.2",
|
"graphql": "^0.8.2",
|
||||||
"graphql-tag": "^1.2.3",
|
"graphql-tag": "^1.2.3",
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
"react-apollo": "^0.8.1",
|
"react-apollo": "^0.8.1",
|
||||||
|
"react-dom": "^15.4.2",
|
||||||
"react-redux": "^5.0.2",
|
"react-redux": "^5.0.2",
|
||||||
"redux": "^3.6.0",
|
"redux": "^3.6.0",
|
||||||
"redux-thunk": "^2.1.0"
|
"redux-thunk": "^2.1.0"
|
||||||
|
|
|
@ -9,7 +9,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
|
|
|
@ -8,7 +8,9 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cxs": "^3.0.0",
|
"cxs": "^3.0.0",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fela": "^4.1.2",
|
"fela": "^4.1.2",
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2",
|
||||||
"react-fela": "^4.1.2"
|
"react-fela": "^4.1.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,20 +1,22 @@
|
||||||
{
|
{
|
||||||
"name": "with-flow",
|
"name": "with-flow",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"author": "Jag Reehal",
|
"author": "Jag Reehal",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next",
|
"dev": "next",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
"flow": "flow",
|
"flow": "flow",
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-eslint": "^7.1.1",
|
"babel-eslint": "^7.1.1",
|
||||||
"babel-plugin-transform-flow-strip-types": "^6.21.0",
|
"babel-plugin-transform-flow-strip-types": "^6.21.0",
|
||||||
"flow-bin": "^0.37.4"
|
"flow-bin": "^0.37.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,9 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"glamor": "^2.20.12",
|
"glamor": "^2.20.12",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
{
|
{
|
||||||
"name": "with-jest",
|
"name": "with-jest",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
|
|
|
@ -10,7 +10,9 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
"nprogress": "^0.2.0"
|
"nprogress": "^0.2.0",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -9,11 +9,13 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"mobx": "^2.7.0",
|
"mobx": "^2.7.0",
|
||||||
"mobx-react": "^4.0.4",
|
"mobx-react": "^4.0.4",
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-plugin-transform-decorators-legacy": "^1.3.4"
|
"babel-plugin-transform-decorators-legacy": "^1.3.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2",
|
||||||
"react-redux": "^5.0.1",
|
"react-redux": "^5.0.1",
|
||||||
"redux": "^3.6.0",
|
"redux": "^3.6.0",
|
||||||
"redux-thunk": "^2.1.0"
|
"redux-thunk": "^2.1.0"
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2",
|
||||||
"styled-components": "1.2.1"
|
"styled-components": "1.2.1"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
"postcss-cssnext": "^2.9.0",
|
"postcss-cssnext": "^2.9.0",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2",
|
||||||
"styled-jsx-postcss": "^0.1.5"
|
"styled-jsx-postcss": "^0.1.5"
|
||||||
},
|
},
|
||||||
"author": "Giuseppe Gurgone",
|
"author": "Giuseppe Gurgone",
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta",
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2",
|
||||||
"styletron-client": "^2.2.0",
|
"styletron-client": "^2.2.0",
|
||||||
"styletron-react": "^2.2.1",
|
"styletron-react": "^2.2.1",
|
||||||
"styletron-server": "^2.2.0"
|
"styletron-server": "^2.2.0"
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "^2.0.0-beta"
|
"next": "^2.0.0-beta",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-plugin-transform-define": "^1.2.0"
|
"babel-plugin-transform-define": "^1.2.0"
|
||||||
|
|
10
package.json
10
package.json
|
@ -72,8 +72,6 @@
|
||||||
"mz": "2.6.0",
|
"mz": "2.6.0",
|
||||||
"path-match": "1.2.4",
|
"path-match": "1.2.4",
|
||||||
"pkg-up": "1.0.0",
|
"pkg-up": "1.0.0",
|
||||||
"react": "15.4.2",
|
|
||||||
"react-dom": "15.4.2",
|
|
||||||
"react-hot-loader": "3.0.0-beta.6",
|
"react-hot-loader": "3.0.0-beta.6",
|
||||||
"send": "0.14.1",
|
"send": "0.14.1",
|
||||||
"source-map-support": "0.4.11",
|
"source-map-support": "0.4.11",
|
||||||
|
@ -110,7 +108,13 @@
|
||||||
"standard": "8.6.0",
|
"standard": "8.6.0",
|
||||||
"wd": "^1.1.3",
|
"wd": "^1.1.3",
|
||||||
"webpack-stream": "3.2.0",
|
"webpack-stream": "3.2.0",
|
||||||
"cross-env": "^3.1.4"
|
"cross-env": "^3.1.4",
|
||||||
|
"react": "15.4.2",
|
||||||
|
"react-dom": "15.4.2"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2"
|
||||||
},
|
},
|
||||||
"jest": {
|
"jest": {
|
||||||
"testEnvironment": "node",
|
"testEnvironment": "node",
|
||||||
|
|
|
@ -18,9 +18,6 @@ module.exports = {
|
||||||
{
|
{
|
||||||
alias: {
|
alias: {
|
||||||
'babel-runtime': babelRuntimePath,
|
'babel-runtime': babelRuntimePath,
|
||||||
react: require.resolve('react'),
|
|
||||||
'react-dom': require.resolve('react-dom'),
|
|
||||||
'react-dom/server': require.resolve('react-dom/server'),
|
|
||||||
'next/link': require.resolve('../../../lib/link'),
|
'next/link': require.resolve('../../../lib/link'),
|
||||||
'next/prefetch': require.resolve('../../../lib/prefetch'),
|
'next/prefetch': require.resolve('../../../lib/prefetch'),
|
||||||
'next/css': require.resolve('../../../lib/css'),
|
'next/css': require.resolve('../../../lib/css'),
|
||||||
|
|
|
@ -173,9 +173,6 @@ export default async function createCompiler (dir, { dev = false, quiet = false
|
||||||
{
|
{
|
||||||
alias: {
|
alias: {
|
||||||
'babel-runtime': babelRuntimePath,
|
'babel-runtime': babelRuntimePath,
|
||||||
react: require.resolve('react'),
|
|
||||||
'react-dom': require.resolve('react-dom'),
|
|
||||||
'react-dom/server': require.resolve('react-dom/server'),
|
|
||||||
'next/link': require.resolve('../../lib/link'),
|
'next/link': require.resolve('../../lib/link'),
|
||||||
'next/prefetch': require.resolve('../../lib/prefetch'),
|
'next/prefetch': require.resolve('../../lib/prefetch'),
|
||||||
'next/css': require.resolve('../../lib/css'),
|
'next/css': require.resolve('../../lib/css'),
|
||||||
|
|
Loading…
Reference in a new issue