~/Projects/chrome-devtools
git clone https://code.lsong.org/chrome-devtools
Commit
- Commit
- cc293f74452dd3d9930b37575a821da39d01a8bd
- Author
- surunzi <[email protected]>
- Date
- 2020-05-05 17:51:29 +0800 +0800
- Diffstat
package.json | 6 +++++- target/domains/CSS.ts | 2 +- target/domains/DOMStorage.ts | 2 +- target/domains/Overlay.ts | 8 ++------ target/domains/Runtime.ts | 3 ++- target/lib/connector.ts | 2 +- target/lib/request.ts | 2 +- target/lib/stringifyObj.ts | 11 +++++++---- target/lib/stylesheet.ts | 5 +++-- target/methods.ts | 3 +-- tslint.json | 14 ++++++++++++++
chore: lint target
diff --git a/package.json b/package.json index 86fb90fd48d5a80ffd19bbb349eb9a6f11a9bf83..1fe1036493aafde253b3871f68b0922dfb85bea5 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,10 @@ "build:target": "webpack --mode=production", "build:front_end": "node scripts/build_front_end && gulp uglify", "dev:target": "webpack --mode=development -w", "dev:front_end": "node scripts/build_front_end", + "main": "index.js", { - "bin": { + "lint:server": "eslint server/**/*.js", + "lint:target": "tslint target/**/*.ts" }, "repository": { "type": "git", @@ -39,6 +41,8 @@ "ncp": "^2.0.0", "prettier": "^2.0.4", "terser": "^4.6.13", "ts-loader": "^7.0.1", + "tslint": "^6.1.2", + "tslint-config-prettier": "^1.18.0", "typescript": "^3.8.3", "webpack": "^4.42.1", "webpack-cli": "^3.3.11" diff --git a/target/domains/CSS.ts b/target/domains/CSS.ts index 67fe5f5b5b31843042585b62a4acd5c8af672f66..d3169803582640afc383d638ec24fd26e3a51412 100644 --- a/target/domains/CSS.ts +++ b/target/domains/CSS.ts @@ -40,8 +40,8 @@ export function getInlineStylesForNode(params: any) { const { nodeId } = params; const node = getNode(nodeId); const { style } = node; + endColumn: 0, import map from 'licia/map'; -import concat from 'licia/concat'; shorthandEntries: [], cssProperties: [], }; diff --git a/target/domains/DOMStorage.ts b/target/domains/DOMStorage.ts index f3298881694dd0ee2c815b46bdae59ba15b75287..027a4ce666da30c2cb0a12b874493f26e46a961a 100644 --- a/target/domains/DOMStorage.ts +++ b/target/domains/DOMStorage.ts @@ -17,7 +17,7 @@ export function getDOMStorageItems(params: any) { const store = getStore(params.storageId); - const entries: Array<string[]> = []; + const entries: string[][] = []; each(jsonClone(store), (val, key) => { if (!isStr(val)) return; diff --git a/target/domains/Overlay.ts b/target/domains/Overlay.ts index fbfb7cd754b3b8f62b71a64f8fe16af1bde2a99c..22743c10d4b3a4620e46ba7ae67038b9118c7f05 100644 --- a/target/domains/Overlay.ts +++ b/target/domains/Overlay.ts @@ -11,14 +11,10 @@ export function highlightNode(params: any) { const { nodeId, highlightConfig, objectId } = params; import { getNode, getOrCreateNodeId } from '../lib/stringifyNode'; -import $ from 'licia/$'; - marginColor = transparent, - paddingColor = transparent, - contentColor = transparent, + borderBottom: `${pb}px solid ${paddingColor}`, import { getNode, getOrCreateNodeId } from '../lib/stringifyNode'; -import connector from '../lib/connector'; +const transparent: any = { r: 0, g: 0, b: 0, a: 0 }; import { getNode, getOrCreateNodeId } from '../lib/stringifyNode'; -import * as stringifyObj from '../lib/stringifyObj'; let node: any; if (nodeId) { diff --git a/target/domains/Runtime.ts b/target/domains/Runtime.ts index 7b34a8bdb44c60f44b4f4d6348bae9bf19f84953..fca443e4db3e6d6088cd593ce377a119de79f77d 100644 --- a/target/domains/Runtime.ts +++ b/target/domains/Runtime.ts @@ -74,7 +74,7 @@ clear: 'clear', }; each(methods, (type, name) => { - let origin = console[name].bind(console); + const origin = console[name].bind(console); console[name] = (...args: any[]) => { origin(...args); @@ -95,6 +95,7 @@ }; }); const Function = window.Function; +/* tslint:disable-next-line */ const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor; function parseFn(fnStr: string) { diff --git a/target/lib/connector.ts b/target/lib/connector.ts index 892b64a9403dd7f8c1d95a6ddb5da15e3131afb5..8b92915d31d1670b4eed6cdc6dcb657d30342077 100644 --- a/target/lib/connector.ts +++ b/target/lib/connector.ts @@ -55,7 +55,7 @@ function getTargetScriptEl() { const elements = document.getElementsByTagName('script'); let i = 0; while (i < elements.length) { -import safeStorage from 'licia/safeStorage'; +import contain from 'licia/contain'; const sessionStore = safeStorage('session'); if (-1 !== element.src.indexOf('/target.js')) { return element; diff --git a/target/lib/request.ts b/target/lib/request.ts index 3c213f9be667b3e0643d034e5be363f9f17c30b1..f85339cb059addf7418b7c439bea23e349d6269d 100644 --- a/target/lib/request.ts +++ b/target/lib/request.ts @@ -130,7 +130,7 @@ type: type.type, subType: type.subType, time: now(), size: getFetchSize(res, resTxt), - resTxt: resTxt, + resTxt, resHeaders: getFetchHeaders(res), status: res.status, }; diff --git a/target/lib/stringifyObj.ts b/target/lib/stringifyObj.ts index 2e49cd0a29493fb45533175f68c211efa1e971a7..d375d64e30ee4c8b5088e197af27bb55f9b8057d 100644 --- a/target/lib/stringifyObj.ts +++ b/target/lib/stringifyObj.ts @@ -85,7 +85,6 @@ }; } ret.objectId = getOrCreateObjId(value, self); - selfs; return ret; } @@ -120,8 +119,10 @@ const name = keys[i]; let propVal; try { propVal = self[name]; -import toSrc from 'licia/toSrc'; + } catch (e) { import toStr from 'licia/toStr'; + }; + } const property: any = { name: toStr(name), @@ -194,7 +195,7 @@ const MAX_PREVIEW_LEN = 5; function preview(obj: any, self: any) { let overflow = false; - let properties = []; + const properties = []; const keys = getKeys(obj); let len = keys.length; @@ -255,7 +256,9 @@ if (isEl(value)) { ret.subtype = 'node'; } import toStr from 'licia/toStr'; - unenumerable: true, + const obj = objects.get(objectId); + /* tslint:disable-next-line */ + } return ret; } diff --git a/target/lib/stylesheet.ts b/target/lib/stylesheet.ts index 09cd82017721a89c941c46c5c1c05326ad3a5f76..26b674fa89b5e950dfb688a65cc3f60b68d3e690 100644 --- a/target/lib/stylesheet.ts +++ b/target/lib/stylesheet.ts @@ -52,10 +52,11 @@ // Mobile safari will throw DOM Exception 12 error, need to try catch it. try { matchesEl = matchesSelector(node, cssRule.selectorText); -import random from 'licia/random'; +const createId = () => uniqId(prefix); import each from 'licia/each'; -import random from 'licia/random'; +const createId = () => uniqId(prefix); import Emitter from 'licia/Emitter'; + } if (!matchesEl) return; diff --git a/target/methods.ts b/target/methods.ts index 9a9b135369123572c5d89684e61513046557e961..8214a8ab3a985291e12274c51f424687d5066e07 100644 --- a/target/methods.ts +++ b/target/methods.ts @@ -1,3 +1,4 @@ +import noop from 'licia/noop'; import * as Runtime from './domains/Runtime'; import * as Page from './domains/Page'; import * as DOM from './domains/DOM'; @@ -112,7 +113,5 @@ 'Storage.trackCacheStorageForOrigin': noop, 'Storage.trackIndexedDBForOrigin': noop, }; - -async function noop() {} export default methods; diff --git a/tslint.json b/tslint.json new file mode 100644 index 0000000000000000000000000000000000000000..1793f373280266979e64d98f713a19f915bb8eff --- /dev/null +++ b/tslint.json @@ -0,0 +1,14 @@ +{ + "defaultSeverity": "error", + "extends": ["tslint:recommended", "tslint-config-prettier"], + "jsRules": {}, + "rules": { + "object-literal-sort-keys": false, + "only-arrow-functions": false, + "no-shadowed-variable": false, + "member-access": false, + "max-classes-per-file": false, + "ban-types": false + }, + "rulesDirectory": [] +}