chore: upgrade to yarn 2 (#5279) #11006

nsinghal12 · 2022-10-20T06:36:19Z

This PR contains ui code for yarn upgrade to yarn 2

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

crenshaw-dev · 2022-10-20T15:31:53Z

Looks like we'll have to disable the Snyk integration to get this to work. https://github.com/snyk/cli/issues/1518

crenshaw-dev · 2022-10-20T15:45:20Z

Not sure what this means:

#39 [argocd-ui 6/6] RUN HOST_ARCH=amd64 NODE_ENV='production' NODE_ONLINE_ENV='online' NODE_OPTIONS=--max_old_space_size=8192 yarn build
#39 1.258 Usage Error: Couldn't find the node_modules state file - running an install might help (findPackageLocation)

* test: add unit test for server version Signed-off-by: emirot <emirot.nolan@gmail.com> * test: add unit test for server version Signed-off-by: emirot <emirot.nolan@gmail.com> * test: add unit test for server version Signed-off-by: emirot <emirot.nolan@gmail.com> * tests: update cmd dependencies Signed-off-by: emirot <emirot.nolan@gmail.com> Signed-off-by: emirot <emirot.nolan@gmail.com> Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

With Kiali v1.57.1 an additional status condition was added: ``` - lastTransitionTime: '2022-10-14T11:56:24Z' message: '' reason: '' status: 'False' type: Failure ``` Based on the discussion in kiali/kiali#5560 this should not lead to a degraded health state. This will no longer return Degraded as a catch-all and use the `type` and `status` fields of the condition to determine the CR health. Signed-off-by: Allex Veldman <allexveldman+github@gmail.com> Signed-off-by: Allex Veldman <allexveldman+github@gmail.com> Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

* issue-10592 Wrap errors with message Signed-off-by: Apoorva Mahabaleshwara <apoorvamahabaleshwara@Apoorvas-MBP.attlocal.net> Signed-off-by: Apoorva Mahabaleshwara <apoorvambhat@gmail.com> * issue-10592 remove unwanted error wrappers Signed-off-by: Apoorva Mahabaleshwara <apoorvamahabaleshwara@Apoorvas-MBP.attlocal.net> Signed-off-by: Apoorva Mahabaleshwara <apoorvambhat@gmail.com> * chore: fix error wrapper messages Signed-off-by: Apoorva Mahabaleshwara <apoorvambhat@gmail.com> Signed-off-by: Apoorva Mahabaleshwara <apoorvamahabaleshwara@Apoorvas-MBP.attlocal.net> Signed-off-by: Apoorva Mahabaleshwara <apoorvambhat@gmail.com> Co-authored-by: Apoorva Mahabaleshwara <apoorvamahabaleshwara@Apoorvas-MBP.attlocal.net> Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

…d replicas to ReplicaSet (argoproj#10613) * Misc UI Improvements: sort by created at in resource list view, add message to AnalysisRun and replicas to Replicaset Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> * Address PR comments Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> * No underscore needed in created_at. Add space between icon and message in health details for non-controlled resources Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> * Guard section Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> Co-authored-by: Remington Breeze <remington@breeze.software> Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* chore: fix e2e Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more config Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * global Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

Signed-off-by: Niti <gupta.sweet.niti@gmail.com>

test/e2e/fixture/fixture.go

Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Niti <gupta.sweet.niti@gmail.com>

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

nsinghal12 · 2022-10-26T04:43:53Z

Hi @crenshaw-dev I tried multiple things today to try fix the uuid/v1 error:

Adding uuid/v1 as a dev dependency
Adding uuid as a packageExtension in .yarnrc.yml
Try allowing yarn to update lock file
Adding yarn set version berry and yarn install --immutable to step on installing dependencies

But the code is unable to resolve the package.

As I see uuid/v1 is not a package in NPM registry. It is the uuid package from which v1.js is being imported. I believe we will need to modify the argo-ui source code to switch from CommonJS require to ES import statements. (refer https://github.com/argoproj/argo-ui/blob/master/src/components/form-field/form-field.tsx#L7)

I haven't yet found guidance in my Google search on how to resolve CJS level-2 dependencies. Any advice on where to look, or how to resolve without modifying argo-ui ?

crenshaw-dev · 2022-11-01T13:28:42Z

@keithchong I think this PR is very close to being done. Can you take a look at the build failures? I don't know yarn well enough to have any ideas.

keithchong · 2022-11-02T21:23:36Z

Hi @crenshaw-dev, I haven't actually migrated to yarn 2 before. Did you follow the steps here? https://yarnpkg.com/getting-started/migration#step-by-step

blakepettersson · 2022-11-08T07:15:55Z

I believe we will need to modify the argo-ui source code to switch from CommonJS require to ES import statements. (refer https://github.com/argoproj/argo-ui/blob/master/src/components/form-field/form-field.tsx#L7)

It was a while since I've worked with yarn, but IIRC yarn 2 requires all dependencies to be explicitly be stated in package.json and from what I can see it is not.

It could be a good opportunity to modify argo-ui to ES import, and to perhaps upgrade uuid to a newer version?

blakepettersson · 2023-05-06T13:53:17Z

@nsinghal12 @keithchong @crenshaw-dev I think the required changes are in argoproj/argo-ui#367.

Related to argoproj#11006, all dependencies that are used within the app needs to be expressed in package.json, in case we ever want to use yarn berry or pnpm. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: set explicit package.json deps Related to #11006, all dependencies that are used within the app needs to be expressed in package.json, in case we ever want to use yarn berry or pnpm. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * fix: downgrade history dependency Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

blakepettersson · 2023-06-04T13:00:41Z

@nsinghal12 if you have time you can try to merge master and see if it builds now.

nsinghal12 · 2023-06-09T06:00:50Z

@nsinghal12 if you have time you can try to merge master and see if it builds now.

Hello @blakepettersson I merged master and updated this branch but looks like build is failing at install node dependencies in integration tests.

blakepettersson · 2023-06-09T08:00:08Z

@nsinghal12 I think your yaml.lock file is malformed (it seems to contain Git conflict diffs). I'd suggest removing it and then regenerating the lockfile.

nsinghal12 · 2023-06-09T22:01:09Z

@nsinghal12 I think your yaml.lock file is malformed (it seems to contain Git conflict diffs). I'd suggest removing it and then regenerating the lockfile.

I think you meant yarn.lock file. I deleted and regenrated the file again and pushed it. But looks like same issue.

crenshaw-dev · 2023-06-09T22:22:05Z

@nsinghal12 are you sure you added the new yarn.lock and pushed it? GitHub is still showing it as deleted.

crenshaw-dev · 2023-06-09T22:23:37Z

Oh, I see. Make sure you run yarn install from inside the ui directory.

blakepettersson · 2023-06-10T11:32:12Z

I think you meant yarn.lock file.

@nsinghal12 yes, that was a silly typo 😄

As @crenshaw-dev said, the yarn.lock should be regenerated by running yarn install in the ui/ dir.

* chore: set explicit package.json deps Related to argoproj#11006, all dependencies that are used within the app needs to be expressed in package.json, in case we ever want to use yarn berry or pnpm. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * fix: downgrade history dependency Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

crenshaw-dev · 2023-09-20T13:56:31Z

Closing for now as this needs more work.

* chore: set explicit package.json deps Related to argoproj#11006, all dependencies that are used within the app needs to be expressed in package.json, in case we ever want to use yarn berry or pnpm. Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> * fix: downgrade history dependency Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> --------- Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

crenshaw-dev changed the title ~~PR for issue#5279~~ chore: upgrade to yarn 2 (#5279) Oct 20, 2022

emirot and others added 11 commits October 20, 2022 10:00

PR for issue#5279

35985bb

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

Adding .yarn/releases folder

5f52b1a

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

removing options

f082a3f

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

Updating .gitignore and gitattributes

ed1f94c

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

no zero-installs yet

1327082

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

removing deprecated non interactive

e0e4af4

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

nsinghal12 force-pushed the yarn-2-upgrade branch from ff795bc to e0e4af4 Compare October 20, 2022 17:03

nsinghal12 added 2 commits October 21, 2022 09:01

Merge branch 'master' into yarn-2-upgrade

e8b465a

Signed-off-by: Niti <gupta.sweet.niti@gmail.com>

Changing linker from node_modules to pnp

b7c532d

Signed-off-by: Niti <gupta.sweet.niti@gmail.com>

crenshaw-dev reviewed Oct 21, 2022

View reviewed changes

test/e2e/fixture/fixture.go Outdated Show resolved Hide resolved

nsinghal12 and others added 8 commits October 21, 2022 09:10

Update test/e2e/fixture/fixture.go

6ae3b57

Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Niti <gupta.sweet.niti@gmail.com>

Merge branch 'master' into yarn-2-upgrade

3e0a7b4

Merge branch 'master' into yarn-2-upgrade

54cd116

Specify to use yarn berry

7a3b6a0

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

adding uuid to deps

22dbd5e

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

remove --frozen-lockfile from yarn install

bf29494

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

add uuid to yarn lock

86e68c9

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

remove uuid as dev-dep

e564212

Signed-off-by: Niti Singhal <gupta.sweet.niti@gmail.com>

crenshaw-dev added hacktoberfest hacktoberfest-accepted Accepted Hacktoberfest contribution labels Oct 27, 2022

crenshaw-dev requested a review from keithchong November 1, 2022 13:28

blakepettersson mentioned this pull request May 6, 2023

chore: upgrade uuid argoproj/argo-ui#367

Merged

blakepettersson mentioned this pull request May 6, 2023

chore: set explicit package.json deps #13483

Merged

8 tasks

nsinghal12 added 2 commits June 8, 2023 08:58

changes from master

9014394

Merge branch 'master' into yarn-2-upgrade

8b4d3f6

update yarn.lock file

495d2ec

crenshaw-dev closed this Sep 20, 2023

crenshaw-dev mentioned this pull request Sep 20, 2023

Upgrade to Yarn 2 #5279

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: upgrade to yarn 2 (#5279) #11006

chore: upgrade to yarn 2 (#5279) #11006

nsinghal12 commented Oct 20, 2022

crenshaw-dev commented Oct 20, 2022

crenshaw-dev commented Oct 20, 2022

nsinghal12 commented Oct 26, 2022

crenshaw-dev commented Nov 1, 2022

keithchong commented Nov 2, 2022

blakepettersson commented Nov 8, 2022

blakepettersson commented May 6, 2023

blakepettersson commented Jun 4, 2023 •

edited

Loading

nsinghal12 commented Jun 9, 2023

blakepettersson commented Jun 9, 2023

nsinghal12 commented Jun 9, 2023

crenshaw-dev commented Jun 9, 2023

crenshaw-dev commented Jun 9, 2023

blakepettersson commented Jun 10, 2023

crenshaw-dev commented Sep 20, 2023

chore: upgrade to yarn 2 (#5279) #11006

chore: upgrade to yarn 2 (#5279) #11006

Conversation

nsinghal12 commented Oct 20, 2022

crenshaw-dev commented Oct 20, 2022

crenshaw-dev commented Oct 20, 2022

nsinghal12 commented Oct 26, 2022

crenshaw-dev commented Nov 1, 2022

keithchong commented Nov 2, 2022

blakepettersson commented Nov 8, 2022

blakepettersson commented May 6, 2023

blakepettersson commented Jun 4, 2023 • edited Loading

nsinghal12 commented Jun 9, 2023

blakepettersson commented Jun 9, 2023

nsinghal12 commented Jun 9, 2023

crenshaw-dev commented Jun 9, 2023

crenshaw-dev commented Jun 9, 2023

blakepettersson commented Jun 10, 2023

crenshaw-dev commented Sep 20, 2023

blakepettersson commented Jun 4, 2023 •

edited

Loading