Skip to content

Commit 38e0a28

Browse files
authored
Merge pull request #18097 from craftcms/feature/inertia-settings
[6.x] Inertia General Settings
2 parents 04a6388 + b65c7ea commit 38e0a28

File tree

227 files changed

+6628
-2721
lines changed

Some content is hidden

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

227 files changed

+6628
-2721
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,8 @@ cpresources/*
1919
.ddev/
2020
test-results/
2121
resources/hot
22+
23+
# Wayfinder generated files
24+
resources/js/actions
25+
resources/js/routes
26+
resources/js/wayfinder

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@ composer.lock
55
vendor/*
66
.ddev/*
77
resources/build/*
8+
resources/js/actions/*
9+
resources/js/routes/*
10+
resources/js/wayfinder/*
811
yii2-adapter/*
912
tests-playwright/.authentication.json

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"guzzlehttp/guzzle": "^7.2.0",
4848
"inertiajs/inertia-laravel": "^2.0",
4949
"laravel/framework": "^12.21.0",
50+
"laravel/wayfinder": "^0.1.12",
5051
"league/uri": "^7.0",
5152
"moneyphp/money": "^4.0",
5253
"phpdocumentor/reflection-docblock": "^5.3",

composer.lock

Lines changed: 63 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"dev:cp": "npm run dev -w @craftcms/cp",
1717
"build:cp": "npm run build -w @craftcms/cp",
1818
"test:cp": "npm run test -w @craftcms/cp",
19-
"storybook:cp": "npm run storybook -w @craftcms/cp"
19+
"storybook:cp": "npm run storybook -w @craftcms/cp",
20+
"build:all": "npm run build:bundles && npm run build:cp && npm run build"
2021
},
2122
"workspaces": [
2223
"packages/*"
@@ -27,6 +28,7 @@
2728
"devDependencies": {
2829
"@craftcms/playwright": "file:packages/craftcms-playwright",
2930
"@craftcms/webpack": "file:packages/craftcms-webpack",
31+
"@laravel/vite-plugin-wayfinder": "^0.1.7",
3032
"@playwright/test": "^1.52.0",
3133
"@tailwindcss/vite": "^4.1.16",
3234
"@total-typescript/tsconfig": "^1.0.4",

packages/craftcms-cp/.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v22

packages/craftcms-cp/.storybook/main.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import type {StorybookConfig} from '@storybook/web-components-vite';
22

33
import {join, dirname} from 'path';
4+
import {mergeConfig} from 'vite';
5+
import tsconfigPaths from 'vite-tsconfig-paths';
46

57
/**
68
* This function is used to resolve the absolute path of a package.
@@ -22,5 +24,11 @@ const config: StorybookConfig = {
2224
name: getAbsolutePath('@storybook/web-components-vite'),
2325
options: {},
2426
},
27+
28+
viteFinal(config, {configType}) {
29+
return mergeConfig(config, {
30+
plugins: [tsconfigPaths()],
31+
});
32+
},
2533
};
2634
export default config;

packages/craftcms-cp/.storybook/preview.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
display: grid;
1111
}
1212

13+
.gap-1 {
14+
gap: 0.25rem;
15+
}
16+
1317
.gap-2 {
1418
gap: 0.5rem;
1519
}
@@ -23,3 +27,14 @@
2327
width: auto;
2428
height: 1em;
2529
}
30+
31+
.stack {
32+
display: grid;
33+
gap: 1em;
34+
}
35+
36+
.list {
37+
list-style: disc;
38+
padding-inline-start: 1.5em;
39+
margin: 0;
40+
}

packages/craftcms-cp/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
"typescript": "^5.8.3",
8585
"unplugin-dts": "^1.0.0-beta.0",
8686
"vite-plugin-dts": "^4.5.4",
87+
"vite-tsconfig-paths": "^5.1.4",
8788
"vitest": "^3.2.4"
8889
},
8990
"dependencies": {

0 commit comments

Comments
 (0)