Merge pull request #162 from bartvde/polyfills

Do not use polyfill service

Author: bartvde

geonode-client/templates/geonode-client/_client_composer_js.html

@@ -1,4 +1,3 @@
 {% load static %}
-<script src="https://cdn.polyfill.io/v2/polyfill.js?features=default,Object.assign"></script>
 <script type="text/javascript" src="{% static 'geonode-client/js/composer.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'geonode-client/cesium/Cesium.js' %}"></script>

geonode-client/templates/geonode-client/_client_viewer_js.html

@@ -1,4 +1,3 @@
 {% load static %}
-<script src="https://cdn.polyfill.io/v2/polyfill.js?features=default,Object.assign"></script>
 <script type="text/javascript" src="{% static 'geonode-client/js/viewer.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'geonode-client/cesium/Cesium.js' %}"></script>

package.json

@@ -18,9 +18,9 @@
     "test:lint": "eslint src --ext .jsx,.js",
     "test:unit": "NODE_ENV=test ./node_modules/karma/bin/karma start --browsers PhantomJS --auto-watch",
     "deploy": "npm run build:gh-pages && git-directory-deploy --directory _build --branch gh-pages",
-		"geonode:mkdir": "mkdir -p geonode-client/static && mkdir -p geonode-client/static/geonode-client && mkdir -p geonode-client/static/geonode-client/js && mkdir -p geonode-client/static/geonode-client/cesium",
-		"geonode:cp": "cp dist/Viewer.min.js geonode-client/static/geonode-client/js/viewer.min.js && cp dist/Composer.min.js geonode-client/static/geonode-client/js/composer.min.js && cp -R dist/cesium/* geonode-client/static/geonode-client/cesium/",
-		"geonode:deploy": "npm run geonode:mkdir && npm run geonode:cp"
+    "geonode:mkdir": "mkdir -p geonode-client/static && mkdir -p geonode-client/static/geonode-client && mkdir -p geonode-client/static/geonode-client/js && mkdir -p geonode-client/static/geonode-client/cesium",
+    "geonode:cp": "cp dist/Viewer.min.js geonode-client/static/geonode-client/js/viewer.min.js && cp dist/Composer.min.js geonode-client/static/geonode-client/js/composer.min.js && cp -R dist/cesium/* geonode-client/static/geonode-client/cesium/",
+    "geonode:deploy": "npm run geonode:mkdir && npm run geonode:cp"
   },
   "main": "dist/viewer.js",
   "browser": "dist/viewer.js",
@@ -36,15 +36,17 @@
     "node": ">6"
   },
   "dependencies": {
-    "react": "15.3.2",
-    "react-dom": "15.3.2",
-    "react-intl": "^2.1.5",
-    "react-tap-event-plugin": "1.0.0",
     "boundless-sdk": "^0.10.20",
+    "core-js": "^2.4.1",
+    "intl": "^1.2.5",
     "material-ui": "0.16.4",
     "ol3-cesium": "3.9.4",
     "openlayers": "3.19.0",
+    "react": "15.3.2",
+    "react-dom": "15.3.2",
+    "react-intl": "^2.1.5",
     "react-redux": "^5.0.0",
+    "react-tap-event-plugin": "1.0.0",
     "redux-thunk": "^2.1.0",
     "whatwg-fetch": "^1.0.0"
   },
@@ -68,10 +70,12 @@
     "enzyme": "^2.7.0",
     "eslint": "^3.7.1",
     "eslint-plugin-react": "^6.4.1",
+    "exports-loader": "^0.6.3",
     "fetch-mock": "^5.6.2",
     "file-loader": "^0.9.0",
     "fs-extra": "0.26.2",
     "git-directory-deploy": "^1.5.1",
+    "imports-loader": "^0.7.0",
     "intl": "^1.2.5",
     "json-loader": "^0.5.4",
     "karma": "^1.3.0",

src/components/geonode.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 global.React = React;
 import ReactDOM from 'react-dom';
 global.ReactDOM = ReactDOM;
+import 'core-js/fn/object/assign';
 import ol from 'openlayers';
 import {addLocaleData, IntlProvider} from 'react-intl';
 global.IntlProvider = IntlProvider;

webpack.config.js

@@ -4,7 +4,11 @@ var path = require('path');
 var BUILD_DIR = path.resolve(__dirname, 'dist');
 var APP_DIR = path.resolve(__dirname, '.');
 
-var plugins = [];
+var plugins = [
+  new webpack.ProvidePlugin({
+    'Intl': 'imports?this=>global!exports?global.Intl!intl'
+  })
+];
 var filename = '[name].js';
 var PROD = JSON.parse(process.env.BUILD_PROD || false);
 if(PROD) {