Merge pull request binary-com#3843 from binary-hamedanchi/mohammad/move_logic

mohammad/move_logic

Author: negarn

build/babel.js

@@ -3,7 +3,7 @@ module.exports = {
         options: {
             minified  : true,
             plugins   : ['transform-remove-strict-mode'],
-            presets   : ['es2015'],
+            presets   : ['env'],
             sourceMap : true,
             sourceType: 'script',
         },

build/webpack.js

@@ -4,7 +4,7 @@ const CircularDependencyPlugin = require('circular-dependency-plugin');
 // const UnusedFilesWebpackPlugin = require('unused-files-webpack-plugin')['default'];
 
 module.exports = function (grunt) {
-    const isProduction = grunt.cli.tasks[0] === 'release';
+    const is_production = grunt.cli.tasks[0] === 'release';
     const plugins = [
         new CircularDependencyPlugin({
             failOnError: true,
@@ -31,9 +31,6 @@ module.exports = function (grunt) {
                 warnings: false,
             },
         }),
-        new webpack.DefinePlugin({
-            '__REACT_DEVTOOLS_GLOBAL_HOOK__': '({ isDisabled: true })'
-        }),
         // new UnusedFilesWebpackPlugin({
         //     patterns: [
         //         'src/javascript/**/*.*',
@@ -42,7 +39,18 @@ module.exports = function (grunt) {
         // }),
     ];
 
-    if (!isProduction) {
+    if (is_production) {
+        plugins.push(
+            new webpack.DefinePlugin({
+                '__REACT_DEVTOOLS_GLOBAL_HOOK__': '({ isDisabled: true })'
+            }),
+            new webpack.DefinePlugin({
+                'process.env': {
+                    NODE_ENV: JSON.stringify('production'),
+                },
+            }),
+        );
+    } else {
         plugins.push(
             function() {
                 this.plugin('watch-run', (watching, callback) => {
@@ -60,47 +68,42 @@ module.exports = function (grunt) {
 
                     callback();
                 });
-            }
+            },
         );
     }
 
     const common_options = {
         node: {
             fs: 'empty',
         },
-        // devtool: isProduction ? 'source-map' : 'cheap-source-map',
+        // devtool: is_production ? 'source-map' : 'cheap-source-map',
         cache: true,
         stats: {
             chunks: false,
         },
         entry: {
-            [isProduction ? 'binary.min' :'binary']: './src/javascript',
+            [is_production ? 'binary.min' :'binary']: './src/javascript',
         },
         output: {
             path         : path.resolve(__dirname, `../${global.dist}/js/`),
             filename     : '[name].js',
             chunkFilename: '[name]_[chunkhash].min.js',
-            publicPath   : `${isProduction || grunt.file.exists(`${process.cwd()}/scripts/CNAME`) ? '' : '/binary-static'}${global.branch ? `/${global.branch_prefix}${global.branch}` : ''}/js/`,
+            publicPath   : `${is_production || grunt.file.exists(`${process.cwd()}/scripts/CNAME`) ? '' : '/binary-static'}${global.branch ? `/${global.branch_prefix}${global.branch}` : ''}/js/`,
+        },
+        resolve: {
+            extensions: ['.js', '.jsx'],
         },
         module: {
             loaders: [
                 {
-                    test   : /\.js$/,
-                    exclude: /node_modules/,
-                    loader : 'babel-loader',
-                    query  : {
-                        presets: ['env'],
-                        compact: false,
-                    },
-                }, {
-                    test   : /\.jsx$/,
+                    test   : /\.jsx?$/,
                     exclude: /node_modules/,
                     loader : 'babel-loader',
                     query  : {
-                        presets: ['react','env'],
+                        presets: ['env', 'react'],
                         plugins: [
                             'transform-object-rest-spread',
-                            'transform-class-properties'
+                            'transform-class-properties',
                         ],
                         compact: false,
                     },

package.json

@@ -28,14 +28,13 @@
     "babel-core": "6.26.0",
     "babel-eslint": "8.0.3",
     "babel-loader": "7.1.2",
-    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-class-properties": "6.24.1",
     "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-plugin-transform-object-rest-spread": "6.26.0",
     "babel-plugin-transform-react-jsx": "6.24.1",
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-es2015": "6.24.1",
-    "babel-preset-react": "^6.24.1",
+    "babel-preset-env": "1.6.1",
+    "babel-preset-react": "6.24.1",
     "babel-register": "6.26.0",
     "binary-live-api": "^29.0.0",
     "chai": "4.1.2",
@@ -51,6 +50,7 @@
     "eslint-config-prettier": "2.9.0",
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-react": "7.5.1",
+    "extend": "3.0.1",
     "gettext-parser": "1.3.0",
     "grunt": "1.0.1",
     "grunt-babel": "7.0.0",