Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] Update deps & bump web to v4.2.0 #2501

Merged
merged 1 commit into from
Sep 15, 2021
Merged

[full-ci] Update deps & bump web to v4.2.0 #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ CORE_COMMITID=370fd807e464dcc5cb9619a8890107424254dfa6
CORE_BRANCH=master

# The test runner source for UI tests
WEB_COMMITID=e44bf0c76d1811339ac58941130a411f420bd302
WEB_COMMITID=0e5a4b4990fc0edb69013122df42785774883e79
WEB_BRANCH=master
14 changes: 7 additions & 7 deletions accounts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"watch": "rollup -c -w",
"test": "echo 'Not implemented'",
"generate-api": "node node_modules/swagger-vue-generator/bin/generate-api.js --package-version v0 --source pkg/proto/v0/accounts.swagger.json --moduleName accounts --destination ui/client/accounts/index.js",
"acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format node_modules/cucumber-pretty -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}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\""
},
"devDependencies": {
"@babel/core": "^7.15.0",
"@babel/core": "^7.15.5",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-proposal-object-rest-spread": "^7.7.7",
Expand All @@ -29,16 +29,16 @@
"@babel/polyfill": "^7.10.1",
"@babel/preset-env": "^7.13.12",
"@babel/register": "^7.14.5",
"@cucumber/cucumber": "^7.3.1",
"@cucumber/pretty-formatter": "^1.0.0-alpha.1",
"@erquhart/rollup-plugin-node-builtins": "^2.1.5",
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-json": "^4.0.1",
"@rollup/plugin-replace": "^2.3.0",
"archiver": "^5.3.0",
"axios": "^0.21.1",
"core-js": "^3.16.1",
"axios": "^0.21.4",
"core-js": "^3.17.3",
"cross-env": "^7.0.3",
"cucumber": "^6.0.5",
"cucumber-pretty": ">=6.0.0",
"debounce": "^1.2.1",
"easygettext": "^2.17.0",
"eslint": "7.24.0",
Expand All @@ -52,7 +52,7 @@
"join-path": "^1.1.1",
"ldapjs": "^2.2.3",
"nightwatch": "1.5.1",
"nightwatch-api": "3.0.1",
"nightwatch-api": "3.0.2",
"nightwatch-vrt": "^0.2.10",
"node-fetch": "^2.6.1",
"qs": "^6.10.1",
Expand Down
6 changes: 3 additions & 3 deletions accounts/pkg/assets/embed.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion accounts/ui/tests/acceptance/stepDefinitions/accountsContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const assert = require('assert')
const { client } = require('nightwatch-api')
const { Given, When, Then } = require('cucumber')
const { Given, When, Then } = require('@cucumber/cucumber')

When('the user browses to the accounts page', function () {
return client.page.accountsPage().navigateAndWaitUntilMounted()
Expand Down
660 changes: 380 additions & 280 deletions accounts/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

0 ...og/unreleased/remove-onlyoffice-extension → ...unreleased/remove-onlyoffice-extension.md
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions changelog/unreleased/update-web-4.2.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Change: Update ownCloud Web to v4.2.0

Tags: web

We updated ownCloud Web to v4.2.0. Please refer to the changelog (linked) for details on the web release.

https://github.com/owncloud/ocis/pull/2501
https://github.com/owncloud/web/releases/tag/v4.2.0
2 changes: 1 addition & 1 deletion idp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"homepage": ".",
"dependencies": {
"@babel/core": "7.13.10",
"@babel/core": "^7.15.5",
"@material-ui/core": "^4.8.0",
"@material-ui/icons": "^4.5.0",
"@svgr/webpack": "5.5.0",
Expand Down
206 changes: 176 additions & 30 deletions idp/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions settings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"watch": "rollup -c -w",
"test": "echo 'Not implemented'",
"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",
"acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format node_modules/cucumber-pretty -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}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\""
},
"devDependencies": {
"@babel/core": "^7.13.10",
"@babel/core": "^7.15.5",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-proposal-object-rest-spread": "^7.7.7",
Expand All @@ -29,16 +29,16 @@
"@babel/polyfill": "^7.10.1",
"@babel/preset-env": "^7.13.12",
"@babel/register": "^7.14.5",
"@cucumber/cucumber": "^7.3.1",
"@cucumber/pretty-formatter": "^1.0.0-alpha.1",
"@erquhart/rollup-plugin-node-builtins": "^2.1.5",
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-json": "^4.0.1",
"@rollup/plugin-replace": "^2.4.2",
"archiver": "^5.3.0",
"axios": "^0.21.1",
"core-js": "3.9.1",
"axios": "^0.21.4",
"core-js": "^3.17.3",
"cross-env": "^7.0.3",
"cucumber": "^6.0.5",
"cucumber-pretty": ">=6.0.0",
"debounce": "^1.2.1",
"easygettext": "^2.7.0",
"eslint": "7.22.0",
Expand All @@ -53,7 +53,7 @@
"ldapjs": "^2.2.4",
"lodash-es": "^4.17.21",
"nightwatch": "1.5.1",
"nightwatch-api": "3.0.1",
"nightwatch-api": "3.0.2",
"nightwatch-vrt": "^0.2.10",
"node-fetch": "^2.6.1",
"qs": "^6.10.1",
Expand Down
6 changes: 3 additions & 3 deletions settings/pkg/assets/embed.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/ui/tests/acceptance/stepDefinitions/settingsContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const assert = require('assert')
const path = require('path')
const fs = require('fs-extra')
const { client } = require('nightwatch-api')
const { Given, When, Then, After, Before } = require('cucumber')
const { Given, When, Then } = require('@cucumber/cucumber')
const languageHelper = require('../helpers/language')

const initialLanguageAssignments = []
Expand Down
Loading