Skip to content

Commit

Permalink
Merge pull request #15 from statamic/v4-upgrade
Browse files Browse the repository at this point in the history
Switch to Vite and update the Getting Started Widget for v4 TailwindCSS
  • Loading branch information
jackmcdade authored Aug 24, 2023
2 parents 95dd1db + c806d7c commit 8127656
Show file tree
Hide file tree
Showing 16 changed files with 11,981 additions and 45 deletions.
Empty file added content/trees/.gitkeep
Empty file.
23 changes: 7 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
{
"private": true,
"scripts": {
"dev": "mix",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "mix --production",
"production": "mix --production"
"dev": "vite",
"build": "vite build"
},
"devDependencies": {
"autoprefixer": "^10.2.5",
"cross-env": "^7.0",
"laravel-mix": "^6.0",
"postcss": "^8.2.9",
"postcss-import": "^14.0.1",
"postcss-nested": "^5.0.5",
"postcss-preset-env": "^6.7.0",
"tailwindcss": "^2.1.1",
"vue-template-compiler": "^2.6.12"
"autoprefixer": "^10.4.14",
"laravel-vite-plugin": "^0.7.2",
"postcss": "^8.4.23",
"tailwindcss": "^3.3.2",
"vite": "^4.0.0"
},
"dependencies": {
"@hotwired/turbo": "^7.0.0-rc.1",
Expand Down
8 changes: 8 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
plugins: {
'postcss-import': {},
'tailwindcss/nesting': {},
tailwindcss: {},
autoprefixer: {},
},
}
86 changes: 86 additions & 0 deletions public/build/assets/site-381f6df3.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/build/assets/site-4ed993c7.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions public/build/assets/site-9bd4acd3.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/build/assets/site-ab9fe09b.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"resources/css/site.css": {
"file": "assets/site-ab9fe09b.css",
"isEntry": true,
"src": "resources/css/site.css"
},
"resources/js/site.js": {
"file": "assets/site-381f6df3.js",
"isEntry": true,
"src": "resources/js/site.js"
}
}
805 changes: 801 additions & 4 deletions public/css/tailwind.css

Large diffs are not rendered by default.

11,038 changes: 11,031 additions & 7 deletions public/js/site.js

Large diffs are not rendered by default.

Empty file added resources/blueprints/.gitkeep
Empty file.
Empty file added resources/views/.gitkeep
Empty file.
3 changes: 1 addition & 2 deletions resources/views/layout.antlers.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
{{ partial:seo }}
<link rel="stylesheet" href="{{ mix src='css/tailwind.css' }}" data-turbolinks-track="reload">
<link rel="stylesheet" href="/css/plyr.css">
<link rel="alternate" type="application/rss+xml" title="RSS Feed for {{ podcast:title }}" href="{{ route:feed }}" />
<script src="{{ mix src='/js/site.js' }}" data-turbolinks-track="reload" defer></script>
{{ vite src="resources/js/site.js|resources/css/tailwind.css" attr:data-turbolinks-track="reload" attr:script="defer" }}
<style>
:root {
--primary-color: {{ theme:primary_color ?? "#FA7268" }};
Expand Down
Loading

0 comments on commit 8127656

Please sign in to comment.