Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump @electron-forge/maker-squirrel from 6.0.0-beta.66 to 6.0.0-beta.67 #953

Merged
merged 57 commits into from
Oct 11, 2022
Merged

Bump @electron-forge/maker-squirrel from 6.0.0-beta.66 to 6.0.0-beta.67 #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
18584d4
Bump isomorphic-git from 1.18.3 to 1.19.0 (#865)
dependabot[bot] Jul 25, 2022
e50dba6
Bump @types/luxon from 2.3.2 to 3.0.0 (#866)
dependabot[bot] Jul 25, 2022
67ba765
Bump @typescript-eslint/eslint-plugin from 5.30.6 to 5.30.7 (#867)
dependabot[bot] Jul 25, 2022
a91524c
Bump electron from 19.0.8 to 19.0.9 (#868)
dependabot[bot] Jul 25, 2022
4f77102
Bump @testing-library/user-event from 14.2.5 to 14.3.0 (#869)
dependabot[bot] Jul 25, 2022
f533d80
Bump react-flow-renderer from 10.3.10 to 10.3.11 (#870)
dependabot[bot] Jul 25, 2022
24bf379
Bump @typescript-eslint/parser from 5.30.6 to 5.30.7 (#871)
dependabot[bot] Jul 25, 2022
7fe1c84
Bump @types/node from 18.0.6 to 18.6.0 (#872)
dependabot[bot] Jul 25, 2022
f726fc7
Bump fork-ts-checker-webpack-plugin from 7.2.12 to 7.2.13 (#873)
dependabot[bot] Jul 25, 2022
894bcd1
Bump webpack from 5.73.0 to 5.74.0 (#875)
dependabot[bot] Aug 1, 2022
295d7ac
Bump parse-path from 5.0.0 to 6.0.0 (#882)
dependabot[bot] Aug 1, 2022
5e2418f
Bump @electron-forge/cli from 6.0.0-beta.64 to 6.0.0-beta.65 (#881)
dependabot[bot] Aug 1, 2022
a0103b7
Bump @electron-forge/plugin-webpack from 6.0.0-beta.64 to 6.0.0-beta.…
dependabot[bot] Aug 1, 2022
ffc161d
Bump @electron-forge/maker-deb from 6.0.0-beta.64 to 6.0.0-beta.65 (#…
dependabot[bot] Aug 1, 2022
8506a9e
Bump @electron-forge/maker-dmg from 6.0.0-beta.64 to 6.0.0-beta.65 (#…
dependabot[bot] Aug 1, 2022
a970cb4
Bump @electron-forge/maker-rpm from 6.0.0-beta.64 to 6.0.0-beta.65 (#…
dependabot[bot] Aug 1, 2022
21d1110
Bump @electron-forge/maker-squirrel from 6.0.0-beta.64 to 6.0.0-beta.…
dependabot[bot] Aug 1, 2022
c0993bd
Bump eslint-plugin-testing-library from 5.5.1 to 5.6.0 (#885)
dependabot[bot] Aug 1, 2022
dca6b9e
Bump eslint from 8.20.0 to 8.21.0 (#887)
dependabot[bot] Aug 1, 2022
b781631
Bump electron from 19.0.9 to 19.0.10 (#891)
dependabot[bot] Aug 1, 2022
5926311
Bump @typescript-eslint/parser from 5.30.7 to 5.32.0 (#893)
dependabot[bot] Aug 1, 2022
855ce90
Bump @types/node from 18.6.0 to 18.6.3 (#890)
dependabot[bot] Aug 1, 2022
3ed7f08
Bump react-transition-group from 4.4.2 to 4.4.5 (#886)
dependabot[bot] Aug 1, 2022
0cced4b
Bump react-flow-renderer from 10.3.11 to 10.3.12 (#894)
dependabot[bot] Aug 1, 2022
0b7d985
Bump isomorphic-git from 1.19.0 to 1.19.1 (#889)
dependabot[bot] Aug 1, 2022
ca70e5c
Bump @typescript-eslint/eslint-plugin from 5.30.7 to 5.32.0 (#892)
dependabot[bot] Aug 1, 2022
c4559e2
Merge branch 'main' into development
nelsonni Oct 1, 2022
4b2641e
Bump @testing-library/jest-dom from 5.16.4 to 5.16.5 (#901)
dependabot[bot] Oct 1, 2022
1024da6
Bump parse-path from 6.0.0 to 7.0.0 (#903)
dependabot[bot] Oct 1, 2022
a1fb8cf
Bump @testing-library/user-event from 14.3.0 to 14.4.3 (#907)
dependabot[bot] Oct 1, 2022
2e0e6ac
Bump parse-url from 7.0.2 to 8.1.0 (#918)
dependabot[bot] Oct 1, 2022
71317c2
Bump electron from 19.0.10 to 21.0.1 (#936)
dependabot[bot] Oct 1, 2022
b062bbf
Bump @electron-forge/plugin-webpack from 6.0.0-beta.65 to 6.0.0-beta.…
dependabot[bot] Oct 1, 2022
0ce1ca6
Bump react-flow-renderer from 10.3.12 to 10.3.17 (#928)
dependabot[bot] Oct 1, 2022
1b30a76
Bump @types/validator from 13.7.4 to 13.7.7 (#933)
dependabot[bot] Oct 1, 2022
ca639db
Bump @testing-library/dom from 8.16.0 to 8.18.1 (#935)
dependabot[bot] Oct 1, 2022
ac89490
Bump @typescript-eslint/eslint-plugin from 5.32.0 to 5.38.1 (#937)
dependabot[bot] Oct 1, 2022
39866dd
Bump @types/node from 18.6.3 to 18.7.23 (#938)
dependabot[bot] Oct 1, 2022
50c0bd1
Bump uuid from 8.3.2 to 9.0.0 (#940)
dependabot[bot] Oct 1, 2022
cfe9bdf
Bump react-redux from 7.2.9 to 8.0.4 (#939)
dependabot[bot] Oct 4, 2022
d8e8c77
Bump eslint-plugin-testing-library from 5.7.0 to 5.7.2 (#942)
dependabot[bot] Oct 4, 2022
f308982
Bump @types/node from 18.7.23 to 18.8.0 (#943)
dependabot[bot] Oct 4, 2022
218c692
Bump @types/parse-path from 5.0.0 to 7.0.0 (#945)
dependabot[bot] Oct 4, 2022
1a5f15d
Bump react-dnd-preview from 6.0.2 to 7.1.1 (#944)
dependabot[bot] Oct 4, 2022
2f53968
Merge checks out remote-only branches into linked worktrees prior to …
nelsonni Oct 5, 2022
7f1b14d
Typo fix
nelsonni Oct 5, 2022
8d033c6
Conflict regex pattern updated to exclude space in front of conflicti…
nelsonni Oct 5, 2022
0e3a79a
Either<T,U> type definition for exclusive or (XOR) parameter restrict…
nelsonni Oct 6, 2022
12c5ed9
Convert to using new Either<T,U> type for inclusion/exclusion paths i…
nelsonni Oct 6, 2022
1c719de
Convert to using new Either<T,U> type for ours/theirs parameters to c…
nelsonni Oct 6, 2022
6b33ae7
Metafile selectByFilepath selector and fetchMetafile thunk expanded t…
nelsonni Oct 6, 2022
86c8508
ResetButton handles metafiles with 'unmerged' status indicating merge…
nelsonni Oct 6, 2022
3c270f5
Metafiles selectByConflicted restricted to 'Editor' or 'Explorer' typ…
nelsonni Oct 6, 2022
411ee0b
ConflictManager loads 'Editor' or 'Explorer' types only, instead of a…
nelsonni Oct 6, 2022
8e11e5a
Update FilebasedMetafiles before opening from ConflictManager to veri…
nelsonni Oct 6, 2022
b13f7a5
Bump @electron-forge/maker-squirrel from 6.0.0-beta.66 to 6.0.0-beta.67
dependabot[bot] Oct 10, 2022
605363f
Merge branch 'development' into dependabot/npm_and_yarn/development/e…
nelsonni Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@electron-forge/maker-deb": "^6.0.0-beta.67",
"@electron-forge/maker-dmg": "^6.0.0-beta.67",
"@electron-forge/maker-rpm": "^6.0.0-beta.67",
"@electron-forge/maker-squirrel": "^6.0.0-beta.65",
"@electron-forge/maker-squirrel": "^6.0.0-beta.67",
"@electron-forge/plugin-webpack": "6.0.0-beta.66",
"@testing-library/dom": "^8.19.0",
"@testing-library/jest-dom": "^5.16.5",
Expand Down
23 changes: 17 additions & 6 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,17 @@
ora "^5.0.0"
pretty-ms "^7.0.0"

"@electron-forge/[email protected]":
version "6.0.0-beta.67"
resolved "https://registry.yarnpkg.com/@electron-forge/async-ora/-/async-ora-6.0.0-beta.67.tgz#c5740d19e4d836cb856ac4c0ca897acbdc11da83"
integrity sha512-pqQlxHRnECDAAQhi3U2JgSj60TBv3e3ZLvL9Wv+dIBVv64Oc2QTRrryO5Svd7w2J1t+enVwQue18IrVaYUjw0w==
dependencies:
chalk "^4.0.0"
debug "^4.3.1"
log-symbols "^4.0.0"
ora "^5.0.0"
pretty-ms "^7.0.0"

"@electron-forge/cli@^6.0.0-beta.67":
version "6.0.0-beta.67"
resolved "https://registry.yarnpkg.com/@electron-forge/cli/-/cli-6.0.0-beta.67.tgz#399a528d5aa1bf4df0dc87b0feee3b1341207752"
Expand Down Expand Up @@ -632,13 +643,13 @@
optionalDependencies:
electron-installer-redhat "^3.2.0"

"@electron-forge/maker-squirrel@^6.0.0-beta.65":
version "6.0.0-beta.66"
resolved "https://registry.yarnpkg.com/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.66.tgz#ed0f09a9ba9c894bd1ba897e08414f06b41acb64"
integrity sha512-yllGUX55WpOQf8rwZ6cQb5uw08Z/xxXNBIBC3qaoyTfclUf1Xwn1QFW7V34cmCagNodM0KPVrE0m9LugFAfXlQ==
"@electron-forge/maker-squirrel@^6.0.0-beta.67":
version "6.0.0-beta.67"
resolved "https://registry.yarnpkg.com/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.67.tgz#f16519d91ec611f2bdf9c949edcd9040f0699cb5"
integrity sha512-Fq46vK5dG1jC0XCL4KZZP6kw3bENQJf9zHWy1bOaEfMSl6CQEOq0dW1PaJSgsdfHruGGnJkW/6IHFpU/K0LpHA==
dependencies:
"@electron-forge/maker-base" "6.0.0-beta.66"
"@electron-forge/shared-types" "6.0.0-beta.66"
"@electron-forge/maker-base" "6.0.0-beta.67"
"@electron-forge/shared-types" "6.0.0-beta.67"
fs-extra "^10.0.0"
optionalDependencies:
electron-winstaller "^5.0.0"
Expand Down