diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bb33030..4f1a13f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: - name: Install preset run: | cd ../app - npx use-preset laravel-tall --auth --debug + npx use-preset laravel-tall --auth --debug --no-interaction - name: Install dependencies run: | diff --git a/src/preset.js b/src/preset.js index dce94ce..d4d2b09 100644 --- a/src/preset.js +++ b/src/preset.js @@ -4,17 +4,18 @@ const { Preset } = require('use-preset'); module.exports = Preset.make('Laravel TALL') .option('auth', false) .option('pagination', true) + .option('interaction', true) + + .apply('use-preset/laravel-tailwindcss') + .with('--no-interaction') + .title('Add Tailwind CSS from its preset') + .chain() .editJson('package.json') - .title('Add Tailwind and Alpine') + .title('Add Alpine.js, remove Lodash & Axios') .merge({ devDependencies: { - '@tailwindcss/ui': '^0.3', - '@tailwindcss/typography': '^0.2', alpinejs: '^2', - tailwindcss: '^1', - 'postcss-nested': '^4', - 'postcss-import': '^12', }, }) .delete(['devDependencies.lodash', 'devDependencies.axios']) @@ -28,11 +29,6 @@ module.exports = Preset.make('Laravel TALL') } }) .chain() - - .delete() - .title('Delete SASS') - .directories('resources/sass') - .chain() .copyDirectory('default') .to('/') @@ -71,11 +67,13 @@ module.exports = Preset.make('Laravel TALL') .chain() .installDependencies() + .if(({ flags }) => Boolean(flags.interaction)) .for('node') .title('Install node dependencies') .chain() .updateDependencies() + .if(({ flags }) => Boolean(flags.interaction)) .for('php') .title('Install PHP dependencies') .chain(); diff --git a/templates/default/postcss.config.js b/templates/default/postcss.config.js deleted file mode 100644 index 84e28ee..0000000 --- a/templates/default/postcss.config.js +++ /dev/null @@ -1,18 +0,0 @@ -/* - |-------------------------------------------------------------------------- - | PostCSS configuration - |-------------------------------------------------------------------------- - | - | You can configure PostCSS and adds plugins in this - | configuration file. - | - */ - -module.exports = { - plugins: [ - require('postcss-import'), - require('tailwindcss'), - require('postcss-nested'), - require('autoprefixer'), - ], -}; diff --git a/templates/default/resources/css/app.css b/templates/default/resources/css/app.css deleted file mode 100644 index 6dc027e..0000000 --- a/templates/default/resources/css/app.css +++ /dev/null @@ -1,40 +0,0 @@ -/* -|-------------------------------------------------------------------------- -| Base styles -|-------------------------------------------------------------------------- -| -| This directive injects Tailwind's base styles, which are a -| modification of normalize.css. -| https://unpkg.com/tailwindcss/dist/base.css -| -| The following directive imports the base.css file, which contains -| your own base styles. -| -*/ -@import 'tailwindcss/base'; -@import 'base'; - -/* -|-------------------------------------------------------------------------- -| Base components -|-------------------------------------------------------------------------- -| -| This directive injects Tailwind's base components, which are -| the container classes and the plugins' components. -| -| The following directive imports the components.css file, which contains -| your own components. -| -*/ -@import 'tailwindcss/components'; -@import 'components'; - -/* -|-------------------------------------------------------------------------- -| Utilities -|-------------------------------------------------------------------------- -| -| This directive injects Tailwind's utilities. -| -*/ -@import 'tailwindcss/utilities'; diff --git a/templates/default/resources/css/base.css b/templates/default/resources/css/base.css deleted file mode 100644 index b0325e1..0000000 --- a/templates/default/resources/css/base.css +++ /dev/null @@ -1,26 +0,0 @@ -/* - |-------------------------------------------------------------------------- - | Application's base styles - |-------------------------------------------------------------------------- - */ - -/** - * Remove the default box-shadow for invalid elements to prevent - * inputs in Livewire components showing with a - * red border by default in Firefox. - * https://github.com/laravel-frontend-presets/tall/issues/7 - */ - -input:invalid, -textarea:invalid, -select:invalid { - box-shadow: none; -} - -/** - * Hide elements with the x-cloak directive from Alpine. - */ - -[x-cloak] { - display: none; -} diff --git a/templates/default/resources/css/components.css b/templates/default/resources/css/components.css deleted file mode 100644 index 4abf346..0000000 --- a/templates/default/resources/css/components.css +++ /dev/null @@ -1,9 +0,0 @@ -/* - |-------------------------------------------------------------------------- - | Application components - |-------------------------------------------------------------------------- - | - | Components of your application are defined in this file. - | https://tailwindcss.com/components/ - | - */ diff --git a/templates/default/tailwind.config.js b/templates/default/tailwind.config.js deleted file mode 100644 index 958c8c9..0000000 --- a/templates/default/tailwind.config.js +++ /dev/null @@ -1,36 +0,0 @@ -const { fontFamily } = require('tailwindcss/defaultTheme'); - -module.exports = { - theme: { - extend: { - fontFamily: { - sans: ['Inter var', ...fontFamily.sans], - }, - }, - }, - - variants: {}, - - purge: { - content: [ - './app/**/*.php', - './resources/**/*.html', - './resources/**/*.js', - './resources/**/*.jsx', - './resources/**/*.ts', - './resources/**/*.tsx', - './resources/**/*.php', - './resources/**/*.vue', - './resources/**/*.twig', - ], - options: { - defaultExtractor: content => content.match(/[\w-/.:]+(?