chore: bump pnpm to version 8.10.5 (#9823)

* chore: bump pnpm to version 8.10.5 * ci: install package manager defined package.json * fixup! ci: install package manager defined package.json * fixup! fixup! ci: install package manager defined package.json * fixup! fixup! fixup! ci: install package manager defined package.json --------- Co-authored-by: Dominik Schmidt <[email protected]>
owncloud · Nov 15, 2023 · 7c248a7 · 7c248a7
1 parent b9bb8fc
commit 7c248a7
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 132 deletions.
diff --git a/.drone.star b/.drone.star
@@ -385,6 +385,7 @@ def pnpmCache(ctx):
         },
         "steps": skipIfUnchanged(ctx, "cache") +
                  installPnpm() +
+                 installPlaywright() +
                  rebuildBuildArtifactCache(ctx, "pnpm", ".pnpm-store") +
                  rebuildBuildArtifactCache(ctx, "playwright", ".playwright"),
         "trigger": {
@@ -579,11 +580,14 @@ def buildCacheWeb(ctx):
         },
         "steps": skipIfUnchanged(ctx, "cache") +
                  restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") +
+                 installPnpm() +
                  [{
                      "name": "build-web",
                      "image": OC_CI_NODEJS,
+                     "environment": {
+                         "NO_INSTALL": "true",
+                     },
                      "commands": [
-                         "pnpm config set store-dir ./.pnpm-store",
                          "make dist",
                      ],
                  }] +
@@ -740,6 +744,7 @@ def e2eTests(ctx):
                 restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + \
                 restoreBuildArtifactCache(ctx, "playwright", ".playwright") + \
                 installPnpm() + \
+                installPlaywright() + \
                 restoreBuildArtifactCache(ctx, "web-dist", "dist") + \
                 setupServerConfigureWeb(params["logLevel"]) + \
                 restoreOcisCache()
@@ -1009,12 +1014,21 @@ def installPnpm():
     return [{
         "name": "pnpm-install",
         "image": OC_CI_NODEJS,
+        "commands": [
+            'npm install --silent --global --force "$(jq -r ".packageManager" < package.json)"',
+            "pnpm config set store-dir ./.pnpm-store",
+            "pnpm install",
+        ],
+    }]
+
+def installPlaywright():
+    return [{
+        "name": "playwright-install",
+        "image": OC_CI_NODEJS,
         "environment": {
             "PLAYWRIGHT_BROWSERS_PATH": ".playwright",
         },
         "commands": [
-            "pnpm config set store-dir ./.pnpm-store",
-            "pnpm install",
             "pnpm playwright install chromium",
         ],
     }]
@@ -1384,13 +1398,11 @@ def runWebuiAcceptanceTests(ctx, suite, alternateSuiteName, filterTags, extraEnv
     for env in extraEnvironment:
         environment[env] = extraEnvironment[env]
 
-    return restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + [{
+    return restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + installPnpm() + [{
         "name": "webui-acceptance-tests",
         "image": OC_CI_NODEJS,
         "environment": environment,
         "commands": [
-            "pnpm config set store-dir ./.pnpm-store",
-            "pnpm install",  # FIXME: use --filter ./tests/acceptance (currently @babel/register is not found)
             "cd %s/tests/acceptance && ./run.sh" % dir["web"],
         ],
         "volumes": [{
@@ -1650,15 +1662,7 @@ def licenseCheck(ctx):
             "os": "linux",
             "arch": "amd64",
         },
-        "steps": [
-            {
-                "name": "pnpm-install",
-                "image": OC_CI_NODEJS,
-                "commands": [
-                    "pnpm config set store-dir ./.pnpm-store",
-                    "pnpm install",
-                ],
-            },
+        "steps": installPnpm() + [
             {
                 "name": "node-check-licenses",
                 "image": OC_CI_NODEJS,

diff --git a/Makefile b/Makefile
@@ -5,7 +5,8 @@ RELEASE := ${CURDIR}/release
 NODE_MODULES := ${CURDIR}/node_modules
 
 node_modules: package.json pnpm-lock.yaml
-	pnpm install && touch ${NODE_MODULES}
+	[ -n "${NO_INSTALL}" ] || pnpm install
+	touch ${NODE_MODULES}
 
 .PHONY: clean
 clean:

diff --git a/Makefile.release b/Makefile.release
@@ -33,7 +33,7 @@ build: build-web copy-config
 
 .PHONY: build-web
 build-web:
-	$(PNPM) install
+	[ -n "${NO_INSTALL}" ] || $(PNPM) install
 	$(PNPM) check:types
 	$(PNPM) build
 

diff --git a/package.json b/package.json
@@ -42,6 +42,7 @@
     "vue": "3.3.4"
   },
   "peerDependencies": {
+    "@uppy/core": "*",
     "caf": "*",
     "portal-vue": "3.0.0",
     "uuid": "*",
@@ -121,7 +122,7 @@
   "engines": {
     "node": ">=16"
   },
-  "packageManager": "pnpm@8.6.2",
+  "packageManager": "pnpm@8.10.5",
   "volta": {
     "node": "16.20.0"
   },