sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4892 from owncloud/pnpm-2

Browse Source 
[full-ci] Build idp and settings frontends with pnpm
This commit is contained in:
Benedikt Kulmann
2022-10-27 10:35:12 +02:00
committed by GitHub
parent 8599b93816 8d342851d7
commit 2b27b0c8bf
27 changed files with 22001 additions and 25959 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.star
+3 -1
View File
@@ -1090,7 +1090,8 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
# TODO: settings/package.json has all the acceptance test dependencies # TODO: settings/package.json has all the acceptance test dependencies
# they shouldn't be needed since we could also use them from web:/tests/acceptance/package.json # they shouldn't be needed since we could also use them from web:/tests/acceptance/package.json
"cd %s/services/settings" % dirs["base"], "cd %s/services/settings" % dirs["base"],
"retry -t 3 'yarn install --immutable'", "pnpm config set store-dir ./.pnpm-store",
"retry -t 3 'pnpm install'",
"make test-acceptance-webui", "make test-acceptance-webui",
], ],
"volumes": [{ "volumes": [{
@@ -1817,6 +1818,7 @@ def makeNodeGenerate(module):
"CHROMEDRIVER_SKIP_DOWNLOAD": "true", # install fails on arm and chromedriver is a test only dependency "CHROMEDRIVER_SKIP_DOWNLOAD": "true", # install fails on arm and chromedriver is a test only dependency
}, },
"commands": [ "commands": [
"pnpm config set store-dir ./.pnpm-store",
"retry -t 3 '%s ci-node-generate'" % (make), "retry -t 3 '%s ci-node-generate'" % (make),
], ],
"volumes": [stepVolumeGo], "volumes": [stepVolumeGo],
Dockerfile
+2 -2
View File
@@ -1,6 +1,6 @@
# Please use this Dockerfile only if # Please use this Dockerfile only if
# you want to build an image from source without # you want to build an image from source without
# Yarn and Go installed on your dev machine. # pnpm and Go installed on your dev machine.
# You can build oCIS using this Dockerfile # You can build oCIS using this Dockerfile
# by running following command: # by running following command:
@@ -10,7 +10,7 @@
# following command instead: # following command instead:
# `make -C ocis dev-docker` # `make -C ocis dev-docker`
# It will build a `owncloud/ocis:dev` image for you # It will build a `owncloud/ocis:dev` image for you
# and use your local Yarn and Go caches and therefore # and use your local pnpm and Go caches and therefore
# is a lot faster than the build steps below. # is a lot faster than the build steps below.
changelog/unreleased/change-build-service-frontends-with-pnpm
+9
View File
@@ -0,0 +1,9 @@
Change: Build service frontends with pnpm instead of yarn
We changed the Node.js packager from Yarn to pnpm to make it more consistent with the main Web repo.
pnpm offers better package isolation and prevents a whole class of errors.
This is only relevant for developers.
https://github.com/owncloud/ocis/pull/4878
https://github.com/owncloud/web/pull/7835
docs/ocis/development/getting-started.md
+1 -1
View File
@@ -17,7 +17,7 @@ So we are trying to reflect this in the tooling. It should be kept simple and qu
Besides standard development tools like git and a text editor, you need the following software for development: Besides standard development tools like git and a text editor, you need the following software for development:
- Go >= v1.18 ([install instructions](https://golang.org/doc/install)) - Go >= v1.18 ([install instructions](https://golang.org/doc/install))
- Yarn ([install instructions](https://classic.yarnpkg.com/en/docs/install)) - pnpm ([install instructions](https://pnpm.io/installation))
- docker ([install instructions](https://docs.docker.com/get-docker/)) - docker ([install instructions](https://docs.docker.com/get-docker/))
- docker-compose ([install instructions](https://docs.docker.com/compose/install/)) - docker-compose ([install instructions](https://docs.docker.com/compose/install/))
docs/services/idp/theming.md
+1 -1
View File
@@ -43,7 +43,7 @@ Every image placed in `idp/ui/src/images` can be directly import into components
If you need to edit or add new locales, you can do so with json files in the `idp/ui/src/locales` folder. If adding new locale, make sure to add it also in the `index.js` file in the same folder. If you need to edit or add new locales, you can do so with json files in the `idp/ui/src/locales` folder. If adding new locale, make sure to add it also in the `index.js` file in the same folder.
## Building assets ## Building assets
In order to build all assets, run `yarn build` in the `idp` folder. This script will compile all assets and output them into `idp/assets` folder. In order to build all assets, run `pnpm build` in the `idp` folder. This script will compile all assets and output them into `idp/assets` folder.
At this point, you have two possible ways how to deploy your new theme: At this point, you have two possible ways how to deploy your new theme:
- run `make generate` in the root folder of your oCIS clone and generate the new assets - run `make generate` in the root folder of your oCIS clone and generate the new assets
docs/services/settings/releasing.md
+1 -1
View File
@@ -10,7 +10,7 @@ geekdocFilePath: releasing.md
## Requirements ## Requirements
You need a working installation of [the Go programming language](https://golang.org/), [the Node runtime](https://nodejs.org/) and [the Yarn package manager](https://yarnpkg.com/) installed to build the assets for a working release. You need a working installation of [the Go programming language](https://golang.org/), [the Node runtime](https://nodejs.org/) and [the pnpm package manager](https://pnpm.io) installed to build the assets for a working release.
## Releasing ## Releasing
docs/services/settings/tests.md
+3 -3
View File
@@ -10,7 +10,7 @@ geekdocFilePath: tests.md
## Requirements ## Requirements
You need a working installation of [the Go programming language](https://golang.org/), [the Node runtime](https://nodejs.org/) and [the Yarn package manager](https://yarnpkg.com/) installed to run the acceptance tests. You may also want to use [Docker](https://www.docker.com/) to start the necessary services in their respective containers. You need a working installation of [the Go programming language](https://golang.org/), [the Node runtime](https://nodejs.org/) and [the pnpm package manager](https://pnpm.io/) installed to run the acceptance tests. You may also want to use [Docker](https://www.docker.com/) to start the necessary services in their respective containers.
## Acceptance Tests ## Acceptance Tests
@@ -23,7 +23,7 @@ Make sure you've cloned the [web frontend repo](https://github.com/owncloud/web/
Install dependencies and bundle the frontend with a watcher by running Install dependencies and bundle the frontend with a watcher by running
```bash ```bash
yarn && yarn build:w pnpm install && pnpm build:w
``` ```
If you skip the step above, the currently bundled frontend from the oCIS binary will be used. If you skip the step above, the currently bundled frontend from the oCIS binary will be used.
@@ -43,7 +43,7 @@ docker compose up selenium middleware-ocis vnc
Navigate into the settings service via `cd ../settings/` and install dependencies and build the bundled settings UI with a watcher by running Navigate into the settings service via `cd ../settings/` and install dependencies and build the bundled settings UI with a watcher by running
```bash ```bash
yarn && yarn watch pnpm install && pnpm watch
``` ```
#### Start oCIS from binary #### Start oCIS from binary
services/idp/.gitignore
+1 -17
View File
@@ -1,17 +1 @@
# yarn2 with Zero-Installs: https://yarnpkg.com/features/zero-installs .pnpm-store/
#.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.*
services/idp/.npmrc
+2
View File
@@ -0,0 +1,2 @@
auto-install-peers=true
public-hoist-pattern[]=*
services/idp/.yarn/releases/yarn-3.1.0.cjs
Vendored
-768
View File
File diff suppressed because one or more lines are too long
services/idp/.yarnrc.yml
-6
View File
@@ -1,6 +0,0 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-3.1.0.cjs
enableScripts: false
enableTelemetry: false
services/idp/Makefile
+10 -10
View File
@@ -30,7 +30,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
ci-node-generate: assets ci-node-generate: assets
.PHONY: assets .PHONY: assets
assets: yarn-build \ assets: pnpm-build \
assets/identifier/static \ assets/identifier/static \
assets/identifier/static/logo.svg \ assets/identifier/static/logo.svg \
assets/identifier/static/favicon.ico assets/identifier/static/favicon.ico
@@ -50,22 +50,22 @@ FAVICON_URL = https://raw.githubusercontent.com/owncloud/assets/main/favicon.ico
assets/identifier/static/favicon.ico: assets/identifier/static/favicon.ico:
curl --fail -o assets/identifier/static/favicon.ico ${FAVICON_URL} curl --fail -o assets/identifier/static/favicon.ico ${FAVICON_URL}
.PHONY: yarn-build .PHONY: pnpm-build
yarn-build: node_modules pnpm-build: node_modules
#yarn lint #TODO: activate #pnpm lint #TODO: activate
#yarn test #TODO: activate #pnpm test #TODO: activate
yarn build pnpm build
.PHONY: node_modules .PHONY: node_modules
node_modules: node_modules:
yarn install --immutable pnpm install
############ licenses ############ ############ licenses ############
.PHONY: ci-node-check-licenses .PHONY: ci-node-check-licenses
ci-node-check-licenses: node_modules ci-node-check-licenses: node_modules
yarn licenses:check pnpm licenses:check
.PHONY: ci-node-save-licenses .PHONY: ci-node-save-licenses
ci-node-save-licenses: node_modules ci-node-save-licenses: node_modules
yarn licenses:csv pnpm licenses:csv
yarn licenses:save pnpm licenses:save
services/idp/i18n/Makefile
+6 -6
View File
@@ -1,6 +1,6 @@
# Tools # Tools
YARN ?= yarn PNPM ?= pnpm
MSGCAT ?= msgcat MSGCAT ?= msgcat
MSGMERGE ?= msgmerge MSGMERGE ?= msgmerge
MSGFMT ?= msgfmt MSGFMT ?= msgfmt
@@ -19,12 +19,12 @@ build: json
json: json:
@for po in $(POS); do \ @for po in $(POS); do \
lang=$$(echo $$po | sed "s/\.po//"); \ lang=$$(echo $$po | sed "s/\.po//"); \
$(YARN) i18next-conv -K --skipUntranslated -l $$lang -s ../i18n/$$po -t ../src/locales/$$lang/translation.json; \ $(PNPM) i18next-conv -K --skipUntranslated -l $$lang -s i18n/$$po -t ../src/locales/$$lang/translation.json; \
done done
$(YARN) node ../i18n/build-json.js ../src/locales/locales.json $(POS) $(PNPM) node i18n/build-json.js ../src/locales/locales.json $(POS)
dev-translation.json: FORCE dev-translation.json: FORCE
$(YARN) i18next --fail-on-warnings $(PNPM) i18next --fail-on-warnings
.PHONY: extract .PHONY: extract
extract: pot extract: pot
@@ -34,8 +34,8 @@ pot: dev-translation.json
@tmpfile1=$(shell mktemp).po; \ @tmpfile1=$(shell mktemp).po; \
tmpfile2=$(shell mktemp).po; \ tmpfile2=$(shell mktemp).po; \
trap 'rm -f "$$tmpfile1" "$$tmpfile2"' EXIT; \ trap 'rm -f "$$tmpfile1" "$$tmpfile2"' EXIT; \
$(YARN) i18next-conv --project "LibreGraph Connect Identifier" -K -l en -s i18n/dev-translation.json -t $$tmpfile1; \ $(PNPM) i18next-conv --project "LibreGraph Connect Identifier" -K -l en -s i18n/dev-translation.json -t $$tmpfile1; \
$(YARN) node i18n/build-pot.js $$tmpfile1 $$tmpfile2; \ $(PNPM) node i18n/build-pot.js $$tmpfile1 $$tmpfile2; \
$(MSGCAT) --no-wrap -o $(POT) $$tmpfile2 $(MSGCAT) --no-wrap -o $(POT) $$tmpfile2
.PHONY: merge .PHONY: merge
services/idp/pnpm-lock.yaml
Generated
+12312
View File
File diff suppressed because it is too large Load Diff
services/idp/scripts/build.js
+2 -2
View File
@@ -30,7 +30,7 @@ const printBuildError = require('react-dev-utils/printBuildError');
const measureFileSizesBeforeBuild = const measureFileSizesBeforeBuild =
FileSizeReporter.measureFileSizesBeforeBuild; FileSizeReporter.measureFileSizesBeforeBuild;
const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild; const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
const useYarn = fs.existsSync(paths.yarnLockFile); const usePnpm = fs.existsSync(paths.pnpmLockFile);
// These sizes are pretty large. We'll warn for bundles exceeding them. // These sizes are pretty large. We'll warn for bundles exceeding them.
const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024; const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
@@ -102,7 +102,7 @@ checkBrowsers(paths.appPath, isInteractive)
publicUrl, publicUrl,
publicPath, publicPath,
buildFolder, buildFolder,
useYarn usePnpm
); );
}, },
err => { err => {
services/idp/scripts/start.js
+2 -2
View File
@@ -32,7 +32,7 @@ const paths = require('../ui_config/paths');
const configFactory = require('../ui_config/webpack.config'); const configFactory = require('../ui_config/webpack.config');
const createDevServerConfig = require('../ui_config/webpackDevServer.config'); const createDevServerConfig = require('../ui_config/webpackDevServer.config');
const useYarn = fs.existsSync(paths.yarnLockFile); const usePnpm = fs.existsSync(paths.pnpmLockFile);
const isInteractive = process.stdout.isTTY; const isInteractive = process.stdout.isTTY;
// Warn and crash if required files are missing // Warn and crash if required files are missing
@@ -93,7 +93,7 @@ checkBrowsers(paths.appPath, isInteractive)
config, config,
devSocket, devSocket,
urls, urls,
useYarn, usePnpm,
useTypeScript, useTypeScript,
tscCompileOnError, tscCompileOnError,
webpack, webpack,
services/idp/ui_config/paths.js
+1 -1
View File
@@ -77,7 +77,7 @@ module.exports = {
appSrc: resolveApp('src'), appSrc: resolveApp('src'),
appTsConfig: resolveApp('tsconfig.json'), appTsConfig: resolveApp('tsconfig.json'),
appJsConfig: resolveApp('jsconfig.json'), appJsConfig: resolveApp('jsconfig.json'),
yarnLockFile: resolveApp('yarn.lock'), pnpmLockFile: resolveApp('pnpm-lock.yaml'),
testsSetup: resolveModule(resolveApp, 'src/setupTests'), testsSetup: resolveModule(resolveApp, 'src/setupTests'),
proxySetup: resolveApp('src/setupProxy.js'), proxySetup: resolveApp('src/setupProxy.js'),
appNodeModules: resolveApp('node_modules'), appNodeModules: resolveApp('node_modules'),
services/idp/yarn.lock
-16009
View File
File diff suppressed because it is too large Load Diff
services/settings/.npmrc
+3
View File
@@ -0,0 +1,3 @@
auto-install-peers=true
hoist-pattern[]=*babel*
services/settings/.yarn/releases/yarn-stable-temp.cjs
Vendored
-768
View File
File diff suppressed because one or more lines are too long
services/settings/Makefile
+10 -10
View File
@@ -37,17 +37,17 @@ include ../../.make/generate.mk
ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
.PHONY: ci-node-generate .PHONY: ci-node-generate
ci-node-generate: yarn-build ci-node-generate: pnpm-build
.PHONY: yarn-build .PHONY: pnpm-build
yarn-build: node_modules pnpm-build: node_modules
yarn lint pnpm lint
yarn test pnpm test
yarn build pnpm build
.PHONY: node_modules .PHONY: node_modules
node_modules: node_modules:
yarn install --immutable pnpm install
############ protobuf ############ ############ protobuf ############
include ../../.make/protobuf.mk include ../../.make/protobuf.mk
@@ -58,9 +58,9 @@ protobuf: buf-generate
############ licenses ############ ############ licenses ############
.PHONY: ci-node-check-licenses .PHONY: ci-node-check-licenses
ci-node-check-licenses: node_modules ci-node-check-licenses: node_modules
yarn licenses:check pnpm licenses:check
.PHONY: ci-node-save-licenses .PHONY: ci-node-save-licenses
ci-node-save-licenses: node_modules ci-node-save-licenses: node_modules
yarn licenses:csv pnpm licenses:csv
yarn licenses:save pnpm licenses:save
services/settings/package.json
+5 -3
View File
@@ -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}\"", "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", "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", "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: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", "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", "lint": "eslint 'ui/**/*.{js,ts,vue}' --color",
@@ -47,10 +47,11 @@
"@babel/plugin-proposal-export-default-from": "^7.16.7", "@babel/plugin-proposal-export-default-from": "^7.16.7",
"@babel/plugin-proposal-object-rest-spread": "^7.15.6", "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
"@babel/plugin-syntax-dynamic-import": "^7.7.4", "@babel/plugin-syntax-dynamic-import": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.15.0", "@babel/plugin-transform-runtime": "^7.19.6",
"@babel/polyfill": "^7.10.1", "@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.18.6", "@babel/preset-env": "^7.18.6",
"@babel/register": "^7.17.7", "@babel/register": "^7.17.7",
"@babel/runtime": "^7.19.4",
"@cucumber/cucumber": "^7.3.2", "@cucumber/cucumber": "^7.3.2",
"@cucumber/pretty-formatter": "^1.0.0", "@cucumber/pretty-formatter": "^1.0.0",
"@erquhart/rollup-plugin-node-builtins": "^2.1.5", "@erquhart/rollup-plugin-node-builtins": "^2.1.5",
@@ -73,6 +74,7 @@
"join-path": "^1.1.1", "join-path": "^1.1.1",
"ldapjs": "^2.3.2", "ldapjs": "^2.3.2",
"license-checker-rseidelsohn": "^3.1.0", "license-checker-rseidelsohn": "^3.1.0",
"lodash": "^4.17.21",
"nightwatch": "1.7.11", "nightwatch": "1.7.11",
"nightwatch-api": "3.0.2", "nightwatch-api": "3.0.2",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.7",
services/settings/pnpm-lock.yaml
Generated
+9625
View File
File diff suppressed because it is too large Load Diff
services/settings/reflex.conf
+1 -1
View File
@@ -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/' -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 # 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
View File
@@ -1,4 +1,3 @@
import 'regenerator-runtime/runtime'
import SettingsApp from './components/SettingsApp.vue' import SettingsApp from './components/SettingsApp.vue'
import store from './store' import store from './store'
import translations from './../l10n/translations.json' import translations from './../l10n/translations.json'
services/settings/ui/tests/run-acceptance-test.sh
+1 -1
View File
@@ -46,7 +46,7 @@ export SERVER_HOST=${SERVER_HOST:-https://localhost:9200}
export BACKEND_HOST=${BACKEND_HOST:-https://localhost:9200} export BACKEND_HOST=${BACKEND_HOST:-https://localhost:9200}
export TEST_TAGS=${TEST_TAGS:-"not @skip"} export TEST_TAGS=${TEST_TAGS:-"not @skip"}
yarn run acceptance-tests "$1" pnpm run acceptance-tests "$1"
status=$? status=$?
exit $status exit $status
services/settings/yarn.lock
-8345
View File
File diff suppressed because it is too large Load Diff