diff --git a/.eslintrc.js b/.eslintrc.js index 3f11e47e4..bf1394e65 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,6 +28,8 @@ module.exports = { 'eol-last': 0, 'react/no-find-dom-node': 0, 'no-case-declarations': 0, - '@typescript-eslint/indent': 0 + '@typescript-eslint/indent': 0, + 'import/no-cycle': 0, + '@typescript-eslint/no-shadow': 0, } }; diff --git a/package.json b/package.json index 713693f2b..380a057ce 100644 --- a/package.json +++ b/package.json @@ -25,23 +25,20 @@ "test": "lerna run test --stream", "test:snapshot": "lerna run test:snapshot", "watchdog:build": "node ./scripts/watchdog.js", - "xima:fix": "xima fix", - "xima:scan": "xima scan --quiet" + "f2elint:scan": "f2elint scan -q -i ./packages/*/src", + "f2elint:fix": "f2elint fix -i ./packages/*/src" }, "husky": { "hooks": { - "pre-commit": "xima exec lint-staged", - "commit-msg": "xima exec commitlint -E HUSKY_GIT_PARAMS" + "pre-commit": "f2elint commit-file-scan", + "commit-msg": "f2elint commit-msg-scan" } }, - "lint-staged": { - "**/*.{css,scss,less}": "xima exec stylelint", - "**/*.{js,jsx,ts,tsx}": "xima exec eslint" - }, "devDependencies": { "@ali/lerna": "^1", - "typescript": "^3.2.2", - "xima": "^0.3.0" + "f2elint": "^2.0.1", + "husky": "^7.0.4", + "typescript": "^3.2.2" }, "engines": { "node": ">=14.0.0" diff --git a/packages/designer/README.md b/packages/designer/README.md deleted file mode 100644 index ce7ea5d04..000000000 --- a/packages/designer/README.md +++ /dev/null @@ -1,4 +0,0 @@ -编排模块 - - -simulator/renderer 发 CDN diff --git a/packages/designer/src/builtin-simulator/bem-tools/border-container.tsx b/packages/designer/src/builtin-simulator/bem-tools/border-container.tsx index 461487e07..4275df98c 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/border-container.tsx +++ b/packages/designer/src/builtin-simulator/bem-tools/border-container.tsx @@ -47,9 +47,9 @@ function getTitle(title: string | I18nData | ReactElement) { @observer export class BorderContainer extends Component<{ - host: BuiltinSimulatorHost, + host: BuiltinSimulatorHost; }, { - target?: ParentalNode, + target?: ParentalNode; }> { state = {} as any; diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts index ae0f09ebd..0671cc730 100644 --- a/packages/designer/src/builtin-simulator/host.ts +++ b/packages/designer/src/builtin-simulator/host.ts @@ -1004,7 +1004,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost { // 假如当前节点就是 locked 状态,要从当前节点的父节点开始查找 return !!(node?.isLocked ? n.parent?.isLocked : n.isLocked); diff --git a/packages/designer/src/designer/builtin-hotkey.ts b/packages/designer/src/designer/builtin-hotkey.ts index 5d187a6b2..62e427b16 100644 --- a/packages/designer/src/designer/builtin-hotkey.ts +++ b/packages/designer/src/designer/builtin-hotkey.ts @@ -179,7 +179,7 @@ hotkey.bind(['command+z', 'ctrl+z'], (e) => { e.preventDefault(); const selection = focusing.focusDesigner?.currentSelection; - const curSelected = Array.from(selection?.selected!); + const curSelected = Array.from(selection?.selected || []); his.back(); selection?.selectAll(curSelected); }); @@ -193,7 +193,7 @@ hotkey.bind(['command+y', 'ctrl+y', 'command+shift+z'], (e) => { } e.preventDefault(); const selection = focusing.focusDesigner?.currentSelection; - const curSelected = Array.from(selection?.selected!); + const curSelected = Array.from(selection?.selected || []); his.forward(); selection?.selectAll(curSelected); }); diff --git a/packages/designer/src/designer/drag-ghost/ghost.less b/packages/designer/src/designer/drag-ghost/ghost.less index 5e2167a09..7ab61b41d 100644 --- a/packages/designer/src/designer/drag-ghost/ghost.less +++ b/packages/designer/src/designer/drag-ghost/ghost.less @@ -8,7 +8,6 @@ align-items: center; pointer-events: none; background-color: rgba(0, 0, 0, 0.4); - //opacity: 0.9; box-shadow: 0 0 6px grey; transform: translate(-10%, -50%); .lc-ghost { diff --git a/packages/designer/src/designer/setting/setting-field.ts b/packages/designer/src/designer/setting/setting-field.ts index 02729a317..b57646333 100644 --- a/packages/designer/src/designer/setting/setting-field.ts +++ b/packages/designer/src/designer/setting/setting-field.ts @@ -98,7 +98,7 @@ export class SettingField extends SettingPropEntry implements SettingEntry { return this._config; } - private initItems(items: Array, settingFieldCollector?: { (name: string | number, field: SettingField): void; (name: string, field: SettingField): void; }) { + private initItems(items: Array, settingFieldCollector?: { (name: string | number, field: SettingField): void; (name: string, field: SettingField): void }) { this._items = items.map((item) => { if (isCustomView(item)) { return item; diff --git a/packages/designer/src/designer/setting/setting-prop-entry.ts b/packages/designer/src/designer/setting/setting-prop-entry.ts index eec80fffa..ae48bae1a 100644 --- a/packages/designer/src/designer/setting/setting-prop-entry.ts +++ b/packages/designer/src/designer/setting/setting-prop-entry.ts @@ -292,7 +292,7 @@ export class SettingPropEntry implements SettingEntry { } } - notifyValueChange(oldValue: any, newValue:any) { + notifyValueChange(oldValue: any, newValue: any) { this.editor.emit(GlobalEvent.Node.Prop.Change, { node: this.getNode(), prop: this, oldValue, newValue }); } diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index 9bf58c9f2..3a181d17e 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -72,7 +72,7 @@ export class DocumentModel { /** * @deprecated */ - private _addons: Array<{ name: string, exportData: any }> = []; + private _addons: Array<{ name: string; exportData: any }> = []; /** * 模拟器 @@ -634,7 +634,7 @@ export class DocumentModel { ) { let visitorResult = {}; if (!visitorName) { - /* tslint:disable no-console */ + /* eslint-disable-next-line no-console */ console.warn('Invalid or empty RootNodeVisitor name.'); } try { diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts index d0965ccf6..4af456ab5 100644 --- a/packages/designer/src/document/node/node.ts +++ b/packages/designer/src/document/node/node.ts @@ -933,7 +933,7 @@ export class Node { return this.props; } - onChildrenChange(fn: (param?: { type: string, node: Node }) => void): (() => void) | undefined { + onChildrenChange(fn: (param?: { type: string; node: Node }) => void): (() => void) | undefined { const wrappedFunc = wrapWithEventSwitch(fn); return this.children?.onChange(wrappedFunc); } diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts index d06fbe231..4c83a4d76 100644 --- a/packages/designer/src/document/node/props/prop.ts +++ b/packages/designer/src/document/node/props/prop.ts @@ -8,6 +8,7 @@ import { TransformStage } from '../transform-stage'; const { set: mobxSet, isObservableArray } = mobx; export const UNSET = Symbol.for('unset'); +// eslint-disable-next-line no-redeclare export type UNSET = typeof UNSET; export interface IPropParent { diff --git a/packages/designer/src/simulator.ts b/packages/designer/src/simulator.ts index 5b3970ee1..d0b73ce30 100644 --- a/packages/designer/src/simulator.ts +++ b/packages/designer/src/simulator.ts @@ -5,6 +5,7 @@ import { BuiltinSimulatorRenderer } from './builtin-simulator/renderer'; import { Node, ParentalNode } from './document'; export type AutoFit = '100%'; +// eslint-disable-next-line no-redeclare export const AutoFit = '100%'; export interface IViewport extends IScrollable { diff --git a/packages/designer/src/utils/logger.ts b/packages/designer/src/utils/logger.ts index 21ff230a6..47ec22c6f 100644 --- a/packages/designer/src/utils/logger.ts +++ b/packages/designer/src/utils/logger.ts @@ -2,6 +2,6 @@ import Logger, { Level } from 'zen-logger'; export { Logger }; -export function getLogger(config: { level: Level, bizName: string }): Logger { +export function getLogger(config: { level: Level; bizName: string }): Logger { return new Logger(config); }