fix: fix static content optimization

salesforce · Apr 16, 2024 · 8c32821 · 8c32821
1 parent 42ab135
commit 8c32821
Show file tree

Hide file tree

Showing 24 changed files with 298 additions and 43 deletions.
diff --git a/...c/__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/actual.html b/...c/__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/actual.html
@@ -0,0 +1,3 @@
+<template>
+    <div class={computed}></div>
+</template>
diff --git a/.../src/__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/ast.json b/.../src/__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/ast.json
@@ -0,0 +1,93 @@
+{
+    "root": {
+        "type": "Root",
+        "location": {
+            "startLine": 1,
+            "startColumn": 1,
+            "endLine": 3,
+            "endColumn": 12,
+            "start": 0,
+            "end": 55,
+            "startTag": {
+                "startLine": 1,
+                "startColumn": 1,
+                "endLine": 1,
+                "endColumn": 11,
+                "start": 0,
+                "end": 10
+            },
+            "endTag": {
+                "startLine": 3,
+                "startColumn": 1,
+                "endLine": 3,
+                "endColumn": 12,
+                "start": 44,
+                "end": 55
+            }
+        },
+        "directives": [],
+        "children": [
+            {
+                "type": "Element",
+                "name": "div",
+                "namespace": "http://www.w3.org/1999/xhtml",
+                "location": {
+                    "startLine": 2,
+                    "startColumn": 5,
+                    "endLine": 2,
+                    "endColumn": 33,
+                    "start": 15,
+                    "end": 43,
+                    "startTag": {
+                        "startLine": 2,
+                        "startColumn": 5,
+                        "endLine": 2,
+                        "endColumn": 27,
+                        "start": 15,
+                        "end": 37
+                    },
+                    "endTag": {
+                        "startLine": 2,
+                        "startColumn": 27,
+                        "endLine": 2,
+                        "endColumn": 33,
+                        "start": 37,
+                        "end": 43
+                    }
+                },
+                "attributes": [
+                    {
+                        "type": "Attribute",
+                        "name": "class",
+                        "value": {
+                            "type": "Identifier",
+                            "start": 1,
+                            "end": 9,
+                            "name": "computed",
+                            "location": {
+                                "startLine": 2,
+                                "startColumn": 10,
+                                "endLine": 2,
+                                "endColumn": 26,
+                                "start": 20,
+                                "end": 36
+                            }
+                        },
+                        "location": {
+                            "startLine": 2,
+                            "startColumn": 10,
+                            "endLine": 2,
+                            "endColumn": 26,
+                            "start": 20,
+                            "end": 36
+                        }
+                    }
+                ],
+                "properties": [],
+                "directives": [],
+                "listeners": [],
+                "children": []
+            }
+        ]
+    }
+}
diff --git a/...c/__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/config.json b/...c/__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/config.json
@@ -0,0 +1,4 @@
+{
+    "apiVersion": 62,
+    "enableStaticContentOptimization": false
+}
diff --git a/...c/__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/expected.js b/...c/__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/expected.js
@@ -0,0 +1,13 @@
+import { registerTemplate } from "lwc";
+function tmpl($api, $cmp, $slotset, $ctx) {
+  const { ncls: api_normalize_class_name, h: api_element } = $api;
+  return [
+    api_element("div", {
+      className: api_normalize_class_name($cmp.computed),
+      key: 0,
+    }),
+  ];
+  /*LWC compiler vX.X.X*/
+}
+export default registerTemplate(tmpl);
+tmpl.stylesheets = [];
diff --git a/...__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/metadata.json b/...__tests__/fixtures/attributes/class-dynamic-deoptimized-with-object-binding/metadata.json
@@ -0,0 +1,3 @@
+{
+    "warnings": []
+}
diff --git a/..._tests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/actual.html b/..._tests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/actual.html
@@ -0,0 +1,3 @@
+<template>
+    <div class={computed}></div>
+</template>
diff --git a/...c/__tests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/ast.json b/...c/__tests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/ast.json
@@ -0,0 +1,93 @@
+{
+    "root": {
+        "type": "Root",
+        "location": {
+            "startLine": 1,
+            "startColumn": 1,
+            "endLine": 3,
+            "endColumn": 12,
+            "start": 0,
+            "end": 55,
+            "startTag": {
+                "startLine": 1,
+                "startColumn": 1,
+                "endLine": 1,
+                "endColumn": 11,
+                "start": 0,
+                "end": 10
+            },
+            "endTag": {
+                "startLine": 3,
+                "startColumn": 1,
+                "endLine": 3,
+                "endColumn": 12,
+                "start": 44,
+                "end": 55
+            }
+        },
+        "directives": [],
+        "children": [
+            {
+                "type": "Element",
+                "name": "div",
+                "namespace": "http://www.w3.org/1999/xhtml",
+                "location": {
+                    "startLine": 2,
+                    "startColumn": 5,
+                    "endLine": 2,
+                    "endColumn": 33,
+                    "start": 15,
+                    "end": 43,
+                    "startTag": {
+                        "startLine": 2,
+                        "startColumn": 5,
+                        "endLine": 2,
+                        "endColumn": 27,
+                        "start": 15,
+                        "end": 37
+                    },
+                    "endTag": {
+                        "startLine": 2,
+                        "startColumn": 27,
+                        "endLine": 2,
+                        "endColumn": 33,
+                        "start": 37,
+                        "end": 43
+                    }
+                },
+                "attributes": [
+                    {
+                        "type": "Attribute",
+                        "name": "class",
+                        "value": {
+                            "type": "Identifier",
+                            "start": 1,
+                            "end": 9,
+                            "name": "computed",
+                            "location": {
+                                "startLine": 2,
+                                "startColumn": 10,
+                                "endLine": 2,
+                                "endColumn": 26,
+                                "start": 20,
+                                "end": 36
+                            }
+                        },
+                        "location": {
+                            "startLine": 2,
+                            "startColumn": 10,
+                            "endLine": 2,
+                            "endColumn": 26,
+                            "start": 20,
+                            "end": 36
+                        }
+                    }
+                ],
+                "properties": [],
+                "directives": [],
+                "listeners": [],
+                "children": []
+            }
+        ]
+    }
+}
diff --git a/..._tests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/config.json b/..._tests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/config.json
@@ -0,0 +1,4 @@
+{
+    "apiVersion": 61,
+    "enableStaticContentOptimization": false
+}
diff --git a/..._tests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/expected.js b/..._tests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/expected.js
@@ -0,0 +1,13 @@
+import { registerTemplate } from "lwc";
+function tmpl($api, $cmp, $slotset, $ctx) {
+  const { h: api_element } = $api;
+  return [
+    api_element("div", {
+      className: $cmp.computed,
+      key: 0,
+    }),
+  ];
+  /*LWC compiler vX.X.X*/
+}
+export default registerTemplate(tmpl);
+tmpl.stylesheets = [];
diff --git a/...ests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/metadata.json b/...ests__/fixtures/attributes/class-dynamic-deoptimized-without-object-binding/metadata.json
@@ -0,0 +1,3 @@
+{
+    "warnings": []
+}
diff --git a/...-compiler/src/__tests__/fixtures/attributes/class-dynamic-with-object-binding/expected.js b/...-compiler/src/__tests__/fixtures/attributes/class-dynamic-with-object-binding/expected.js
@@ -11,7 +11,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
       api_static_part(
         0,
         {
-          className: $cmp.computed,
+          className: api_normalize_class_name($cmp.computed),
         },
         null
       ),

diff --git a/...mpiler/src/__tests__/fixtures/attributes/class-dynamic-without-object-binding/config.json b/...mpiler/src/__tests__/fixtures/attributes/class-dynamic-without-object-binding/config.json
@@ -1,3 +1,3 @@
 {
-    "apiVersion": 60
-}
+    "apiVersion": 61
+}
diff --git a/...es/@lwc/template-compiler/src/__tests__/fixtures/attributes/mixed-props-attrs/expected.js b/...es/@lwc/template-compiler/src/__tests__/fixtures/attributes/mixed-props-attrs/expected.js
@@ -71,7 +71,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
       api_static_part(
         0,
         {
-          className: $cmp.foo,
+          className: api_normalize_class_name($cmp.foo),
         },
         null
       ),

diff --git a/...mplate-compiler/src/__tests__/fixtures/directive-for-each/inline-refence-item/expected.js b/...mplate-compiler/src/__tests__/fixtures/directive-for-each/inline-refence-item/expected.js
@@ -22,7 +22,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
           api_static_part(
             0,
             {
-              className: item.x,
+              className: api_normalize_class_name(item.x),
             },
             null
           ),

diff --git a/...wc/template-compiler/src/__tests__/fixtures/directive-for-each/inline-sibling/expected.js b/...wc/template-compiler/src/__tests__/fixtures/directive-for-each/inline-sibling/expected.js
@@ -25,7 +25,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
             api_static_part(
               0,
               {
-                className: item.x,
+                className: api_normalize_class_name(item.x),
               },
               null
             ),

diff --git a/...ompiler/src/__tests__/fixtures/directive-for-each/static-content-optimization/expected.js b/...ompiler/src/__tests__/fixtures/directive-for-each/static-content-optimization/expected.js
@@ -7,6 +7,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
   const {
     k: api_key,
     d: api_dynamic_text,
+    ncls: api_normalize_class_name,
     sp: api_static_part,
     st: api_static_fragment,
     i: api_iterator,
@@ -43,7 +44,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
             7,
             {
               style: $cmp.baaz,
-              className: $cmp.bar,
+              className: api_normalize_class_name($cmp.bar),
               attrs: {
                 "data-dynamic": $cmp.foo,
               },

diff --git a/.../template-compiler/src/__tests__/fixtures/directive-lwc-if-else/with-siblings/expected.js b/.../template-compiler/src/__tests__/fixtures/directive-lwc-if-else/with-siblings/expected.js
@@ -46,7 +46,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
               api_static_part(
                 0,
                 {
-                  className: $cmp.dynamicClass,
+                  className: api_normalize_class_name($cmp.dynamicClass),
                 },
                 null
               ),
@@ -64,7 +64,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
               api_static_part(
                 0,
                 {
-                  className: $cmp.dynamicClass,
+                  className: api_normalize_class_name($cmp.dynamicClass),
                   style: $cmp.dynamicStyle,
                   attrs: {
                     "data-dynamic": $cmp.dynamic,
@@ -96,7 +96,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
               api_static_part(
                 0,
                 {
-                  className: $cmp.dynamicClass,
+                  className: api_normalize_class_name($cmp.dynamicClass),
                 },
                 null
               ),
@@ -114,7 +114,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
               api_static_part(
                 0,
                 {
-                  className: $cmp.dynamicClass,
+                  className: api_normalize_class_name($cmp.dynamicClass),
                   style: $cmp.dynamicStyle,
                   attrs: {
                     "data-dynamic": $cmp.dynamic,
@@ -143,7 +143,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
       api_static_part(
         0,
         {
-          className: $cmp.dynamicClass,
+          className: api_normalize_class_name($cmp.dynamicClass),
         },
         null
       ),
@@ -161,7 +161,7 @@ function tmpl($api, $cmp, $slotset, $ctx) {
       api_static_part(
         0,
         {
-          className: $cmp.dynamicClass,
+          className: api_normalize_class_name($cmp.dynamicClass),
           style: $cmp.dynamicStyle,
           attrs: {
             "data-dynamic": $cmp.dynamic,

diff --git a/packages/@lwc/template-compiler/src/__tests__/fixtures/expression/attribute-deep/expected.js b/packages/@lwc/template-compiler/src/__tests__/fixtures/expression/attribute-deep/expected.js
@@ -1,13 +1,17 @@
 import { parseFragment, registerTemplate } from "lwc";
 const $fragment1 = parseFragment`<section${3}><p${"c1"}${2}></p></section>`;
 function tmpl($api, $cmp, $slotset, $ctx) {
-  const { sp: api_static_part, st: api_static_fragment } = $api;
+  const {
+    ncls: api_normalize_class_name,
+    sp: api_static_part,
+    st: api_static_fragment,
+  } = $api;
   return [
     api_static_fragment($fragment1, 1, [
       api_static_part(
         1,
         {
-          className: $cmp.bar.foo.baz,
+          className: api_normalize_class_name($cmp.bar.foo.baz),
         },
         null
       ),

diff --git a/...s/@lwc/template-compiler/src/__tests__/fixtures/expression/attribute-multiple/expected.js b/...s/@lwc/template-compiler/src/__tests__/fixtures/expression/attribute-multiple/expected.js
@@ -11,14 +11,14 @@ function tmpl($api, $cmp, $slotset, $ctx) {
       api_static_part(
         0,
         {
-          className: $cmp.foo.c,
+          className: api_normalize_class_name($cmp.foo.c),
         },
         null
       ),
       api_static_part(
         1,
         {
-          className: $cmp.bar.c,
+          className: api_normalize_class_name($cmp.bar.c),
         },
         null
       ),