Fix babel, use modern presets and plugins

forestlovewood · Nov 27, 2018 · 49fe205 · 49fe205
1 parent 0c2b147
commit 49fe205
Show file tree

Hide file tree

Showing 17 changed files with 999 additions and 1,020 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,12 +1,9 @@
 {
-	"only": [
-		"*.babel",
-		"*.jsx",
-		"*.es6"
-	],
 	"presets": [
-		"es2015",
-		"react"
+		"@babel/preset-env",
+		"@babel/preset-react"
 	],
-	"plugins": ["transform-class-properties"]
+	"plugins": [
+		"@babel/plugin-proposal-class-properties"
+	]
 }
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "ExpressionEngine",
-  "repository": "https://github.com/EllisLab/ExpressionEngine",
+  "repository": "https://github.com/ExpressionEngine/ExpressionEngine",
   "private": true,
   "devDependencies": {
     "@babel/cli": "^7.1.2",
     "@babel/core": "^7.1.2",
     "@babel/plugin-proposal-class-properties": "^7.1.0",
     "@babel/preset-env": "^7.1.0",
-    "babel-upgrade": "^0.0.23",
+    "@babel/preset-react": "^7.0.0",
+    "babel-upgrade": "^0.0.23"
   }
 }
diff --git a/themes/ee/asset/javascript/src/components/bulk_edit_entries.js b/themes/ee/asset/javascript/src/components/bulk_edit_entries.js
@@ -1,12 +1,24 @@
-'use strict';
+"use strict";
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 /*!
  * This source file is part of the open source project
@@ -16,97 +28,77 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
  * @copyright Copyright (c) 2003-2018, EllisLab, Inc. (https://ellislab.com)
  * @license   https://expressionengine.com/license Licensed under Apache License, Version 2.0
  */
-
-var BulkEditEntries = function (_React$Component) {
+var BulkEditEntries =
+/*#__PURE__*/
+function (_React$Component) {
   _inherits(BulkEditEntries, _React$Component);
 
   function BulkEditEntries() {
     _classCallCheck(this, BulkEditEntries);
 
-    return _possibleConstructorReturn(this, (BulkEditEntries.__proto__ || Object.getPrototypeOf(BulkEditEntries)).apply(this, arguments));
+    return _possibleConstructorReturn(this, _getPrototypeOf(BulkEditEntries).apply(this, arguments));
   }
 
   _createClass(BulkEditEntries, [{
-    key: 'componentDidUpdate',
+    key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
       if (prevProps.initialItems.length != this.props.initialItems.length) {
         this.props.entriesChanged(this.props.initialItems);
       }
     }
   }, {
-    key: 'handleRemove',
+    key: "handleRemove",
     value: function handleRemove(item) {
       this.props.itemsChanged(this.props.initialItems.filter(function (thisItem) {
         return thisItem.value != item.value;
       }));
     }
   }, {
-    key: 'handleSearch',
+    key: "handleSearch",
     value: function handleSearch(searchTerm) {
       this.props.filterChange('search', searchTerm);
     }
   }, {
-    key: 'render',
+    key: "render",
     value: function render() {
-      var _this2 = this;
+      var _this = this;
 
       var limitedItems = this.props.items.slice(0, this.props.limit);
       var totalItems = this.props.initialItems.length;
       var lang = this.props.lang;
-
-      return React.createElement(
-        'div',
-        null,
-        React.createElement(
-          'h2',
-          null,
-          totalItems,
-          ' ',
-          lang.selectedEntries
-        ),
-        React.createElement(
-          'form',
-          { 'class': 'field-search add-mrg-top' },
-          React.createElement('input', { type: 'text', placeholder: lang.filterSelectedEntries, onChange: function onChange(e) {
-              return _this2.handleSearch(e.target.value);
-            } })
-        ),
-        React.createElement(
-          'ul',
-          { 'class': 'entry-list' },
-          limitedItems.length == 0 && React.createElement('li', { 'class': 'entry-list__item entry-list__item---empty', dangerouslySetInnerHTML: { __html: lang.noEntriesFound } }),
-          limitedItems.map(function (item) {
-            return React.createElement(BulkEditEntryItem, {
-              item: item,
-              handleRemove: function handleRemove(item) {
-                return _this2.handleRemove(item);
-              },
-              lang: lang
-            });
-          })
-        ),
-        React.createElement(
-          'div',
-          { 'class': 'entry-list__note' },
-          lang.showing,
-          ' ',
-          limitedItems.length,
-          ' ',
-          lang.of,
-          ' ',
-          totalItems,
-          ' \u2014 ',
-          React.createElement(
-            'a',
-            { href: '' },
-            React.createElement('span', { 'class': 'icon--remove' }),
-            lang.clearAll
-          )
-        )
-      );
+      return React.createElement("div", null, React.createElement("h2", null, totalItems, " ", lang.selectedEntries), React.createElement("form", {
+        class: "field-search add-mrg-top"
+      }, React.createElement("input", {
+        type: "text",
+        placeholder: lang.filterSelectedEntries,
+        onChange: function onChange(e) {
+          return _this.handleSearch(e.target.value);
+        }
+      })), React.createElement("ul", {
+        class: "entry-list"
+      }, limitedItems.length == 0 && React.createElement("li", {
+        class: "entry-list__item entry-list__item---empty",
+        dangerouslySetInnerHTML: {
+          __html: lang.noEntriesFound
+        }
+      }), limitedItems.map(function (item) {
+        return React.createElement(BulkEditEntryItem, {
+          item: item,
+          handleRemove: function handleRemove(item) {
+            return _this.handleRemove(item);
+          },
+          lang: lang
+        });
+      })), React.createElement("div", {
+        class: "entry-list__note"
+      }, lang.showing, " ", limitedItems.length, " ", lang.of, " ", totalItems, " \u2014 ", React.createElement("a", {
+        href: ""
+      }, React.createElement("span", {
+        class: "icon--remove"
+      }), lang.clearAll)));
     }
   }], [{
-    key: 'render',
+    key: "render",
     value: function render(context, props) {
       $('div[data-bulk-edit-entries-react]', context).each(function () {
         ReactDOM.unmountComponentAtNode(this);
@@ -118,30 +110,22 @@ var BulkEditEntries = function (_React$Component) {
   return BulkEditEntries;
 }(React.Component);
 
-BulkEditEntries.defaultProps = {
+_defineProperty(BulkEditEntries, "defaultProps", {
   items: [],
   limit: 50
-};
-
+});
 
 function BulkEditEntryItem(props) {
-  return React.createElement(
-    'li',
-    { 'class': 'entry-list__item' },
-    React.createElement(
-      'h2',
-      null,
-      props.item.label
-    ),
-    React.createElement(
-      'a',
-      { href: '#', onClick: function onClick(e) {
-          return props.handleRemove(props.item);
-        } },
-      React.createElement('span', { 'class': 'icon--remove' }),
-      props.lang.removeFromSelection
-    )
-  );
+  return React.createElement("li", {
+    class: "entry-list__item"
+  }, React.createElement("h2", null, props.item.label), React.createElement("a", {
+    href: "#",
+    onClick: function onClick(e) {
+      return props.handleRemove(props.item);
+    }
+  }, React.createElement("span", {
+    class: "icon--remove"
+  }), props.lang.removeFromSelection));
 }
 
 var FilterableBulkEditEntries = makeFilterableComponent(BulkEditEntries);