Move query to be used from external library

packages/mindplot/package.json

@@ -32,7 +32,7 @@
     "dependencies": {
         "@wisemapping/core-js": "^0.0.1",
         "@wisemapping/web2d": "^0.0.1",
-        "jquery": "2.1.0",
+        "jquery": "^3.6.0",
         "mootools": "1.4.5",
         "underscore": "^1.13.1"
     },
@@ -61,4 +61,4 @@
         "webpack-dev-server": "^3.11.2",
         "webpack-merge": "^5.8.0"
     }
-}
+}

packages/mindplot/src/components/Designer.js

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 import { $assert, $defined } from '@wisemapping/core-js';
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 
 import Events from './Events';
 import Messages from './Messages';

packages/mindplot/src/components/LinkIcon.js

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 import { $assert } from '@wisemapping/core-js';
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import Icon from './Icon';
 import LinkIconTooltip from './widget/LinkIconTooltip';
 

packages/mindplot/src/components/LocalStorageManager.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import PersistenceManager from './PersistenceManager';
 
 class LocalStorageManager extends PersistenceManager {

packages/mindplot/src/components/NoteIcon.js

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 import { $assert } from '@wisemapping/core-js';
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import Icon from './Icon';
 import FloatingTip from './widget/FloatingTip';
 

packages/mindplot/src/components/footer.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 
 try {
   $(document).trigger('loadcomplete', 'mind');

packages/mindplot/src/components/layout/LayoutManager.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import { $assert, $defined } from '@wisemapping/core-js';
 import Events from '../Events';
 import RootedTreeSet from './RootedTreeSet';

packages/mindplot/src/components/libraries/bootstrap/BootstrapDialog.js

@@ -1,6 +1,6 @@
 import Options from '../../Options';
 
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 
 class BootstrapDialog extends Options {
   

packages/mindplot/src/components/model/FeatureModel.js

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 import { $assert, $defined } from "@wisemapping/core-js";
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 
 class FeatureModel {
   /**

packages/mindplot/src/components/widget/ColorPalettePanel.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import { $assert, $defined } from '@wisemapping/core-js';
 import ToolbarPaneItem from './ToolbarPaneItem';
 

packages/mindplot/src/components/widget/FontFamilyPanel.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import ListToolbarPanel from './ListToolbarPanel';
 
 class FontFamilyPanel extends ListToolbarPanel {

packages/mindplot/src/components/widget/FontSizePanel.js

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 import ListToolbarPanel from './ListToolbarPanel';
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 
 class FontSizePanel extends ListToolbarPanel {
   // eslint-disable-next-line class-methods-use-this

packages/mindplot/src/components/widget/IconPanel.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import ToolbarPaneItem from './ToolbarPaneItem';
 import ImageIcon from '../ImageIcon';
 

packages/mindplot/src/components/widget/KeyboardShortcutTooltip.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import { $assert } from '@wisemapping/core-js';
 import FloatingTip from './FloatingTip';
 

packages/mindplot/src/components/widget/LinkIconTooltip.js

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 import { $assert } from "@wisemapping/core-js";
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import FloatingTip from './FloatingTip';
 
 class LinkIconTooltip extends FloatingTip {

packages/mindplot/src/components/widget/Menu.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 
 import { $defined } from '@wisemapping/core-js';
 import BootstrapDialogRequest from "../libraries/bootstrap/BootstrapDialogRequest";

packages/mindplot/src/components/widget/NoteEditor.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import jQuery from '@libraries/jquery-2.1.0';
+import jQuery from 'jquery';
 import BootstrapDialog from '../libraries/bootstrap/BootstrapDialog';
 
 class NoteEditor extends BootstrapDialog{

packages/mindplot/src/components/widget/ToolbarItem.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import { $assert } from '@wisemapping/core-js';
 import Events from '../Events';
 

packages/mindplot/src/components/widget/ToolbarNotifier.js

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 
 class ToolbarNotifier {
   constructor() {

packages/mindplot/src/components/widget/TopicShapePanel.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import ListToolbarPanel from './ListToolbarPanel';
 
 class TopicShapePanel extends ListToolbarPanel {

packages/mindplot/test/playground/map-render/js/editor.js

@@ -18,7 +18,7 @@
 import { $assert } from '@wisemapping/core-js';
 import { Mindmap, PersistenceManager, Designer, LocalStorageManager, Menu } from '../../../../src/';
 
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 global.jQuery = $;
 
 let designer = null;

packages/web2d/package.json

@@ -54,6 +54,7 @@
         "webpack-merge": "^5.8.0"
     },
     "dependencies": {
-        "@wisemapping/core-js": "^0.0.1"
+        "@wisemapping/core-js": "^0.0.1",
+        "jquery": "^3.6.0"
     }
-}
+}

packages/web2d/src/components/Workspace.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import { $defined } from '@wisemapping/core-js';
 import ElementClass from './ElementClass';
 import Toolkit from './Toolkit';

packages/web2d/src/components/peer/svg/ElementPeer.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import { $assert, $defined } from '@wisemapping/core-js';
 import EventUtils from '../utils/EventUtils';
 import TransformUtil from '../utils/TransformUtils';

packages/web2d/src/components/peer/svg/TextPeer.js

@@ -16,7 +16,7 @@
  *   limitations under the License.
  */
 import { $defined } from '@wisemapping/core-js';
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import ElementPeer from './ElementPeer';
 
 class TextPeer extends ElementPeer {
@@ -169,6 +169,7 @@ class TextPeer extends ElementPeer {
         computedWidth = bbox.width;
       }
     } catch (e) {
+      // eslint-disable-next-line no-console
       console.error(e);
       computedWidth = 10;
     }

packages/web2d/test/playground/Grid.js

@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 
 class Grid {
   constructor(parent, colums, rows) {

packages/web2d/test/playground/arrow.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Arrow, Point,
 } from '../../src';

packages/web2d/test/playground/curvedLine.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, CurvedLine, Point,
 } from '../../src';

packages/web2d/test/playground/events.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-alert */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Elipse,
 } from '../../src';

packages/web2d/test/playground/font.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Text,
 } from '../../src';

packages/web2d/test/playground/group.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-alert */
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Line, Group, Elipse,
 } from '../../src';

packages/web2d/test/playground/line.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Line, Rect,
 } from '../../src';

packages/web2d/test/playground/polyLine.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, PolyLine,
 } from '../../src';

packages/web2d/test/playground/prototype.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Rect, Group,
 } from '../../src';

packages/web2d/test/playground/rect.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Rect,
 } from '../../src';

packages/web2d/test/playground/shapes.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Rect,
 } from '../../src';

packages/web2d/test/playground/workspace.js

@@ -1,4 +1,4 @@
-import $ from '@libraries/jquery-2.1.0';
+import $ from 'jquery';
 import {
   Toolkit, Workspace, Elipse,
 } from '../../src';

packages/web2d/webpack.common.js

@@ -23,11 +23,5 @@ module.exports = {
     ],
   },
   target: 'web',
-  resolve: {
-    alias: {
-      '@libraries': path.resolve(__dirname, '../../libraries/'),
-    },
-    extensions: ['.js', '.json'],
-  },
   plugins: [new CleanWebpackPlugin()],
 };