Merge branch 'release/3.1.0'

Author: jansiegel

.config/base.js

@@ -2,12 +2,13 @@ import nodeResolve from 'rollup-plugin-node-resolve';
 import babel from 'rollup-plugin-babel';
 import typescript from 'rollup-plugin-typescript2';
 import json from 'rollup-plugin-json';
+import commonjs from 'rollup-plugin-commonjs';
 
 export const plugins = {
   typescript: typescript(),
   babel: babel({
     babelrc: false,
-    exclude: ['node_modules/**', '**.json'],
+    exclude: ['/node_modules/', '**.json'],
     extensions: ['.js', '.ts', '.tsx', '.jsx'],
     presets: [
       '@babel/env'
@@ -17,6 +18,12 @@ export const plugins = {
   json: json({
     include: 'package.json',
     compact: true
+  }),
+  commonjs: commonjs({
+    include: [
+      'node_modules/**',
+      'src/lib/**'
+    ]
   })
 };
 
@@ -25,6 +32,7 @@ export const baseConfig = {
   plugins: [
     plugins.json,
     plugins.replace,
+    plugins.commonjs,
     plugins.typescript,
     plugins.babel,
     plugins.nodeResolve,

.config/commonjs.js

@@ -1,5 +1,5 @@
-import { baseConfig } from './base';
-import commonjs from 'rollup-plugin-commonjs';
+import typescript from 'rollup-plugin-typescript2';
+import { baseConfig, plugins } from './base';
 
 const env = process.env.NODE_ENV;
 const filename = 'react-handsontable.js';
@@ -8,7 +8,8 @@ export const cjsConfig = {
   output: {
     format: env,
     indent: false,
-    file: `./commonjs/${filename}`
+    file: `./commonjs/${filename}`,
+    exports: 'named'
   },
-  plugins: baseConfig.plugins.concat([commonjs()])
+  plugins: baseConfig.plugins,
 };

.config/es.js

@@ -1,4 +1,5 @@
 import typescript from 'rollup-plugin-typescript2';
+import { baseConfig } from './base';
 import { plugins } from './base';
 
 const env = process.env.NODE_ENV;
@@ -13,15 +14,16 @@ export const esConfig = {
   plugins: [
     plugins.json,
     plugins.replace,
+    plugins.commonjs,
     typescript({
       tsconfigOverride: {
         compilerOptions: {
           declaration: true
         }
       },
-      useTsconfigDeclarationDir: true
+      useTsconfigDeclarationDir: true,
     }),
     plugins.babel,
     plugins.nodeResolve,
-  ],
+  ]
 };

.config/minified.js

@@ -10,7 +10,13 @@ const minConfig = {
     name: 'Handsontable.react',
     indent: false,
     sourcemap: true,
-    file: `./dist/${minFilename}`
+    exports: 'named',
+    file: `./dist/${minFilename}`,
+    globals: {
+      react: 'React',
+      'react-dom': 'ReactDOM',
+      handsontable: 'Handsontable'
+    }
   },
   plugins: baseConfig.plugins.concat([
     uglify({
@@ -21,7 +27,6 @@ const minConfig = {
         pure_getters: true,
         unsafe: true,
         unsafe_comps: true,
-        warnings: false
       }
     })
   ])

.config/umd.js

@@ -1,4 +1,5 @@
 import { addLicenseBanner } from './helpers/licenseBanner';
+import { baseConfig } from './base';
 
 const env = process.env.NODE_ENV;
 const filename = 'react-handsontable.js';
@@ -9,8 +10,15 @@ const umdConfig = {
     name: 'Handsontable.react',
     indent: false,
     sourcemap: true,
-    file: `./dist/${filename}`
-  }
+    exports: 'named',
+    file: `./dist/${filename}`,
+    globals: {
+      react: 'React',
+      'react-dom': 'ReactDOM',
+      handsontable: 'Handsontable'
+    }
+  },
+  plugins: baseConfig.plugins
 };
 
 addLicenseBanner(umdConfig);