catchup to master

Author: James Portelli

.babelrc

@@ -0,0 +1,2 @@
+*/node_modules
+*.log

.dockerignore

@@ -10,27 +10,8 @@
   },
   "globals" : {
     "adz": true,
-    jQuery: true,
-    translate: true,
-    pluralTranslate: true
-  },
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "classes": true,
-    "defaultParams": true,
-    "destructuring": true,
-    "forOf": true,
-    "generators": false,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralDuplicateProperties": false,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "spread": true,
-    "superInFunctions": true,
-    "templateStrings": true,
-    "jsx": true
+    "jQuery": true,
+    "Immutable": true
   },
   "rules": {
 /**
@@ -45,6 +26,15 @@
  */
     "no-var": 2,                     // http://eslint.org/docs/rules/no-var
     "jsx-quotes": [2, "prefer-double"],   //http://eslint.org/docs/rules/jsx-quotes
+    "constructor-super": 2,
+    "no-useless-constructor": 2,
+    "no-useless-computed-key": 2,
+    "no-const-assign": 2,
+    "no-dupe-class-members": 2,
+    "no-new-symbol": 2,
+    "no-this-before-super": 2,
+    "arrow-spacing": 1,
+    "no-class-assign": 2,
 /**
  * Variables
  */
@@ -54,7 +44,10 @@
       "vars": "local",
       "args": "after-used"
     }],
-    "no-use-before-define": 2,       // http://eslint.org/docs/rules/no-use-before-define
+    "no-use-before-define": 2,       // http://eslint.org/docs/rules/no-use-before-define,
+    "no-undef": 2,
+    "no-delete-var": 2,
+    "no-label-var": 2,
 
 /**
  * Possible errors
@@ -80,6 +73,10 @@
     "no-unreachable": 2,             // http://eslint.org/docs/rules/no-unreachable
     "use-isnan": 2,                  // http://eslint.org/docs/rules/use-isnan
     "block-scoped-var": 2,           // http://eslint.org/docs/rules/block-scoped-var
+    "no-dupe-args": 2,
+    "no-template-curly-in-string": 2,
+    "valid-typeof": [2, { "requireStringLiterals": true }],
+
 /**
  * Best practices
  */
@@ -121,7 +118,15 @@
     "radix": 2,                      // http://eslint.org/docs/rules/radix
     "vars-on-top": 2,                // http://eslint.org/docs/rules/vars-on-top
     "wrap-iife": [2, "any"],         // http://eslint.org/docs/rules/wrap-iife
-    "yoda": 2,                       // http://eslint.org/docs/rules/yoda
+    "yoda": 2,                       // http://eslint.org/docs/rules/yoda,
+    "prefer-const": 2,
+    "no-empty-pattern": 2,
+    "no-extra-label": 2,
+    "no-global-assign": 2,
+    "no-self-assign": 2,
+    "no-unmodified-loop-condition": 2,
+    "no-unused-expressions": [2, { "allowShortCircuit": true }],
+    "no-useless-call": 2,
 
 /**
  * Style
@@ -172,7 +177,10 @@
     "space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren
     "space-infix-ops": 2,            // http://eslint.org/docs/rules/space-infix-ops
     "keyword-spacing": 0,    // http://eslint.org/docs/rules/space-return-throw-case
-    "spaced-comment": 2,             // http://eslint.org/docs/rules/spaced-comment
+    "spaced-comment": 2,             // http://eslint.org/docs/rules/spaced-comment,
+    "no-whitespace-before-property": 2,
+    "no-array-constructor": 2,
+    "object-curly-spacing": [1, "always"],
 
 /**
  * JSX style

.eslintrc

@@ -10,4 +10,3 @@ npm-debug.log
 lerna-debug.log
 **.orig
 .vscode
-package-lock.json

.gitignore

@@ -0,0 +1,10 @@
+FROM node:8.11.4
+
+WORKDIR /app/website
+
+EXPOSE 3000 35729
+COPY ./docs /app/docs
+COPY ./website /app/website
+RUN yarn install
+
+CMD ["yarn", "start"]

Dockerfile

@@ -1,12 +1,20 @@
 # React Data Grid 
-[![Build status](https://ci.appveyor.com/api/projects/status/smciktvlkvp6r8w7/branch/master?svg=true)](https://ci.appveyor.com/project/adazzle/react-data-grid/branch/master)[![Coverage Status](https://coveralls.io/repos/adazzle/react-data-grid/badge.svg?branch=master)](https://coveralls.io/r/adazzle/react-data-grid?branch=master) [![npm version](https://badge.fury.io/js/react-data-grid.svg)](http://badge.fury.io/js/react-data-grid) 
+
+[logo]: https://user-images.githubusercontent.com/1432798/48616964-077b9400-e98d-11e8-9b56-f70e0722b83d.png "ReactDataGrid"
+
+[![Build status](https://ci.appveyor.com/api/projects/status/smciktvlkvp6r8w7/branch/master?svg=true)](https://ci.appveyor.com/project/adazzle/react-data-grid/branch/master)
+[![Coverage Status](https://coveralls.io/repos/adazzle/react-data-grid/badge.svg?branch=master)](https://coveralls.io/r/adazzle/react-data-grid?branch=master)
+[![npm version](https://badge.fury.io/js/react-data-grid.svg)](http://badge.fury.io/js/react-data-grid) 
 ![npm dependencies](https://david-dm.org/adazzle/react-data-grid.svg)
 [![CDNJS](https://img.shields.io/cdnjs/v/react-data-grid.svg)](https://cdnjs.com/libraries/react-data-grid)
-[![React Data Grid chat](https://react-data-grid.herokuapp.com/badge.svg)](https://react-data-grid.herokuapp.com/)
 
-Excel-like grid component built with React, with editors, keyboard navigation, copy & paste, and the like http://adazzle.github.io/react-data-grid/  
+Excel-like grid component built with React, with editors, keyboard navigation, copy & paste, and the like 
+
+
+http://adazzle.github.io/react-data-grid/  
 ![react-data-grid](https://cloud.githubusercontent.com/assets/1432798/7348812/78063bd6-ecec-11e4-89d5-ffd327721cd7.PNG)
 
+
 Overview 
 --------
 ReactDataGrid is an advanced JavaScript spreadsheet-like grid component built using React

README.md

@@ -0,0 +1,12 @@
+module.exports = {
+  presets: [
+    ['@babel/env', {
+      useBuiltIns: 'entry'}],
+    '@babel/react'],
+  plugins: [
+    '@babel/plugin-proposal-class-properties',
+    '@babel/plugin-transform-property-literals',
+    '@babel/plugin-transform-member-expression-literals',
+    '@babel/plugin-transform-runtime'
+  ]
+};

babel.config.js

@@ -0,0 +1,6 @@
+ie 11
+last 2 chrome versions
+last 2 edge versions
+last 2 firefox versions
+last 2 safari versions
+Firefox ESR

browserslist

@@ -0,0 +1,4 @@
+$input = Read-Host "Enter your authorised github username"
+Set-Item -Path Env:GIT_USER -Value ($input)
+Set-Location .\website
+npm run publish-gh-pages

ci/publish/publish-web.ps1

@@ -54,10 +54,6 @@ if($?)
   $versionBumpMessage = "Version bump to $nextVersion [ci skip]"
   npm run beforepublish
   ./node_modules/.bin/lerna publish --repo-version $nextVersion  --skip-git --yes
-  if($?) {
-    Write-Host "Regenerating public site and examples"
-    node ./ci/publish/publishExamples.js
-  }
   git add .
   git commit -m $versionBumpMessage
   git push

ci/publish/publish.ps1

@@ -36,7 +36,7 @@ if (argv.file) {
 const webpackCfg = Object.keys(defaultWebpack).reduce((res, key) => {
   let value = defaultWebpack[key];
   if (key === 'module') {
-    value = Object.assign({}, value, { postLoaders: null});
+    value = Object.assign({}, value);
   } else if (key === 'plugins') {
     value = [...value, new webpack.SourceMapDevToolPlugin({
       filename: null,
@@ -47,6 +47,7 @@ const webpackCfg = Object.keys(defaultWebpack).reduce((res, key) => {
   return res;
 }, {});
 webpackCfg.devtool = argv.file ? 'inline-source-map' : undefined;
+webpackCfg.mode = 'development';
 
 module.exports = function(config) {
   config.set({

config/karma.dev.js

@@ -1,10 +1,6 @@
-/*
-* In local config, only run tests using phantom js. No code coverage reports applied
-*/
 var webpack = require('webpack');
 require('airbnb-browser-shims');
 var webpackConfig = require('./webpack.common.config.js');
-var RewirePlugin = require("rewire-webpack");
 var path = require('path');
 var argv = require('minimist')(process.argv.slice(2));
 var RELEASE = !!argv.release;
@@ -23,7 +19,7 @@ module.exports = function (config) {
   };
 
   function getBrowsers(){
-    var browsers = ['PhantomJS'];
+    var browsers = [];
     if(BROWSERS) {
       return BROWSERS.split(',');
     }
@@ -63,14 +59,6 @@ module.exports = function (config) {
     return preprocessors;
   }
 
-  function lookupPhantomJS() {
-    try {
-      return require('phantomjs').path;
-    } catch(e){
-      return;
-    }
-  }
-
   config.set({
 
     basePath: path.join(__dirname, '../'),
@@ -80,19 +68,32 @@ module.exports = function (config) {
     preprocessors: getPreprocessors(),
 
     webpack: {
+      mode: RELEASE ? 'production' : 'development',
       devtool: 'inline-source-map',
       module: {
-        loaders: webpackConfig.module.loaders
+        rules: [
+          {
+            test: /\.(js|jsx)$/,
+            exclude: /node_modules/,
+            use: [
+              { loader: 'babel-loader', options: { envName: 'test' } }
+            ]
+          },
+          {
+            test: /\.css$/,
+            use: [
+              { loader: 'style-loader' },
+              { loader: 'css-loader' }
+            ]
+          }
+        ]
       },
       resolve: {
-        extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx'],
+        extensions: ['.webpack.js', '.web.js', '.js', '.jsx'],
         alias: {
           common: path.resolve('packages/common/')
         }
       },
-      plugins: [
-        new RewirePlugin()
-      ],
       externals: {
         'cheerio': 'window',
         'react/lib/ExecutionEnvironment': true,
@@ -152,7 +153,6 @@ module.exports = function (config) {
     plugins: [
       'karma-chrome-launcher',
       'karma-firefox-launcher',
-      'karma-phantomjs-launcher-nonet',
       'karma-ie-launcher',
       'karma-jasmine',
       'karma-jasmine-matchers',
@@ -175,15 +175,6 @@ module.exports = function (config) {
         flags: [ '--remote-debugging-port=9333' ],
         debug: true
       }
-    },
-
-    phantomjsLauncher: {
-      // configure PhantomJS executable for each platform
-      cmd: {
-        linux: lookupPhantomJS(),
-        darwin: lookupPhantomJS(),
-        win32: path.join(__dirname, '../test/browser/phantomjs.exe')
-      }
     }
   });
 };

config/karma.js

@@ -1,28 +1,9 @@
-const webpack = require('webpack');
+const path = require('path');
 const argv = require('minimist')(process.argv.slice(2));
 const RELEASE = argv.release;
-const path = require('path');
-
-function getPlugins() {
-  const nodeEnv = RELEASE ? '"production"' : '"development"';
-  var pluginsBase =  [
-    new webpack.DefinePlugin({'process.env.NODE_ENV': nodeEnv, 'global': 'window'})
-  ];
-
-  if (RELEASE) {
-    pluginsBase.push(new webpack.optimize.DedupePlugin());
-    pluginsBase.push(new webpack.optimize.OccurenceOrderPlugin());
-    pluginsBase.push(new webpack.optimize.AggressiveMergingPlugin());
-    pluginsBase.push(new webpack.optimize.UglifyJsPlugin({
-      include: /\.min\.js$/,
-      compress: { warnings: false }
-    }));
-  }
-  return pluginsBase;
-}
 
 const config = {
-  debug: !RELEASE,
+  mode: RELEASE ? 'production' : 'development',
   externals: {
     react: {
       root: 'React',
@@ -36,7 +17,7 @@ const config = {
       commonjs2: 'react-dom',
       amd: 'react-dom'
     },
-    'react/addons': 'React',
+   'react/addons': 'React',
     moment: 'moment',
     immutable: {
       root: 'Immutable',
@@ -45,23 +26,26 @@ const config = {
     }
   },
   module: {
-    loaders: [
-      { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' },
-      { test: /\.css$/, loader: 'style-loader!css-loader' }
+    rules: [
+      {
+        test: /\.(js|jsx)$/,
+        exclude: /node_modules/,
+        use: ['babel-loader']
+      },
+      {
+        test: /\.css$/,
+        use: [
+          { loader: 'style-loader' },
+          { loader: 'css-loader' }
+        ]
+      }
     ]
   },
-  plugins: getPlugins(),
   resolve: {
     alias: {
       common: path.resolve('packages/common/')
     }
-  },
-  postLoaders: [
-    {
-      test: /\.js$/,
-      exclude: /node_modules|testData/,
-      loader: 'jshint'
-    }]
+  }
 };