Skip to content

Commit

Permalink
Merge branch 'master' into perf/search
Browse files Browse the repository at this point in the history
  • Loading branch information
tiensonqin committed Dec 13, 2020
2 parents 0bdf2c6 + 9c18b2c commit 57b9e7f
Show file tree
Hide file tree
Showing 25 changed files with 2,678 additions and 1,564 deletions.
23 changes: 23 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"extends": [
"stylelint-config-standard"
],
"rules": {
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": [
"tailwind",
"apply",
"variants",
"responsive",
"screen"
]
}
],
"declaration-block-trailing-semicolon": null,
"no-descending-specificity": null,
"declaration-empty-line-before": null,
"block-no-empty": null
}
}
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@
"version": "0.0.1",
"private": true,
"devDependencies": {
"@tailwindcss/ui": "^0.1.3",
"cross-env": "^7.0.3",
"@tailwindcss/ui": "0.7.2",
"cssnano": "^4.1.10",
"del": "^6.0.0",
"gulp": "^4.0.2",
"gulp-clean-css": "^4.3.0",
"gulp-concat": "^2.6.1",
"gulp-postcss": "^9.0.0",
"npm-run-all": "^4.1.5",
"postcss": "^7.0.21",
"postcss-cli": "^6.1.3",
"purgecss": "^2.1.0",
"postcss": "8.2.1",
"postcss-cli": "8.3.0",
"postcss-nested": "^5.0.1",
"purgecss": "3.0.0",
"shadow-cljs": "2.8.81",
"tailwindcss": "^1.3.4"
"stylelint": "^13.8.0",
"stylelint-config-standard": "^20.0.0",
"tailwindcss": "2.0.1"
},
"scripts": {
"watch": "run-p cljs:watch gulp:build gulp:watch",
Expand All @@ -28,6 +30,7 @@
"clean": "gulp clean",
"test": "run-s cljs:test cljs:run-test",
"report": "run-s cljs:report",
"style:lint": "stylelint \"src/**/*.css\" ",
"gulp:watch": "gulp watch",
"gulp:build": "cross-env NODE_ENV=production gulp build",
"cljs:watch": "clojure -M:cljs watch app publishing",
Expand Down
8 changes: 4 additions & 4 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = (ctx) => ({
plugins: [
require("autoprefixer"),
require("tailwindcss")("tailwind.config.js"),
ctx.env === "production" ? require("cssnano")({ preset: "default" }) : null,
require('postcss-nested'),
require('tailwindcss')('tailwind.config.js'),
ctx.env === 'production' ? require('cssnano')({ preset: 'default' }) : null,
],
});
})
Loading

0 comments on commit 57b9e7f

Please sign in to comment.