Merge pull request #1701 from adsabs/release-1.1.140

Revert "Lazy loaded widgets (#1665)"

.babelrc

@@ -1,5 +1,29 @@
 {
+	"plugins": [
+		"transform-react-jsx",
+		["transform-object-rest-spread", { "useBuiltIns": true }],
+		"transform-object-assign"
+	],
 	"presets": [
-		"@babel/react"
+		[
+			"env",
+			{
+				"targets": {
+					"browsers": [
+						"last 2 versions",
+						"ios_saf >= 8",
+						"not IE <= 10",
+						"chrome >= 49",
+						"firefox >= 49",
+						"> 1%"
+					]
+				},
+				"debug": false,
+				"loose": true,
+				"modules": false,
+				"useBuiltIns": true
+			}
+		],
+		"react"
 	]
 }

.gitignore

@@ -33,7 +33,6 @@ src/styles/css
 .vagrant
 
 src/discovery.vars.js
-grunt/requirejs.js
 .*
 !.babelrc
 !.travis.yml

grunt/aliases.yaml

@@ -95,21 +95,16 @@ release:
   tasks:
     - 'env:prod'
     - 'assets'
-    # - 'clean:release'
-    # - 'copy:release'
+    - 'clean:release'
+    - 'copy:release'
     - 'compile-handlebars:index'
     - 'exec:git_describe'
-    - 'optimize-build'
-    - 'string-replace:final'
-    # - 'imagemin'
-    - 'cssmin'
-    - 'htmlmin'
-    # - 'string-replace:dist'
-    # - 'babel:release'
-    # - 'requirejs:release_concatenated'
-    # - 'uglify:release'
-    # - 'requirejs:release_css'
-    # - 'concurrent:hash_require'
-    # - 'copy:keep_original'
-    # - 'copy:bumblebee_app'
-    # - 'assemble'
+    - 'string-replace:dist'
+    - 'babel:release'
+    - 'requirejs:release_concatenated'
+    - 'uglify:release'
+    - 'requirejs:release_css'
+    - 'concurrent:hash_require'
+    - 'copy:keep_original'
+    - 'copy:bumblebee_app'
+    - 'assemble'

grunt/clean.js

@@ -6,9 +6,7 @@
  */
 module.exports = {
   release: {
-    src: [
-      'dist/',
-    ]
+    src: ['dist/']
   },
   deploy: {
     src: [

grunt/copy.js

@@ -231,7 +231,8 @@ module.exports = function (grunt) {
       files: [{
         expand: true,
         src: [
-          './src/**'
+          './src/**',
+          '!./src/index.html'
         ],
         dest: 'dist/',
         rename: function(dest, src) {

grunt/hash_require.js

@@ -12,14 +12,9 @@ module.exports = {
       mapping: 'dist/jsmap.json',
       destBasePath: 'dist/',
       srcBasePath: 'dist/',
-      flatten: false,
-      clean: true,
-      prepend: true
+      flatten:false
     },
-    src: [
-      'dist/*.js',
-      'dist/js/**/*.js'
-    ]
+    src: ['dist/js/**/*.js']
   },
   css: {
     options: {