Skip to content

Commit

Permalink
React 18 Migration (#108)
Browse files Browse the repository at this point in the history
* React 18 Migration

* Fix import

* Update package.json

---------

Co-authored-by: Moritz Heckmann <moritz.heckmann@datavisyn.io>
Co-authored-by: oltionchampari <oltion.champari@datavisyn.io>
Co-authored-by: Michael Pühringer <51900829+puehringer@users.noreply.github.com>
  • Loading branch information
4 people authored May 16, 2023
1 parent 76c9ba4 commit f529e80
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 8 deletions.
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@
"visyn_scripts": "git+ssh://git@github.com/datavisyn/visyn_scripts.git#develop",
"xxhashjs": "^0.2.2"
},
"resolutions": {
"@types/react": "~18.2.0",
"@types/react-dom": "~18.2.0",
"react": "~18.2.0",
"react-dom": "~18.2.0"
},
"visyn": {
"entries": {
"app": "./index.js"
Expand Down
4 changes: 2 additions & 2 deletions src/phovea.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Licensed under the new BSD license, available at http://caleydo.org/license
**************************************************************************** */

import { IRegistry } from 'visyn_core';
import { IRegistry } from 'visyn_core/plugin';
import { EP_TDP_CORE_LINEUP_PANEL_TAB, IPanelTabExtensionDesc } from 'tdp_core';

export default function (registry: IRegistry) {
Expand All @@ -15,7 +15,7 @@ export default function (registry: IRegistry) {
EP_TDP_CORE_LINEUP_PANEL_TAB,
'statisticalAnalysisPanel',
function () {
return import('./app/TouringPanel.js').then((m) => m.TouringPanel);
return import('./app/TouringPanel').then((m) => m.TouringPanel);
},
<IPanelTabExtensionDesc>{
cssClass: 'statistical-analysis-tab',
Expand Down
2 changes: 1 addition & 1 deletion src/phovea_registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Licensed under the new BSD license, available at http://caleydo.org/license
**************************************************************************** */

import { PluginRegistry } from 'visyn_core';
import { PluginRegistry } from 'visyn_core/plugin';
import reg from './phovea';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/ATouringTask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as $ from 'jquery';
import * as d3v3 from 'd3v3';
import 'select2';
import { LocalDataProvider, IColumnDesc, CategoricalColumn, ICategoricalColumnDesc, Column } from 'lineupjs';
import { IServerColumn } from 'visyn_core';
import { IServerColumn } from 'visyn_core/base';
import { UniqueIdManager } from 'tdp_core';
import { IMeasureResult, ISimilarityMeasure, ISetParameters } from '../base/interfaces';
import { SCOPE } from '../base/constants';
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/ColumnComparisonTask.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as XXH from 'xxhashjs';
import { cloneDeep } from 'lodash';
import { IColumnDesc } from 'lineupjs';
import { IServerColumn } from 'visyn_core';
import { IServerColumn } from 'visyn_core/base';
import colCmpHtml from '../templates/ColumnComparison.html'; // webpack imports html to variable
import colCmpIcon from '../assets/colCmp.png';

Expand Down
3 changes: 2 additions & 1 deletion src/tasks/RankingAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { LocalDataProvider, IColumnDesc, ICategory, Column, Ranking, IDataRow, IOrderedGroup } from 'lineupjs';
import { IServerColumn, IAccessorFunc } from 'tdp_core';
import { IAccessorFunc } from 'tdp_core';
import { IServerColumn } from 'visyn_core/base';

import { BaseUtils } from '../base/BaseUtils';

Expand Down
2 changes: 1 addition & 1 deletion src/tasks/RowComparisonTask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as $ from 'jquery';
import * as d3v3 from 'd3v3';
import * as XXH from 'xxhashjs';
import { IColumnDesc, ICategoricalColumnDesc, ICategory } from 'lineupjs';
import { IServerColumn } from 'visyn_core';
import { IServerColumn } from 'visyn_core/base';
import rowCmpHtml from '../templates/RowComparison.html'; // webpack imports html to variable
import rowCmpIcon from '../assets/rowCmp.png';

Expand Down
2 changes: 1 addition & 1 deletion src/tasks/TaskUtils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as d3v3 from 'd3v3';
import { IColumnDesc } from 'lineupjs';
import { IServerColumn } from 'visyn_core';
import { IServerColumn } from 'visyn_core/base';
import { UniqueIdManager } from 'tdp_core';
import { RankingAdapter } from './RankingAdapter';

Expand Down

0 comments on commit f529e80

Please sign in to comment.