Skip to content

Commit

Permalink
Node 18 and assets
Browse files Browse the repository at this point in the history
  • Loading branch information
rimi-itk committed Aug 3, 2023
1 parent 5a80bb3 commit b190e10
Show file tree
Hide file tree
Showing 11 changed files with 4,042 additions and 6,366 deletions.
12 changes: 12 additions & 0 deletions .markdownlintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
// @see https://github.com/DavidAnson/markdownlint/blob/main/schema/.markdownlint.jsonc
// MD013/line-length - Line length
"MD013": {
// Exclude code blocks
"code_blocks": false
}
}

// Local Variables:
// mode: json
// End:
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
## Upgrade from version 1.5.2

```sh
# Upgrade migrations
itkdev-docker-compose bin/console doctrine:migrations:list
itkdev-docker-compose bin/console doctrine:migrations:sync-metadata-storage
itkdev-docker-compose bin/console doctrine:migrations:version --add --all --no-interaction
itkdev-docker-compose bin/console doctrine:migrations:list
itkdev-docker-compose-server pull
itkdev-docker-compose-server up --detach --remove-orphans
itkdev-docker-compose-server exec phpfpm composer install --no-dev --no-scripts
Expand Down
3 changes: 2 additions & 1 deletion assets/admin/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

@import '~bootstrap/scss/buttons';
@import '~bootstrap/scss/forms';
@import '~bootstrap/scss/custom-forms';
// Removed in Bootstrap 5
// @import '~bootstrap/scss/custom-forms';
@import '~bootstrap/scss/tables';
@import '~bootstrap/scss/pagination';
@import '~bootstrap/scss/transitions';
Expand Down
3 changes: 2 additions & 1 deletion assets/admin/item/item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

@import '~bootstrap/scss/buttons';
@import '~bootstrap/scss/forms';
@import '~bootstrap/scss/custom-forms';
// Removed in Bootstrap 5
// @import '~bootstrap/scss/custom-forms';
@import '~bootstrap/scss/transitions';
@import '~bootstrap/scss/images';

Expand Down
3 changes: 2 additions & 1 deletion assets/app/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

@import '~bootstrap/scss/buttons';
@import '~bootstrap/scss/forms';
@import '~bootstrap/scss/custom-forms';
// Removed in Bootstrap 5
// @import '~bootstrap/scss/custom-forms';
@import '~bootstrap/scss/tables';
@import '~bootstrap/scss/pagination';
@import '~bootstrap/scss/transitions';
Expand Down
5 changes: 4 additions & 1 deletion assets/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
// Bootstrap configuration
@import '~bootstrap/scss/functions';
@import '~bootstrap/scss/variables';
@import '~bootstrap/scss/variables-dark';
@import '~bootstrap/scss/maps';
@import '~bootstrap/scss/mixins';
@import '~bootstrap/scss/root';
@import '~bootstrap/scss/reboot';
Expand Down Expand Up @@ -38,4 +40,5 @@
// @import '~bootstrap/scss/carousel';
// @import '~bootstrap/scss/spinners';
@import '~bootstrap/scss/utilities';
@import '~bootstrap/scss/print';
// Removed in Bootstrap 5
// @import '~bootstrap/scss/print';
3 changes: 2 additions & 1 deletion assets/partials/initSelect2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@import '~bootstrap/scss/mixins';
@import '~bootstrap/scss/variables';
@import '~select2/src/scss/core';
@import '~@ttskch/select2-bootstrap4-theme/src/layout';
// Replaced by select2-bootstrap-5-theme
// @import '~@ttskch/select2-bootstrap4-theme/src/layout';

// Modify BS-4 select 2 theme using different styleguide hence we disable our stylelint for
/* stylelint-disable */
Expand Down
3 changes: 2 additions & 1 deletion assets/security/login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@

@import '~bootstrap/scss/buttons';
@import '~bootstrap/scss/forms';
@import '~bootstrap/scss/custom-forms';
// Removed in Bootstrap 5
// @import '~bootstrap/scss/custom-forms';
2 changes: 1 addition & 1 deletion docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
- PHP_MEMORY_LIMIT=512M

node:
image: node:14
image: node:18
profiles:
- dev
networks:
Expand Down
52 changes: 29 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
{
"devDependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.28",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@symfony/webpack-encore": "^0.31.0",
"@ttskch/select2-bootstrap4-theme": "^1.4.0",
"acorn": "^7.2.0",
"bootstrap": "^4.4.1",
"core-js": "^3.0.0",
"eslint": "^6.0.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.20.2",
"@babel/core": "^7.17.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/preset-env": "^7.16.0",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@popperjs/core": "^2.11.8",
"@symfony/webpack-encore": "^4.0.0",
"bootstrap": "^5.3.1",
"core-js": "^3.23.0",
"eslint": "^8.46.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"jquery": "^3.5.1",
"node-sass": "^4.14.0",
"popper.js": "^1.16.1",
"regenerator-runtime": "^0.13.2",
"sass-loader": "^9.0.1",
"select2": "^4.0.13",
"stylelint": "^13.3.3",
"stylelint-config-sass-guidelines": "^7.0.0",
"stylelint-scss": "^3.17.2",
"webpack-notifier": "^1.6.0"
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-standard": "^5.0.0",
"jquery": "^3.7.0",
"markdownlint-cli": "^0.35.0",
"regenerator-runtime": "^0.13.9",
"sass": "^1.64.2",
"sass-loader": "^13.0.0",
"select2": "^4.1.0-rc.0",
"select2-bootstrap-5-theme": "^1.3.0",
"stylelint": "^15.10.2",
"stylelint-config-sass-guidelines": "^10.0.0",
"stylelint-scss": "^5.0.1",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"webpack-notifier": "^1.15.0"
},
"license": "UNLICENSED",
"private": true,
Expand All @@ -31,11 +36,12 @@
"dev": "encore dev",
"watch": "encore dev --watch",
"build": "encore production --progress",
"coding-standards-check/markdownlint": "markdownlint --ignore LICENSE.md '*.md' docs/",
"coding-standards-check/stylelint": "stylelint --config=.stylelintrc.js 'assets/**/*.scss'",
"coding-standards-check/scss": "yarn run coding-standards-check/stylelint",
"coding-standards-check/eslint": "eslint --config .eslintrc.js 'assets/**/*.js'",
"coding-standards-check/js": "yarn run coding-standards-check/eslint",
"coding-standards-check": "yarn run coding-standards-check/scss; yarn run coding-standards-check/js",
"coding-standards-check": "yarn run coding-standards-check/scss; yarn run coding-standards-check/js; yarn run coding-standards-check/markdownlint",
"coding-standards-apply/stylelint": "stylelint --config=.stylelintrc.js 'assets/**/*.scss' --fix",
"coding-standards-apply/scss": "yarn run coding-standards-apply/stylelint",
"coding-standards-apply/eslint": "eslint --config .eslintrc.js 'assets/**/*.js' --fix",
Expand Down
Loading

0 comments on commit b190e10

Please sign in to comment.