Skip to content
This repository was archived by the owner on May 26, 2023. It is now read-only.

Commit 8f43d40

Browse files
committed
Merge branch 'hotfix/2.2.3'
2 parents 7abb1a7 + 402ecb7 commit 8f43d40

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

.gitlab-ci.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ include:
1313
- config/node/npm-install.yml
1414
- config/node/eslint.yml
1515
- config/node/stylelint.yml
16-
- config/node/prettier-twig.yml
16+
- config/node/prettier.yml
1717
- config/php/composer-install.yml
1818
- config/php/phpcs.yml
1919
- config/php/phpstan.yml
@@ -29,15 +29,11 @@ node_stylelint:
2929
variables:
3030
STYLELINT_ARGS: 'web/wp-content/themes/studiometa/src/**/*.scss'
3131

32-
node_prettier_twig:
32+
node_prettier:
3333
variables:
3434
PRETTIER_ARGS: 'web/wp-content/themes/studiometa/templates/**/*.twig'
3535

3636
php_phpcs:
3737
variables:
3838
PHPCS_ARGS: --extensions=php --standard=./phpcs.xml --report=\\Satesh\\Phpcs\\GitLabReport --report-file=gl-phpcs-codequality.json
3939

40-
php_phpstan:
41-
variables:
42-
PHP_EXEC_CMD_ARGS: -e 'XDEBUG_MODE=off'
43-
PHPSTAN_ARGS: analyse --error-format=gitlab > gl-phpstan-codequality.json

CHANGELOG.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Changelog
22

3-
Tous les changements notables de ce projet seront documentés dans ce fichier. Le format est basé sur [Keep a Changelog](https://keepachangelog.com/fr/1.0.0/),
4-
et ce projet suit les règles du [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
3+
Tous les changements notables de ce projet seront documentés dans ce fichier. Le format est basé sur [Keep a Changelog](https://keepachangelog.com/fr/1.0.0/), et ce projet suit les règles du [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
54

65
## Non publié

readme.md README.md

File renamed without changes.

jsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"noImplicitThis": true,
1010
"esModuleInterop": true,
1111
"lib": ["esnext", "dom"],
12-
"moduleResolution": "node"
12+
"moduleResolution": "bundler"
1313
}
1414
}

0 commit comments

Comments
 (0)