Skip to content

Commit

Permalink
style: 💄 switch indents from 4 to 2
Browse files Browse the repository at this point in the history
  • Loading branch information
lenconda committed Jul 14, 2021
1 parent 313ae9c commit 0b59b58
Show file tree
Hide file tree
Showing 42 changed files with 2,243 additions and 2,149 deletions.
121 changes: 69 additions & 52 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,55 +1,72 @@
module.exports = {
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint/eslint-plugin'],
extends: [
'alloy',
'alloy/typescript',
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint/eslint-plugin'],
extends: [
'alloy',
'alloy/typescript',
],
root: true,
env: {
node: true,
jest: true,
},
rules: {
semi: 'off',
'comma-dangle': ['error', 'always-multiline'],
'switch-colon-spacing': ['error', {
'after': true,
'before': false,
}],
quotes: ['error', 'single'],
indent: ['error', 2, {
SwitchCase: 1,
}],
'eol-last': ['error', 'always'],
'space-infix-ops': 'off',
'max-nested-callbacks': 'off',
'max-params': 'off',
'prefer-regex-literals': 'off',
'no-useless-call': 'off',
'complexity': 'off',
'no-new-func': 'off',
'comma-spacing': ['error', {
'before': false,
'after': true,
}],
'key-spacing': [2, {
'beforeColon': false,
'afterColon': true,
'mode': 'strict',
}],
'no-multiple-empty-lines': ['error', {
'max': 1,
'maxEOF': 1,
}],
'@typescript-eslint/semi': ['error', 'always'],
'@typescript-eslint/space-infix-ops': ['error', {
'int32Hint': true,
}],
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/consistent-type-assertions': 'off',
'@typescript-eslint/no-require-imports': 'off',
'@typescript-eslint/no-parameter-properties': 'off',
'@typescript-eslint/type-annotation-spacing': [
'error',
{
'before': true,
'after': true,
'overrides': {
'colon': {
'before': false,
'after': true,
},
},
},
],
root: true,
env: {
node: true,
jest: true,
},
rules: {
semi: 'off',
'comma-dangle': ['error', 'always-multiline'],
'switch-colon-spacing': ['error', { 'after': true, 'before': false }],
quotes: ['error', 'single'],
indent: ['error', 4, { SwitchCase: 1 }],
'eol-last': ['error', 'always'],
'space-infix-ops': 'off',
'max-nested-callbacks': 'off',
'max-params': 'off',
'prefer-regex-literals': 'off',
'no-useless-call': 'off',
'complexity': 'off',
'no-new-func': 'off',
'comma-spacing': ['error', { 'before': false, 'after': true }],
'key-spacing': [2, { 'beforeColon': false, 'afterColon': true, 'mode': 'strict' }],
'no-multiple-empty-lines': ['error', { 'max': 1, 'maxEOF': 1 }],
'@typescript-eslint/semi': ['error', 'always'],
'@typescript-eslint/space-infix-ops': ['error', { 'int32Hint': true }],
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/consistent-type-assertions': 'off',
'@typescript-eslint/no-require-imports': 'off',
'@typescript-eslint/no-parameter-properties': 'off',
'@typescript-eslint/type-annotation-spacing': [
'error',
{
'before': true,
'after': true,
'overrides': {
'colon': {
'before': false,
'after': true,
},
},
},
],
},
},
};
152 changes: 77 additions & 75 deletions .umirc.ts
Original file line number Diff line number Diff line change
@@ -1,80 +1,82 @@
import { defineConfig } from 'dumi';
import {
defineConfig,
} from 'dumi';

export default defineConfig({
title: 'Dollie.js',
outputPath: 'docs-dist',
mode: 'site',
publicPath: '/',
hash: true,
locales: [
['en-US', 'English'],
['zh-CN', '中文'],
],
copy: [
{
from: 'docs/public',
to: 'public'
},
],
theme: {
'@c-primary': '#844d28',
title: 'Dollie.js',
outputPath: 'docs-dist',
mode: 'site',
publicPath: '/',
hash: true,
locales: [
['en-US', 'English'],
['zh-CN', '中文'],
],
copy: [
{
from: 'docs/public',
to: 'public',
},
styles: [
'https://unpkg.zhimg.com/[email protected]/dist/antd.min.css',
'img { max-width: 86% !important; display: block; margin: 0 auto; }',
'.__dumi-default-locale-select, .__dumi-default-search-input { border-radius: 2px !important; }',
'.__dumi-default-locale-select, .__dumi-default-search-input:focus { border: 1px solid rgba(255, 255, 255, .4) !important; }',
'.__dumi-default-search-input { border: 1px solid transparent !important; }',
'.__dumi-default-menu-doc-locale { display: none !important; }',
'.__dumi-default-navbar { background-color: #0b0f13 !important; box-shadow: 0 0 0.2rem rgb(0 0 0 / 10%), 0 0.2rem 0.4rem rgb(0 0 0 / 20%) !important; }',
'.__dumi-default-search-input { background-color: rgba(255, 255, 255, .1) !important; color: rgba(255, 255, 255, .8) !important; }',
'.__dumi-default-navbar-logo { font-size: 22px !important; color: white !important; }',
'.__dumi-default-navbar nav > span > a:not(.active) { color: rgba(255, 255, 255, .6) !important; }',
'.__dumi-default-navbar nav > span > a:not(.active):hover { color: rgba(255, 255, 255, .8) !important; }',
'.__dumi-default-navbar nav > span > a.active::after { display: none !important; }',
'.__dumi-default-locale-select:hover { background-color: transparent !important; }',
'.__dumi-default-menu[data-mode=\'site\'] .__dumi-default-menu-list > li > a::after { display: none !important; }',
'.__dumi-default-menu[data-mode=\'site\'] .__dumi-default-menu-list > li > a.active { background: rgb(132, 77, 40, 0.3) !important; }',
'.__dumi-default-menu-inner ul li a::before, .__dumi-default-menu-inner ul li > span::before { display: none !important; }',
'.__dumi-default-layout-hero button { border-radius: 4px !important; }',
'.__dumi-default-menu[data-mode=\'site\'] { background: white !important; }',
'code, pre { font-family: Menlo, Consolas, Courier, monospace !important; font-size: 14px; background: transparent !important; }',
'[data-prefers-color=dark] .markdown a { color: #844d28 !important; }',
'pre { color: #333 !important; }',
'h1 code, h2 code, h3 code, h4 code, h5 code, h6 code { font-size: inherit; }',
'https://cdn.jsdelivr.net/npm/[email protected]/themes/prism-vs.css',
'[data-prefers-color=dark] .__dumi-default-menu-inner ul li a:hover, [data-prefers-color=dark] .__dumi-default-menu-inner ul li > span:hover, [data-prefers-color=dark] .__dumi-default-menu-inner ul li a.active, [data-prefers-color=dark] .__dumi-default-menu-inner ul li > span.active { color: #844d28 !important; }',
'[data-prefers-color=dark] code[class*="language-"], [data-prefers-color=dark] pre[class*="language-"] { color: white !important; }',
'[data-prefers-color=dark] .markdown *:not(pre) code { color: #844d28 !important; }',
'.__dumi-default-menu[data-mode=\'site\'] { padding-top: 0 !important; }',
'[data-prefers-color=dark] .__dumi-default-navbar nav > span > a:hover, [data-prefers-color=dark] .__dumi-default-navbar nav > span > a.active, [data-prefers-color=dark] .__dumi-default-layout-footer-meta, [data-prefers-color=dark] .__dumi-default-layout-footer-meta > span:last-child::before { color: #844d28 !important; }',
'.__dumi-default-menu[data-mode=\'site\'] .__dumi-default-menu-list { margin-top: 50px; }',
'@media (min-width: 960px) { div[data-show-sidemenu="true"] .__dumi-default-layout-content { padding-left: 10%; padding-right: 10%; } }',
'@media (min-width: 1680px) { div[data-show-sidemenu="true"] .__dumi-default-layout-content { padding-left: 26%; padding-right: 26%; } }',
'.markdown blockquote { border-left-color: #844d28 !important; }',
'.markdown *:not(pre) code { color: #844d28 !important; }'
],
theme: {
'@c-primary': '#844d28',
},
styles: [
'https://unpkg.zhimg.com/[email protected]/dist/antd.min.css',
'img { max-width: 86% !important; display: block; margin: 0 auto; }',
'.__dumi-default-locale-select, .__dumi-default-search-input { border-radius: 2px !important; }',
'.__dumi-default-locale-select, .__dumi-default-search-input:focus { border: 1px solid rgba(255, 255, 255, .4) !important; }',
'.__dumi-default-search-input { border: 1px solid transparent !important; }',
'.__dumi-default-menu-doc-locale { display: none !important; }',
'.__dumi-default-navbar { background-color: #0b0f13 !important; box-shadow: 0 0 0.2rem rgb(0 0 0 / 10%), 0 0.2rem 0.4rem rgb(0 0 0 / 20%) !important; }',
'.__dumi-default-search-input { background-color: rgba(255, 255, 255, .1) !important; color: rgba(255, 255, 255, .8) !important; }',
'.__dumi-default-navbar-logo { font-size: 22px !important; color: white !important; }',
'.__dumi-default-navbar nav > span > a:not(.active) { color: rgba(255, 255, 255, .6) !important; }',
'.__dumi-default-navbar nav > span > a:not(.active):hover { color: rgba(255, 255, 255, .8) !important; }',
'.__dumi-default-navbar nav > span > a.active::after { display: none !important; }',
'.__dumi-default-locale-select:hover { background-color: transparent !important; }',
'.__dumi-default-menu[data-mode=\'site\'] .__dumi-default-menu-list > li > a::after { display: none !important; }',
'.__dumi-default-menu[data-mode=\'site\'] .__dumi-default-menu-list > li > a.active { background: rgb(132, 77, 40, 0.3) !important; }',
'.__dumi-default-menu-inner ul li a::before, .__dumi-default-menu-inner ul li > span::before { display: none !important; }',
'.__dumi-default-layout-hero button { border-radius: 4px !important; }',
'.__dumi-default-menu[data-mode=\'site\'] { background: white !important; }',
'code, pre { font-family: Menlo, Consolas, Courier, monospace !important; font-size: 14px; background: transparent !important; }',
'[data-prefers-color=dark] .markdown a { color: #844d28 !important; }',
'pre { color: #333 !important; }',
'h1 code, h2 code, h3 code, h4 code, h5 code, h6 code { font-size: inherit; }',
'https://cdn.jsdelivr.net/npm/[email protected]/themes/prism-vs.css',
'[data-prefers-color=dark] .__dumi-default-menu-inner ul li a:hover, [data-prefers-color=dark] .__dumi-default-menu-inner ul li > span:hover, [data-prefers-color=dark] .__dumi-default-menu-inner ul li a.active, [data-prefers-color=dark] .__dumi-default-menu-inner ul li > span.active { color: #844d28 !important; }',
'[data-prefers-color=dark] code[class*="language-"], [data-prefers-color=dark] pre[class*="language-"] { color: white !important; }',
'[data-prefers-color=dark] .markdown *:not(pre) code { color: #844d28 !important; }',
'.__dumi-default-menu[data-mode=\'site\'] { padding-top: 0 !important; }',
'[data-prefers-color=dark] .__dumi-default-navbar nav > span > a:hover, [data-prefers-color=dark] .__dumi-default-navbar nav > span > a.active, [data-prefers-color=dark] .__dumi-default-layout-footer-meta, [data-prefers-color=dark] .__dumi-default-layout-footer-meta > span:last-child::before { color: #844d28 !important; }',
'.__dumi-default-menu[data-mode=\'site\'] .__dumi-default-menu-list { margin-top: 50px; }',
'@media (min-width: 960px) { div[data-show-sidemenu="true"] .__dumi-default-layout-content { padding-left: 10%; padding-right: 10%; } }',
'@media (min-width: 1680px) { div[data-show-sidemenu="true"] .__dumi-default-layout-content { padding-left: 26%; padding-right: 26%; } }',
'.markdown blockquote { border-left-color: #844d28 !important; }',
'.markdown *:not(pre) code { color: #844d28 !important; }'
],
favicon: '/public/images/favicon.ico',
resolve: {
includes: ['docs'],
previewLangs: [],
},
navs: {
'en-US': [
null,
{
title: 'GitHub',
path: 'https://github.com/dolliejs/dollie',
},
],
favicon: '/public/images/favicon.ico',
resolve: {
includes: ['docs'],
previewLangs: [],
},
navs: {
'en-US': [
null,
{
title: 'GitHub',
path: 'https://github.com/dolliejs/dollie',
},
],
'zh-CN': [
null,
{
title: 'GitHub',
path: 'https://github.com/dolliejs/dollie',
},
],
},
logo: '/public/images/dollie.svg',
exportStatic: {},
'zh-CN': [
null,
{
title: 'GitHub',
path: 'https://github.com/dolliejs/dollie',
},
],
},
logo: '/public/images/dollie.svg',
exportStatic: {},
});
3 changes: 0 additions & 3 deletions .vscode/settings.json

This file was deleted.

8 changes: 4 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages": [
"packages/@dollie/*"
],
"version": "3.0.1"
"packages": [
"packages/@dollie/*"
],
"version": "3.0.1"
}
59 changes: 30 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
{
"private": true,
"scripts": {
"watch:cli": "cd packages/@dollie/cli && npm run build:watch",
"watch:core": "cd packages/@dollie/core && npm run build:watch",
"watch:origins": "cd packages/@dollie/origins && npm run build:watch",
"watch": "concurrently \"npm:watch:*\"",
"docs:start": "dumi dev",
"docs:build": "dumi build",
"docs:deploy": "node scripts/docs.js",
"checksum": "node scripts/check.js",
"publish": "node scripts/publish.js"
},
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/node": "^15.12.2",
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.27.0",
"aliyun-oss-deploy": "^0.1.5",
"antd": "^4.16.6",
"babel-eslint": "^10.1.0",
"concurrently": "^6.2.0",
"dumi": "^1.1.22",
"eslint": "^7.28.0",
"eslint-config-alloy": "^4.1.0",
"jest": "^27.0.4",
"lerna": "^4.0.0",
"md5-file": "^5.0.0",
"typescript": "^3.7.7"
}
"private": true,
"scripts": {
"watch:cli": "cd packages/@dollie/cli && npm run build:watch",
"watch:core": "cd packages/@dollie/core && npm run build:watch",
"watch:origins": "cd packages/@dollie/origins && npm run build:watch",
"watch": "concurrently \"npm:watch:*\"",
"docs:start": "dumi dev",
"docs:build": "dumi build",
"docs:deploy": "node scripts/docs.js",
"checksum": "node scripts/check.js",
"publish": "node scripts/publish.js"
},
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/node": "^15.12.2",
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.27.0",
"aliyun-oss-deploy": "^0.1.5",
"antd": "^4.16.6",
"babel-eslint": "^10.1.0",
"concurrently": "^6.2.0",
"dumi": "^1.1.22",
"eslint": "^7.28.0",
"eslint-config-alloy": "^4.1.0",
"jest": "^27.0.4",
"lerna": "^4.0.0",
"md5-file": "^5.0.0",
"rimraf": "^3.0.2",
"typescript": "^3.7.7"
}
}
Loading

0 comments on commit 0b59b58

Please sign in to comment.