diff --git a/package.json b/package.json index 87310dc409..e11ec8445c 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dev:shared": "rollup -c rollup/rollup.config.shared.js -w", "pretest": "npm run build", "prepublish": "npm run build && npm run lint", - "prettier": "prettier --use-tabs --single-quote --write \"src/**/*.ts\" \"src/**/*.js\"" + "prettier": "prettier --use-tabs --single-quote --trailing-comma es5 --write \"src/**/*.ts\"" }, "repository": { "type": "git", diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts index 09b7e3409a..084f1e7d90 100644 --- a/src/generators/Generator.ts +++ b/src/generators/Generator.ts @@ -84,7 +84,7 @@ export default class Generator { enter: (node: Node) => { this.code.addSourcemapLocation(node.start); this.code.addSourcemapLocation(node.end); - } + }, }); } @@ -127,7 +127,7 @@ export default class Generator { if (lexicalDepth === 0 && context) code.overwrite(node.start, node.end, context, { storeName: true, - contentOnly: false + contentOnly: false, }); } else if (isReference(node, parent)) { const { name } = flattenReference(node); @@ -182,13 +182,13 @@ export default class Generator { leave(node: Node) { if (/^Function/.test(node.type)) lexicalDepth -= 1; if (node._scope) scope = scope.parent; - } + }, }); return { dependencies: expression._dependencies, // TODO probably a better way to do this contexts: usedContexts, - snippet: `[✂${expression.start}-${expression.end}✂]` + snippet: `[✂${expression.start}-${expression.end}✂]`, }; } @@ -227,7 +227,7 @@ export default class Generator { leave(node: Node) { if (node._scope) scope = scope.parent; - } + }, }); dependencies.forEach(name => { @@ -294,7 +294,7 @@ export default class Generator { function addString(str: string) { compiled.addSource({ - content: new MagicString(str) + content: new MagicString(str), }); } @@ -308,7 +308,7 @@ export default class Generator { if (!parts.length) { compiled.addSource({ filename, - content: new MagicString(this.source).remove(0, this.source.length) + content: new MagicString(this.source).remove(0, this.source.length), }); } @@ -322,7 +322,7 @@ export default class Generator { compiled.addSource({ filename, - content: snippet + content: snippet, }); }); @@ -333,9 +333,9 @@ export default class Generator { code: compiled.toString(), map: compiled.generateMap({ includeContent: true, - file: options.outputFilename + file: options.outputFilename, }), - css: this.css + css: this.css, }; } @@ -493,7 +493,7 @@ export default class Generator { const { key } = templateProperties.onrender; this.code.overwrite(key.start, key.end, 'oncreate', { storeName: true, - contentOnly: false + contentOnly: false, }); templateProperties.oncreate = templateProperties.onrender; } @@ -502,7 +502,7 @@ export default class Generator { const { key } = templateProperties.onteardown; this.code.overwrite(key.start, key.end, 'ondestroy', { storeName: true, - contentOnly: false + contentOnly: false, }); templateProperties.ondestroy = templateProperties.onteardown; } @@ -597,7 +597,7 @@ export default class Generator { computations, hasJs, namespace, - templateProperties + templateProperties, }; } } diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index f99c1d52c9..d4ad5608f7 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -93,7 +93,7 @@ export default class Block { outro: new CodeBuilder(), unmount: new CodeBuilder(), detachRaw: new CodeBuilder(), - destroy: new CodeBuilder() + destroy: new CodeBuilder(), }; this.hasIntroMethod = false; // a block could have an intro method but not intro transitions, e.g. if a sibling block has intros diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts index cfb3bacdca..78258bac2b 100644 --- a/src/generators/dom/index.ts +++ b/src/generators/dom/index.ts @@ -63,7 +63,7 @@ export default function dom( computations, hasJs, templateProperties, - namespace + namespace, } = generator.parseJs(); const { block, state } = preprocess(generator, namespace, parsed.html); @@ -74,7 +74,7 @@ export default function dom( const builders = { main: new CodeBuilder(), - _set: new CodeBuilder() + _set: new CodeBuilder(), }; if (computations.length) { @@ -319,7 +319,7 @@ export default function dom( leave(node) { if (node._scope) scope = scope.parent; - } + }, }); if (key === 'transitionManager') { @@ -343,6 +343,6 @@ export default function dom( return generator.generate(builders.main.toString(), options, { name, - format + format, }); } diff --git a/src/generators/dom/preprocess.ts b/src/generators/dom/preprocess.ts index 595b753d57..93cbbf7e4b 100644 --- a/src/generators/dom/preprocess.ts +++ b/src/generators/dom/preprocess.ts @@ -26,7 +26,7 @@ const elementsWithoutText = new Set([ 'optgroup', 'select', 'ul', - 'video' + 'video', ]); const preprocessors = { @@ -40,7 +40,7 @@ const preprocessors = { block.addDependencies(dependencies); node._state = getChildState(state, { - name: block.getUniqueName('text') + name: block.getUniqueName('text'), }); }, @@ -87,7 +87,7 @@ const preprocessors = { block.addDependencies(dependencies); node._block = block.child({ - name: generator.getUniqueName(`create_if_block`) + name: generator.getUniqueName(`create_if_block`), }); node._state = getChildState(state); @@ -107,7 +107,7 @@ const preprocessors = { attachBlocks(node.else.children[0]); } else if (node.else) { node.else._block = block.child({ - name: generator.getUniqueName(`create_if_block`) + name: generator.getUniqueName(`create_if_block`), }); node.else._state = getChildState(state); @@ -181,11 +181,11 @@ const preprocessors = { indexNames, listNames, - params: block.params.concat(listName, context, indexName) + params: block.params.concat(listName, context, indexName), }); node._state = getChildState(state, { - inEachBlock: true + inEachBlock: true, }); generator.blocks.push(node._block); @@ -195,7 +195,7 @@ const preprocessors = { if (node.else) { node.else._block = block.child({ - name: generator.getUniqueName(`${node._block.name}_else`) + name: generator.getUniqueName(`${node._block.name}_else`), }); node.else._state = getChildState(state); @@ -235,7 +235,7 @@ const preprocessors = { namespace: node.name === 'svg' ? 'http://www.w3.org/2000/svg' : state.namespace, - allUsedContexts: [] + allUsedContexts: [], }); } @@ -267,7 +267,7 @@ const preprocessors = { ); node._block = block.child({ - name: generator.getUniqueName(`create_${name}_yield_fragment`) + name: generator.getUniqueName(`create_${name}_yield_fragment`), }); generator.blocks.push(node._block); @@ -278,7 +278,7 @@ const preprocessors = { preprocessChildren(generator, block, node._state, node); } } - } + }, }; function preprocessChildren( @@ -359,13 +359,13 @@ export default function preprocess( indexNames: new Map(), listNames: new Map(), - dependencies: new Set() + dependencies: new Set(), }); const state: State = { namespace, parentNode: null, - isTopLevel: true + isTopLevel: true, }; generator.blocks.push(block); diff --git a/src/generators/dom/visitors/Component/Attribute.ts b/src/generators/dom/visitors/Component/Attribute.ts index 1bd477a396..5549931864 100644 --- a/src/generators/dom/visitors/Component/Attribute.ts +++ b/src/generators/dom/visitors/Component/Attribute.ts @@ -15,12 +15,12 @@ export default function visitAttribute( // attributes without values, e.g.