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

Jump to bottom

Avoid accidental removal of some frontend dependencies #7140

Merged
merged 2 commits into from
May 1, 2021
Merged

Avoid accidental removal of some frontend dependencies #7140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aad4fdb
Fix missing package and upgrade
jordisala1991 May 1, 2021
4bbc9c3
Add more comments to explain assets
jordisala1991 May 1, 2021
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
8 changes: 8 additions & 0 deletions assets/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import '../scss/app.scss';

// Require jQuery normally
import $ from 'jquery';

// jQuery scrollTo is not directly used in SonataAdmin
// but it is used on SonataPage, SonataArticle and SonataDashboard
import 'jquery.scrollto';

// Only using sortable widget from jQuery UI library
Expand All @@ -23,6 +26,9 @@ import 'moment';
// Eonasdan Bootstrap DateTimePicker in its version 3 does not
// provide the scss or plain css, it only provides the less version
// of its source files, that's why it is not included it via npm.
//
// Eonasdan Bootstrap DateTimePicker is not directly used in SonataAdmin
// but it is used on form-extensions package
import '../vendor/bootstrap-datetimepicker.min';
import 'jquery-form';

Expand All @@ -34,6 +40,8 @@ import 'x-editable/dist/bootstrap3-editable/js/bootstrap-editable';
import 'select2/dist/js/select2.full';
import 'admin-lte';
import 'icheck';

// jQuery SlimScroll is used in AdminLTE v2
import 'jquery-slimscroll';

// No Framework Waypoints version and sticky shortcut
Expand Down
3 changes: 3 additions & 0 deletions assets/scss/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
// Eonasdan Bootstrap DateTimePicker in its version 3 does not
// provide the scss or plain css, it only provides the less version
// of its source files, that's why it is not included it via npm.
//
// Eonasdan Bootstrap DateTimePicker is not directly used in SonataAdmin
// but it is used on form-extensions package
@import "../vendor/bootstrap-datetimepicker.min.css";

// Only use sortable widget from jQuery UI library
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@
"eslint-plugin-header": "^3.1",
"eslint-plugin-import": "^2.22",
"file-loader": "^6.0",
"postcss": "^8.2",
"postcss-loader": "^5.2",
"sass": "^1.32",
"sass-loader": "^11.0",
"stylelint": "^13.12",
"stylelint-config-standard": "^21.0",
"stylelint-config-standard": "^22.0",
"stylelint-order": "^4.1",
"stylelint-scss": "^3.19",
"stylelint-webpack-plugin": "^2.1"
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5906,7 +5906,7 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2
source-map "^0.6.1"
supports-color "^6.1.0"

postcss@^8.2.10:
postcss@^8.2, postcss@^8.2.10:
version "8.2.13"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f"
integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==
Expand Down Expand Up @@ -6895,17 +6895,17 @@ stylehacks@^4.0.0:
postcss "^7.0.0"
postcss-selector-parser "^3.0.0"

stylelint-config-recommended@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-4.0.0.tgz#665a0034065e6704d5032ba51bf4efa37d328ef9"
integrity sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ==
stylelint-config-recommended@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz#fb5653f495a60b4938f2ad3e77712d9e1039ae78"
integrity sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA==

stylelint-config-standard@^21.0:
version "21.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-21.0.0.tgz#4942cfa27301eb6702fa8fc46a44da35d1a5cfd7"
integrity sha512-Yf6mx5oYEbQQJxWuW7X3t1gcxqbUx52qC9SMS3saC2ruOVYEyqmr5zSW6k3wXflDjjFrPhar3kp68ugRopmlzg==
stylelint-config-standard@^22.0:
version "22.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-22.0.0.tgz#c860be9a13ebbc1b084456fa10527bf13a44addf"
integrity sha512-uQVNi87SHjqTm8+4NIP5NMAyY/arXrBgimaaT7skvRfE9u3JKXRK9KBkbr4pVmeciuCcs64kAdjlxfq6Rur7Hw==
dependencies:
stylelint-config-recommended "^4.0.0"
stylelint-config-recommended "^5.0.0"

stylelint-order@^4.1:
version "4.1.0"
Expand Down