Merge pull request #73 from ProjectMirador/remove-mirador-path-imports

Update mirador to 4.0.0-alpha.5, remove full path imports

__tests__/CanvasDownloadLinks.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { OSDReferences } from 'mirador/dist/es/src/plugins/OSDReferences';
+import { OSDReferences } from 'mirador';
 import CanvasDownloadLinks from '../src/CanvasDownloadLinks';
 import { render, screen } from './test-utils';
 

jest.config.js

@@ -11,9 +11,9 @@ module.exports = {
     '<rootDir>/setupJest.js',
   ],
   testEnvironment: 'jsdom',
-  // Ignore Mirador/Manifesto code from jest transforms
+  // Ignore Mirador/Manifesto/dnd libs code from jest transforms
   transformIgnorePatterns: [
-    '<rootDir>/node_modules/(?!(mirador|manifesto.js))',
+    '<rootDir>/node_modules/(?!(mirador|manifesto.js|react-dnd|dnd-core|@react-dnd|dnd-multi-backend|rdndmb-html5-to-touch))',
   ],
   testPathIgnorePatterns: [
     '<rootDir>/__tests__/test-utils.js',

package.json

@@ -33,7 +33,7 @@
   "peerDependencies": {
     "@mui/material": "^5.x",
     "lodash": "^4.17.11",
-    "mirador": "^4.0.0-alpha.4",
+    "mirador": "^4.0.0-alpha.5",
     "react": "18.x",
     "react-dom": "18.x"
   },
@@ -73,7 +73,7 @@
     "jest-environment-jsdom": "^29.4.3",
     "jest-puppeteer": "^9.0.2",
     "lodash": "^4.17.15",
-    "mirador": "^4.0.0-alpha.1",
+    "mirador": "^4.0.0-alpha.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "terser-webpack-plugin": "^5.3.1",

src/CanvasDownloadLinks.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import uniqBy from 'lodash/uniqBy';
-import { OSDReferences } from 'mirador/dist/es/src/plugins/OSDReferences';
+import { OSDReferences } from 'mirador';
 import Typography from '@mui/material/Typography';
 import Link from '@mui/material/Link';
 import List from '@mui/material/List';

src/MiradorDownloadDialog.js

@@ -2,13 +2,13 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import {
   getCanvasLabel,
+  getContainerId,
+  getManifestoInstance,
   getVisibleCanvases,
+  getWindowViewType,
   selectInfoResponse,
-} from 'mirador/dist/es/src/state/selectors/canvases';
-import { getWindowViewType } from 'mirador/dist/es/src/state/selectors/windows';
-import { getManifestoInstance } from 'mirador/dist/es/src/state/selectors/manifests';
-import { getContainerId } from 'mirador/dist/es/src/state/selectors/config';
-import ScrollIndicatedDialogContent from 'mirador/dist/es/src/containers/ScrollIndicatedDialogContent';
+  ScrollIndicatedDialogContent,
+} from 'mirador';
 import Typography from '@mui/material/Typography';
 import Dialog from '@mui/material/Dialog';
 import DialogTitle from '@mui/material/DialogTitle';