fix: sync with lad v1.3.0

ladjs · Feb 12, 2021 · f6c008c · f6c008c
1 parent e3600fd
commit f6c008c
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 102 deletions.
diff --git a/.env.defaults b/.env.defaults
@@ -35,7 +35,7 @@ API_URL={{API_PROTOCOL}}://{{API_HOST}}:{{API_PORT}}
 API_SSL_KEY_PATH=
 API_SSL_CERT_PATH=
 API_SSL_CA_PATH=
-API_RATELIMIT_WHITELIST=138.197.213.185,178.62.29.206,104.248.224.170
+API_RATELIMIT_WHITELIST=
 
 #########
 ## app ##

diff --git a/assets/css/_custom.scss b/assets/css/_custom.scss
@@ -9,7 +9,8 @@
 body {
   padding-top: 77px;
   text-rendering: optimizeLegibility;
-  font-smoothing: antialiased;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 .text-decoration-underline {

diff --git a/assets/css/_markdown.scss b/assets/css/_markdown.scss
@@ -4,6 +4,8 @@
 .markdown-body {
   margin-left: 20px;
   margin-right: 20px;
+  font-family: $font-family-sans-serif;
+
   @for $index from 1 through 6 {
     h#{$index} {
       .anchor {
@@ -13,21 +15,24 @@
       }
     }
   }
+
+  code, kbd, pre, .commit-tease-sha, .blob-num, .blob-code-inner, {
+    font-family: $font-family-monospace;
+  }
+
   code {
     color: #24292e;
     font-size: 100%;
   }
-  pre > code {
-    display: block;
-  }
-  font-family: $font-family-sans-serif;
-  code, kbd, pre, .commit-tease-sha, .blob-num, .blob-code-inner, {
-    font-family: $font-family-monospace;
-  }
-  .highlight pre, pre {
-    padding: 1rem;
+
+  pre {
+    > code {
+      display: block;
+    }
   }
+
   pre, .highlight pre {
     font-size: 100%;
+    padding: 1rem;
   }
 }
diff --git a/assets/css/app.scss b/assets/css/app.scss
@@ -21,13 +21,19 @@ $question: theme-color('light');
 // font awesome
 @import 'node_modules/@fortawesome/fontawesome-free/scss/fontawesome';
 // @import 'node_modules/@fortawesome/fontawesome-free/scss/brands';
+
+// <https://github.com/stylelint/stylelint/issues/3848>
+$fontAwesomeBrands: 'Font Awesome 5 Brands';
+$fontAwesomeFree: 'Font Awesome 5 Free';
 .fab {
   font-family: 'Font Awesome 5 Brands';
+  font-family: $fontAwesomeBrands;
   font-weight: 400;
 }
 // @import 'node_modules/@fortawesome/fontawesome-free/scss/solid';
 .fa, .fas {
   font-family: 'Font Awesome 5 Free';
+  font-family: $fontAwesomeFree;
   font-weight: 900;
 }
 @import 'node_modules/@fortawesome/fontawesome-free/scss/v4-shims';

diff --git a/gulpfile.js b/gulpfile.js
@@ -14,7 +14,6 @@ const cssnano = require('cssnano');
 const del = require('del');
 const envify = require('@ladjs/gulp-envify');
 const fontMagician = require('postcss-font-magician');
-const fontSmoothing = require('postcss-font-smoothing');
 const getStream = require('get-stream');
 const globby = require('globby');
 const gulpRemark = require('gulp-remark');
@@ -124,7 +123,6 @@ function css() {
           display: 'swap'
         }),
         postcssPresetEnv({ browsers: 'extends @ladjs/browserslist-config' }),
-        fontSmoothing(),
         ...(PROD ? [cssnano({ autoprefixer: false })] : []),
         reporter()
       ])

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "@koa/router": "^10.0.0",
     "@ladjs/api": "^6.0.0",
     "@ladjs/assets": "^1.1.1",
-    "@ladjs/env": "^2.0.2",
+    "@ladjs/env": "^3.0.0",
     "@ladjs/graceful": "^1.0.5",
     "@ladjs/i18n": "^7.0.1",
     "@ladjs/mongoose": "^2.1.1",
@@ -62,7 +62,7 @@
     "cheerio": "^1.0.0-rc.5",
     "clipboard": "^2.0.6",
     "consolidate": "^0.16.0",
-    "crypto-random-string": "^3.3.0",
+    "crypto-random-string": "^3.3.1",
     "custom-fonts-in-emails": "^4.0.2",
     "dashify": "^2.0.0",
     "dayjs": "^1.10.4",
@@ -131,10 +131,10 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.13",
-    "@babel/core": "^7.12.13",
+    "@babel/cli": "^7.12.16",
+    "@babel/core": "^7.12.16",
     "@babel/polyfill": "^7.12.1",
-    "@babel/preset-env": "^7.12.13",
+    "@babel/preset-env": "^7.12.16",
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
     "@ladjs/browserslist-config": "^0.0.1",
@@ -188,7 +188,6 @@
     "parse-git-config": "^3.0.0",
     "postcss": "^8.2.6",
     "postcss-font-magician": "^3.0.0",
-    "postcss-font-smoothing": "^0.1.0",
     "postcss-preset-env": "^6.7.0",
     "postcss-reporter": "^7.0.2",
     "postcss-scss": "^3.0.4",