Skip to content

Commit f5b9495

Browse files
Merge branch 'pure-postcss' into main
2 parents 483f80c + 7ad53e5 commit f5b9495

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

src/TailwindCssPreset.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ public static function installAuth()
2929
protected static function updatePackageArray(array $packages)
3030
{
3131
return array_merge([
32+
'@tailwindcss/ui' => '^0.3',
33+
'autoprefixer' => '^9.6',
3234
'laravel-mix' => '^5.0.1',
33-
'laravel-mix-tailwind' => '^0.1.0',
35+
'postcss-import' => '^12.0',
36+
'postcss-nested' => '^4.2',
3437
'tailwindcss' => '^1.4',
35-
'@tailwindcss/custom-forms' => '^0.2',
38+
'vue-template-compiler' => '^2.6.11',
3639
], Arr::except($packages, [
3740
'bootstrap',
3841
'bootstrap-sass',
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@tailwind base;
1+
@import "tailwindcss/base";
22

3-
@tailwind components;
3+
@import "tailwindcss/components";
44

5-
@tailwind utilities;
5+
@import "tailwindcss/utilities";

src/tailwindcss-stubs/tailwind.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ module.exports = {
88
},
99
variants: {},
1010
plugins: [
11-
require('@tailwindcss/custom-forms')
11+
require('@tailwindcss/ui'),
1212
]
1313
}

src/tailwindcss-stubs/webpack.mix.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
const mix = require('laravel-mix');
22

3-
require('laravel-mix-tailwind');
4-
53
/*
64
|--------------------------------------------------------------------------
75
| Mix Asset Management
@@ -13,11 +11,16 @@ require('laravel-mix-tailwind');
1311
|
1412
*/
1513

16-
mix.js('resources/js/app.js', 'public/js')
17-
.postCss('resources/css/app.css', 'public/css')
18-
.tailwind('./tailwind.config.js');
14+
mix
15+
.js('resources/js/app.js', 'public/js')
16+
.postCss('resources/css/app.css', 'public/css', [
17+
require('postcss-import'),
18+
require('tailwindcss'),
19+
require('postcss-nested'),
20+
require('autoprefixer'),
21+
]);
1922

2023
if (mix.inProduction()) {
2124
mix
22-
.version();
25+
.version();
2326
}

0 commit comments

Comments
 (0)