Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/upgrade tailwindcss #319

Merged
merged 18 commits into from
Aug 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": {
"presets": [
[
"babel-preset-env",
"@babel/preset-env",
{
"targets": {
"node": "current"
Expand Down
3 changes: 3 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not dead
17 changes: 10 additions & 7 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
const path = require('path');

module.exports = {
stories: ['../src/**/*.stories.@(js|mdx)'],
addons: [
'@storybook/addon-docs',
'@storybook/addon-a11y',
'@storybook/addon-storysource',
'@storybook/addon-knobs',
'@storybook/addon-actions',
'@storybook/addon-essentials'
'@storybook/addon-links',
'@storybook/addon-essentials',
{
name: '@storybook/addon-postcss',
options: {
postcssLoaderOptions: {
implementation: require('postcss'),
},
},
},
]
}
4 changes: 1 addition & 3 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import { addDecorator, addParameters } from '@storybook/vue'
import 'focus-visible'
import 'svgxuse'

import { withKnobs } from '@storybook/addon-knobs'

import '../assets/styles/tailwind.css'
// Wrap every story in Alpaca App component
import AApp from '../src/atoms/app/App.vue'

addDecorator(withKnobs)
addDecorator(() => ({
components: { AApp },
template: `
Expand Down
31 changes: 4 additions & 27 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,16 @@ const StyleLintPlugin = require('stylelint-webpack-plugin')
const path = require('path')

module.exports = ({ config }) => {
config.module.rules.push({
test: /\.scss$/,
use: [
'vue-style-loader',
'css-loader',
'sass-loader'
]
})

config.module.rules.push({
test: /\.scss$/,
use: [
{
loader: 'postcss-loader',
options: {
ident: 'postcss',
syntax: 'postcss-scss',
plugins: [
require('tailwindcss'),
require('autoprefixer')
]
}
}
]
})

config.module.rules.push({
enforce: 'pre',
test: /\.(js|vue)$/,
exclude: /node_modules/,
loader: 'eslint-loader'
loader: 'eslint-loader',
options: {
emitWarning: true
}
})

config.plugins.push(new StyleLintPlugin({
files: [
'src/**/*.vue',
Expand Down
14 changes: 13 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,19 @@
"stylelint-config-rational-order"
],
"rules": {
"at-rule-no-unknown": null,
"at-rule-no-unknown": [
true,
{
ignoreAtRules: [
'tailwind',
'apply',
'variants',
'responsive',
'screen',
]
}
],
"declaration-block-trailing-semicolon": null,
"no-descending-specificity": null,
"block-no-empty": null,
"color-no-invalid-hex": true,
Expand Down
8 changes: 0 additions & 8 deletions assets/styles/_focus-visible.scss

This file was deleted.

4 changes: 0 additions & 4 deletions assets/styles/_globals.scss

This file was deleted.

46 changes: 0 additions & 46 deletions assets/styles/_reset.scss

This file was deleted.

140 changes: 0 additions & 140 deletions assets/styles/_variables.scss

This file was deleted.

33 changes: 0 additions & 33 deletions assets/styles/mixins/_focus.scss

This file was deleted.

19 changes: 0 additions & 19 deletions assets/styles/mixins/_mq.scss

This file was deleted.

22 changes: 0 additions & 22 deletions assets/styles/mixins/_visually-hidden.scss

This file was deleted.

File renamed without changes.
Loading