Merge pull request #15 from grammarly/update-peer-dependencies

Change peerDependencies versions

Author: blacktaxi

.travis.yml

@@ -9,15 +9,25 @@ cache:
     - examples/todomvc/node_modules
     - test/manual/node_modules
 
+env:
+  global:
+    - V_REACT=16.2.0 V_REACT_TYPES=16.0.33 V_REACT_DOM_TYPES=16.0.3
+  matrix:
+    - V_RXJS=5.5.6
+    - V_RXJS=5.*
+
+before_install:
+  - yarn add react@$V_REACT react-dom@$V_REACT @types/react@$V_REACT_TYPES @types/react-dom@$V_REACT_DOM_TYPES rxjs@$V_RXJS
+  - cd ./examples/all && yarn add react@$V_REACT react-dom@$V_REACT @types/react@$V_REACT_TYPES @types/react-dom@$V_REACT_DOM_TYPES rxjs@$V_RXJS && cd ../..
+  - cd ./examples/todomvc && yarn add react@$V_REACT react-dom@$V_REACT @types/react@$V_REACT_TYPES @types/react-dom@$V_REACT_DOM_TYPES rxjs@$V_RXJS && cd ../..
+  - cd ./test/manual && yarn add react@$V_REACT react-dom@$V_REACT @types/react@$V_REACT_TYPES @types/react-dom@$V_REACT_DOM_TYPES rxjs@$V_RXJS && cd ../..
+
 jobs:
   include:
-    - script: npm run test:unit
-    - script: npm run test:examples
-    - script: npm run test:todomvc
-    - script: npm run test:manual
     - stage: github release
       script: npm run build && npm pack
       deploy:
+        env: V_RXJS=5.5.6
         provider: releases
         api_key:
           secure: k+Pvk4XKUjjVjc7jJ8OVW4fjOc8dFacupYjEZ3qV8JAFPSCpLcJi0ijGHZx44r/EaaVaVMBamGCtUQR1eotq8xturxfQZz6Jug+Eu6zOUh1KqVNzqGyv4y7UfLT5HHq7bthFBmdJ7gIN0hm0Fvi0/xm7FZWoPeucnhu31WQ16dSFUw5HBMLgjDk7IaKyVslCrERwccBshxYRuwy3+Qs3kvmwu0QHGxnZmlgNdacKdgXcrdw6QfJOmAQsoidbyhIaCfxmh/ZQESCDU5WIOBjoZnEh3qZlGxvgUPUVp7bYZ68Q3g0/Xs2y5khyIKwtlCDum5E7GGUUwXtuX1WltfhWhKLtaeFN68OANI9GZTaLYWiBYsF32szkvsjB4NL8t5rsPFJ0D4zzY9WGzaBPVtE3JmwrSpPm+M2A2gbgmEzh7CT+UFIWtmNcKtQkuLVBTNnpgMBhW2XRQmVlpvMfykQuQbISsypeUqqNyIQ5br87zWIILfdGkcminSM4qtESvO/Ltd3/JxfZIv2Xdc3oq0GpB+Pl62EWGn8hnAJ0FcWX/XDTTpDLWgld26VchfQp3+T5k4ZxMyl8lSuR0okPzj+GpLkoW2hc8fqtEVcTIwU+53C/wKcPWvBbf5WTHryDLXYptjAXhOorSIybfzeVkGSbaejH7ROQBKm7n53kjy1OGv0=

examples/all/package.json

@@ -8,7 +8,6 @@
     "npm": ">=3.0.0"
   },
   "scripts": {
-    "preinstall": "cd ../.. && (yarn || npm i) && npm run build",
     "build:webpack": "NODE_ENV=production webpack --config webpack/webpack.prod.js",
     "build": "npm run clean && npm run build:static && npm run build:webpack",
     "build:static": "cp -r ./static ./build",
@@ -20,18 +19,18 @@
   "author": "Grammarly, Inc.",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grammarly/focal": "file:../../",
+    "@grammarly/focal": "0.6.436",
     "@grammarly/tslint-config": "^0.3.1",
-    "@types/react": "15.0.38",
-    "@types/react-dom": "15.5.1",
+    "@types/react": "16.0.33",
+    "@types/react-dom": "16.0.3",
     "css-loader": "^0.26.1",
     "express": "^4.14.0",
-    "react": "15.6.1",
-    "react-dom": "15.6.1",
+    "react": "16.2.0",
+    "react-dom": "16.2.0",
     "react-transform-catch-errors": "^1.0.2",
     "react-transform-hmr": "^1.0.4",
     "redbox-react": "^1.3.0",
-    "rxjs": "5.4.2",
+    "rxjs": "5.5.6",
     "style-loader": "^0.13.1",
     "styled-components": "1.4.4",
     "todomvc-app-css": "^2.0.6",
@@ -41,6 +40,7 @@
     "typescript": "2.4.1",
     "webpack": "^1.13.2",
     "webpack-dev-middleware": "^1.6.1",
+    "webpack-fail-plugin": "2.0.0",
     "webpack-hot-middleware": "^2.12.2"
   }
 }

examples/all/webpack/webpack.dev.js

@@ -1,5 +1,6 @@
 var webpack = require('webpack');
 var path = require('path');
+var failPlugin = require('webpack-fail-plugin');
 
 var APP_DIR = path.join(__dirname, '..', 'src');
 
@@ -38,7 +39,8 @@ module.exports = {
   },
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin()
+    new webpack.NoErrorsPlugin(),
+    failPlugin
   ],
   resolve: {
     root: [path.resolve('../src')],

examples/all/webpack/webpack.prod.js

@@ -1,5 +1,6 @@
 var path = require('path');
 var webpack = require('webpack');
+var failPlugin = require('webpack-fail-plugin');
 
 var APP_DIR = path.join(__dirname, '..', 'src');
 
@@ -41,7 +42,8 @@ module.exports = {
       compressor: {
         warnings: false
       }
-    })
+    }),
+    failPlugin
   ],
   resolve: {
     root: [path.resolve('../src')],

examples/todomvc/package.json

@@ -8,7 +8,6 @@
     "npm": ">=3.0.0"
   },
   "scripts": {
-    "preinstall": "cd ../.. && (yarn || npm i) && npm run build",
     "build:webpack": "NODE_ENV=production webpack --config webpack/webpack.prod.js",
     "build": "npm run clean && npm run build:static && npm run build:webpack",
     "build:static": "cp -r ./static ./build",
@@ -20,24 +19,25 @@
   "author": "Grammarly, Inc.",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grammarly/focal": "file:../../",
+    "@grammarly/focal": "0.6.436",
     "@grammarly/tslint-config": "^0.3.1",
-    "@types/react": "15.0.38",
-    "@types/react-dom": "15.5.1",
+    "@types/react": "16.0.33",
+    "@types/react-dom": "16.0.3",
     "express": "^4.14.0",
-    "react": "15.6.1",
-    "react-dom": "15.6.1",
+    "react": "16.2.0",
+    "react-dom": "16.2.0",
     "react-transform-catch-errors": "^1.0.2",
     "react-transform-hmr": "^1.0.4",
     "redbox-react": "^1.3.0",
-    "rxjs": "5.4.2",
+    "rxjs": "5.5.6",
     "todomvc-app-css": "^2.0.6",
     "ts-loader": "^2.3.0",
     "tslint": "^4.1.1",
     "tslint-loader": "^3.3.0",
     "typescript": "2.4.1",
     "webpack": "^1.13.2",
     "webpack-dev-middleware": "^1.6.1",
+    "webpack-fail-plugin": "2.0.0",
     "webpack-hot-middleware": "^2.12.2"
   }
 }

examples/todomvc/webpack/webpack.dev.js

@@ -1,5 +1,6 @@
 var webpack = require('webpack');
 var path = require('path');
+var failPlugin = require('webpack-fail-plugin');
 
 var APP_DIR = path.join(__dirname, '..', 'src');
 
@@ -31,7 +32,8 @@ module.exports = {
   },
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin()
+    new webpack.NoErrorsPlugin(),
+    failPlugin
   ],
   resolve: {
     root: [path.resolve('../src')],

examples/todomvc/webpack/webpack.prod.js

@@ -1,5 +1,6 @@
 var path = require('path');
 var webpack = require('webpack');
+var failPlugin = require('webpack-fail-plugin');
 
 var APP_DIR = path.join(__dirname, '..', 'src');
 
@@ -34,7 +35,8 @@ module.exports = {
       compressor: {
         warnings: false
       }
-    })
+    }),
+    failPlugin
   ],
   resolve: {
     root: [path.resolve('../src')],

package.json

@@ -12,10 +12,10 @@
     "clean": "rm -rf ./dist",
     "build": "npm run clean && tsc && npm run lint",
     "test": "npm run test:unit && npm run test:examples && npm run test:todomvc && npm run test:manual",
-    "test:manual": "cd test/manual && rm -rf node_modules/@grammarly/focal && npm i --ignore-scripts && npm run build",
+    "test:manual": "cd test/manual && npm i && npm run build",
     "test:unit": "npm run build && tape ./dist/test/**/*.js | tap-spec",
-    "test:examples": "cd examples/all && rm -rf node_modules/@grammarly/focal && npm i --ignore-scripts && npm run build",
-    "test:todomvc": "cd examples/todomvc && rm -rf node_modules/@grammarly/focal && npm i --ignore-scripts && npm run build",
+    "test:examples": "cd examples/all && npm i && npm run build",
+    "test:todomvc": "cd examples/todomvc && npm i && npm run build",
     "test:watch": "watch 'npm test' src test",
     "lint": "tslint --type-check --project tsconfig.json -c tslint.json",
     "preversion": "if ! [[ $(git rev-parse --abbrev-ref HEAD) == \"master\" ]]; then echo \"Not on the master branch.\" && exit 1; fi",
@@ -83,23 +83,23 @@
   "devDependencies": {
     "@grammarly/tslint-config": "0.5.1",
     "@types/node": "^6.0.34",
+    "@types/react": "16.0.33",
+    "@types/react-dom": "16.0.3",
     "@types/tape": "^4.2.27",
+    "react": "16.2.0",
+    "react-dom": "16.2.0",
+    "rxjs": "5.5.6",
     "tap-spec": "^4.1.1",
     "tape": "^4.5.1",
     "tslint": "5.2.0",
     "typescript": "2.4.1",
-    "watch": "^0.18.0",
-    "@types/react": "15.0.38",
-    "@types/react-dom": "15.5.1",
-    "react": "15.6.1",
-    "react-dom": "15.6.1",
-    "rxjs": "5.4.2"
+    "watch": "^0.18.0"
   },
   "peerDependencies": {
-    "@types/react": "15.0.38",
-    "@types/react-dom": "15.5.1",
-    "react": "15.6.1",
-    "react-dom": "15.6.1",
-    "rxjs": "5.4.2"
+    "@types/react": ">= 16.0.33 < 17.0.0-0",
+    "@types/react-dom": ">= 16.0.3 < 17.0.0-0",
+    "react": ">= 16.2.0 < 17.0.0-0",
+    "react-dom": ">= 16.2.0 < 17.0.0-0",
+    "rxjs": ">= 5.4.2 < 6.0.0-0"
   }
 }

test/manual/package.json

@@ -4,7 +4,6 @@
   "version": "0.0.0",
   "main": "webpack/dev_server.js",
   "scripts": {
-    "preinstall": "cd ../.. && (yarn || npm i) && npm run build",
     "build:webpack": "NODE_ENV=production webpack --config webpack/webpack.prod.js",
     "build": "npm run clean && npm run build:static && npm run build:webpack",
     "build:static": "cp -r ./static ./build",
@@ -16,24 +15,25 @@
   "author": "Grammarly, Inc.",
   "license": "(c) 2016 Grammarly",
   "devDependencies": {
-    "@grammarly/focal": "file:../../",
+    "@grammarly/focal": "0.6.436",
     "@grammarly/tslint-config": "^0.3.1",
-    "@types/react": "15.0.38",
-    "@types/react-dom": "15.5.1",
+    "@types/react": "16.0.33",
+    "@types/react-dom": "16.0.3",
     "express": "^4.14.0",
-    "react": "15.6.1",
-    "react-dom": "15.6.1",
+    "react": "16.2.0",
+    "react-dom": "16.2.0",
     "react-transform-catch-errors": "^1.0.2",
     "react-transform-hmr": "^1.0.4",
     "redbox-react": "^1.3.0",
-    "rxjs": "5.4.2",
+    "rxjs": "5.5.6",
     "todomvc-app-css": "^2.0.6",
     "ts-loader": "^2.3.0",
     "tslint": "^4.1.1",
     "tslint-loader": "^3.3.0",
     "typescript": "2.4.1",
     "webpack": "^1.13.2",
     "webpack-dev-middleware": "^1.6.1",
+    "webpack-fail-plugin": "2.0.0",
     "webpack-hot-middleware": "^2.12.2"
   }
 }

test/manual/webpack/webpack.dev.js

@@ -1,5 +1,6 @@
 var webpack = require('webpack');
 var path = require('path');
+var failPlugin = require('webpack-fail-plugin');
 
 var APP_DIR = path.join(__dirname, '..', 'src');
 
@@ -31,7 +32,8 @@ module.exports = {
   },
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin()
+    new webpack.NoErrorsPlugin(),
+    failPlugin
   ],
   resolve: {
     root: [path.resolve('../src')],

test/test_react.tsx

@@ -43,13 +43,13 @@ test('react', t => {
 
   testRender(t,
     <F.span style={fromConst({ color: 'red' })}></F.span>,
-    '<span style="color:red;"></span>',
+    '<span style="color:red"></span>',
     'Render F element with observable in style'
   )
 
   testRender(t,
     <F.span style={fromConst({ color: 'red' })}>{fromConst('test')}</F.span>,
-    '<span style="color:red;">test</span>',
+    '<span style="color:red">test</span>',
     'Render F element with 2 observables'
   )
 
@@ -125,7 +125,7 @@ test('react', t => {
     <F.div onClick={() => { /* no-op */ }} style={{ display: 'block', color: fromConst('red') }}>
       <F.span>Hello</F.span>
     </F.div>,
-    '<div style="display:block;color:red;"><span>Hello</span></div>',
+    '<div style="display:block;color:red"><span>Hello</span></div>',
     'div with onClick'
   )