diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d55c256eaecb1..1e787efe6e3ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile index 5717cd0b6a5f5..b8701646a143e 100644 --- a/.gitpod.dockerfile +++ b/.gitpod.dockerfile @@ -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 \ diff --git a/doc/Developing.md b/doc/Developing.md index ca9ee5115c517..2613713f37642 100644 --- a/doc/Developing.md +++ b/doc/Developing.md @@ -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.) diff --git a/packages/git/package.json b/packages/git/package.json index 8262d3197616e..720d4eb11a7fb 100644 --- a/packages/git/package.json +++ b/packages/git/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index ecef29d665c73..3eaf85180ae06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4919,15 +4919,15 @@ drivelist@^9.0.2: nan "^2.14.0" prebuild-install "^5.2.4" -dugite-extra@0.1.14: - version "0.1.14" - resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.14.tgz#514c89b6c597bf8b748b4febd53382559a2a8fdd" - integrity sha512-apUiaj322iSSBx5X7/8Dg3GP6mDLl5y6RaeEWBpLUHfBKxQyTTVHG0YpzYCKe2ke1EbrSmreVNo1FwDnIb3qlw== +dugite-extra@0.1.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" dugite-no-gpl@1.69.0: version "1.69.0" @@ -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" @@ -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==