Skip to content

Commit

Permalink
Merge pull request #16151 from mshima/skip_ci-deps
Browse files Browse the repository at this point in the history
Adjust dependencies.
  • Loading branch information
mshima authored Sep 5, 2021
2 parents af5a826 + a6e0972 commit 2a8724d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 196 deletions.
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ updates:
ignore:
# Must match @angular-devkit/build-webpack dependency https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/package.json#L16
- dependency-name: 'webpack'
# https://github.com/ng-bootstrap/ng-bootstrap/issues/3899
- dependency-name: 'bootstrap'
versions: ['>=5']

- package-ecosystem: 'npm'
directory: '/generators/common/templates/'
Expand Down Expand Up @@ -56,6 +59,10 @@ updates:
labels:
- 'theme: react'
- 'theme: dependencies'
ignore:
# https://github.com/reactstrap/reactstrap/issues/1748
- dependency-name: 'bootstrap'
versions: ['>=5']

- package-ecosystem: 'npm'
directory: '/generators/client/templates/vue/'
Expand All @@ -66,6 +73,13 @@ updates:
labels:
- 'theme: vue'
- 'theme: dependencies'
ignore:
# vue-cli peer-deps https://github.com/vuejs/vue-cli/issues/6374
- dependency-name: 'eslint'
versions: ['>=7']
# https://github.com/bootstrap-vue/bootstrap-vue/issues/5507
- dependency-name: 'bootstrap'
versions: ['>=5']

- package-ecosystem: 'github-actions'
directory: '/'
Expand Down
1 change: 0 additions & 1 deletion generators/client/templates/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
"webpack-merge": "5.8.0",
"workbox-webpack-plugin": "6.2.4",
"vue-jest": "3.0.7",
"vue-template-compiler": "2.6.12",
"vue-loader": "15.9.8"
}
}
2 changes: 1 addition & 1 deletion generators/client/templates/vue/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"url-loader": "<%= dependabotPackageJson.devDependencies['url-loader'] %>",
"vue-jest": "<%= dependabotPackageJson.devDependencies['vue-jest'] %>",
"vue-loader": "<%= dependabotPackageJson.devDependencies['vue-loader'] %>",
"vue-template-compiler": "<%= dependabotPackageJson.devDependencies['vue-template-compiler'] %>",
"vue-template-compiler": "<%= dependabotPackageJson.dependencies['vue'] %>",
"webpack": "<%= dependabotPackageJson.devDependencies['webpack'] %>",
"webpack-bundle-analyzer": "<%= dependabotPackageJson.devDependencies['webpack-bundle-analyzer'] %>",
"webpack-cli": "<%= dependabotPackageJson.devDependencies['webpack-cli'] %>",
Expand Down
192 changes: 0 additions & 192 deletions package-lock.json

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

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
"didyoumean": "1.2.2",
"ejs": "3.1.6",
"faker": "5.5.3",
"find-up": "5.0.0",
"glob": "7.1.7",
"gulp-filter": "7.0.0",
"insight": "0.11.1",
Expand All @@ -98,7 +97,6 @@
"mem-fs-editor": "9.3.0",
"minimatch": "3.0.4",
"normalize-path": "3.0.0",
"ora": "5.4.1",
"os-locale": "5.0.0",
"p-queue": "6.6.2",
"parse-gitignore": "1.0.1",
Expand Down

0 comments on commit 2a8724d

Please sign in to comment.