add react and react dom as peer (#1024)

- tackles #997 - add ./idea to gitignore for webstorm users - update all the examples
2024-01-19 02:48:18 +00:00 · 2017-02-08 05:41:38 +01:00 · 2017-02-08 05:41:38 +01:00 · 4a73ccbb00
parent aa971d6a1c
commit 4a73ccbb00
38 changed files with 114 additions and 43 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,8 @@ npm-debug.log
 # coverage
 .nyc_output
 coverage
+
+# editors
+.idea/*
+*.iml
+*.sublime-*
--- a/examples/basic-css/package.json
+++ b/examples/basic-css/package.json
@ -7,7 +7,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/custom-server-express/package.json
+++ b/examples/custom-server-express/package.json
@ -6,6 +6,8 @@
  },
  "dependencies": {
    "express": "^4.14.0",
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  }
 }
--- a/examples/custom-server-hapi/package.json
+++ b/examples/custom-server-hapi/package.json
@ -6,6 +6,8 @@
  },
  "dependencies": {
    "hapi": "^16.1.0",
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  }
 }
--- a/examples/custom-server-koa/package.json
+++ b/examples/custom-server-koa/package.json
@ -8,6 +8,8 @@
  "dependencies": {
    "koa": "^1.2.4",
    "koa-router": "^5.4.0",
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  }
 }
--- a/examples/custom-server/package.json
+++ b/examples/custom-server/package.json
@ -5,6 +5,8 @@
    "start": "NODE_ENV=production node server.js"
  },
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  }
 }
--- a/examples/data-fetch/package.json
+++ b/examples/data-fetch/package.json
@ -8,7 +8,9 @@
  },
  "dependencies": {
    "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": "",
  "license": "ISC"
--- a/examples/head-elements/package.json
+++ b/examples/head-elements/package.json
@ -7,7 +7,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "*"
+    "next": "*",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/hello-world/package.json
+++ b/examples/hello-world/package.json
@ -7,7 +7,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "*"
+    "next": "*",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/layout-component/package.json
+++ b/examples/layout-component/package.json
@ -7,7 +7,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "*"
+    "next": "*",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/nested-components/package.json
+++ b/examples/nested-components/package.json
@ -7,7 +7,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "*"
+    "next": "*",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/parameterized-routing/package.json
+++ b/examples/parameterized-routing/package.json
@ -6,6 +6,8 @@
  },
  "dependencies": {
    "next": "^2.0.0-beta",
-    "path-match": "1.2.4"
+    "path-match": "1.2.4",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  }
 }
--- a/examples/progressive-render/package.json
+++ b/examples/progressive-render/package.json
@ -7,6 +7,8 @@
  },
  "dependencies": {
    "next": "latest",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
    "react-no-ssr": "1.1.0"
  }
 }
--- a/examples/shared-modules/package.json
+++ b/examples/shared-modules/package.json
@ -9,7 +9,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "*"
+    "next": "*",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/ssr-caching/package.json
+++ b/examples/ssr-caching/package.json
@ -7,6 +7,8 @@
  "dependencies": {
    "express": "^4.14.0",
    "lru-cache": "^4.0.2",
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  }
 }
--- a/examples/using-inferno/package.json
+++ b/examples/using-inferno/package.json
@ -7,9 +7,11 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "^2.0.0-beta",
    "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": "",
  "license": "MIT"
--- a/examples/using-preact/package.json
+++ b/examples/using-preact/package.json
@ -9,7 +9,9 @@
  "dependencies": {
    "next": "^2.0.0-beta",
    "preact": "^7.1.0",
-    "preact-compat": "^3.9.4"
+    "preact-compat": "^3.9.4",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC",
--- a/examples/using-router/package.json
+++ b/examples/using-router/package.json
@ -9,7 +9,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/with-amp/package.json
+++ b/examples/with-amp/package.json
@ -7,7 +7,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/with-aphrodite/package.json
+++ b/examples/with-aphrodite/package.json
@ -8,7 +8,9 @@
  },
  "dependencies": {
    "aphrodite": "^1.1.0",
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/with-apollo/package.json
+++ b/examples/with-apollo/package.json
@ -11,7 +11,9 @@
    "graphql": "^0.8.2",
    "graphql-tag": "^1.2.3",
    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
    "react-apollo": "^0.8.1",
+    "react-dom": "^15.4.2",
    "react-redux": "^5.0.2",
    "redux": "^3.6.0",
    "redux-thunk": "^2.1.0"
--- a/examples/with-custom-babel-config/package.json
+++ b/examples/with-custom-babel-config/package.json
@ -9,7 +9,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC",
--- a/examples/with-cxs/package.json
+++ b/examples/with-cxs/package.json
@ -8,7 +8,9 @@
  },
  "dependencies": {
    "cxs": "^3.0.0",
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/with-fela/package.json
+++ b/examples/with-fela/package.json
@ -9,6 +9,8 @@
  "dependencies": {
    "fela": "^4.1.2",
    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
    "react-fela": "^4.1.2"
  }
-}
+}
--- a/examples/with-flow/package.json
+++ b/examples/with-flow/package.json
@ -1,20 +1,22 @@
 {
  "name": "with-flow",
-  "version": "1.0.0",    
+  "version": "1.0.0",
  "license": "MIT",
  "author": "Jag Reehal",
  "scripts": {
    "dev": "next",
    "build": "next build",
-    "flow": "flow",    
+    "flow": "flow",
    "start": "next start"
  },
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "devDependencies": {
    "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"
  }
-}
+}
--- a/examples/with-glamor/package.json
+++ b/examples/with-glamor/package.json
@ -8,7 +8,9 @@
  },
  "dependencies": {
    "glamor": "^2.20.12",
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/with-jest/package.json
+++ b/examples/with-jest/package.json
@ -1,7 +1,9 @@
 {
  "name": "with-jest",
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "scripts": {
    "test": "jest",
--- a/examples/with-loading/package.json
+++ b/examples/with-loading/package.json
@ -10,7 +10,9 @@
  },
  "dependencies": {
    "next": "^2.0.0-beta",
-    "nprogress": "^0.2.0"
+    "nprogress": "^0.2.0",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/with-mobx/package.json
+++ b/examples/with-mobx/package.json
@ -9,11 +9,13 @@
  "dependencies": {
    "mobx": "^2.7.0",
    "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": "",
  "license": "ISC",
  "devDependencies": {
    "babel-plugin-transform-decorators-legacy": "^1.3.4"
  }
-}
+}
--- a/examples/with-prefetching/package.json
+++ b/examples/with-prefetching/package.json
@ -7,7 +7,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "author": "",
  "license": "ISC"
--- a/examples/with-redux/package.json
+++ b/examples/with-redux/package.json
@ -8,6 +8,8 @@
  },
  "dependencies": {
    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
    "react-redux": "^5.0.1",
    "redux": "^3.6.0",
    "redux-thunk": "^2.1.0"
--- a/examples/with-styled-components/package.json
+++ b/examples/with-styled-components/package.json
@ -8,6 +8,8 @@
  },
  "dependencies": {
    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
    "styled-components": "1.2.1"
  },
  "author": "",
--- a/examples/with-styled-jsx-postcss/package.json
+++ b/examples/with-styled-jsx-postcss/package.json
@ -9,6 +9,8 @@
  "dependencies": {
    "next": "^2.0.0-beta",
    "postcss-cssnext": "^2.9.0",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
    "styled-jsx-postcss": "^0.1.5"
  },
  "author": "Giuseppe Gurgone",
--- a/examples/with-styletron/package.json
+++ b/examples/with-styletron/package.json
@ -8,6 +8,8 @@
  },
  "dependencies": {
    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
    "styletron-client": "^2.2.0",
    "styletron-react": "^2.2.1",
    "styletron-server": "^2.2.0"
--- a/examples/with-universal-configuration/package.json
+++ b/examples/with-universal-configuration/package.json
@ -7,7 +7,9 @@
    "start": "next start"
  },
  "dependencies": {
-    "next": "^2.0.0-beta"
+    "next": "^2.0.0-beta",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
  },
  "devDependencies": {
    "babel-plugin-transform-define": "^1.2.0"
--- a/package.json
+++ b/package.json
@ -72,8 +72,6 @@
    "mz": "2.6.0",
    "path-match": "1.2.4",
    "pkg-up": "1.0.0",
-    "react": "15.4.2",
-    "react-dom": "15.4.2",
    "react-hot-loader": "3.0.0-beta.6",
    "send": "0.14.1",
    "source-map-support": "0.4.11",
@ -110,7 +108,13 @@
    "standard": "8.6.0",
    "wd": "^1.1.3",
    "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": {
    "testEnvironment": "node",
--- a/server/build/babel/preset.js
+++ b/server/build/babel/preset.js
@ -18,9 +18,6 @@ module.exports = {
      {
        alias: {
          '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/prefetch': require.resolve('../../../lib/prefetch'),
          'next/css': require.resolve('../../../lib/css'),
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@ -173,9 +173,6 @@ export default async function createCompiler (dir, { dev = false, quiet = false
              {
                alias: {
                  '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/prefetch': require.resolve('../../lib/prefetch'),
                  'next/css': require.resolve('../../lib/css'),