Skip to content

Commit

Permalink
Merge pull request #98 from davidhellmann/dev/craft-vite
Browse files Browse the repository at this point in the history
🔖 version: 4.0.13
  • Loading branch information
davidhellmann authored Jan 20, 2024
2 parents 00aad2a + 9169f0b commit f98ca99
Show file tree
Hide file tree
Showing 91 changed files with 5,799 additions and 6,412 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
/web/cpresources/*
/web/dist/*
/web/cache/*
/web/social-share-images/*


# TAILWIND
/_tailwind/*
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v19
v20
6 changes: 3 additions & 3 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
trailingComma: 'all',
tabWidth: 2,
semi: true,
Expand All @@ -14,8 +14,8 @@ module.exports = {
},
],
plugins: [
'./node_modules/prettier-plugin-tailwindcss',
'./node_modules/prettier-plugin-twig-melody',
// './node_modules/prettier-plugin-twig-melody',
'prettier-plugin-tailwindcss',
],
tailwindConfig: './tailwind.config.js',
twigPrintWidth: 120,
Expand Down
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,35 @@
# davidhellmann/craftcms-baukasten Change Log.
## 4.0.13 - 2024.01.20

### added
- Rollup copy plugin to copy `src/public/*` to `web/dist` on npm run dev (start only). Feel free to extend it to your needs.

### updated
- (cms): CraftCMS (4.6.1)
- (plugin): Blitz (4.10.3)
- (plugin): Super Table (3.0.12)
- (plugin): Code Field (4.0.12)
- (plugin): CKEditor (3.6.0)
- (plugin): ImagerX (4.2.4)
- (plugin): Sherlock (4.4.1)
- (plugin): Image Resizer (3.0.9)
- (plugin): Hyper (1.1.19)
- (plugin): MatrixMate (2.1.4)
- (plugin): Formie (2.1.2)
- (plugin): Navigation (2.0.24)
- (plugin): SEOmatic (4.0.37)
- (plugin): Vite (4.0.7)
- (plugin): Sprig (2.7.3)
- (npm): all packages to latest versions
- (vite): 5.0.2


### fixed
-

### removed
- prettier twig plugin

## 4.0.12 - 2023.09.04

### added
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ Go to `./` and do this: `valet link craftcms-baukasten` to create a domain like
- `npm run upgrade-interactive` To get an interactive GUI to update NPM Packages
- `npm run twc` creates a `tailwind.app.css` file in `./src/css/`

## How to use static assets with Vite
Assets must be in `src/public/` to be copied to `web/dist` folder.
```twig
<img class="w-12 h-12" src="{{ craft.vite.asset('images/svg/logo.svg', true) }}" alt="">
{% set asset = craft.vite.asset('images/svg/logo.svg', true) %}
{{ craft.vite.inline(asset) }}
```


## Whats inside?
### Some Basic Fields:
Expand Down
37 changes: 19 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,42 @@
{
"require": {
"amici/craft-super-dynamic-fields": "2.0.0.5",
"craftcms/ckeditor": "3.5.1",
"craftcms/cms": "4.5.3",
"craftcms/ckeditor": "3.6.0",
"craftcms/cms": "4.6.1",
"dodecastudio/craft-blurhash": "2.0.5",
"doublesecretagency/craft-cpcss": "2.6.0",
"mmikkel/cp-clearcache": "1.3.0",
"mmikkel/cp-field-inspect": "^1.4.4",
"nystudio107/craft-code-field": "4.0.10",
"nystudio107/craft-code-field": "4.0.12",
"nystudio107/craft-emptycoalesce": "4.0.0",
"nystudio107/craft-minify": "^4.0.0-beta.2",
"nystudio107/craft-scripts": "^1.2.13",
"nystudio107/craft-seomatic": "4.0.30",
"nystudio107/craft-vite": "4.0.6",
"putyourlightson/craft-blitz": "4.5.2",
"nystudio107/craft-seomatic": "4.0.37",
"nystudio107/craft-vite": "4.0.7",
"putyourlightson/craft-blitz": "4.10.3",
"putyourlightson/craft-elements-panel": "2.0.0",
"putyourlightson/craft-sherlock": "4.3.0",
"putyourlightson/craft-sprig": "2.6.2",
"spacecatninja/imager-x": "4.2.2",
"putyourlightson/craft-sherlock": "4.4.1",
"putyourlightson/craft-sprig": "2.7.3",
"spacecatninja/imager-x": "4.2.4",
"spatie/browsershot": "^3.59",
"studioespresso/craft-dumper": "3.0.1",
"vaersaagod/matrixmate": "2.1.3",
"verbb/formie": "2.0.35",
"verbb/hyper": "1.1.11",
"verbb/image-resizer": "3.0.7",
"verbb/navigation": "2.0.20",
"verbb/super-table": "3.0.9",
"vaersaagod/matrixmate": "2.1.4",
"verbb/formie": "2.1.2",
"verbb/hyper": "1.1.19",
"verbb/image-resizer": "3.0.9",
"verbb/navigation": "2.0.24",
"verbb/super-table": "3.0.12",
"vlucas/phpdotenv": "^5.4",
"yiisoft/yii2-redis": "^2.0.13"
},
"require-dev": {
"craftcms/generator": "^1.6",
"nystudio107/craft-autocomplete": "^1.0",
"roave/security-advisories": "dev-latest",
"yiisoft/yii2-shell": "^2.0.4"
},
"autoload": {
"psr-4": {
"modules\\sitemodule\\": "modules/sitemodule/"
"modules\\socialshareimage\\": "modules/social-share-image/"
}
},
"minimum-stability": "dev",
Expand All @@ -49,7 +50,7 @@
"sort-packages": true,
"optimize-autoloader": true,
"platform": {
"php": "8.1.0"
"php": "8.2.0"
}
},
"scripts": {
Expand Down
Loading

0 comments on commit f98ca99

Please sign in to comment.