fix: revert the ES workaround for @fortawesome again, it doesn't wo…

…rk anymore
josdejong · Jul 28, 2022 · 69533af · 69533af
1 parent 76d717b
commit 69533af
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 128 deletions.
diff --git a/package.json b/package.json
@@ -33,10 +33,9 @@
     "test": "mocha",
     "check": "svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
-    "lint": "npm-run-all lint:**",
+    "lint": "npm run lint:prettier && npm run lint:eslint",
     "lint:prettier": "prettier --check --plugin-search-dir=. .",
     "lint:eslint": "eslint --cache --ignore-path .gitignore .",
-    "lint:fortawesome-es-workaround": "node tools/validateFortawesomeESWorkaround.js",
     "format": "prettier --write --plugin-search-dir=. .",
     "prepare": "husky install && cd tools && node generateDiffSequenceEsm.js && cd ..",
     "release": "npm-run-all release:**",

diff --git a/src/lib/components/controls/DropdownButton.svelte b/src/lib/components/controls/DropdownButton.svelte
@@ -2,7 +2,7 @@
 
 <script lang="ts">
   import Icon from 'svelte-awesome'
-  import { faCaretDown } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faCaretDown } from '@fortawesome/free-solid-svg-icons'
   import { onDestroy, onMount } from 'svelte'
   import { keyComboFromEvent } from '../../utils/keyBindings'
   import type { DropdownButtonItem } from '../../types'

diff --git a/src/lib/components/controls/ValidationErrorsOverview.svelte b/src/lib/components/controls/ValidationErrorsOverview.svelte
@@ -5,7 +5,7 @@
     faAngleDown,
     faAngleRight,
     faExclamationTriangle
-  } from '@fortawesome/free-solid-svg-icons/index.es'
+  } from '@fortawesome/free-solid-svg-icons'
   import { isEmpty } from 'lodash-es'
   import Icon from 'svelte-awesome'
   import { stringifyPath } from '../../utils/pathUtils.js'

diff --git a/src/lib/components/controls/navigationBar/NavigationBarItem.svelte b/src/lib/components/controls/navigationBar/NavigationBarItem.svelte
@@ -2,7 +2,7 @@
 
 <script lang="ts">
   import Icon from 'svelte-awesome'
-  import { faAngleRight } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faAngleRight } from '@fortawesome/free-solid-svg-icons'
   import NavigationBarDropdown from '../../../components/controls/navigationBar/NavigationBarDropdown.svelte'
   import { getContext } from 'svelte'
   import type { JSONPath } from 'immutable-json-patch'

diff --git a/src/lib/components/controls/selectQueryLanguage/SelectQueryLanguage.svelte b/src/lib/components/controls/selectQueryLanguage/SelectQueryLanguage.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import Icon from 'svelte-awesome'
-  import { faCheckSquare, faSquare } from '@fortawesome/free-regular-svg-icons/index.es'
+  import { faCheckSquare, faSquare } from '@fortawesome/free-regular-svg-icons'
   import type { QueryLanguage, OnChangeQueryLanguage } from '../../../types'
 
   export let queryLanguages: QueryLanguage[]

diff --git a/src/lib/components/modals/Header.svelte b/src/lib/components/modals/Header.svelte
@@ -3,7 +3,7 @@
 <script lang="ts">
   import { getContext } from 'svelte'
   import Icon from 'svelte-awesome'
-  import { faTimes } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faTimes } from '@fortawesome/free-solid-svg-icons'
 
   export let title = 'Modal'
 

diff --git a/src/lib/components/modals/TransformModal.svelte b/src/lib/components/modals/TransformModal.svelte
@@ -2,7 +2,7 @@
 
 <script lang="ts">
   import { uniqueId } from '../../utils/uniqueId.js'
-  import { faCaretDown, faCaretRight } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faCaretDown, faCaretRight } from '@fortawesome/free-solid-svg-icons'
   import { debounce, isEmpty, noop } from 'lodash-es'
   import { getContext } from 'svelte'
   import Icon from 'svelte-awesome'

diff --git a/src/lib/components/modals/TransformModalHeader.svelte b/src/lib/components/modals/TransformModalHeader.svelte
@@ -3,7 +3,7 @@
 <script lang="ts">
   import { getContext } from 'svelte'
   import Icon from 'svelte-awesome'
-  import { faCog, faTimes } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faCog, faTimes } from '@fortawesome/free-solid-svg-icons'
   import SelectQueryLanguage from '../controls/selectQueryLanguage/SelectQueryLanguage.svelte'
   import type { OnChangeQueryLanguage, QueryLanguage } from '../../types'
 

diff --git a/src/lib/components/modals/repair/JSONRepairComponent.svelte b/src/lib/components/modals/repair/JSONRepairComponent.svelte
@@ -7,7 +7,7 @@
     faExclamationTriangle,
     faTimes,
     faWrench
-  } from '@fortawesome/free-solid-svg-icons/index.es'
+  } from '@fortawesome/free-solid-svg-icons'
   import { createDebug } from '../../../utils/debug'
   import Message from '../../controls/Message.svelte'
   import { normalizeJsonParseError } from '../../../utils/jsonUtils.js'

diff --git a/src/lib/components/modes/textmode/TextMode.svelte b/src/lib/components/modes/textmode/TextMode.svelte
@@ -1,7 +1,7 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  import { faExclamationTriangle, faWrench } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faExclamationTriangle, faWrench } from '@fortawesome/free-solid-svg-icons'
   import { createDebug } from '../../../utils/debug'
   import { immutableJSONPatch, revertJSONPatch } from 'immutable-json-patch'
   import jsonrepair from 'jsonrepair'

diff --git a/src/lib/components/modes/textmode/menu/TextMenu.svelte b/src/lib/components/modes/textmode/menu/TextMenu.svelte
@@ -7,7 +7,7 @@
     faSearch,
     faSortAmountDownAlt,
     faUndo
-  } from '@fortawesome/free-solid-svg-icons/index.es'
+  } from '@fortawesome/free-solid-svg-icons'
   import { faJSONEditorCompact, faJSONEditorFormat } from '$lib/img/customFontawesomeIcons'
   import Menu from '../../../controls/Menu.svelte'
   import { noop } from 'lodash-es'

diff --git a/src/lib/components/modes/treemode/JSONNode.svelte b/src/lib/components/modes/treemode/JSONNode.svelte
@@ -1,7 +1,7 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  import { faCaretDown, faCaretRight } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faCaretDown, faCaretRight } from '@fortawesome/free-solid-svg-icons'
   import classnames from 'classnames'
   import type { JSONArray, JSONData, JSONObject, JSONPath, JSONPointer } from 'immutable-json-patch'
   import { appendToJSONPointer, compileJSONPointer, parseJSONPointer } from 'immutable-json-patch'

diff --git a/src/lib/components/modes/treemode/TreeMode.svelte b/src/lib/components/modes/treemode/TreeMode.svelte
@@ -2,7 +2,7 @@
 
 <script lang="ts">
   import { createAutoScrollHandler } from '../../controls/createAutoScrollHandler'
-  import { faCheck, faCode, faWrench } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faCheck, faCode, faWrench } from '@fortawesome/free-solid-svg-icons'
   import { createDebug } from '$lib/utils/debug'
   import type { JSONData, JSONPatchDocument, JSONPath } from 'immutable-json-patch'
   import {

diff --git a/src/lib/components/modes/treemode/ValidationErrorIcon.svelte b/src/lib/components/modes/treemode/ValidationErrorIcon.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
   import Icon from 'svelte-awesome'
   import { getContext } from 'svelte'
   import { tooltip } from '../../controls/tooltip/tooltip'

diff --git a/src/lib/components/modes/treemode/contextmenu/ContextMenu.svelte b/src/lib/components/modes/treemode/contextmenu/ContextMenu.svelte
@@ -13,7 +13,7 @@
     faPen,
     faSortAmountDownAlt,
     faTimes
-  } from '@fortawesome/free-solid-svg-icons/index.es'
+  } from '@fortawesome/free-solid-svg-icons'
   import type { JSONData } from 'immutable-json-patch'
   import { compileJSONPointer, getIn } from 'immutable-json-patch'
   import { initial, isEmpty } from 'lodash-es'
@@ -23,11 +23,7 @@
   import { canConvert, singleItemSelected } from '$lib/logic/selection'
   import { keyComboFromEvent } from '$lib/utils/keyBindings'
   import { isObject, isObjectOrArray } from '$lib/utils/typeUtils'
-  import {
-    faCheckSquare,
-    faLightbulb,
-    faSquare
-  } from '@fortawesome/free-regular-svg-icons/index.es'
+  import { faCheckSquare, faLightbulb, faSquare } from '@fortawesome/free-regular-svg-icons'
   import { findNearestElement } from '$lib/utils/domUtils'
   import type { DocumentState } from '../../../../types'
   import { isKeySelection, isMultiSelection, isValueSelection } from '../../../../logic/selection'

diff --git a/src/lib/components/modes/treemode/contextmenu/ContextMenuButton.svelte b/src/lib/components/modes/treemode/contextmenu/ContextMenuButton.svelte
@@ -1,7 +1,7 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  import { faCaretDown } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faCaretDown } from '@fortawesome/free-solid-svg-icons'
   import Icon from 'svelte-awesome'
   import {
     CONTEXT_MENU_EXPLANATION,

diff --git a/src/lib/components/modes/treemode/menu/SearchBox.svelte b/src/lib/components/modes/treemode/menu/SearchBox.svelte
@@ -11,7 +11,7 @@
     faCircleNotch,
     faSearch,
     faTimes
-  } from '@fortawesome/free-solid-svg-icons/index.es'
+  } from '@fortawesome/free-solid-svg-icons'
   import { DEBOUNCE_DELAY, MAX_SEARCH_RESULTS } from '$lib/constants'
   import { keyComboFromEvent } from '$lib/utils/keyBindings'
 

diff --git a/src/lib/components/modes/treemode/menu/TreeMenu.svelte b/src/lib/components/modes/treemode/menu/TreeMenu.svelte
@@ -9,7 +9,7 @@
     faSearch,
     faSortAmountDownAlt,
     faUndo
-  } from '@fortawesome/free-solid-svg-icons/index.es'
+  } from '@fortawesome/free-solid-svg-icons'
   import { CONTEXT_MENU_EXPLANATION } from '$lib/constants'
   import { faJSONEditorCollapse, faJSONEditorExpand } from '$lib/img/customFontawesomeIcons'
   import { isObjectOrArray } from '$lib/utils/typeUtils'

diff --git a/src/lib/plugins/value/components/BooleanToggle.svelte b/src/lib/plugins/value/components/BooleanToggle.svelte
@@ -1,7 +1,7 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  import { faCheckSquare, faSquare } from '@fortawesome/free-regular-svg-icons/index.es'
+  import { faCheckSquare, faSquare } from '@fortawesome/free-regular-svg-icons'
   import type { JSONData, JSONPath } from 'immutable-json-patch'
   import { compileJSONPointer } from 'immutable-json-patch'
   import Icon from 'svelte-awesome'

diff --git a/src/lib/plugins/value/components/TimestampTag.svelte b/src/lib/plugins/value/components/TimestampTag.svelte
@@ -2,7 +2,7 @@
 
 <script lang="ts">
   import Icon from 'svelte-awesome'
-  import { faClock } from '@fortawesome/free-regular-svg-icons/index.es'
+  import { faClock } from '@fortawesome/free-regular-svg-icons'
   import { getContext } from 'svelte'
   import { tooltip } from '../../../components/controls/tooltip/tooltip.js'
 

diff --git a/src/routes/examples/components/ReadonlyPassword.svelte b/src/routes/examples/components/ReadonlyPassword.svelte
@@ -2,7 +2,7 @@
 
 <script>
   import Icon from 'svelte-awesome'
-  import { faLock } from '@fortawesome/free-solid-svg-icons/index.es'
+  import { faLock } from '@fortawesome/free-solid-svg-icons'
   import { createValueSelection } from 'svelte-jsoneditor'
 
   export let value

diff --git a/src/routes/examples/custom_menu_buttons.svelte b/src/routes/examples/custom_menu_buttons.svelte
@@ -1,6 +1,6 @@
 <script>
   import { JSONEditor } from 'svelte-jsoneditor'
-  import { faCopy } from '@fortawesome/free-regular-svg-icons/index.es'
+  import { faCopy } from '@fortawesome/free-regular-svg-icons'
 
   let content = {
     text: undefined, // used when in text mode

diff --git a/tools/validateFortawesomeESWorkaround.js b/tools/validateFortawesomeESWorkaround.js