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.

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

Update dugite-extra, remove --ignore-engines #10722

Merged
merged 1 commit into from
Feb 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Build
shell: bash
run: |
yarn --ignore-engines --skip-integrity-check --network-timeout 100000
yarn --skip-integrity-check --network-timeout 100000
./scripts/check_git_status.sh
yarn lint
yarn build:examples
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN sudo apt-get update \

ENV SHELL=/bin/bash

ENV NODE_VERSION="12.14.1"
ENV NODE_VERSION="14.19.0"
RUN bash -c ". .nvm/nvm.sh \
&& nvm install $NODE_VERSION \
&& nvm use $NODE_VERSION \
Expand Down
2 changes: 1 addition & 1 deletion doc/Developing.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ For Windows instructions [click here](#building-on-windows).

- Node.js `>= 12.14.1`.
- For now, **use** Node 12.
- Node 14 is supported, Node 16 _should_ work, but you might need to run `yarn --ignore-engines` to get around some arbitrary constraints.
- Node 14 is supported, Node 16 _should_ work.
- If you are interested in Theia's VS Code Extension support then you should use a Node version at least compatible with the one included in the version of Electron used by [VS Code](https://github.com/microsoft/vscode).
- [Yarn package manager](https://yarnpkg.com/en/docs/install) `>= 1.7.0` **AND** `< 2.x.x`.
- git (If you would like to use the Git-extension too, you will need to have git version 2.11.0 or higher.)
Expand Down
4 changes: 2 additions & 2 deletions packages/git/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@types/diff": "^3.2.2",
"@types/p-queue": "^2.3.1",
"diff": "^3.4.0",
"dugite-extra": "0.1.14",
"find-git-exec": "^0.0.3",
"dugite-extra": "0.1.15",
"find-git-exec": "^0.0.4",
"find-git-repositories": "^0.1.1",
"moment": "2.24.0",
"octicons": "^7.1.0",
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4919,15 +4919,15 @@ drivelist@^9.0.2:
nan "^2.14.0"
prebuild-install "^5.2.4"

[email protected].14:
version "0.1.14"
resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.14.tgz#514c89b6c597bf8b748b4febd53382559a2a8fdd"
integrity sha512-apUiaj322iSSBx5X7/8Dg3GP6mDLl5y6RaeEWBpLUHfBKxQyTTVHG0YpzYCKe2ke1EbrSmreVNo1FwDnIb3qlw==
[email protected].15:
version "0.1.15"
resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.15.tgz#322406b628ea5515c5c6fcd65e4d040543d6268a"
integrity sha512-beLmQcIXLA8aXqWQZF/ooECoZvYKpBywIFwgqAoYnV04NdWUXDtZ6mMcjQf5eAz5PjXGXAYSuQ31zkPL8J85+A==
dependencies:
byline "^5.0.0"
dugite-no-gpl "1.69.0"
find-git-exec "^0.0.3"
upath "^1.0.0"
find-git-exec "^0.0.4"
upath "^2.0.1"

[email protected]:
version "1.69.0"
Expand Down Expand Up @@ -5700,10 +5700,10 @@ find-cache-dir@^3.2.0, find-cache-dir@^3.3.1:
make-dir "^3.0.2"
pkg-dir "^4.1.0"

find-git-exec@^0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/find-git-exec/-/find-git-exec-0.0.3.tgz#4ce941859ebe7f359fb8e56aafd2acf3c955b52c"
integrity sha512-cGsuku5hwdOpToV6axI0fRCABuw1yozFtQv13pVK0j7BjILU8buDtHKmSrsZN340Sjj3Z42n8fcF1Xu4nRuBbA==
find-git-exec@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/find-git-exec/-/find-git-exec-0.0.4.tgz#f1d0d35f93ad99bc81aacd357388d00ae902bc92"
integrity sha512-klzQwno+dpdeahtHhvZZ5Yn6K+zme1Aj+YJ4ZD+DywSLrQoyCywTrsubUZa1hHRehmfwBThoeKjS7fsaxhpfNA==
dependencies:
"@types/node" "^10.14.22"
"@types/which" "^1.3.2"
Expand Down Expand Up @@ -11207,7 +11207,7 @@ unzipper@^0.9.11:
readable-stream "~2.3.6"
setimmediate "~1.0.4"

upath@^1.0.0, upath@^1.0.2:
upath@^1.0.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
Expand Down