Skip to content

Commit

Permalink
Release 25.0.0 (#875)
Browse files Browse the repository at this point in the history
* chore: prepare next dev release

* Use correct workflow branches (#862)

fix branches

* prepare next dev version

* deps: update React in package.json (#865)

* Update package.json

* Update package.json

* prepare next dev version

* chore: version pinning (#867)

version pinning

* prepare next dev version

* Mantine7 (#864)

* migrate to mantine 7

* add test menu item and fix cypress test

* dist files and linting

* add new yarn.lock

* Update versions

* Update backend versions

---------

Co-authored-by: Michael Puehringer <michael.puehringer@datavisyn.io>

* prepare next dev version

* feat: rspack

* Remove storybook as it hoists fork-ts-checker-webpack-plugin

* Remove cypress component testing

* Switch to start:full

* Update scripts

* fix: remove polyfill (#871)

* Update package.json

* feat: rspack (#870)

* feat: rspack

* Remove storybook as it hoists fork-ts-checker-webpack-plugin

* Remove cypress component testing

* Switch to start:full

* Update scripts

* Update package.json

* Revert "feat: rspack" (#872)

Revert "feat: rspack (#870)"

This reverts commit 5566ddf.

* prepare next dev version

* prepare release 25.0.0

---------

Co-authored-by: Holger Stitz <holger.stitz@datavisyn.io>
Co-authored-by: Michael Pühringer <51900829+puehringer@users.noreply.github.com>
Co-authored-by: dvdanielamoitzi <57343176+dvdanielamoitzi@users.noreply.github.com>
Co-authored-by: Michael Puehringer <michael.puehringer@datavisyn.io>
  • Loading branch information
5 people authored Feb 29, 2024
1 parent e84e985 commit a7e1fe6
Show file tree
Hide file tree
Showing 27 changed files with 127 additions and 203 deletions.
22 changes: 0 additions & 22 deletions .storybook/main.js

This file was deleted.

15 changes: 0 additions & 15 deletions .storybook/preview.js

This file was deleted.

20 changes: 2 additions & 18 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,4 @@
import { defineConfig } from 'cypress';
import * as webpackConfig from 'visyn_scripts/config/webpack.config';
import * as cypressConfig from 'visyn_scripts/config/cypress.config.template';

export default defineConfig({
viewportHeight: 1080,
viewportWidth: 1920,
defaultCommandTimeout: 10000,
e2e: {
baseUrl: 'http://localhost:8080',
// eslint-disable-next-line @typescript-eslint/no-unused-vars
setupNodeEvents(on, config) {},
},
component: {
devServer: {
framework: 'react',
bundler: 'webpack',
webpackConfig: webpackConfig({ workspace_mode: 'single' }, { mode: 'production' }),
},
},
});
export default defineConfig(cypressConfig);
7 changes: 1 addition & 6 deletions dist/scss/abstracts/_variables.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scss/components/_view_lineup.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/scss/fontawesome.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scss/main.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scss/storybook.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions dist/scss/vendors/_font-awesome.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/scss/vendors/_lineup.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/scss/vendors/_select2.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 32 additions & 32 deletions dist/scss/vendors/bootstrap/_2_components.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions dist/scss/vendors/bootstrap/overrides/_forms.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 8 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tdp_core",
"description": "Target discovery platform for exploring rankings of genes, disease models, and other entities.",
"version": "24.0.1",
"version": "25.0.0",
"author": {
"name": "datavisyn GmbH",
"email": "contact@datavisyn.io",
Expand Down Expand Up @@ -38,20 +38,18 @@
"compile": "visyn_scripts compile",
"copy": "visyn_scripts copy",
"cy:open": "cypress open",
"cy:run": "cypress run --e2e && cypress run --component",
"cy:run": "cypress run --e2e",
"delete-dependencies": "visyn_scripts clean node_modules",
"dist": "mkdir lib && cd dist && tar cvzf ../lib/tdp_core.tar.gz *",
"docs": "visyn_scripts docs",
"lint:fix": "visyn_scripts lint --fix",
"lint": "visyn_scripts lint",
"predist": "yarn run lint && yarn run test && yarn run build",
"start:fast": "visyn_scripts start --env workspace_mode=single fast=true",
"start:full": "visyn_scripts start --env workspace_mode=single fast=false",
"start": "visyn_scripts start --env workspace_mode=single",
"storybook:build": "NODE_OPTIONS=--max_old_space_size=4096 build-storybook",
"storybook": "NODE_OPTIONS=--max_old_space_size=4096 start-storybook -p 6006",
"test": "visyn_scripts test",
"webpack:dev": "visyn_scripts build --mode development --env workspace_mode=single",
"webpack:prod": "visyn_scripts build --mode production --env workspace_mode=single"
"bundle:dev": "visyn_scripts bundle --mode development --env workspace_mode=single",
"bundle:prod": "visyn_scripts bundle --mode production --env workspace_mode=single"
},
"dependencies": {
"@popperjs/core": "^2.9.3",
Expand Down Expand Up @@ -84,30 +82,19 @@
"select2": "~4.0.13",
"select2-bootstrap-theme": "0.1.0-beta.9",
"use-deep-compare-effect": "^1.8.0",
"visyn_core": "^8.1.3",
"visyn_core": "^9.0.0",
"visyn_scripts": "^8.0.0"
},
"devDependencies": {
"@babel/core": "^7.17.7",
"@babel/plugin-transform-typescript": "7.17.12",
"@storybook/addon-actions": "^6.5.16",
"@storybook/addon-essentials": "^6.5.16",
"@storybook/addon-interactions": "^6.5.16",
"@storybook/addon-links": "^6.5.16",
"@storybook/builder-webpack5": "^6.5.16",
"@storybook/manager-webpack5": "^6.5.16",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "^6.5.16",
"@storybook/testing-library": "0.0.13",
"cypress": "^11.2.0",
"storybook-addon-swc": "^1.1.9"
"cypress": "^13.0.0"
},
"resolutions": {
"@types/react": "~18.2.0",
"@types/react-dom": "~18.2.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"webpack": "5.74.0"
"react-dom": "~18.2.0"
},
"visyn": {
"entries": {
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ flask-swagger-ui==3.36.0
Pillow==9.3.0
pymongo~=3.11.1
python-memcached==1.59
visyn_core>=8.1.3,<9.0.0
visyn_core>=9.0.0,<10.0.0
yamlreader==3.0.4
7 changes: 1 addition & 6 deletions src/scss/abstracts/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ $annotation_color_hover: #006b90 !default;
$anchor_color: red !default;
$anchor_color_hover: darkred !default;

/* phovea_ui */
$fa-font-path: '~@fortawesome/fontawesome-free/webfonts' !default;

$phovea-loading-icon-url: url('../../assets/caleydo_c_anim.svg') !default;
$phovea-loading-icon-size: auto !default;

Expand All @@ -101,8 +98,6 @@ $anchor_color_hover: darkred !default;
$select-data-color: orange !default;
$hover-data-color: #ffc46b !default;

// TODO: Without this, we get "Can't resolve './node_modules/lineupengine/src/styles/lineupengine/src/assets/loading.svg' in '.../workspaces/<repo>'"
// Why do I need to do this? Probably because lineupjs defines $engine_assets and it is resolving it relatively?
$engine_assets: '~lineupengine/src/assets';
$engine_assets: '../assets';
$engine_loading_image: url('#{$engine_assets}/loading.svg') !default;
$engine_loading_static_image: url('#{$engine_assets}/loading_s.svg') !default;
2 changes: 1 addition & 1 deletion src/scss/components/_view_lineup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
}
}

$lu_assets: "~lineupjs/src/assets";
$lu_assets: "../assets";

@at-root {
.tdp-ranking-export-form {
Expand Down
6 changes: 3 additions & 3 deletions src/scss/fontawesome.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "~@fortawesome/fontawesome-free/scss/functions";
@import "~@fortawesome/fontawesome-free/scss/variables";
@import "~@fortawesome/fontawesome-free/scss/mixins";
@import "@fortawesome/fontawesome-free/scss/functions";
@import "@fortawesome/fontawesome-free/scss/variables";
@import "@fortawesome/fontawesome-free/scss/mixins";
2 changes: 1 addition & 1 deletion src/scss/main.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~visyn_core/dist/scss/main.scss";
@import "visyn_core/scss/main.scss";

@import "./abstracts/functions";
@import './abstracts/variables';
Expand Down
2 changes: 1 addition & 1 deletion src/scss/storybook.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@import "./vendors/bootstrap/1_variables_mixins_utilities";

// map-merge my theme-colors
// @import "~target360/dist/scss/vendors/bootstrap_modify_maps";
// @import "target360/dist/scss/vendors/bootstrap_modify_maps";

// Include all Bootstrap components as needed
@import "./vendors/bootstrap/2_components";
Expand Down
Loading

0 comments on commit a7e1fe6

Please sign in to comment.