new build and fontawesome cleanup

rhiannanberry · rhiannanberry · commit 554d49fa3e6b · 2021-10-06T11:08:40.000-04:00
diff --git a/dist/grapes.js b/dist/grapes.js
diff --git a/dist/grapes.min.js b/dist/grapes.min.js
diff --git a/dist/grapes.min.js.map b/dist/grapes.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "grapesjs",
   "description": "Free and Open Source Web Builder Framework",
-  "version": "0.14.62",
+  "version": "0.14.63",
   "author": "Artur Arseniev",
   "license": "BSD-3-Clause",
   "homepage": "http://grapesjs.com",
   "main": "dist/grapes.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/artf/grapesjs.git"
+    "url": "https://github.com/springbot/grapesjs"
   },
   "dependencies": {
     "@fortawesome/fontawesome-pro": "^5.15.4",
diff --git a/src/asset_manager/model/AssetImage.js b/src/asset_manager/model/AssetImage.js
@@ -7,5 +7,5 @@ module.exports = Asset.extend({
     unitDim: 'px',
     height: 0,
     width: 0
-  },
+  }
 });
diff --git a/src/block_manager/view/CategoryView.js b/src/block_manager/view/CategoryView.js
@@ -16,8 +16,8 @@ module.exports = Backbone.View.extend({
     this.config = config;
     const pfx = this.config.pStylePrefix || '';
     this.pfx = pfx;
-    this.caretR = 'fa fa-caret-right';
-    this.caretD = 'fa fa-caret-down';
+    this.caretR = 'far fa-caret-right';
+    this.caretD = 'far fa-caret-down';
     this.iconClass = `${pfx}caret-icon`;
     this.activeClass = `${pfx}open`;
     this.className = `${pfx}block-category`;
diff --git a/src/dom_components/config/config.js b/src/dom_components/config/config.js
@@ -27,7 +27,7 @@ module.exports = {
   components: [],
 
   // Class for new image component
-  imageCompClass: 'fa fa-picture-o',
+  imageCompClass: 'far fa-image',
 
   // Open assets manager on create of image component
   oAssetsOnCreate: true,
diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js
@@ -79,7 +79,7 @@ const avoidInline = em => em && em.getConfig('avoidInlineStyle');
  *  For example if you create a component likes this: `{ removable: false, draggable: false, propagate: ['removable', 'draggable'] }`
  *  and append some new component inside, the new added component will get the exact same properties indicated in the `propagate` array (and the `propagate` property itself). Default: `[]`
  * @property {Array<Object>} [toolbar=null] Set an array of items to show up inside the toolbar when the component is selected (move, clone, delete).
- * Eg. `toolbar: [ { attributes: {class: 'fa fa-arrows'}, command: 'tlb-move' }, ... ]`.
+ * Eg. `toolbar: [ { attributes: {class: 'far fa-arrows'}, command: 'tlb-move' }, ... ]`.
  * By default, when `toolbar` property is falsy the editor will add automatically commands like `move`, `delete`, etc. based on its properties.
  * @property {Collection<Component>} [components=null] Children components. Default: `null`
  */
@@ -634,7 +634,7 @@ const Component = Backbone.Model.extend(Styleable).extend(
         var tb = [];
         if (model.collection) {
           tb.push({
-            attributes: { class: 'fa fa-arrow-up' },
+            attributes: { class: 'far fa-arrow-up' },
             command: ed => ed.runCommand('core:component-exit', { force: 1 })
           });
         }
@@ -650,13 +650,13 @@ const Component = Backbone.Model.extend(Styleable).extend(
         }
         if (model.get('copyable')) {
           tb.push({
-            attributes: { class: 'fa fa-clone' },
+            attributes: { class: 'far fa-clone' },
             command: 'tlb-clone'
           });
         }
         if (model.get('removable')) {
           tb.push({
-            attributes: { class: 'fa fa-trash-o' },
+            attributes: { class: 'far fa-trash' },
             command: 'tlb-delete'
           });
         }
diff --git a/src/dom_components/model/ComponentImage.js b/src/dom_components/model/ComponentImage.js
@@ -58,7 +58,7 @@ module.exports = Component.extend(
 
           if (!hasButtonBool) {
             tb.push({
-              attributes: { class: 'fa fa-pencil' },
+              attributes: { class: 'far fa-pencil' },
               command: cmdName
             });
             this.set('toolbar', tb);
diff --git a/src/index.js b/src/index.js
@@ -3,10 +3,7 @@ import Editor from './editor';
 import { isElement, isFunction } from 'underscore';
 import polyfills from 'utils/polyfills';
 import PluginManager from './plugin_manager';
-import { library, dom } from '@fortawesome/fontawesome-svg-core';
-import { far } from '@fortawesome/pro-regular-svg-icons';
-import { fas } from '@fortawesome/pro-solid-svg-icons';
-import { faHorizontalRule as falFaHorizontalRule } from '@fortawesome/pro-light-svg-icons';
+import { loadIcons } from './utils/FontAwesome';
 
 polyfills();
 
@@ -50,10 +47,7 @@ module.exports = (() => {
      * })
      */
     init(config = {}) {
-      // fontawesome icons
-      library.add(far, fas, falFaHorizontalRule);
-      dom.watch();
-
+      loadIcons();
       const els = config.container;
       if (!els) throw new Error("'container' is required");
       config = { ...defaultConfig, ...config };
diff --git a/src/selector_manager/view/ClassTagView.js b/src/selector_manager/view/ClassTagView.js
@@ -106,8 +106,8 @@ module.exports = require('backbone').View.extend({
    */
   updateStatus() {
     const { model, $el } = this;
-    const chkOn = 'fa-check-square-o';
-    const chkOff = 'fa-square-o';
+    const chkOn = 'fa-check-square';
+    const chkOff = 'fa-square';
     const $chk = $el.find('[data-tag-status]');
 
     if (model.get('active')) {
diff --git a/src/utils/FontAwesome.js b/src/utils/FontAwesome.js
@@ -0,0 +1,99 @@
+import { library, dom } from '@fortawesome/fontawesome-svg-core';
+import { faHorizontalRule as falFaHorizontalRule } from '@fortawesome/pro-light-svg-icons/faHorizontalRule';
+import { faAlignCenter } from '@fortawesome/pro-regular-svg-icons/faAlignCenter';
+import { faAlignJustify } from '@fortawesome/pro-regular-svg-icons/faAlignJustify';
+import { faAlignLeft } from '@fortawesome/pro-regular-svg-icons/faAlignLeft';
+import { faAlignRight } from '@fortawesome/pro-regular-svg-icons/faAlignRight';
+import { faArrowToBottom } from '@fortawesome/pro-regular-svg-icons/faArrowToBottom';
+import { faArrowToLeft } from '@fortawesome/pro-regular-svg-icons/faArrowToLeft';
+import { faArrowToRight } from '@fortawesome/pro-regular-svg-icons/faArrowToRight';
+import { faArrowToTop } from '@fortawesome/pro-regular-svg-icons/faArrowToTop';
+import { faArrowUp } from '@fortawesome/pro-regular-svg-icons/faArrowUp';
+import { faArrows } from '@fortawesome/pro-regular-svg-icons/faArrows';
+import { faArrowsAlt } from '@fortawesome/pro-regular-svg-icons/faArrowsAlt';
+import { faBorderInner } from '@fortawesome/pro-regular-svg-icons/faBorderInner';
+import { faBorderStyle } from '@fortawesome/pro-regular-svg-icons/faBorderStyle';
+import { faCaretDown } from '@fortawesome/pro-regular-svg-icons/faCaretDown';
+import { faCaretRight } from '@fortawesome/pro-regular-svg-icons/faCaretRight';
+import { faCaretUp } from '@fortawesome/pro-regular-svg-icons/faCaretUp';
+import { faCheck } from '@fortawesome/pro-regular-svg-icons/faCheck';
+import { faCheckSquare } from '@fortawesome/pro-regular-svg-icons/faCheckSquare';
+import { faChevronDown } from '@fortawesome/pro-regular-svg-icons/faChevronDown';
+import { faChevronUp } from '@fortawesome/pro-regular-svg-icons/faChevronUp';
+import { faClone } from '@fortawesome/pro-regular-svg-icons/faClone';
+import { faCode } from '@fortawesome/pro-regular-svg-icons/faCode';
+import { faEdit } from '@fortawesome/pro-regular-svg-icons/faEdit';
+import { faEye } from '@fortawesome/pro-regular-svg-icons/faEye';
+import { faEyeSlash } from '@fortawesome/pro-regular-svg-icons/faEyeSlash';
+import { faHorizontalRule } from '@fortawesome/pro-regular-svg-icons/faHorizontalRule';
+import { faLineHeight } from '@fortawesome/pro-regular-svg-icons/faLineHeight';
+import { faObjectGroup } from '@fortawesome/pro-regular-svg-icons/faObjectGroup';
+import { faPencil } from '@fortawesome/pro-regular-svg-icons/faPencil';
+import { faImage } from '@fortawesome/pro-regular-svg-icons/faImage';
+import { faPlus } from '@fortawesome/pro-regular-svg-icons/faPlus';
+import { faSlidersH } from '@fortawesome/pro-regular-svg-icons/faSlidersH';
+import { faSquare } from '@fortawesome/pro-regular-svg-icons/faSquare';
+import { faStrikethrough } from '@fortawesome/pro-regular-svg-icons/faStrikethrough';
+import { faTextSize } from '@fortawesome/pro-regular-svg-icons/faTextSize';
+import { faTextWidth } from '@fortawesome/pro-regular-svg-icons/faTextWidth';
+import { faTimes } from '@fortawesome/pro-regular-svg-icons/faTimes';
+import { faTimesCircle } from '@fortawesome/pro-regular-svg-icons/faTimesCircle';
+import { faTrash } from '@fortawesome/pro-regular-svg-icons/faTrash';
+import { faUnderline } from '@fortawesome/pro-regular-svg-icons/faUnderline';
+import { faCaretDown as fasCaretDown } from '@fortawesome/pro-solid-svg-icons/faCaretDown';
+import { faCaretUp as fasCaretUp } from '@fortawesome/pro-solid-svg-icons/faCaretUp';
+import { faHorizontalRule as fasHorizontalRule } from '@fortawesome/pro-solid-svg-icons/faHorizontalRule';
+import { faPaintBrush } from '@fortawesome/pro-solid-svg-icons/faPaintBrush';
+import { faThLarge } from '@fortawesome/pro-solid-svg-icons/faThLarge';
+
+export const loadIcons = () => {
+  library.add(
+    fasCaretDown,
+    fasCaretUp,
+    fasHorizontalRule,
+    faPaintBrush,
+    faThLarge,
+    falFaHorizontalRule,
+    faAlignCenter,
+    faAlignJustify,
+    faAlignLeft,
+    faAlignRight,
+    faArrowToBottom,
+    faArrowToLeft,
+    faArrowToRight,
+    faArrowToTop,
+    faArrowUp,
+    faArrows,
+    faArrowsAlt,
+    faBorderInner,
+    faBorderStyle,
+    faCaretDown,
+    faCaretRight,
+    faCaretUp,
+    faCheck,
+    faCheckSquare,
+    faChevronDown,
+    faChevronUp,
+    faClone,
+    faCode,
+    faEdit,
+    faEye,
+    faEyeSlash,
+    faHorizontalRule,
+    faLineHeight,
+    faObjectGroup,
+    faPencil,
+    faImage,
+    faPlus,
+    faSlidersH,
+    faSquare,
+    faStrikethrough,
+    faTextSize,
+    faTextWidth,
+    faTimes,
+    faTimesCircle,
+    faTrash,
+    faUnderline
+  );
+  dom.watch();
+};
