Skip to content

Commit 8ba9dfc

Browse files
Merge pull request #27 from helsingborg-stad/vite-migration
vite-migration
2 parents e28aa4c + 03cd5f4 commit 8ba9dfc

Some content is hidden

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

67 files changed

+9084
-6745
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ vendor/
2121

2222
# ignore dist files
2323
/dist/*
24+
assets/
2425

2526
# ignore jekyll build directory
2627
/_site
@@ -57,6 +58,10 @@ Thumbs.db
5758
*.tar
5859
*.zip
5960

61+
# ignore tests
62+
.phpunit.result.cache
63+
.coverage
64+
6065
# -------------------------
6166
# BEGIN Whitelisted Files
6267
# -------------------------

biome.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"$schema": "https://biomejs.dev/schemas/2.3.5/schema.json",
3+
"linter": {
4+
"rules": {
5+
"complexity": {
6+
"noStaticOnlyClass": "off"
7+
},
8+
"style": {
9+
"noNonNullAssertion": "off"
10+
}
11+
}
12+
},
13+
"formatter": {
14+
"lineWidth": 120
15+
},
16+
"javascript": {
17+
"formatter": {
18+
"quoteStyle": "single"
19+
}
20+
},
21+
"assist": {
22+
"enabled": true,
23+
"actions": {
24+
"source": {
25+
"organizeImports": "on"
26+
}
27+
}
28+
}
29+
}

bootstrap.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
3+
require_once './vendor/autoload.php';

broken-link-detector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
);
6060

6161
$manifestFilePathResolver = new ManifestFilePathResolver(
62-
$config->getPluginPath() . "dist/manifest.json",
62+
$config->getPluginPath() . "assets/dist/manifest.json",
6363
$baseFileSystem,
6464
$manifestFileWpService,
6565
$urlFilePathResolver

composer.json

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,9 @@
1010
"test:e2e": "phpunit -c phpunit.e2e.xml --testdox",
1111
"coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --testdox",
1212
"minimal": "./vendor/bin/phpunit",
13-
"php:lint": "./vendor/bin/phpcs -s",
14-
"php:fix": "./vendor/bin/phpcbf",
15-
"php:analyze": "vendor/bin/phpstan analyse -c phpstan.neon"
16-
},
17-
"extra": {
18-
"hooks": {
19-
"commit-msg": [
20-
"./bin/commit-msg.sh $1"
21-
]
22-
},
23-
"merge-plugin": {
24-
"include": [
25-
"composer.local.json"
26-
],
27-
"ignore-duplicates": false,
28-
"merge-dev": true,
29-
"merge-extra": true,
30-
"merge-scripts": true
31-
}
13+
"lint": "vendor/bin/mago lint",
14+
"fix": "vendor/bin/mago lint --format-after-fix --fix",
15+
"format": "vendor/bin/mago fmt"
3216
},
3317
"authors": [
3418
{
@@ -50,36 +34,34 @@
5034
}
5135
},
5236
"require": {
53-
"php": ">=8.1",
37+
"php": ">=8.2",
5438
"helsingborg-stad/acf-export-manager": ">=1.0.0",
5539
"symfony/polyfill-intl-idn": "1.31.0",
5640
"helsingborg-stad/wpservice": "^2.0",
57-
"helsingborg-stad/acfservice": "^1.3.0"
41+
"helsingborg-stad/acfservice": "^1.3.0",
42+
"helsingborg-stad/wputilservice": "^0.2.44"
5843
},
5944
"require-dev": {
6045
"codedungeon/phpunit-result-printer": "^0.32.0",
61-
"squizlabs/php_codesniffer": "^3.7",
62-
"wp-coding-standards/wpcs": "^3.0",
6346
"phpcompatibility/phpcompatibility-wp": "*",
64-
"brainmaestro/composer-git-hooks": "^2.8",
6547
"composer/installers": "~1.0",
6648
"php-mock/php-mock-mockery": "^1.4",
67-
"wikimedia/composer-merge-plugin": "^2.1",
68-
"phpstan/phpstan": "2.0.x-dev",
6949
"johnpbloch/wordpress-core": "dev-master",
70-
"phpunit/phpunit": "^9.6",
7150
"yoast/phpunit-polyfills": "^3.0",
72-
"wp-cli/wp-cli": "^2.11"
51+
"wp-cli/wp-cli": "^2.11",
52+
"phpunit/phpunit": "^9.6",
53+
"carthage-software/mago": "^1.0.0-rc.3"
7354
},
7455
"suggest": {
75-
"helsingborg-stad/component-library": "Required for modal feature. (version ^6.0.0) is recommended."
56+
"helsingborg-stad/component-library": "Required for modal feature. (version ^6.0.0) is recommended.",
57+
"helsingborg-stad/municipio": "^6.0.0"
7658
},
7759
"config": {
7860
"allow-plugins": {
7961
"composer/installers": true,
80-
"dealerdirect/phpcodesniffer-composer-installer": true,
8162
"wikimedia/composer-merge-plugin": true,
82-
"johnpbloch/wordpress-core-installer": true
63+
"johnpbloch/wordpress-core-installer": true,
64+
"carthage-software/mago": true
8365
}
8466
}
8567
}

0 commit comments

Comments
 (0)