chore: bump pnpm to version 8.10.5 (#10051)

Signed-off-by: Swikriti Tripathi <[email protected]>
owncloud · Nov 23, 2023 · 67d59ce · 67d59ce
1 parent 822cdf0
commit 67d59ce
Show file tree

Hide file tree

Showing 51 changed files with 115 additions and 159 deletions.
diff --git a/.drone.star b/.drone.star
@@ -387,6 +387,7 @@ def pnpmCache(ctx):
         },
         "steps": skipIfUnchanged(ctx, "cache") +
                  installPnpm() +
+                 installPlaywright() +
                  rebuildBuildArtifactCache(ctx, "pnpm", ".pnpm-store") +
                  rebuildBuildArtifactCache(ctx, "playwright", ".playwright"),
         "trigger": {
@@ -581,11 +582,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",
                      ],
                  }] +
@@ -741,6 +745,7 @@ def e2eTests(ctx):
                 restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + \
                 restoreBuildArtifactCache(ctx, "playwright", ".playwright") + \
                 installPnpm() + \
+                installPlaywright() + \
                 restoreBuildArtifactCache(ctx, "web-dist", "dist") + \
                 copyFilesForUpload()
 
@@ -1013,12 +1018,22 @@ 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",
         ],
     }]
 
@@ -1389,13 +1404,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": [{
@@ -1655,15 +1668,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
@@ -41,6 +41,7 @@
     "vue": "3.3.4"
   },
   "peerDependencies": {
+    "@uppy/core": "3.3.0",
     "caf": "*",
     "portal-vue": "*",
     "uuid": "*",
@@ -61,7 +62,7 @@
     "@ownclouders/eslint-config": "workspace:*",
     "@ownclouders/prettier-config": "workspace:*",
     "@ownclouders/tsconfig": "workspace:*",
-    "@playwright/test": "1.33.0",
+    "@playwright/test": "1.39.0",
     "@rollup/plugin-inject": "5.0.3",
     "@types/jest": "29.5.1",
     "@types/jest-axe": "3.5.5",
@@ -98,7 +99,6 @@
     "node-fetch": "2.6.11",
     "pino": "7.11.0",
     "pino-pretty": "7.6.1",
-    "playwright": "1.33.0",
     "postcss": "8.4.20",
     "qs": "6.11.1",
     "react": "17.0.2",
@@ -120,7 +120,7 @@
   "engines": {
     "node": ">=16"
   },
-  "packageManager": "pnpm@8.6.2",
+  "packageManager": "pnpm@8.10.5",
   "volta": {
     "node": "16.20.0"
   },