Fix Uglify Issue

adsabs · Apr 7, 2018 · 8d0d4bf · 8d0d4bf
1 parent 87f9b61
commit 8d0d4bf
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/grunt/copy.js b/grunt/copy.js
@@ -136,15 +136,6 @@ module.exports = function (grunt) {
           rename: function (dest, src) {
             return dest + src.replace('prop-types', 'index');
           }
-        },
-        {
-          cwd: 'node_modules/immutable/dist',
-          src: 'immutable.min.js',
-          dest: 'src/libs/immutable/',
-          expand: true,
-          rename: function (dest, src) {
-            return dest + src.replace('immutable.min', 'index');
-          }
         }
       ]
     },

diff --git a/grunt/exec.js b/grunt/exec.js
@@ -10,7 +10,7 @@ module.exports = {
     cmd: 'node node_modules/requirejs/bin/r.js -convert src/libs/dsjslib src/libs/dsjslib'
   },
   convert_redux_immutable: {
-    cmd: 'mkdir src/libs/redux-immutable && node_modules/.bin/browserify --standalone combineReducers node_modules/redux-immutable/dist/index.js > src/libs/redux-immutable/index.js'
+    cmd: "mkdir src/libs/redux-immutable && node_modules/.bin/browserify --standalone combineReducers -x 'immutable' node_modules/redux-immutable/dist/index.js > src/libs/redux-immutable/index.js"
   },
   latest_commit: {
     cmd: 'git rev-parse --short=7 --verify HEAD | cat > git-latest-commit'

diff --git a/grunt/requirejs.js b/grunt/requirejs.js
@@ -64,7 +64,8 @@ module.exports = function (grunt) {
           'react-dom' : 'empty:',
           'jquery' : 'empty:',
           'jquery-ui' : 'empty:',
-          'requirejs' : 'empty:'
+          'requirejs' : 'empty:',
+          'immutable': 'empty:'
         }
       }
     },

diff --git a/package.json b/package.json
@@ -15,7 +15,6 @@
     "bootstrap-sass": "^3.3.7",
     "create-react-class": "^15.6.2",
     "file-saver": "^1.3.3",
-    "immutable": "^3.8.2",
     "lodash": "^2.4.2",
     "prop-types": "^15.6.0",
     "react": "^15.6.1",

diff --git a/src/discovery.config.js b/src/discovery.config.js
@@ -196,7 +196,7 @@ require.config({
     'google-analytics': "//www.google-analytics.com/analytics",
     'google-recaptcha' : '//www.google.com/recaptcha/api.js?&render=explicit&onload=onRecaptchaLoad',
     'hbs': 'libs/require-handlebars-plugin/hbs',
-    'immutable': 'libs/immutable/index',
+    'immutable': 'https://cdnjs.cloudflare.com/ajax/libs/immutable/3.8.2/immutable.min',
     'jquery' : '//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min',
     'jquery-querybuilder': 'libs/jQuery-QueryBuilder/query-builder',
     'jquery-ui' : '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min',
@@ -267,7 +267,7 @@ require.config({
     'd3-cloud' : {
       deps :['d3']
     },
-    
+
     'jquery-ui' : {
       deps: ['jquery']
     },