migrate to yarn 3

owncloud · Nov 16, 2021 · c397a98 · c397a98
1 parent d0649ec
commit c397a98
Show file tree

Hide file tree

Showing 15 changed files with 32,199 additions and 22,242 deletions.
diff --git a/.drone.star b/.drone.star
@@ -622,7 +622,7 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1,
                     "cd /srv/app/web",
                     "git checkout $WEB_COMMITID",
                     "cp -r tests/acceptance/filesForUpload/* /uploads",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "yarn build",
                     "./tests/acceptance/run.sh",
                 ],
@@ -685,10 +685,10 @@ def accountsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                     "cd /srv/app/web",
                     "git checkout $WEB_COMMITID",
                     "cp -r tests/acceptance/filesForUpload/* /uploads",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "yarn build",
                     "cd /drone/src/accounts",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "make test-acceptance-webui",
                 ],
                 "volumes": [stepVolumeOC10Tests] +
@@ -749,9 +749,9 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                     "cp -r /srv/app/web/tests/acceptance/filesForUpload/* /uploads",
                     "cd /srv/app/web",
                     "git checkout $WEB_COMMITID",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "cd /drone/src/settings",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "make test-acceptance-webui",
                 ],
                 "volumes": [stepVolumeOC10Tests] +

diff --git a/accounts/.gitignore b/accounts/.gitignore
@@ -0,0 +1,17 @@
+# yarn2 with Zero-Installs: https://yarnpkg.com/features/zero-installs
+#.yarn/*
+#!.yarn/cache
+#!.yarn/patches
+#!.yarn/plugins
+#!.yarn/releases
+#!.yarn/sdks
+#!.yarn/versions
+
+# yarn2 not using Zero-Installs: https://yarnpkg.com/features/zero-installs
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
diff --git a/accounts/.yarn/releases/yarn-3.1.0.cjs b/accounts/.yarn/releases/yarn-3.1.0.cjs
diff --git a/accounts/.yarnrc.yml b/accounts/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.1.0.cjs
diff --git a/accounts/Makefile b/accounts/Makefile
@@ -44,7 +44,7 @@ yarn-build: node_modules
 
 .PHONY: node_modules
 node_modules:
-	yarn install --frozen-lockfile
+	yarn install --immutable
 
 ############ protobuf ############
 PROTO_VERSION := v0

diff --git a/accounts/package.json b/accounts/package.json
@@ -80,5 +80,6 @@
   },
   "peerDependencies": {
     "owncloud-design-system": "^11.0.0"
-  }
+  },
+  "packageManager": "[email protected]"
 }
diff --git a/accounts/yarn.lock b/accounts/yarn.lock
diff --git a/idp/.gitignore b/idp/.gitignore
@@ -0,0 +1,17 @@
+# yarn2 with Zero-Installs: https://yarnpkg.com/features/zero-installs
+#.yarn/*
+#!.yarn/cache
+#!.yarn/patches
+#!.yarn/plugins
+#!.yarn/releases
+#!.yarn/sdks
+#!.yarn/versions
+
+# yarn2 not using Zero-Installs: https://yarnpkg.com/features/zero-installs
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
diff --git a/idp/.yarn/releases/yarn-3.1.0.cjs b/idp/.yarn/releases/yarn-3.1.0.cjs
diff --git a/idp/.yarnrc.yml b/idp/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.1.0.cjs
diff --git a/idp/Makefile b/idp/Makefile
@@ -57,4 +57,4 @@ yarn-build: node_modules
 
 .PHONY: node_modules
 node_modules:
-	yarn install --frozen-lockfile
+	yarn install --immutable
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		nodeLinker: node-modules

		yarnPath: .yarn/releases/yarn-3.1.0.cjs