diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d352af42..a56623a39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,44 @@ +## 0.42.0rc0 + +([Full Changelog](https://github.com/jupyterlab/jupyterlab-git/compare/v0.41.0...d14ba4ab42371a139dadceb56c2458819bee6c53)) + +### Enhancements made + +- Add git stash [#1228](https://github.com/jupyterlab/jupyterlab-git/pull/1228) ([@shawnesquivel](https://github.com/shawnesquivel)) +- Fix files changed and reverting merge commits from the history panel bug [#1227](https://github.com/jupyterlab/jupyterlab-git/pull/1227) ([@basokant](https://github.com/basokant)) +- Adding support for standalone diffs of images [#1223](https://github.com/jupyterlab/jupyterlab-git/pull/1223) ([@basokant](https://github.com/basokant)) + +### Bugs fixed + +- Fix menu entry selection [#1246](https://github.com/jupyterlab/jupyterlab-git/pull/1246) ([@fcollonval](https://github.com/fcollonval)) +- fix switch from a detached head to a branch not working [#1218](https://github.com/jupyterlab/jupyterlab-git/pull/1218) ([@basokant](https://github.com/basokant)) +- fix history panel not rendering when history is empty [#1215](https://github.com/jupyterlab/jupyterlab-git/pull/1215) ([@basokant](https://github.com/basokant)) + +### Maintenance and upkeep improvements + +- Update configuration on latest 3.x template [#1248](https://github.com/jupyterlab/jupyterlab-git/pull/1248) ([@fcollonval](https://github.com/fcollonval)) +- Bump vega from 5.21.0 to 5.23.0 in /ui-tests [#1229](https://github.com/jupyterlab/jupyterlab-git/pull/1229) ([@dependabot](https://github.com/dependabot)) +- Update pre-commit [#1216](https://github.com/jupyterlab/jupyterlab-git/pull/1216) ([@fcollonval](https://github.com/fcollonval)) +- Bump to 0.41.0 [#1204](https://github.com/jupyterlab/jupyterlab-git/pull/1204) ([@fcollonval](https://github.com/fcollonval)) + +### Other merged PRs + +- Bump json5 from 2.2.0 to 2.2.3 in /ui-tests [#1235](https://github.com/jupyterlab/jupyterlab-git/pull/1235) ([@dependabot](https://github.com/dependabot)) +- Bump webpack from 5.74.0 to 5.76.1 [#1232](https://github.com/jupyterlab/jupyterlab-git/pull/1232) ([@dependabot](https://github.com/dependabot)) +- add shawnesquivel as a contributor for code [#1225](https://github.com/jupyterlab/jupyterlab-git/pull/1225) ([@allcontributors](https://github.com/allcontributors)) +- add basokant as a contributor for code [#1224](https://github.com/jupyterlab/jupyterlab-git/pull/1224) ([@allcontributors](https://github.com/allcontributors)) +- bug: modified password placeholder text depending if remote URI is github (Fix #1176) [#1220](https://github.com/jupyterlab/jupyterlab-git/pull/1220) ([@shawnesquivel](https://github.com/shawnesquivel)) +- Bump http-cache-semantics from 4.1.0 to 4.1.1 [#1213](https://github.com/jupyterlab/jupyterlab-git/pull/1213) ([@dependabot](https://github.com/dependabot)) +- Hide overflow for latest item on click [#1212](https://github.com/jupyterlab/jupyterlab-git/pull/1212) ([@ardislu](https://github.com/ardislu)) +- Bump json5 from 1.0.1 to 1.0.2 [#1208](https://github.com/jupyterlab/jupyterlab-git/pull/1208) ([@dependabot](https://github.com/dependabot)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/jupyterlab/jupyterlab-git/graphs/contributors?from=2022-12-15&to=2023-06-19&type=c)) + +[@allcontributors](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab-git+involves%3Aallcontributors+updated%3A2022-12-15..2023-06-19&type=Issues) | [@ardislu](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab-git+involves%3Aardislu+updated%3A2022-12-15..2023-06-19&type=Issues) | [@basokant](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab-git+involves%3Abasokant+updated%3A2022-12-15..2023-06-19&type=Issues) | [@dependabot](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab-git+involves%3Adependabot+updated%3A2022-12-15..2023-06-19&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab-git+involves%3Afcollonval+updated%3A2022-12-15..2023-06-19&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab-git+involves%3Agithub-actions+updated%3A2022-12-15..2023-06-19&type=Issues) | [@shawnesquivel](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab-git+involves%3Ashawnesquivel+updated%3A2022-12-15..2023-06-19&type=Issues) | [@welcome](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab-git+involves%3Awelcome+updated%3A2022-12-15..2023-06-19&type=Issues) + diff --git a/package.json b/package.json index abdf47d93..3132a6c84 100644 --- a/package.json +++ b/package.json @@ -1,218 +1,218 @@ { - "name": "@jupyterlab/git", - "version": "0.41.0", - "description": "A JupyterLab extension for version control using git", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "style": "style/index.css", - "license": "BSD-3-Clause", - "author": { - "name": "Jupyter Development Team" - }, - "keywords": [ - "Jupyter", - "JupyterLab", - "JupyterLab3", - "jupyterlab-extension", - "Git" - ], - "scripts": { - "build": "jlpm build:lib && jlpm build:labextension:dev", - "build:labextension": "jupyter labextension build .", - "build:labextension:dev": "jupyter labextension build --development True .", - "build:lib": "genversion --es6 --semi src/version.ts && tsc --sourceMap", - "build:lib:prod": "genversion --es6 --semi src/version.ts && tsc", - "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension", - "clean": "jlpm clean:lib", - "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache", - "clean:labextension": "rimraf jupyterlab_git/labextension jupyterlab_git/_version.py", - "clean:lib": "rimraf lib tsconfig.tsbuildinfo", - "clean:lintcache": "rimraf .eslintcache .stylelintcache", - "clean:more": "jlpm clean && rimraf build dist MANIFEST", - "clean:slate": "jlpm clean:more && jlpm clean:labextension && rimraf node_modules", - "contributors:generate": "jlpm run all-contributors generate", - "eslint": "jlpm eslint:check --fix", - "eslint:check": "eslint . --cache --ext .ts,.tsx", - "install:extension": "jlpm build", - "lint": "jlpm stylelint && jlpm prettier && jlpm eslint", - "lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check", - "prepare": "genversion --es6 --semi src/version.ts", - "prettier": "jlpm prettier:base --write --list-different", - "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"", - "prettier:check": "jlpm prettier:base --check", - "stylelint": "jlpm stylelint:check --fix", - "stylelint:check": "stylelint --cache \"style/**/*.css\"", - "test": "jest --coverage --no-cache", - "watch": "run-p watch:src watch:labextension", - "watch:labextension": "jupyter labextension watch .", - "watch:src": "tsc -w" - }, - "files": [ - "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}", - "schema/**/*.{json,}", - "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}", - "style/index.js" - ], - "sideEffects": [ - "style/*.css", - "style/index.js" - ], - "styleModule": "style/index.js", - "dependencies": { - "@jupyterlab/application": "^3.0.0", - "@jupyterlab/apputils": "^3.0.0", - "@jupyterlab/codemirror": "^3.0.0", - "@jupyterlab/console": "^3.0.0", - "@jupyterlab/coreutils": "^5.0.0", - "@jupyterlab/docregistry": "^3.0.0", - "@jupyterlab/filebrowser": "^3.0.0", - "@jupyterlab/galata": "^4.5.2", - "@jupyterlab/mainmenu": "^3.0.0", - "@jupyterlab/nbformat": "^3.0.0", - "@jupyterlab/rendermime": "^3.0.0", - "@jupyterlab/services": "^6.0.0", - "@jupyterlab/settingregistry": "^3.0.0", - "@jupyterlab/terminal": "^3.0.0", - "@jupyterlab/translation": "^3.0.0", - "@jupyterlab/ui-components": "^3.0.0", - "@lumino/collections": "^1.2.3", - "@lumino/commands": "^1.12.0", - "@lumino/coreutils": "^1.5.3", - "@lumino/disposable": "^1.4.3", - "@lumino/messaging": "^1.7.1", - "@lumino/polling": "^1.3.3", - "@lumino/signaling": "^1.4.3", - "@lumino/widgets": "^1.17.0", - "@material-ui/core": "^4.8.2", - "@material-ui/icons": "^4.5.1", - "@material-ui/lab": "^4.0.0-alpha.54", - "@playwright/test": "^1.32.1", - "diff-match-patch": "^1.0.4", - "filesize": "^10.0.7", - "nbdime": "^6.1.1", - "nbdime-jupyterlab": "^2.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-virtualized-auto-sizer": "^1.0.2", - "react-window": "^1.8.5", - "typestyle": "^2.0.1" - }, - "devDependencies": { - "@babel/core": "^7.0.0", - "@babel/preset-env": "^7.0.0", - "@jupyterlab/builder": "^3.0.0", - "@jupyterlab/testutils": "3.0.0 - 3.0.7 || ^3.0.12", - "@types/codemirror": "^0.0.97", - "@types/diff-match-patch": "^1.0.32", - "@types/enzyme": "^3.1.15", - "@types/jest": "^26.0.0", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", - "@types/react-virtualized-auto-sizer": "^1.0.0", - "@types/react-window": "^1.8.2", - "@types/resize-observer-browser": "^0.1.7", - "@typescript-eslint/eslint-plugin": "^4.8.1", - "@typescript-eslint/parser": "^4.8.1", - "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", - "all-contributors-cli": "^6.14.0", - "enzyme": "^3.7.0", - "eslint": "^7.14.0", - "eslint-config-prettier": "^6.15.0", - "eslint-plugin-prettier": "^3.1.4", - "eslint-plugin-react": "^7.19.0", - "genversion": "^2.2.1", - "husky": "^1.3.1", - "identity-obj-proxy": "^3.0.0", - "jest": "^26.0.0", - "jest-fetch-mock": "^3.0.0", - "lint-staged": "^11.0.0", - "mkdirp": "^1.0.3", - "npm-run-all": "^4.1.5", - "prettier": "^2.1.1", - "rimraf": "^3.0.2", - "stylelint": "^14.3.0", - "stylelint-config-prettier": "^9.0.4", - "stylelint-config-recommended": "^6.0.0", - "stylelint-config-standard": "~24.0.0", - "stylelint-prettier": "^2.0.0", - "ts-jest": "^26.0.0", - "typescript": "~4.1.3" - }, - "peerDependencies": { - "codemirror": "^5.0.0" - }, - "directories": { - "lib": "lib" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "*.{ts,tsx}": [ - "eslint . --ext .ts,.tsx --fix" - ] - }, - "repository": { - "type": "git", - "url": "https://github.com/jupyterlab/jupyterlab-git.git" - }, - "bugs": { - "url": "https://github.com/jupyterlab/jupyterlab-git/issues" - }, - "homepage": "https://github.com/jupyterlab/jupyterlab-git", - "resolutions": { - "react": "^17.0.0", - "react-dom": "^17.0.0", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0" - }, - "jupyterlab": { - "discovery": { - "server": { - "managers": [ - "pip", - "conda" - ], - "base": { - "name": "jupyterlab-git" + "name": "@jupyterlab/git", + "version": "0.42.0-rc0", + "description": "A JupyterLab extension for version control using git", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "style": "style/index.css", + "license": "BSD-3-Clause", + "author": { + "name": "Jupyter Development Team" + }, + "keywords": [ + "Jupyter", + "JupyterLab", + "JupyterLab3", + "jupyterlab-extension", + "Git" + ], + "scripts": { + "build": "jlpm build:lib && jlpm build:labextension:dev", + "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", + "build:lib": "genversion --es6 --semi src/version.ts && tsc --sourceMap", + "build:lib:prod": "genversion --es6 --semi src/version.ts && tsc", + "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension", + "clean": "jlpm clean:lib", + "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache", + "clean:labextension": "rimraf jupyterlab_git/labextension jupyterlab_git/_version.py", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", + "clean:lintcache": "rimraf .eslintcache .stylelintcache", + "clean:more": "jlpm clean && rimraf build dist MANIFEST", + "clean:slate": "jlpm clean:more && jlpm clean:labextension && rimraf node_modules", + "contributors:generate": "jlpm run all-contributors generate", + "eslint": "jlpm eslint:check --fix", + "eslint:check": "eslint . --cache --ext .ts,.tsx", + "install:extension": "jlpm build", + "lint": "jlpm stylelint && jlpm prettier && jlpm eslint", + "lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check", + "prepare": "genversion --es6 --semi src/version.ts", + "prettier": "jlpm prettier:base --write --list-different", + "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"", + "prettier:check": "jlpm prettier:base --check", + "stylelint": "jlpm stylelint:check --fix", + "stylelint:check": "stylelint --cache \"style/**/*.css\"", + "test": "jest --coverage --no-cache", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" + }, + "files": [ + "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}", + "schema/**/*.{json,}", + "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}", + "style/index.js" + ], + "sideEffects": [ + "style/*.css", + "style/index.js" + ], + "styleModule": "style/index.js", + "dependencies": { + "@jupyterlab/application": "^3.0.0", + "@jupyterlab/apputils": "^3.0.0", + "@jupyterlab/codemirror": "^3.0.0", + "@jupyterlab/console": "^3.0.0", + "@jupyterlab/coreutils": "^5.0.0", + "@jupyterlab/docregistry": "^3.0.0", + "@jupyterlab/filebrowser": "^3.0.0", + "@jupyterlab/galata": "^4.5.2", + "@jupyterlab/mainmenu": "^3.0.0", + "@jupyterlab/nbformat": "^3.0.0", + "@jupyterlab/rendermime": "^3.0.0", + "@jupyterlab/services": "^6.0.0", + "@jupyterlab/settingregistry": "^3.0.0", + "@jupyterlab/terminal": "^3.0.0", + "@jupyterlab/translation": "^3.0.0", + "@jupyterlab/ui-components": "^3.0.0", + "@lumino/collections": "^1.2.3", + "@lumino/commands": "^1.12.0", + "@lumino/coreutils": "^1.5.3", + "@lumino/disposable": "^1.4.3", + "@lumino/messaging": "^1.7.1", + "@lumino/polling": "^1.3.3", + "@lumino/signaling": "^1.4.3", + "@lumino/widgets": "^1.17.0", + "@material-ui/core": "^4.8.2", + "@material-ui/icons": "^4.5.1", + "@material-ui/lab": "^4.0.0-alpha.54", + "@playwright/test": "^1.32.1", + "diff-match-patch": "^1.0.4", + "filesize": "^10.0.7", + "nbdime": "^6.1.1", + "nbdime-jupyterlab": "^2.1.0", + "react": "^17.0.1", + "react-dom": "^17.0.1", + "react-virtualized-auto-sizer": "^1.0.2", + "react-window": "^1.8.5", + "typestyle": "^2.0.1" + }, + "devDependencies": { + "@babel/core": "^7.0.0", + "@babel/preset-env": "^7.0.0", + "@jupyterlab/builder": "^3.0.0", + "@jupyterlab/testutils": "3.0.0 - 3.0.7 || ^3.0.12", + "@types/codemirror": "^0.0.97", + "@types/diff-match-patch": "^1.0.32", + "@types/enzyme": "^3.1.15", + "@types/jest": "^26.0.0", + "@types/react": "^17.0.0", + "@types/react-dom": "^17.0.0", + "@types/react-virtualized-auto-sizer": "^1.0.0", + "@types/react-window": "^1.8.2", + "@types/resize-observer-browser": "^0.1.7", + "@typescript-eslint/eslint-plugin": "^4.8.1", + "@typescript-eslint/parser": "^4.8.1", + "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", + "all-contributors-cli": "^6.14.0", + "enzyme": "^3.7.0", + "eslint": "^7.14.0", + "eslint-config-prettier": "^6.15.0", + "eslint-plugin-prettier": "^3.1.4", + "eslint-plugin-react": "^7.19.0", + "genversion": "^2.2.1", + "husky": "^1.3.1", + "identity-obj-proxy": "^3.0.0", + "jest": "^26.0.0", + "jest-fetch-mock": "^3.0.0", + "lint-staged": "^11.0.0", + "mkdirp": "^1.0.3", + "npm-run-all": "^4.1.5", + "prettier": "^2.1.1", + "rimraf": "^3.0.2", + "stylelint": "^14.3.0", + "stylelint-config-prettier": "^9.0.4", + "stylelint-config-recommended": "^6.0.0", + "stylelint-config-standard": "~24.0.0", + "stylelint-prettier": "^2.0.0", + "ts-jest": "^26.0.0", + "typescript": "~4.1.3" + }, + "peerDependencies": { + "codemirror": "^5.0.0" + }, + "directories": { + "lib": "lib" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" } - } }, - "extension": true, - "schemaDir": "schema", - "sharedPackages": { - "@material-ui/core": { - "singleton": true - }, - "@material-ui/icons": { - "singleton": true - }, - "@material-ui/lab": { - "singleton": true - }, - "codemirror": { - "bundled": false, - "singleton": true - }, - "nbdime": { - "bundled": false, - "singleton": true - }, - "nbdime-jupyterlab": { - "bundled": false, - "singleton": true - }, - "react": { - "bundled": false, - "singleton": true - }, - "react-dom": { - "bundled": false, - "singleton": true - } + "lint-staged": { + "*.{ts,tsx}": [ + "eslint . --ext .ts,.tsx --fix" + ] + }, + "repository": { + "type": "git", + "url": "https://github.com/jupyterlab/jupyterlab-git.git" + }, + "bugs": { + "url": "https://github.com/jupyterlab/jupyterlab-git/issues" }, - "outputDir": "jupyterlab_git/labextension" - } + "homepage": "https://github.com/jupyterlab/jupyterlab-git", + "resolutions": { + "react": "^17.0.0", + "react-dom": "^17.0.0", + "@types/react": "^17.0.0", + "@types/react-dom": "^17.0.0" + }, + "jupyterlab": { + "discovery": { + "server": { + "managers": [ + "pip", + "conda" + ], + "base": { + "name": "jupyterlab-git" + } + } + }, + "extension": true, + "schemaDir": "schema", + "sharedPackages": { + "@material-ui/core": { + "singleton": true + }, + "@material-ui/icons": { + "singleton": true + }, + "@material-ui/lab": { + "singleton": true + }, + "codemirror": { + "bundled": false, + "singleton": true + }, + "nbdime": { + "bundled": false, + "singleton": true + }, + "nbdime-jupyterlab": { + "bundled": false, + "singleton": true + }, + "react": { + "bundled": false, + "singleton": true + }, + "react-dom": { + "bundled": false, + "singleton": true + } + }, + "outputDir": "jupyterlab_git/labextension" + } }