Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

Align che-theia with upstream changes #1213

Merged
merged 5 commits into from
Sep 29, 2021

Conversation

RomanNikitenko
Copy link
Member

@RomanNikitenko RomanNikitenko commented Sep 3, 2021

What does this PR do?

  • Moves che-theia to ES2017.
  • Provides adaptation to upstream changes.
  • Pin che-theia to theia commit before new breaking change (eclipse-theia/theia@23e09c2). Adaption for those changes will be provided within a separate PR.

Screenshot/screencast of this PR

What issues does this PR fix or reference?

eclipse-che/che#20366
eclipse-che/che#20360

How to test this PR?

  • the PR fixes deploy of remote plugins, please see Steps to reproduce here
  • activation of VS Code extensions should be fixed, please see the comment here.
  • all other functionality should work as before breaking changes in upstream.

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

Happy Path Channel

HAPPY_PATH_CHANNEL=stable

@codecov
Copy link

codecov bot commented Sep 3, 2021

Codecov Report

Merging #1213 (89c29ab) into main (c299f59) will decrease coverage by 1.50%.
The diff coverage is 18.14%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1213      +/-   ##
==========================================
- Coverage   32.78%   31.28%   -1.51%     
==========================================
  Files         290      296       +6     
  Lines        9885     9826      -59     
  Branches     1457     1316     -141     
==========================================
- Hits         3241     3074     -167     
- Misses       6641     6749     +108     
  Partials        3        3              
Impacted Files Coverage Δ
...theia-about/src/browser/about-che-theia-dialog.tsx 0.00% <0.00%> (ø)
...credentials/src/browser/che-credentials-service.ts 0.00% <0.00%> (ø)
...entials/src/browser/credentials-frontend-module.ts 0.00% <0.00%> (ø)
...eia-credentials/src/common/credentials-protocol.ts 0.00% <0.00%> (ø)
...eia-credentials/src/node/che-credentials-server.ts 0.00% <0.00%> (ø)
...s/src/node/che-theia-credentials-backend-module.ts 0.00% <0.00%> (ø)
...rowser/src/browser/che-mini-browser-environment.ts 0.00% <0.00%> (ø)
...ia-plugin-remote/src/node/hosted-plugin-service.ts 0.00% <0.00%> (ø)
...in-remote/src/node/plugin-remote-backend-module.ts 0.00% <0.00%> (ø)
...theia-plugin-remote/src/node/plugin-remote-init.ts 0.00% <0.00%> (ø)
... and 207 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f85127c...89c29ab. Read the comment docs.

@che-bot

This comment has been minimized.

@RomanNikitenko
Copy link
Member Author

The changes fix errors from eclipse-che/che#20366, but there are still problems related to plugins, so I'm investigating eclipse-che/che#20360

@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "es6",
"target": "ES2017",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should really align the compiler options with the other plugins, in particular add "extends": "../../configs/base.tsconfig", There will be some errors compiling, but they are easily fixed.

Copy link
Member Author

@RomanNikitenko RomanNikitenko Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks Florent it was done within #1215

@@ -2,7 +2,7 @@
"extends": "../../configs/base.tsconfig.json",
"compilerOptions": {
"lib": [
"es6",
"ES2017",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is the default in base.tsconfig.json, I believe we can remove the "lib" option here. it would make future updates easier.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@che-bot

This comment has been minimized.

@RomanNikitenko

This comment has been minimized.

@che-bot

This comment has been minimized.

@che-bot
Copy link
Contributor

che-bot commented Sep 24, 2021

✅ E2E Happy path tests succeed 🎉

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia quay.io/crw_pr/che-theia:1213
che-theia-endpoint-runtime-binary quay.io/crw_pr/che-theia-endpoint-runtime-binary:1213

Test product:

  • Use comment "[crw-ci-test]" to rerun happy path E2E test.
  • Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

Eclipse Che QE channel: https://mattermost.eclipse.org/eclipse/channels/eclipse-che-qe

@che-bot
Copy link
Contributor

che-bot commented Sep 24, 2021

✅ E2E Happy path tests succeed 🎉

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia quay.io/crw_pr/che-theia:1213
che-theia-endpoint-runtime-binary quay.io/crw_pr/che-theia-endpoint-runtime-binary:1213

Test product:

  • Use comment "[crw-ci-test]" to rerun happy path E2E test.
  • Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

Eclipse Che QE channel: https://mattermost.eclipse.org/eclipse/channels/eclipse-che-qe

Signed-off-by: Roman Nikitenko <[email protected]>
@che-bot
Copy link
Contributor

che-bot commented Sep 24, 2021

✅ E2E Happy path tests succeed 🎉

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia quay.io/crw_pr/che-theia:1213
che-theia-endpoint-runtime-binary quay.io/crw_pr/che-theia-endpoint-runtime-binary:1213

Test product:

  • Use comment "[crw-ci-test]" to rerun happy path E2E test.
  • Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

Eclipse Che QE channel: https://mattermost.eclipse.org/eclipse/channels/eclipse-che-qe

@RomanNikitenko RomanNikitenko marked this pull request as ready for review September 24, 2021 08:30
Copy link
Member

@azatsarynnyy azatsarynnyy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm approving it based on the passed HappyPath tests.

@azatsarynnyy
Copy link
Member

I think it's better to merge it after the upcoming 7.37 release, as it brings a lot of new commits from upstream. Which potentially may cause some other runtime breakages.

@azatsarynnyy
Copy link
Member

7.37.x has been already tagged https://github.com/eclipse-che/che-theia/tree/7.37.x
So, we're good to merge.

@RomanNikitenko RomanNikitenko merged commit 911c9e2 into eclipse-che:main Sep 29, 2021
@RomanNikitenko RomanNikitenko deleted the es2017 branch September 29, 2021 13:24
@che-bot che-bot added this to the 7.38 milestone Sep 29, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants