Skip to content

Commit

Permalink
Revert "workaround intrusive warning due to deprecated bootstrap prop…
Browse files Browse the repository at this point in the history
…erty (#19159)" (#19200)

This reverts commit 2375fc3.
  • Loading branch information
mshima committed Jul 20, 2022
1 parent 2f6c4d4 commit b5f0f7a
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 29 deletions.
8 changes: 0 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ updates:
# Should match generated project node major version.
- dependency-name: '@types/node'
versions: ['>=17']
# Force autoprefixer@10.4.5 to workaround https://github.com/twbs/bootstrap/issues/36259
# Drop when bootstrap@5.2.0 or 5.1.4 is released
- dependency-name: 'autoprefixer'
versions: ['>=10.4.6']

- package-ecosystem: 'npm'
directory: '/generators/client/templates/vue/'
Expand All @@ -95,10 +91,6 @@ updates:
# Should match generated project node major version.
- dependency-name: '@types/node'
versions: ['>=17']
# Force autoprefixer@10.4.5 to workaround https://github.com/twbs/bootstrap/issues/36259
# Drop when bootstrap@5.2.0 or 5.1.4 is released
- dependency-name: 'autoprefixer'
versions: ['>=10.4.6']

- package-ecosystem: 'github-actions'
directory: '/'
Expand Down
5 changes: 0 additions & 5 deletions generators/client/templates/angular/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@
"webpack-notifier": "<%= dependabotPackageJson.devDependencies['webpack-notifier'] %>"
},
"overrides": {
<%#
Force autoprefixer@10.4.5 to workaround https://github.com/twbs/bootstrap/issues/36259
Drop when bootstrap@5.2.0 or 5.1.4 is released
_%>
"autoprefixer": "10.4.5",
"webpack": "<%= dependabotPackageJson.devDependencies['webpack'] %>"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion generators/client/templates/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@types/webpack-env": "1.17.0",
"@typescript-eslint/eslint-plugin": "5.30.7",
"@typescript-eslint/parser": "5.30.7",
"autoprefixer": "10.4.5",
"autoprefixer": "10.4.7",
"browser-sync": "2.27.10",
"browser-sync-webpack-plugin": "2.3.0",
"copy-webpack-plugin": "11.0.0",
Expand Down
7 changes: 0 additions & 7 deletions generators/client/templates/react/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,6 @@
"webapp:test": "<%= clientPackageManager %> run test --",
"webpack-dev-server": "webpack serve"
},
<%#
Force autoprefixer@10.4.5 to workaround https://github.com/twbs/bootstrap/issues/36259
Drop when bootstrap@5.2.0 or 5.1.4 is released
_%>
"overrides": {
"autoprefixer": "10.4.5"
},
"jestSonar": {
"reportPath": "<%= BUILD_DIR %>test-results/jest",
"reportFile": "TESTS-results-sonar.xml"
Expand Down
2 changes: 1 addition & 1 deletion generators/client/templates/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@vue/vue2-jest": "28.0.1",
"@vue/test-utils": "1.3.0",
"axios-mock-adapter": "1.21.1",
"autoprefixer": "10.4.5",
"autoprefixer": "10.4.7",
"browser-sync-webpack-plugin": "2.3.0",
"copy-webpack-plugin": "11.0.0",
"css-loader": "6.7.1",
Expand Down
7 changes: 0 additions & 7 deletions generators/client/templates/vue/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,6 @@
"webpack-dev-server": "webpack serve --config webpack/webpack.common.js",
"webpack": "webpack --config webpack/webpack.common.js"
},
<%#
Force autoprefixer@10.4.5 to workaround https://github.com/twbs/bootstrap/issues/36259
Drop when bootstrap@5.2.0 or 5.1.4 is released
_%>
"overrides": {
"autoprefixer": "10.4.5"
},
"jestSonar": {
"reportPath": "<%= BUILD_DIR %>test-results/jest",
"reportFile": "TESTS-results-sonar.xml"
Expand Down

0 comments on commit b5f0f7a

Please sign in to comment.