From 2129e63353c9234575c571323140085045ab86c1 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 22 Apr 2018 15:57:55 -0400 Subject: [PATCH 1/2] remove unused contextDependencies references --- src/generators/server-side-rendering/Block.ts | 1 - .../server-side-rendering/visitors/AwaitBlock.ts | 4 ---- src/generators/server-side-rendering/visitors/EachBlock.ts | 7 +------ 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/generators/server-side-rendering/Block.ts b/src/generators/server-side-rendering/Block.ts index 24ef567854..5b727dc828 100644 --- a/src/generators/server-side-rendering/Block.ts +++ b/src/generators/server-side-rendering/Block.ts @@ -14,7 +14,6 @@ export default class Block { contexts: Map; indexes: Map; - contextDependencies: Map; constructor(options: BlockOptions) { Object.assign(this, options); diff --git a/src/generators/server-side-rendering/visitors/AwaitBlock.ts b/src/generators/server-side-rendering/visitors/AwaitBlock.ts index 6251eb15c0..b24e8b3636 100644 --- a/src/generators/server-side-rendering/visitors/AwaitBlock.ts +++ b/src/generators/server-side-rendering/visitors/AwaitBlock.ts @@ -16,11 +16,7 @@ export default function visitAwaitBlock( const contexts = new Map(block.contexts); contexts.set(node.value, '__value'); - const contextDependencies = new Map(block.contextDependencies); - contextDependencies.set(node.value, dependencies); - const childBlock = block.child({ - contextDependencies, contexts }); diff --git a/src/generators/server-side-rendering/visitors/EachBlock.ts b/src/generators/server-side-rendering/visitors/EachBlock.ts index 491a9fbc1c..4818ad548f 100644 --- a/src/generators/server-side-rendering/visitors/EachBlock.ts +++ b/src/generators/server-side-rendering/visitors/EachBlock.ts @@ -22,20 +22,15 @@ export default function visitEachBlock( const indexes = new Map(block.indexes); if (node.index) indexes.set(node.index, node.context); - const contextDependencies = new Map(block.contextDependencies); - contextDependencies.set(node.context, dependencies); - if (node.destructuredContexts) { for (let i = 0; i < node.destructuredContexts.length; i += 1) { contexts.set(node.destructuredContexts[i], `${node.context}[${i}]`); - contextDependencies.set(node.destructuredContexts[i], dependencies); } } const childBlock = block.child({ contexts, - indexes, - contextDependencies, + indexes }); node.children.forEach((child: Node) => { From 9164dcbfa55ade7cf84933c26a95772d7e4d9e5c Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 22 Apr 2018 16:00:32 -0400 Subject: [PATCH 2/2] remove more unused references --- src/generators/server-side-rendering/visitors/AwaitBlock.ts | 2 +- src/generators/server-side-rendering/visitors/EachBlock.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generators/server-side-rendering/visitors/AwaitBlock.ts b/src/generators/server-side-rendering/visitors/AwaitBlock.ts index b24e8b3636..1570647db5 100644 --- a/src/generators/server-side-rendering/visitors/AwaitBlock.ts +++ b/src/generators/server-side-rendering/visitors/AwaitBlock.ts @@ -9,7 +9,7 @@ export default function visitAwaitBlock( node: Node ) { block.contextualise(node.expression); - const { dependencies, snippet } = node.metadata; + const { snippet } = node.metadata; // TODO should this be the generator's job? It's duplicated between // here and the equivalent DOM compiler visitor diff --git a/src/generators/server-side-rendering/visitors/EachBlock.ts b/src/generators/server-side-rendering/visitors/EachBlock.ts index 4818ad548f..eaf43f8bd3 100644 --- a/src/generators/server-side-rendering/visitors/EachBlock.ts +++ b/src/generators/server-side-rendering/visitors/EachBlock.ts @@ -9,7 +9,7 @@ export default function visitEachBlock( node: Node ) { block.contextualise(node.expression); - const { dependencies, snippet } = node.metadata; + const { snippet } = node.metadata; const open = `\${ ${node.else ? `${snippet}.length ? ` : ''}${snippet}.map(${node.index ? `(${node.context}, ${node.index})` : `(${node.context})`} => \``; generator.append(open);