From 3a8390c49eef03f61a1e8a50b722c29f4681cf0d Mon Sep 17 00:00:00 2001
From: AllenFang <ayu780129@hotmail.com>
Date: Sun, 14 Jan 2018 18:29:27 +0800
Subject: [PATCH] react-bootstrap-table2-example depend other packages via
 webpack resolver instead of node modules

---
 .../{src => }/index.js                         |  6 +++---
 .../react-bootstrap-table2-editor/package.json |  2 +-
 .../.storybook/.babelrc                        |  3 +++
 .../.storybook/webpack.config.js               | 18 ++++++++++++------
 .../package.json                               |  8 ++------
 .../{src => }/index.js                         |  6 +++---
 .../react-bootstrap-table2-filter/package.json |  2 +-
 .../{src => }/index.js                         |  0
 .../package.json                               |  2 +-
 .../{src => }/index.js                         |  2 +-
 .../package.json                               |  2 +-
 packages/react-bootstrap-table2/index.js       |  5 +++++
 packages/react-bootstrap-table2/package.json   |  2 +-
 packages/react-bootstrap-table2/src/index.js   |  5 -----
 14 files changed, 34 insertions(+), 29 deletions(-)
 rename packages/react-bootstrap-table2-editor/{src => }/index.js (66%)
 create mode 100644 packages/react-bootstrap-table2-example/.storybook/.babelrc
 rename packages/react-bootstrap-table2-filter/{src => }/index.js (57%)
 rename packages/react-bootstrap-table2-overlay/{src => }/index.js (100%)
 rename packages/react-bootstrap-table2-paginator/{src => }/index.js (61%)
 create mode 100644 packages/react-bootstrap-table2/index.js
 delete mode 100644 packages/react-bootstrap-table2/src/index.js

diff --git a/packages/react-bootstrap-table2-editor/src/index.js b/packages/react-bootstrap-table2-editor/index.js
similarity index 66%
rename from packages/react-bootstrap-table2-editor/src/index.js
rename to packages/react-bootstrap-table2-editor/index.js
index 0d8be80..df715d7 100644
--- a/packages/react-bootstrap-table2-editor/src/index.js
+++ b/packages/react-bootstrap-table2-editor/index.js
@@ -1,10 +1,10 @@
-import wrapperFactory from './wrapper';
-import editingCellFactory from './editing-cell';
+import wrapperFactory from './src/wrapper';
+import editingCellFactory from './src/editing-cell';
 import {
   CLICK_TO_CELL_EDIT,
   DBCLICK_TO_CELL_EDIT,
   DELAY_FOR_DBCLICK
-} from './const';
+} from './src/const';
 
 export default (options = {}) => ({
   wrapperFactory,
diff --git a/packages/react-bootstrap-table2-editor/package.json b/packages/react-bootstrap-table2-editor/package.json
index 8b7aab8..9db5fab 100644
--- a/packages/react-bootstrap-table2-editor/package.json
+++ b/packages/react-bootstrap-table2-editor/package.json
@@ -2,7 +2,7 @@
   "name": "react-bootstrap-table2-editor",
   "version": "0.0.1",
   "description": "it's the editor addon for react-bootstrap-table2",
-  "main": "src/index.js",
+  "main": "./dist/react-bootstrap-table2-editor.min.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/packages/react-bootstrap-table2-example/.storybook/.babelrc b/packages/react-bootstrap-table2-example/.storybook/.babelrc
new file mode 100644
index 0000000..9683237
--- /dev/null
+++ b/packages/react-bootstrap-table2-example/.storybook/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["react", "es2015", "stage-0", ["env", {"modules": false} ]]
+}
\ No newline at end of file
diff --git a/packages/react-bootstrap-table2-example/.storybook/webpack.config.js b/packages/react-bootstrap-table2-example/.storybook/webpack.config.js
index 3cbe327..c293835 100644
--- a/packages/react-bootstrap-table2-example/.storybook/webpack.config.js
+++ b/packages/react-bootstrap-table2-example/.storybook/webpack.config.js
@@ -1,10 +1,10 @@
 const path = require('path');
 
-const sourcePath = path.join(__dirname, '../../react-bootstrap-table2/src');
-const paginationSourcePath = path.join(__dirname, '../../react-bootstrap-table2-paginator/src');
-const overlaySourcePath = path.join(__dirname, '../../react-bootstrap-table2-overlay/src');
-const filterSourcePath = path.join(__dirname, '../../react-bootstrap-table2-filter/src');
-const editorSourcePath = path.join(__dirname, '../../react-bootstrap-table2-editor/src');
+const sourcePath = path.join(__dirname, '../../react-bootstrap-table2');
+const paginationSourcePath = path.join(__dirname, '../../react-bootstrap-table2-paginator');
+const overlaySourcePath = path.join(__dirname, '../../react-bootstrap-table2-overlay');
+const filterSourcePath = path.join(__dirname, '../../react-bootstrap-table2-filter');
+const editorSourcePath = path.join(__dirname, '../../react-bootstrap-table2-editor');
 const sourceStylePath = path.join(__dirname, '../../react-bootstrap-table2/style');
 const paginationStylePath = path.join(__dirname, '../../react-bootstrap-table2-paginator/style');
 const storyPath = path.join(__dirname, '../stories');
@@ -16,6 +16,12 @@ const aliasPath = {
   src: srcPath,
   components: path.join(srcPath, 'components'),
   utils: path.join(srcPath, 'utils'),
+
+  'react-bootstrap-table2': sourcePath,
+  'react-bootstrap-table2-editor': editorSourcePath,
+  'react-bootstrap-table2-filter': filterSourcePath,
+  'react-bootstrap-table2-overlay': overlaySourcePath,
+  'react-bootstrap-table2-paginator': paginationSourcePath,
 };
 
 const loaders = [{
@@ -28,7 +34,7 @@ const loaders = [{
   test: /\.js?$/,
   use: ['babel-loader'],
   exclude: /node_modules/,
-  include: [sourcePath, paginationSourcePath, overlaySourcePath, filterSourcePath, editorSourcePath, storyPath],
+  include: [sourcePath, paginationSourcePath, overlaySourcePath, filterSourcePath, editorSourcePath, storyPath]
 }, {
   test: /\.css$/,
   use: ['style-loader', 'css-loader'],
diff --git a/packages/react-bootstrap-table2-example/package.json b/packages/react-bootstrap-table2-example/package.json
index e75be94..08dcab7 100644
--- a/packages/react-bootstrap-table2-example/package.json
+++ b/packages/react-bootstrap-table2-example/package.json
@@ -18,16 +18,12 @@
     "react-dom": "^15.0.0"
   },
   "dependencies": {
-    "bootstrap": "^3.3.7",
-    "react-bootstrap-table2": "0.0.1",
-    "react-bootstrap-table2-editor": "0.0.1",
-    "react-bootstrap-table2-paginator": "0.0.1",
-    "react-bootstrap-table2-overlay": "0.0.1",
-    "react-bootstrap-table2-filter": "0.0.1"
+    "bootstrap": "^3.3.7"
   },
   "devDependencies": {
     "@storybook/addon-console": "^1.0.0",
     "@storybook/react": "^3.2.8",
+    "babel-preset-env": "^1.6.1",
     "react-redux": "^5.0.6",
     "redux": "^3.7.2",
     "redux-thunk": "^2.2.0",
diff --git a/packages/react-bootstrap-table2-filter/src/index.js b/packages/react-bootstrap-table2-filter/index.js
similarity index 57%
rename from packages/react-bootstrap-table2-filter/src/index.js
rename to packages/react-bootstrap-table2-filter/index.js
index 4b38550..f6335a8 100644
--- a/packages/react-bootstrap-table2-filter/src/index.js
+++ b/packages/react-bootstrap-table2-filter/index.js
@@ -1,6 +1,6 @@
-import TextFilter from './components/text';
-import wrapperFactory from './wrapper';
-import * as Comparison from './comparison';
+import TextFilter from './src/components/text';
+import wrapperFactory from './src/wrapper';
+import * as Comparison from './src/comparison';
 
 export default (options = {}) => ({
   wrapperFactory,
diff --git a/packages/react-bootstrap-table2-filter/package.json b/packages/react-bootstrap-table2-filter/package.json
index f512aa7..ecb2e15 100644
--- a/packages/react-bootstrap-table2-filter/package.json
+++ b/packages/react-bootstrap-table2-filter/package.json
@@ -2,7 +2,7 @@
   "name": "react-bootstrap-table2-filter",
   "version": "0.0.1",
   "description": "it's the column filter addon for react-bootstrap-table2",
-  "main": "./lib",
+  "main": "./dist/react-bootstrap-table2-filter.min.js",
   "author": "",
   "license": "ISC"
 }
diff --git a/packages/react-bootstrap-table2-overlay/src/index.js b/packages/react-bootstrap-table2-overlay/index.js
similarity index 100%
rename from packages/react-bootstrap-table2-overlay/src/index.js
rename to packages/react-bootstrap-table2-overlay/index.js
diff --git a/packages/react-bootstrap-table2-overlay/package.json b/packages/react-bootstrap-table2-overlay/package.json
index e62939c..70738f1 100644
--- a/packages/react-bootstrap-table2-overlay/package.json
+++ b/packages/react-bootstrap-table2-overlay/package.json
@@ -2,7 +2,7 @@
   "name": "react-bootstrap-table2-overlay",
   "version": "0.0.1",
   "description": "it's a loading overlay component for react-bootstrap-table2",
-  "main": "./lib",
+  "main": "./dist/react-bootstrap-table2-overlay.min.js",
   "author": "",
   "license": "ISC",
   "dependencies": {
diff --git a/packages/react-bootstrap-table2-paginator/src/index.js b/packages/react-bootstrap-table2-paginator/index.js
similarity index 61%
rename from packages/react-bootstrap-table2-paginator/src/index.js
rename to packages/react-bootstrap-table2-paginator/index.js
index fd468cb..edd0067 100644
--- a/packages/react-bootstrap-table2-paginator/src/index.js
+++ b/packages/react-bootstrap-table2-paginator/index.js
@@ -1,4 +1,4 @@
-import wrapperFactory from './wrapper';
+import wrapperFactory from './src/wrapper';
 
 export default (options = {}) => ({
   wrapperFactory,
diff --git a/packages/react-bootstrap-table2-paginator/package.json b/packages/react-bootstrap-table2-paginator/package.json
index 586158a..c50ae6f 100644
--- a/packages/react-bootstrap-table2-paginator/package.json
+++ b/packages/react-bootstrap-table2-paginator/package.json
@@ -2,7 +2,7 @@
   "name": "react-bootstrap-table2-paginator",
   "version": "0.0.1",
   "description": "it's the pagination addon for react-bootstrap-table2",
-  "main": "./lib",
+  "main": "./dist/react-bootstrap-table2-paginator.min.js",
   "author": "",
   "license": "ISC"
 }
diff --git a/packages/react-bootstrap-table2/index.js b/packages/react-bootstrap-table2/index.js
new file mode 100644
index 0000000..c134e64
--- /dev/null
+++ b/packages/react-bootstrap-table2/index.js
@@ -0,0 +1,5 @@
+import BootstrapTable from './src/bootstrap-table';
+import withDataStore from './src/container';
+
+export default withDataStore(BootstrapTable);
+
diff --git a/packages/react-bootstrap-table2/package.json b/packages/react-bootstrap-table2/package.json
index c511937..1ea3460 100644
--- a/packages/react-bootstrap-table2/package.json
+++ b/packages/react-bootstrap-table2/package.json
@@ -2,7 +2,7 @@
   "name": "react-bootstrap-table2",
   "version": "0.0.1",
   "description": "Rebuilt for react-bootstrap-table",
-  "main": "./lib",
+  "main": "./dist/react-bootstrap-table2.min.js",
   "author": "",
   "license": "ISC"
 }
diff --git a/packages/react-bootstrap-table2/src/index.js b/packages/react-bootstrap-table2/src/index.js
deleted file mode 100644
index db955bd..0000000
--- a/packages/react-bootstrap-table2/src/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import BootstrapTable from './bootstrap-table';
-import withDataStore from './container';
-
-export default withDataStore(BootstrapTable);
-