diff --git a/.eslintrc.json b/.eslintrc.json index bc3786f5c0..48c686c3ab 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -21,7 +21,7 @@ "prefer-const": [2, { "destructuring": "all" }], "arrow-spacing": 2, "no-inner-declarations": 0, - "@typescript-eslint/indent": [2, "tab", { "SwitchCase": 1 }], + "@typescript-eslint/indent": ["warn", "tab", { "SwitchCase": 1 }], "@typescript-eslint/camelcase": "off", "@typescript-eslint/no-use-before-define": "off", "@typescript-eslint/array-type": ["error", "array-simple"], diff --git a/src/compiler/compile/render-dom/Block.ts b/src/compiler/compile/render-dom/Block.ts index 0bcc3ff7ed..95c90ef101 100644 --- a/src/compiler/compile/render-dom/Block.ts +++ b/src/compiler/compile/render-dom/Block.ts @@ -372,8 +372,8 @@ export default class Block { ${properties} }; `.replace(/(#+)(\w*)/g, (_match: string, sigil: string, name: string) => { - return sigil === '#' ? this.alias(name) : sigil.slice(1) + name; - }); + return sigil === '#' ? this.alias(name) : sigil.slice(1) + name; + }); } render_listeners(chunk: string = '') { diff --git a/src/compiler/compile/render-dom/index.ts b/src/compiler/compile/render-dom/index.ts index 665c6931b4..143e553998 100644 --- a/src/compiler/compile/render-dom/index.ts +++ b/src/compiler/compile/render-dom/index.ts @@ -79,8 +79,8 @@ export default function dom( ${$$props} => { ${uses_props && component.invalidate('$$props', `$$props = @assign(@assign({}, $$props), $$new_props)`)} ${writable_props.map(prop => - `if ('${prop.export_name}' in $$props) ${component.invalidate(prop.name, `${prop.name} = $$props.${prop.export_name}`)};` - )} + `if ('${prop.export_name}' in $$props) ${component.invalidate(prop.name, `${prop.name} = $$props.${prop.export_name}`)};` + )} ${component.slots.size > 0 && `if ('$$scope' in ${$$props}) ${component.invalidate('$$scope', `$$scope = ${$$props}.$$scope`)};`} } diff --git a/src/compiler/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render-dom/wrappers/EachBlock.ts index 1cd2d989e3..a1a875a12f 100644 --- a/src/compiler/compile/render-dom/wrappers/EachBlock.ts +++ b/src/compiler/compile/render-dom/wrappers/EachBlock.ts @@ -312,8 +312,8 @@ export default class EachBlockWrapper extends Wrapper { block.builders.init.add_block(deindent` const ${get_key} = ctx => ${ - // @ts-ignore todo: probably error - this.node.key.render()}; + // @ts-ignore todo: probably error + this.node.key.render()}; for (var #i = 0; #i < ${this.vars.each_block_value}.${length}; #i += 1) { let child_ctx = ${this.vars.get_each_context}(ctx, ${this.vars.each_block_value}, #i); diff --git a/src/compiler/compile/render-dom/wrappers/IfBlock.ts b/src/compiler/compile/render-dom/wrappers/IfBlock.ts index 74818d1e11..1b47c84a22 100644 --- a/src/compiler/compile/render-dom/wrappers/IfBlock.ts +++ b/src/compiler/compile/render-dom/wrappers/IfBlock.ts @@ -213,8 +213,8 @@ export default class IfBlockWrapper extends Wrapper { block.builders.init.add_block(deindent` function ${select_block_type}(ctx) { ${this.branches - .map(({ condition, block }) => `${condition ? `if (${condition}) ` : ''}return ${block.name};`) - .join('\n')} + .map(({ condition, block }) => `${condition ? `if (${condition}) ` : ''}return ${block.name};`) + .join('\n')} } `); @@ -292,8 +292,8 @@ export default class IfBlockWrapper extends Wrapper { function ${select_block_type}(ctx) { ${this.branches - .map(({ condition }, i) => `${condition ? `if (${condition}) ` : ''}return ${i};`) - .join('\n')} + .map(({ condition }, i) => `${condition ? `if (${condition}) ` : ''}return ${i};`) + .join('\n')} ${!has_else && `return -1;`} } `); diff --git a/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts index b1bc3c78c3..220a1328e7 100644 --- a/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts +++ b/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts @@ -234,8 +234,8 @@ export default class InlineComponentWrapper extends Wrapper { if (attribute.dependencies.size > 0) { updates.push(deindent` if (${[...attribute.dependencies] - .map(dependency => `changed.${dependency}`) - .join(' || ')}) ${name_changes}${quote_prop_if_necessary(attribute.name)} = ${attribute.get_value(block)}; + .map(dependency => `changed.${dependency}`) + .join(' || ')}) ${name_changes}${quote_prop_if_necessary(attribute.name)} = ${attribute.get_value(block)}; `); } }); diff --git a/src/compiler/compile/render-dom/wrappers/Window.ts b/src/compiler/compile/render-dom/wrappers/Window.ts index 44abe534fc..585864664a 100644 --- a/src/compiler/compile/render-dom/wrappers/Window.ts +++ b/src/compiler/compile/render-dom/wrappers/Window.ts @@ -141,17 +141,17 @@ export default class WindowWrapper extends Wrapper { if (bindings.scrollX || bindings.scrollY) { block.builders.update.add_block(deindent` if (${ - [bindings.scrollX, bindings.scrollY].filter(Boolean).map( - b => `changed.${b}` - ).join(' || ') -} && !${scrolling}) { + [bindings.scrollX, bindings.scrollY].filter(Boolean).map( + b => `changed.${b}` + ).join(' || ') + } && !${scrolling}) { ${scrolling} = true; clearTimeout(${scrolling_timeout}); window.scrollTo(${ - bindings.scrollX ? `ctx.${bindings.scrollX}` : `window.pageXOffset` -}, ${ - bindings.scrollY ? `ctx.${bindings.scrollY}` : `window.pageYOffset` -}); + bindings.scrollX ? `ctx.${bindings.scrollX}` : `window.pageXOffset` + }, ${ + bindings.scrollY ? `ctx.${bindings.scrollY}` : `window.pageYOffset` + }); ${scrolling_timeout} = setTimeout(${clear_scrolling}, 100); } `);