Skip to content

Commit 5bf7e6f

Browse files
committed
wip 3.x updates
1 parent 2bd9cd6 commit 5bf7e6f

25 files changed

+223
-139
lines changed

.gitattributes

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,25 @@
22
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
33

44
# Ignore all test and documentation with "export-ignore".
5-
/.github export-ignore
6-
/.gitattributes export-ignore
7-
/.gitignore export-ignore
8-
/phpunit.xml.dist export-ignore
9-
/art export-ignore
10-
/docs export-ignore
11-
/tests export-ignore
12-
/.editorconfig export-ignore
13-
/.php_cs.dist.php export-ignore
14-
/psalm.xml export-ignore
15-
/psalm.xml.dist export-ignore
16-
/testbench.yaml export-ignore
17-
/UPGRADING.md export-ignore
18-
/phpstan.neon.dist export-ignore
5+
/.github export-ignore
6+
/.gitattributes export-ignore
7+
/.gitignore export-ignore
8+
/.idea export-ignore
9+
/.prettierrc export-ignore
10+
/.package-lock.json export-ignore
11+
/.editorconfig export-ignore
12+
/.php_cs.dist.php export-ignore
13+
/phpunit.xml.dist export-ignore
14+
/art export-ignore
15+
/docs export-ignore
16+
/tests export-ignore
17+
/psalm.xml export-ignore
18+
/psalm.xml.dist export-ignore
19+
/testbench.yaml export-ignore
20+
/UPGRADING.md export-ignore
21+
/phpstan.neon.dist export-ignore
1922
/phpstan-baseline.neon export-ignore
23+
/images export-ignore
24+
/package.json export-ignore
25+
/postcss.config.js export-ignore
26+
/tailwind.config.js export-ignore
File renamed without changes.

.github/workflows/run-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: Run Tests
22

33
on:
44
push:
5-
branches: [main]
65
pull_request:
7-
branches: [main]
86

97
jobs:
108
test:
@@ -13,10 +11,12 @@ jobs:
1311
fail-fast: true
1412
matrix:
1513
os: [ubuntu-latest, windows-latest]
16-
php: [8.1]
17-
laravel: [9.*]
18-
stability: [prefer-lowest, prefer-stable]
14+
php: [8.2, 8.1]
15+
laravel: [10.*, 9.*]
16+
stability: [prefer-stable]
1917
include:
18+
- laravel: 10.*
19+
testbench: 8.*
2020
- laravel: 9.*
2121
testbench: 7.*
2222

@@ -44,4 +44,4 @@ jobs:
4444
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4545
4646
- name: Execute tests
47-
run: vendor/bin/pest
47+
run: ./vendor/bin/pest --verbose

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.idea
22
.phpunit.result.cache
3+
.DS_Store
34
build
45
composer.lock
56
coverage

bin/build.js

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import * as esbuild from 'esbuild'
2+
3+
const isDev = process.argv.includes('--dev')
4+
5+
async function compile(options) {
6+
const context = await esbuild.context(options)
7+
8+
if (isDev) {
9+
await context.watch()
10+
} else {
11+
await context.rebuild()
12+
await context.dispose()
13+
}
14+
}
15+
16+
const defaultOptions = {
17+
define: {
18+
'process.env.NODE_ENV': isDev ? `'development'` : `'production'`,
19+
},
20+
bundle: true,
21+
mainFields: ['module', 'main'],
22+
platform: 'neutral',
23+
sourcemap: isDev ? 'inline' : false,
24+
sourcesContent: isDev,
25+
treeShaking: true,
26+
target: ['es2020'],
27+
minify: !isDev,
28+
plugins: [{
29+
name: 'watchPlugin',
30+
setup: function (build) {
31+
build.onStart(() => {
32+
console.log(`Build started at ${new Date(Date.now()).toLocaleTimeString()}: ${build.initialOptions.outfile}`)
33+
})
34+
35+
build.onEnd((result) => {
36+
if (result.errors.length > 0) {
37+
console.log(`Build failed at ${new Date(Date.now()).toLocaleTimeString()}: ${build.initialOptions.outfile}`, result.errors)
38+
} else {
39+
console.log(`Build finished at ${new Date(Date.now()).toLocaleTimeString()}: ${build.initialOptions.outfile}`)
40+
}
41+
})
42+
}
43+
}],
44+
}
45+
46+
compile({
47+
...defaultOptions,
48+
entryPoints: ['./resources/js/skeleton.js'],
49+
outfile: './resources/dist/skeleton.js',
50+
})

composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,21 @@
2424
"filament/filament": "^3.0",
2525
"filament/forms": "^3.0",
2626
"filament/tables": "^3.0",
27-
"spatie/laravel-package-tools": "^1.13.5",
27+
"spatie/laravel-package-tools": "^1.15.0",
2828
"illuminate/contracts": "^9.0|^10.0"
2929
},
3030
"require-dev": {
3131
"laravel/pint": "^1.0",
32-
"nunomaduro/collision": "^6.0",
32+
"nunomaduro/collision": "^6.0|^7.0",
3333
"nunomaduro/larastan": "^2.0.1",
3434
"orchestra/testbench": "^7.0",
35-
"pestphp/pest": "^1.21",
36-
"pestphp/pest-plugin-laravel": "^1.1",
37-
"pestphp/pest-plugin-livewire": "^1.0",
38-
"pestphp/pest-plugin-parallel": "^0.3",
35+
"pestphp/pest": "^2.0",
36+
"pestphp/pest-plugin-laravel": "^2.0",
37+
"pestphp/pest-plugin-livewire": "^2.0",
3938
"phpstan/extension-installer": "^1.1",
4039
"phpstan/phpstan-deprecation-rules": "^1.0",
4140
"phpstan/phpstan-phpunit": "^1.0",
42-
"phpunit/phpunit": "^9.5",
41+
"phpunit/phpunit": "^9.5|^10.0",
4342
"spatie/laravel-ray": "^1.26"
4443
},
4544
"autoload": {

configure-stubs/package/package.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

configure-stubs/package/plugin.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

configure-stubs/package/tailwind.config.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

configure-stubs/theme/package.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)