Merge pull request #4892 from owncloud/pnpm-2

[full-ci] Build idp and settings frontends with pnpm

services/settings/.npmrc

@@ -0,0 +1,3 @@
+auto-install-peers=true
+
+hoist-pattern[]=*babel*

services/settings/Makefile

@@ -37,17 +37,17 @@ include ../../.make/generate.mk
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
 
 .PHONY: ci-node-generate
-ci-node-generate: yarn-build
+ci-node-generate: pnpm-build
 
-.PHONY: yarn-build
-yarn-build: node_modules
-	yarn lint
-	yarn test
-	yarn build
+.PHONY: pnpm-build
+pnpm-build: node_modules
+	pnpm lint
+	pnpm test
+	pnpm build
 
 .PHONY: node_modules
 node_modules:
-	yarn install --immutable
+	pnpm install
 
 ############ protobuf ############
 include ../../.make/protobuf.mk
@@ -58,9 +58,9 @@ protobuf: buf-generate
 ############ licenses ############
 .PHONY: ci-node-check-licenses
 ci-node-check-licenses: node_modules
-	yarn licenses:check
+	pnpm licenses:check
 
 .PHONY: ci-node-save-licenses
 ci-node-save-licenses: node_modules
-	yarn licenses:csv
-	yarn licenses:save
+	pnpm licenses:csv
+	pnpm licenses:save

services/settings/package.json

@@ -15,7 +15,7 @@
     "acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\"",
     "build": "rollup -c",
     "generate-api": "node node_modules/swagger-vue-generator/bin/generate-api.js --package-version v0 --source pkg/proto/v0/settings.swagger.json --moduleName settings --destination ui/client/settings/index.js",
-    "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'ocis-settings@0.0.0'",
+    "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'ocis-settings@0.0.0;owncloud-design-system@13.1.0'",
     "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../third-party-licenses/node/settings/third-party-licenses.csv",
     "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../third-party-licenses/node/settings/third-party-licenses",
     "lint": "eslint 'ui/**/*.{js,ts,vue}' --color",
@@ -47,10 +47,11 @@
     "@babel/plugin-proposal-export-default-from": "^7.16.7",
     "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
     "@babel/plugin-syntax-dynamic-import": "^7.7.4",
-    "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/polyfill": "^7.10.1",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.18.6",
     "@babel/register": "^7.17.7",
+    "@babel/runtime": "^7.19.4",
     "@cucumber/cucumber": "^7.3.2",
     "@cucumber/pretty-formatter": "^1.0.0",
     "@erquhart/rollup-plugin-node-builtins": "^2.1.5",
@@ -73,6 +74,7 @@
     "join-path": "^1.1.1",
     "ldapjs": "^2.3.2",
     "license-checker-rseidelsohn": "^3.1.0",
+    "lodash": "^4.17.21",
     "nightwatch": "1.7.11",
     "nightwatch-api": "3.0.2",
     "node-fetch": "^2.6.7",

services/settings/reflex.conf

@@ -2,4 +2,4 @@
 -r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-settings-debug && bin/ocis-settings-debug --log-level debug server --debug-pprof --debug-zpages --asset-path assets/'
 
 # frontend
--r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'yarn build && make generate'
+-r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'pnpm build && make generate'

services/settings/ui/app.js

@@ -1,4 +1,3 @@
-import 'regenerator-runtime/runtime'
 import SettingsApp from './components/SettingsApp.vue'
 import store from './store'
 import translations from './../l10n/translations.json'

services/settings/ui/tests/run-acceptance-test.sh

@@ -46,7 +46,7 @@ export SERVER_HOST=${SERVER_HOST:-https://localhost:9200}
 export BACKEND_HOST=${BACKEND_HOST:-https://localhost:9200}
 export TEST_TAGS=${TEST_TAGS:-"not @skip"}
 
-yarn run acceptance-tests "$1"
+pnpm run acceptance-tests "$1"
 
 status=$?
 exit $status