Skip to content

Commit

Permalink
Restore collapsers (#701)
Browse files Browse the repository at this point in the history
* CM6: Restore collapser

* Add integration test

* Update Playwright Snapshots

* Update Playwright Snapshots

* [skip ci] Apply suggestions from code review

Co-authored-by: Florence Haudin <99649086+HaudinFlorence@users.noreply.github.com>

* Propagate rename

* Add integration test

* Extend nbdime-merge-test4 to consider a case with 2 collapsers.

* Retry once on CI

* Add minor changes related to ui-tests.

* Update Playwright Snapshots

* Update Playwright Snapshots

* Restore collapsers style with 3 dots ellipsis and updates the unix ui-tests snapshots.

* Modify comments in ui-test merge-test4.

* Update Playwright Snapshots

* Mix old and new

* Update Playwright Snapshots

* Update Playwright Snapshots

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Florence Haudin <99649086+HaudinFlorence@users.noreply.github.com>
Co-authored-by: HaudinFlorence <haudin.florence@gmail.com>
  • Loading branch information
4 people committed Oct 10, 2023
1 parent 8079074 commit 40e692a
Show file tree
Hide file tree
Showing 29 changed files with 657 additions and 83 deletions.
352 changes: 299 additions & 53 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"scripts": {
"build": "lerna run build",
"build:dev": "tsc --build",
"build:dev": "lerna run build:dev",
"clean": "lerna run clean",
"prettier": "prettier --list-different --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
"prettier:check": "prettier --check \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
Expand All @@ -13,7 +13,9 @@
"update:lab": "update-dependency --lerna --minimal --regex ^@jupyterlab/",
"update:lab:next": "update-dependency --lerna --minimal --regex ^@jupyterlab/ ^next",
"updated": "lerna updated",
"watch": "tsc --build --watch"
"watch:webapp": "run-p watch:lib watch:app",
"watch:app": "lerna exec --stream --scope \"nbdime-webapp\" npm run watch",
"watch:lib": "lerna exec --stream --scope \"nbdime\" --scope \"jupyterlab-rise\" npm run watch"
},
"devDependencies": {
"@jupyterlab/buildutils": "4.0.0",
Expand All @@ -24,6 +26,7 @@
"jest": "^29.6.4",
"lerna": "^4.0.0",
"mocha": "^10.2.0",
"npm-run-all": "^4.1.5",
"rimraf": "^2.6.3",
"npm-which": "^3.0.1"
},
Expand Down

0 comments on commit 40e692a

Please sign in to comment.