v3.0.0 #946

nelsonni · 2022-10-06T18:40:38Z

This PR resolves #874, #600, #542, #380, and signifies the following version changes (per Semantic Version):

MAJOR version increase
Git commands transitioned from relying on isomorphic-git to directly calling git through execute (a utility function for spawning a shell and executing commands within that shell)
- git-add adds file content to the index (aka staging area)
- git-branch lists, creates, or deletes branches
- git-cat-file provides content or type and size information for repository objects
- git-check-ref-format ensures that a reference name is well formed
- git-checkout switches branches or restores working tree files
- git-clone clones a repository into a new directory
- git-commit records changes to the repository
- git-config gets and sets repository or global options
- git-ignore locates and parses .gitignore files
- git-log shows commit logs
- git-merge joins two or more development histories together
- git-path resolves worktree paths for traversing main and linked worktree branches
- git-restore restores working tree files
- git-rev-parse picks out and massages parameters
- git-status shows the working tree status
- git-utils provides utility functions for parsing URLs and validating remote repository information
- git-version checks for locally installed versions of git and verifies minimum compatibility
- git-worktree manages multiple working trees
metafiles/selectByFilepath expanded to include optional handlers parameter for filtering on handler field
ConflictManager restricts the type of cards loaded by clicking on a conflicting file to Editor or Explorer handler types only
ResetButton properly handles reverting unmerged files that contain conflicting chunks from a merge attempt
Without<T, U> type defined to extract exclusive properties from type T as compared to U (where U could be a single type or a union type)
Either<T, U> type defined for exclusively matching either T or U, but not both type (i.e. an XOR or mutually exclusive or operation)
Chore: Bump versions of the following packages:
- @electron-forge/cli to 6.0.0-beta.65
- @electron-forge/maker-deb to 6.0.0-beta.65
- @electron-forge/maker-dmg to 6.0.0-beta.65
- @electron-forge/maker-rpm to 6.0.0-beta.65
- @electron-forge/maker-squirrel to 6.0.0-beta.65
- @electron-forge/plugin-webpack to 6.0.0-beta.65
- @testing-library/dom to 8.18.1
- @testing-library/jest-dom to 5.16.5
- @testing-library/user-event to 14.4.3
- @types/node to 18.8.0
- @types/luxon to 3.0.0
- @types/parse-path to 7.0.0
- @types/validator to 13.7.7
- @typescript-eslint/parser to 5.32.0
- @typescript-eslint/eslint-plugin to 5.38.1
- electron to 21.0.1
- eslint to 8.21.0
- eslint-plugin-testing-library to 5.7.2
- fork-ts-checker-webpack-plugin to 7.2.13
- webpack to 5.74.0
- isomorphic-git to 1.19.1
- parse-path to 7.0.0
- parse-url to 8.1.0
- react-dnd-preview to 7.1.1
- react-flow-renderer to 10.3.17
- react-redux to 8.0.4
- react-transition-group to 4.4.5
- uuid to 9.0.0

Bumps [isomorphic-git](https://github.com/isomorphic-git/isomorphic-git) from 1.18.3 to 1.19.0. - [Release notes](https://github.com/isomorphic-git/isomorphic-git/releases) - [Changelog](https://github.com/isomorphic-git/isomorphic-git/blob/main/docs/in-the-news.md) - [Commits](isomorphic-git/isomorphic-git@v1.18.3...v1.19.0) --- updated-dependencies: - dependency-name: isomorphic-git dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [@types/luxon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/luxon) from 2.3.2 to 3.0.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/luxon) --- updated-dependencies: - dependency-name: "@types/luxon" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.30.6 to 5.30.7. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.30.7/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [electron](https://github.com/electron/electron) from 19.0.8 to 19.0.9. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](electron/electron@v19.0.8...v19.0.9) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 14.2.5 to 14.3.0. - [Release notes](https://github.com/testing-library/user-event/releases) - [Changelog](https://github.com/testing-library/user-event/blob/main/CHANGELOG.md) - [Commits](testing-library/user-event@v14.2.5...v14.3) --- updated-dependencies: - dependency-name: "@testing-library/user-event" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [react-flow-renderer](https://github.com/wbkd/react-flow) from 10.3.10 to 10.3.11. - [Release notes](https://github.com/wbkd/react-flow/releases) - [Changelog](https://github.com/wbkd/react-flow/blob/main/CHANGELOG.md) - [Commits](xyflow/xyflow@10.3.10...10.3.11) --- updated-dependencies: - dependency-name: react-flow-renderer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.30.6 to 5.30.7. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.30.7/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.0.6 to 18.6.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [fork-ts-checker-webpack-plugin](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin) from 7.2.12 to 7.2.13. - [Release notes](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/releases) - [Changelog](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/blob/main/CHANGELOG.md) - [Commits](TypeStrong/fork-ts-checker-webpack-plugin@v7.2.12...v7.2.13) --- updated-dependencies: - dependency-name: fork-ts-checker-webpack-plugin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [webpack](https://github.com/webpack/webpack) from 5.73.0 to 5.74.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.73.0...v5.74.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [parse-path](https://github.com/IonicaBizau/parse-path) from 5.0.0 to 6.0.0. - [Release notes](https://github.com/IonicaBizau/parse-path/releases) - [Commits](IonicaBizau/parse-path@5.0.0...6.0.0) --- updated-dependencies: - dependency-name: parse-path dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@electron-forge/cli](https://github.com/electron-userland/electron-forge) from 6.0.0-beta.64 to 6.0.0-beta.65. - [Release notes](https://github.com/electron-userland/electron-forge/releases) - [Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) - [Commits](electron/forge@v6.0.0-beta.64...v6.0.0-beta.65) --- updated-dependencies: - dependency-name: "@electron-forge/cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

…65 (#884) Bumps [@electron-forge/plugin-webpack](https://github.com/electron-userland/electron-forge) from 6.0.0-beta.64 to 6.0.0-beta.65. - [Release notes](https://github.com/electron-userland/electron-forge/releases) - [Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) - [Commits](electron/forge@v6.0.0-beta.64...v6.0.0-beta.65) --- updated-dependencies: - dependency-name: "@electron-forge/plugin-webpack" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

) Bumps [@electron-forge/maker-deb](https://github.com/electron-userland/electron-forge) from 6.0.0-beta.64 to 6.0.0-beta.65. - [Release notes](https://github.com/electron-userland/electron-forge/releases) - [Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) - [Commits](electron/forge@v6.0.0-beta.64...v6.0.0-beta.65) --- updated-dependencies: - dependency-name: "@electron-forge/maker-deb" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

) Bumps [@electron-forge/maker-dmg](https://github.com/electron-userland/electron-forge) from 6.0.0-beta.64 to 6.0.0-beta.65. - [Release notes](https://github.com/electron-userland/electron-forge/releases) - [Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) - [Commits](electron/forge@v6.0.0-beta.64...v6.0.0-beta.65) --- updated-dependencies: - dependency-name: "@electron-forge/maker-dmg" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

) Bumps [@electron-forge/maker-rpm](https://github.com/electron-userland/electron-forge) from 6.0.0-beta.64 to 6.0.0-beta.65. - [Release notes](https://github.com/electron-userland/electron-forge/releases) - [Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) - [Commits](electron/forge@v6.0.0-beta.64...v6.0.0-beta.65) --- updated-dependencies: - dependency-name: "@electron-forge/maker-rpm" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

…65 (#888) Bumps [@electron-forge/maker-squirrel](https://github.com/electron-userland/electron-forge) from 6.0.0-beta.64 to 6.0.0-beta.65. - [Release notes](https://github.com/electron-userland/electron-forge/releases) - [Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) - [Commits](electron/forge@v6.0.0-beta.64...v6.0.0-beta.65) --- updated-dependencies: - dependency-name: "@electron-forge/maker-squirrel" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [eslint-plugin-testing-library](https://github.com/testing-library/eslint-plugin-testing-library) from 5.5.1 to 5.6.0. - [Release notes](https://github.com/testing-library/eslint-plugin-testing-library/releases) - [Changelog](https://github.com/testing-library/eslint-plugin-testing-library/blob/main/.releaserc.json) - [Commits](testing-library/eslint-plugin-testing-library@v5.5.1...v5.6.0) --- updated-dependencies: - dependency-name: eslint-plugin-testing-library dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [eslint](https://github.com/eslint/eslint) from 8.20.0 to 8.21.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.20.0...v8.21.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [electron](https://github.com/electron/electron) from 19.0.9 to 19.0.10. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](electron/electron@v19.0.9...v19.0.10) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.30.7 to 5.32.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.32.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.6.0 to 18.6.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [react-transition-group](https://github.com/reactjs/react-transition-group) from 4.4.2 to 4.4.5. - [Release notes](https://github.com/reactjs/react-transition-group/releases) - [Changelog](https://github.com/reactjs/react-transition-group/blob/master/CHANGELOG.md) - [Commits](reactjs/react-transition-group@v4.4.2...v4.4.5) --- updated-dependencies: - dependency-name: react-transition-group dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [react-flow-renderer](https://github.com/wbkd/react-flow) from 10.3.11 to 10.3.12. - [Release notes](https://github.com/wbkd/react-flow/releases) - [Changelog](https://github.com/wbkd/react-flow/blob/main/CHANGELOG.md) - [Commits](xyflow/xyflow@10.3.11...10.3.12) --- updated-dependencies: - dependency-name: react-flow-renderer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [isomorphic-git](https://github.com/isomorphic-git/isomorphic-git) from 1.19.0 to 1.19.1. - [Release notes](https://github.com/isomorphic-git/isomorphic-git/releases) - [Changelog](https://github.com/isomorphic-git/isomorphic-git/blob/main/docs/in-the-news.md) - [Commits](isomorphic-git/isomorphic-git@v1.19.0...v1.19.1) --- updated-dependencies: - dependency-name: isomorphic-git dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.30.7 to 5.32.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.32.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.16.4 to 5.16.5. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](testing-library/jest-dom@v5.16.4...v5.16.5) --- updated-dependencies: - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [parse-path](https://github.com/IonicaBizau/parse-path) from 6.0.0 to 7.0.0. - [Release notes](https://github.com/IonicaBizau/parse-path/releases) - [Commits](IonicaBizau/parse-path@6.0.0...7.0.0) --- updated-dependencies: - dependency-name: parse-path dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 14.3.0 to 14.4.3. - [Release notes](https://github.com/testing-library/user-event/releases) - [Changelog](https://github.com/testing-library/user-event/blob/main/CHANGELOG.md) - [Commits](testing-library/user-event@v14.3...v14.4.3) --- updated-dependencies: - dependency-name: "@testing-library/user-event" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

…66 (#941) Bumps [@electron-forge/plugin-webpack](https://github.com/electron-userland/electron-forge) from 6.0.0-beta.65 to 6.0.0-beta.66. - [Release notes](https://github.com/electron-userland/electron-forge/releases) - [Changelog](https://github.com/electron-userland/electron-forge/blob/master/CHANGELOG.md) - [Commits](electron/forge@v6.0.0-beta.65...v6.0.0-beta.66) --- updated-dependencies: - dependency-name: "@electron-forge/plugin-webpack" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [react-flow-renderer](https://github.com/wbkd/react-flow) from 10.3.12 to 10.3.17. - [Release notes](https://github.com/wbkd/react-flow/releases) - [Changelog](https://github.com/wbkd/react-flow/blob/main/CHANGELOG.md) - [Commits](xyflow/xyflow@10.3.12...10.3.17) --- updated-dependencies: - dependency-name: react-flow-renderer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@types/validator](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/validator) from 13.7.4 to 13.7.7. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/validator) --- updated-dependencies: - dependency-name: "@types/validator" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@testing-library/dom](https://github.com/testing-library/dom-testing-library) from 8.16.0 to 8.18.1. - [Release notes](https://github.com/testing-library/dom-testing-library/releases) - [Changelog](https://github.com/testing-library/dom-testing-library/blob/main/CHANGELOG.md) - [Commits](testing-library/dom-testing-library@v8.16.0...v8.18.1) --- updated-dependencies: - dependency-name: "@testing-library/dom" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.32.0 to 5.38.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.38.1/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.6.3 to 18.7.23. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [uuid](https://github.com/uuidjs/uuid) from 8.3.2 to 9.0.0. - [Release notes](https://github.com/uuidjs/uuid/releases) - [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md) - [Commits](uuidjs/uuid@v8.3.2...v9.0.0) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

* Bump react-redux from 7.2.9 to 8.0.4 Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.9 to 8.0.4. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](reduxjs/react-redux@v7.2.9...v8.0.4) --- updated-dependencies: - dependency-name: react-redux dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * isDescendant evaluates whether a filepath is a descendant of a root path * metafileSelectors.selectByRoot updated to use io.isDescendant() for consistent path evaluations * Hoist FilebasedMetafile states into Explorer to prevent infinite loop on nested updates * Hoist card.expanded field into CardComponent to reduce possible infinite loops due to circular references to the Redux store * React component tests masked until further investigation of redux-mock-store * Match props signature for updated Editor component * Explicit return type definition for custom RTK createSelector usage Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [eslint-plugin-testing-library](https://github.com/testing-library/eslint-plugin-testing-library) from 5.7.0 to 5.7.2. - [Release notes](https://github.com/testing-library/eslint-plugin-testing-library/releases) - [Changelog](https://github.com/testing-library/eslint-plugin-testing-library/blob/main/.releaserc.json) - [Commits](testing-library/eslint-plugin-testing-library@v5.7.0...v5.7.2) --- updated-dependencies: - dependency-name: eslint-plugin-testing-library dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.7.23 to 18.8.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [@types/parse-path](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/parse-path) from 5.0.0 to 7.0.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/parse-path) --- updated-dependencies: - dependency-name: "@types/parse-path" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

Bumps [react-dnd-preview](https://github.com/LouisBrunner/dnd-multi-backend) from 6.0.2 to 7.1.1. - [Release notes](https://github.com/LouisBrunner/dnd-multi-backend/releases) - [Commits](LouisBrunner/dnd-multi-backend@v6.0.2...v7.1.1) --- updated-dependencies: - dependency-name: react-dnd-preview dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicholas Nelson <nelsonni@oregonstate.edu>

…attempting to merge

…ng filenames

…ions

…n a mocked git repository project

…heckoutPathspec()

…o optionally restrict results based on handler types

… conflicts

…es only

…ssociating the ConflictManager itself

…fy accurate content is displayed

dependabot bot and others added 30 commits July 24, 2022 21:45

Merge branch 'main' into development

c4559e2

dependabot bot and others added 23 commits September 30, 2022 22:42

Merge checks out remote-only branches into linked worktrees prior to …

2f53968

…attempting to merge

Typo fix

7f1b14d

Conflict regex pattern updated to exclude space in front of conflicti…

8d033c6

…ng filenames

Either<T,U> type definition for exclusive or (XOR) parameter restrict…

0e3a79a

…ions

Convert to using new Either<T,U> type for inclusion/exclusion paths i…

12c5ed9

…n a mocked git repository project

Convert to using new Either<T,U> type for ours/theirs parameters to c…

1c719de

…heckoutPathspec()

Metafile selectByFilepath selector and fetchMetafile thunk expanded t…

6b33ae7

…o optionally restrict results based on handler types

ResetButton handles metafiles with 'unmerged' status indicating merge…

86c8508

… conflicts

Metafiles selectByConflicted restricted to 'Editor' or 'Explorer' typ…

3c270f5

…es only

ConflictManager loads 'Editor' or 'Explorer' types only, instead of a…

411ee0b

…ssociating the ConflictManager itself

Update FilebasedMetafiles before opening from ConflictManager to veri…

8e11e5a

…fy accurate content is displayed

nelsonni added bug Bug reports or bug fixes feature Feature requests or improvements dependencies Issues or updates to dependency files labels Oct 6, 2022

This was linked to issues Oct 6, 2022

git-worktree implementation #380

Closed

Abortable merge, clone, and checkout commands #542

Closed

Unstaging linked worktree files fails to reset file in the git index (aka staging area) #600

Closed

nelsonni merged commit 5521773 into main Oct 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

v3.0.0 #946

v3.0.0 #946

nelsonni commented Oct 6, 2022

v3.0.0 #946

v3.0.0 #946

Conversation

nelsonni commented Oct 6, 2022