Skip to content

Commit 0423a5b

Browse files
authored
Merge pull request #65 from AndreasEngelmark/main
Implementation of Signifly's redesign
2 parents cf18942 + b7b1767 commit 0423a5b

File tree

289 files changed

+14910
-13841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+14910
-13841
lines changed

.prettierrc.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"printWidth": 80,
3+
"tabWidth": 2,
4+
"useTabs": true,
5+
"semi": true,
6+
"trailingComma": "es5",
7+
"endOfLine": "lf"
8+
}

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ composer coding-standards-apply
137137
```
138138

139139
```sh
140-
docker run --volume ${PWD}:/app --workdir /app node:latest yarn install
141-
docker run --volume ${PWD}:/app --workdir /app node:latest yarn coding-standards-check
142-
docker run --volume ${PWD}:/app --workdir /app node:latest yarn coding-standards-apply
140+
docker run --volume ${PWD}:/app --workdir /app node:16.13.2 yarn install
141+
docker run --volume ${PWD}:/app --workdir /app node:16.13.2 yarn coding-standards-check
142+
docker run --volume ${PWD}:/app --workdir /app node:16.13.2 yarn coding-standards-apply
143143
```
144144

145145
### GitHub Actions
@@ -175,6 +175,6 @@ composer coding-standards-check
175175
## Build assets
176176

177177
```sh
178-
docker run --volume ${PWD}:/app --workdir /app node:latest yarn install
179-
docker run --volume ${PWD}:/app --workdir /app node:latest yarn encore dev
178+
docker run --volume ${PWD}:/app --workdir /app node:16.13.2 yarn install
179+
docker run --volume ${PWD}:/app --workdir /app node:16.13.2 yarn encore dev
180180
```

composer.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@
9696
"Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
9797
],
9898
"coding-standards-check/drupal-check": [
99-
"vendor/bin/drupal-check --deprecations --analysis web/profiles/custom/os2loop"
99+
"php vendor/bin/drupal-check --deprecations --analysis web/profiles/custom/os2loop"
100100
],
101101
"coding-standards-check/phpcs": [
102-
"vendor/bin/phpcs --standard=phpcs.xml.dist"
102+
"php vendor/bin/phpcs --standard=phpcs.xml.dist"
103103
],
104104
"coding-standards-check/twigcs": [
105105
"twigcs web/profiles/custom/os2loop/themes/os2loop_theme/templates"
@@ -123,10 +123,11 @@
123123
"prefer-stable": true,
124124
"config": {
125125
"sort-packages": true,
126+
"process-timeout": 0,
126127
"allow-plugins": {
127-
"dealerdirect/phpcodesniffer-composer-installer": true,
128128
"composer/installers": true,
129129
"cweagans/composer-patches": true,
130+
"dealerdirect/phpcodesniffer-composer-installer": true,
130131
"drupal/console-extend-plugin": true,
131132
"drupal/core-composer-scaffold": true,
132133
"drupal/core-project-message": true
@@ -136,6 +137,9 @@
136137
"drupal-scaffold": {
137138
"locations": {
138139
"web-root": "web/"
140+
},
141+
"file-mapping": {
142+
"[web-root]/sites/development.services.yml": false
139143
}
140144
},
141145
"installer-paths": {
@@ -195,7 +199,8 @@
195199
"patches": {
196200
"drupal/core": {
197201
"Disable forced configuration langcode (https://www.drupal.org/project/drupal/issues/3150540)": "https://www.drupal.org/files/issues/2020-06-10/locale-config-langcodes.patch",
198-
"Handle undefined index when using form states (https://www.drupal.org/project/drupal/issues/2700667)": "https://www.drupal.org/files/issues/2020-03-11/2700667-104.patch"
202+
"Handle undefined index when using form states (https://www.drupal.org/project/drupal/issues/2700667)": "https://www.drupal.org/files/issues/2020-03-11/2700667-104.patch",
203+
"Multiple usages of FieldPluginBase::getEntity do not check for NULL, leading to WSOD (https://www.drupal.org/project/drupal/issues/3007424)": "https://www.drupal.org/files/issues/2021-01-06/3007424-108.patch"
199204
},
200205
"drupal/flag": {
201206
"Implement Migration Paths for Flag 7.x (https://www.drupal.org/project/flag/issues/2409901#comment-13082245)": "https://www.drupal.org/files/issues/2019-04-25/2409901_flag_migration_paths_52.patch",
@@ -212,14 +217,19 @@
212217
},
213218
"drupal/masquerade": {
214219
"https://www.drupal.org/project/masquerade/issues/2962970#comment-13391256": "https://www.drupal.org/files/issues/2019-12-13/temporary%20unmask%20workaround-2962970-8.patch"
220+
},
221+
"drupal/devel": {
222+
"Public methods are not visible in kint (https://www.drupal.org/project/devel/issues/3112201)": "https://www.drupal.org/files/issues/2022-04-26/devel_3112201_4.patch"
215223
}
216224
}
217225
},
218226
"require-dev": {
219227
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
220228
"drupal/coder": "^8.3",
221229
"drupal/core-dev": "^9.1",
230+
"drupal/devel": "^4.1",
222231
"friendsoftwig/twigcs": "^5.0",
232+
"kint-php/kint": "^4.1",
223233
"mglaman/drupal-check": "^1.1",
224234
"os2loop/os2loop_fixtures": "*",
225235
"phpspec/prophecy-phpunit": "^2.0"

0 commit comments

Comments
 (0)