Skip to content

Commit

Permalink
Merge pull request #19 from gwleuverink/fix/css-import-regression
Browse files Browse the repository at this point in the history
fix css loader regression
  • Loading branch information
gwleuverink authored Oct 24, 2024
2 parents 3921b0c + 1a6d4a9 commit fa25048
Show file tree
Hide file tree
Showing 28 changed files with 1,096 additions and 998 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
ba11d6aba92e038053ced776acbea2162480bced
ce545c791e04bbb7bc7504ef3cd3723e0bcc130f
2b933d9eef0263a6907b2d11e0917f6d9c6bed20
dffb2f5008527de546ce3b467471823cb689fb10
3 changes: 3 additions & 0 deletions .github/workflows/browser-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ jobs:
- name: Install Composer dependecies
run: composer update --no-progress --optimize-autoloader --${{ matrix.dependency-version }}

- name: Install Laravel
run: composer update illuminate/support:"${{ matrix.laravel }}" illuminate/contracts:"${{ matrix.laravel }}" --no-progress

- name: Directory Permissions
run: sudo chown -R $(whoami) vendor/pestphp/pest/.temp vendor/orchestra

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ jobs:
- name: Install Composer dependecies
run: composer update --no-progress --optimize-autoloader --${{ matrix.dependency-version }}

- name: Install Laravel
run: composer update illuminate/support:"${{ matrix.laravel }}" illuminate/contracts:"${{ matrix.laravel }}" --no-progress

- name: Directory Permissions
run: sudo chown -R $(whoami) vendor/pestphp/pest/.temp vendor/orchestra

Expand Down
13 changes: 8 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
"squizlabs/php_codesniffer": "^3.10",
"tightenco/duster": "^3.0",
"tightenco/tlint": "^9.3",
"pestphp/pest": "^2.35",
"pestphp/pest": "^3.0",
"spatie/laravel-ignition": "^2.8",
"symfony/thanks": "^1.3",
"orchestra/testbench": "^9",
"orchestra/testbench-dusk": "^9",
"orchestra/testbench-dusk": "^9.8",
"livewire/livewire": "^3.5"
},
"config": {
Expand Down Expand Up @@ -78,6 +78,7 @@
"cd ./workbench && npm ci",
"ln -sf $PWD/workbench/jsconfig.json ./vendor/orchestra/testbench-core/laravel",
"ln -sf $PWD/workbench/node_modules/ ./vendor/orchestra/testbench-core/laravel",
"ln -sf $PWD/config/bundle.php ./vendor/orchestra/testbench-core/laravel/config",
"ln -sf $PWD/workbench/resources/js/ ./vendor/orchestra/testbench-core/laravel/resources",
"ln -sf $PWD/workbench/resources/css/ ./vendor/orchestra/testbench-core/laravel/resources"
],
Expand All @@ -90,12 +91,14 @@
"fix": "vendor/bin/duster fix",
"analyze": "vendor/bin/phpstan analyse",
"baseline": "vendor/bin/phpstan analyse --generate-baseline",

"clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
"prepare": "@php vendor/bin/testbench package:discover --ansi",
"build": "@php vendor/bin/testbench workbench:build --ansi",

"dusk:install-chromedriver": "@php vendor/bin/dusk-updater detect --auto-update --ansi",
"test": "@php vendor/bin/pest --group=feature,unit",
"test-browser": "@php vendor/bin/pest --exclude-group=feature,unit",
"test-all": "@php vendor/bin/pest --bail"
"test": "@php vendor/bin/testbench package:test --group=feature --group=unit",
"test-browser": "@php vendor/bin/testbench package:test --exclude-group=feature --exclude-group=unit",
"test-all": "@php vendor/bin/testbench package:test --bail"
}
}
Loading

0 comments on commit fa25048

Please sign in to comment.