From e6c239c203ae4214e9f63518d27682e4b13ce11b Mon Sep 17 00:00:00 2001 From: jimafisk Date: Tue, 8 Dec 2020 01:24:56 -0500 Subject: [PATCH] Fix regexp replacements for allComponents SSR (#20). --- cmd/build/client.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/build/client.go b/cmd/build/client.go index 3c5cc297..71dbe4ae 100644 --- a/cmd/build/client.go +++ b/cmd/build/client.go @@ -253,11 +253,15 @@ func compileSvelte(ctx *v8go.Context, SSRctx *v8go.Context, layoutPath string, d } // Remove allComponents object (leaving just componentSignature) for SSR. - reAllComponentsDot := regexp.MustCompile(`allComponents\.`) - ssrStr = reAllComponentsDot.ReplaceAllString(ssrStr, "") - reAllComponentsBracket := regexp.MustCompile(`allComponents\[\"?(.*)\"?\]`) - //ssrStr = reAllComponentsBracket.ReplaceAllString(ssrStr, "eval(${1})") + // Match: allComponents.layout_components_grid_svelte + reAllComponentsDot := regexp.MustCompile(`allComponents\.(layout_.*_svelte)`) + ssrStr = reAllComponentsDot.ReplaceAllString(ssrStr, "${1}") + // Match: allComponents[component] + reAllComponentsBracket := regexp.MustCompile(`allComponents\[(.*)\]`) ssrStr = reAllComponentsBracket.ReplaceAllString(ssrStr, "globalThis[${1}]") + // Match: allComponents["layout_components_decrementer_svelte"] + reAllComponentsBracketStr := regexp.MustCompile(`allComponents\[\"(.*)\"\]`) + ssrStr = reAllComponentsBracketStr.ReplaceAllString(ssrStr, "${1}") // Add component to context so it can be used to render HTML in data_source.go. _, addSSRCompErr := SSRctx.RunScript(ssrStr, "create_ssr")