Skip to content

Commit

Permalink
Merge pull request #903 from nextcloud/dependabot/npm_and_yarn/nextcl…
Browse files Browse the repository at this point in the history
…oud/router-3.0.0

Chore(deps): Bump @nextcloud/router from 2.2.1 to 3.0.0
  • Loading branch information
max-nextcloud authored Feb 12, 2024
2 parents bedecb8 + c0f1472 commit faf6874
Show file tree
Hide file tree
Showing 13 changed files with 165 additions and 47 deletions.
4 changes: 2 additions & 2 deletions js/terms_of_service-admin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/terms_of_service-admin.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/terms_of_service-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/terms_of_service-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/terms_of_service-registration.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/terms_of_service-registration.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/terms_of_service-user.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/terms_of_service-user.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

134 changes: 103 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"@nextcloud/axios": "^2.3.0",
"@nextcloud/dialogs": "^5.1.1",
"@nextcloud/router": "^2.2.1",
"@nextcloud/router": "^3.0.0",
"@nextcloud/vue": "^8.6.2",
"vue": "^2.7.16",
"vue-frag": "^1.4.3",
Expand Down
46 changes: 46 additions & 0 deletions package.json.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"name": "terms_of_service",
"description": "Requires users to accept the terms of service before accessing data.",
"version": "2.3.2",
"author": "Joas Schilling <[email protected]>",
"license": "agpl",
"private": true,
"scripts": {
"build": "NODE_ENV=production webpack --progress --config webpack.js",
"dev": "NODE_ENV=development webpack --config webpack.js",
"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
"lint": "eslint --ext .js,.vue src",
"lint:fix": "eslint --ext .js,.vue src --fix",
"stylelint": "stylelint **/*.css **/*.scss **/*.vue",
"stylelint:fix": "stylelint **/*.css **/*.scss **/*.vue --fix"
},
"dependencies": {
"@nextcloud/axios": "^2.3.0",
"@nextcloud/dialogs": "^5.1.1",
<<<<<<< HEAD
"@nextcloud/router": "^2.2.1",
"@nextcloud/vue": "^8.6.2",
=======
"@nextcloud/router": "^3.0.0",
"@nextcloud/vue": "^8.6.1",
>>>>>>> c21015a (Chore(deps): Bump @nextcloud/router from 2.2.1 to 3.0.0)
"vue": "^2.7.16",
"vue-frag": "^1.4.3",
"vue-material-design-icons": "^5.3.0"
},
"browserslist": [
"extends @nextcloud/browserslist-config"
],
"engines": {
"node": "^20.0.0",
"npm": "^10.0.0"
},
"devDependencies": {
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^3.0.0",
"@nextcloud/eslint-config": "^8.3.0",
"@nextcloud/stylelint-config": "^2.4.0",
"@nextcloud/webpack-vue-config": "^6.0.1",
"vue-template-compiler": "^2.7.16"
}
}

0 comments on commit faf6874

Please sign in to comment.