From f2330391ebb3a3b1ded9409d6278b959f0bbb969 Mon Sep 17 00:00:00 2001
From: James Tu <jmsjtu@gmail.com>
Date: Wed, 13 Nov 2024 10:48:42 -0800
Subject: [PATCH 1/3] feat: remove decorator imports visitor (#4840)

* feat: remove decorator imports visitor

* Update packages/@lwc/ssr-compiler/src/compile-js/remove-decorator-import.ts

Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>

---------

Co-authored-by: Will Harney <62956339+wjhsf@users.noreply.github.com>
---
 .../@lwc/ssr-compiler/src/compile-js/index.ts |  2 ++
 .../src/compile-js/remove-decorator-import.ts | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 packages/@lwc/ssr-compiler/src/compile-js/remove-decorator-import.ts

diff --git a/packages/@lwc/ssr-compiler/src/compile-js/index.ts b/packages/@lwc/ssr-compiler/src/compile-js/index.ts
index 20ba9b89b7..c05c8f3014 100644
--- a/packages/@lwc/ssr-compiler/src/compile-js/index.ts
+++ b/packages/@lwc/ssr-compiler/src/compile-js/index.ts
@@ -16,6 +16,7 @@ import { catalogStaticStylesheets, catalogAndReplaceStyleImports } from './style
 import { addGenerateMarkupExport, assignGenerateMarkupToComponent } from './generate-markup';
 import { catalogWireAdapters } from './wire';
 
+import { removeDecoratorImport } from './remove-decorator-import';
 import type { Identifier as EsIdentifier, Program as EsProgram, Expression } from 'estree';
 import type { Visitors, ComponentMetaState } from './types';
 import type { CompilationMode } from '../shared';
@@ -34,6 +35,7 @@ const visitors: Visitors = {
         replaceLwcImport(path, state);
         catalogTmplImport(path, state);
         catalogAndReplaceStyleImports(path, state);
+        removeDecoratorImport(path);
     },
     ClassDeclaration(path, state) {
         if (!path.node?.superClass) {
diff --git a/packages/@lwc/ssr-compiler/src/compile-js/remove-decorator-import.ts b/packages/@lwc/ssr-compiler/src/compile-js/remove-decorator-import.ts
new file mode 100644
index 0000000000..41d8c14d7f
--- /dev/null
+++ b/packages/@lwc/ssr-compiler/src/compile-js/remove-decorator-import.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: MIT
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
+ */
+
+import { ImportDeclaration } from 'estree';
+import { NodePath, builders as b } from 'estree-toolkit';
+
+export function removeDecoratorImport(path: NodePath<ImportDeclaration>) {
+    if (!path.node || path.node.source.value !== '@lwc/ssr-runtime') {
+        return;
+    }
+
+    const filteredSpecifiers = path.node.specifiers.filter(
+        (specifier) =>
+            !(
+                specifier.type === 'ImportSpecifier' &&
+                specifier.imported.type === 'Identifier' &&
+                // Excluding track because it also has a non-decorator signature that might be used
+                (specifier.imported.name === 'api' || specifier.imported.name === 'wire')
+            )
+    );
+
+    if (filteredSpecifiers.length !== path.node.specifiers.length) {
+        path.replaceWith(b.importDeclaration(filteredSpecifiers, b.literal('@lwc/ssr-runtime')));
+    }
+}

From 29a641e2f572b20e015546d398e50a129123f6d9 Mon Sep 17 00:00:00 2001
From: Eugene Kashida <ekashida@gmail.com>
Date: Wed, 13 Nov 2024 12:00:47 -0800
Subject: [PATCH 2/3] chore: remove deprecated contextmenu html global
 attribute (#4834)

---
 packages/@lwc/babel-plugin-component/src/constants.ts        | 1 -
 .../as-component-prop/undeclared/expected.html               | 5 +----
 .../as-component-prop/undeclared/modules/x/child/child.html  | 1 -
 .../undeclared/modules/x/component/component.html            | 1 -
 .../as-component-prop/with-@api/expected.html                | 5 +----
 .../as-component-prop/with-@api/modules/x/child/child.html   | 1 -
 .../as-component-prop/with-@api/modules/x/child/child.js     | 1 -
 .../with-@api/modules/x/component/component.html             | 1 -
 .../as-component-prop/without-@api/expected.html             | 5 +----
 .../without-@api/modules/x/child/child.html                  | 1 -
 .../as-component-prop/without-@api/modules/x/child/child.js  | 1 -
 .../without-@api/modules/x/component/component.html          | 1 -
 packages/@lwc/shared/src/html-attributes.ts                  | 1 -
 13 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/packages/@lwc/babel-plugin-component/src/constants.ts b/packages/@lwc/babel-plugin-component/src/constants.ts
index 624276a4e5..f8be05db9f 100644
--- a/packages/@lwc/babel-plugin-component/src/constants.ts
+++ b/packages/@lwc/babel-plugin-component/src/constants.ts
@@ -14,7 +14,6 @@ const AMBIGUOUS_PROP_SET = new Map([
     ['bgcolor', 'bgColor'],
     ['accesskey', 'accessKey'],
     ['contenteditable', 'contentEditable'],
-    ['contextmenu', 'contextMenu'],
     ['tabindex', 'tabIndex'],
     ['maxlength', 'maxLength'],
     ['maxvalue', 'maxValue'],
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/expected.html
index fd5b663233..e421b7fc85 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/expected.html
@@ -1,6 +1,6 @@
 <x-component>
   <template shadowrootmode="open">
-    <x-child accesskey="foo" aria-activedescendant="foo" aria-atomic="foo" aria-autocomplete="foo" aria-busy="foo" aria-checked="foo" aria-colcount="foo" aria-colindex="foo" aria-colspan="foo" aria-controls="foo" aria-current="foo" aria-describedby="foo" aria-details="foo" aria-disabled="foo" aria-errormessage="foo" aria-expanded="foo" aria-flowto="foo" aria-haspopup="foo" aria-hidden="foo" aria-invalid="foo" aria-keyshortcuts="foo" aria-label="foo" aria-labelledby="foo" aria-level="foo" aria-live="foo" aria-modal="foo" aria-multiline="foo" aria-multiselectable="foo" aria-orientation="foo" aria-owns="foo" aria-placeholder="foo" aria-posinset="foo" aria-pressed="foo" aria-readonly="foo" aria-relevant="foo" aria-required="foo" aria-roledescription="foo" aria-rowcount="foo" aria-rowindex="foo" aria-rowspan="foo" aria-selected="foo" aria-setsize="foo" aria-sort="foo" aria-valuemax="foo" aria-valuemin="foo" aria-valuenow="foo" aria-valuetext="foo" autocapitalize="foo" autofocus="foo" contenteditable="foo" contextmenu="foo" dir="foo" draggable="foo" enterkeyhint="foo" exportparts="foo" id="foo" inputmode="foo" itemid="foo" itemprop="foo" itemref="foo" itemscope="foo" itemtype="foo" lang="foo" nonce="foo" role="foo" spellcheck="foo" tabindex="foo" title="foo" translate="foo">
+    <x-child accesskey="foo" aria-activedescendant="foo" aria-atomic="foo" aria-autocomplete="foo" aria-busy="foo" aria-checked="foo" aria-colcount="foo" aria-colindex="foo" aria-colspan="foo" aria-controls="foo" aria-current="foo" aria-describedby="foo" aria-details="foo" aria-disabled="foo" aria-errormessage="foo" aria-expanded="foo" aria-flowto="foo" aria-haspopup="foo" aria-hidden="foo" aria-invalid="foo" aria-keyshortcuts="foo" aria-label="foo" aria-labelledby="foo" aria-level="foo" aria-live="foo" aria-modal="foo" aria-multiline="foo" aria-multiselectable="foo" aria-orientation="foo" aria-owns="foo" aria-placeholder="foo" aria-posinset="foo" aria-pressed="foo" aria-readonly="foo" aria-relevant="foo" aria-required="foo" aria-roledescription="foo" aria-rowcount="foo" aria-rowindex="foo" aria-rowspan="foo" aria-selected="foo" aria-setsize="foo" aria-sort="foo" aria-valuemax="foo" aria-valuemin="foo" aria-valuenow="foo" aria-valuetext="foo" autocapitalize="foo" autofocus="foo" contenteditable="foo" dir="foo" draggable="foo" enterkeyhint="foo" exportparts="foo" id="foo" inputmode="foo" itemid="foo" itemprop="foo" itemref="foo" itemscope="foo" itemtype="foo" lang="foo" nonce="foo" role="foo" spellcheck="foo" tabindex="foo" title="foo" translate="foo">
       <template shadowrootmode="open">
         <span>
           accessKey: 
@@ -176,9 +176,6 @@
         <span>
           contentEditable: 
         </span>
-        <span>
-          contextMenu: 
-        </span>
         <span>
           crossorigin: 
         </span>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/modules/x/child/child.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/modules/x/child/child.html
index 82553d2a57..a254534229 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/modules/x/child/child.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/modules/x/child/child.html
@@ -57,7 +57,6 @@
     <span>colSpan: {colSpan}</span>
     <span>command: {command}</span>
     <span>contentEditable: {contentEditable}</span>
-    <span>contextMenu: {contextMenu}</span>
     <span>crossorigin: {crossorigin}</span>
     <span>datetime: {datetime}</span>
     <span>details: {details}</span>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/modules/x/component/component.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/modules/x/component/component.html
index b35b57577f..45db140bcf 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/modules/x/component/component.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/undeclared/modules/x/component/component.html
@@ -57,7 +57,6 @@
         colspan={dynamic}
         command={dynamic}
         contenteditable={dynamic}
-        contextmenu={dynamic}
         crossorigin={dynamic}
         datetime={dynamic}
         details={dynamic}
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/expected.html
index 5d8aca0026..9a61b50795 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/expected.html
@@ -1,6 +1,6 @@
 <x-component>
   <template shadowrootmode="open">
-    <x-child contextmenu="foo" exportparts="foo">
+    <x-child exportparts="foo">
       <template shadowrootmode="open">
         <span>
           accessKey: foo
@@ -176,9 +176,6 @@
         <span>
           contentEditable: foo
         </span>
-        <span>
-          contextMenu: 
-        </span>
         <span>
           crossorigin: 
         </span>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/child/child.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/child/child.html
index 82553d2a57..a254534229 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/child/child.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/child/child.html
@@ -57,7 +57,6 @@
     <span>colSpan: {colSpan}</span>
     <span>command: {command}</span>
     <span>contentEditable: {contentEditable}</span>
-    <span>contextMenu: {contextMenu}</span>
     <span>crossorigin: {crossorigin}</span>
     <span>datetime: {datetime}</span>
     <span>details: {details}</span>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/child/child.js b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/child/child.js
index 538d3d46b1..e979f3d113 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/child/child.js
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/child/child.js
@@ -59,7 +59,6 @@ export default class extends LightningElement {
     @api colSpan
     @api command
     @api contentEditable
-    @api contextMenu
     @api crossorigin
     @api datetime
     @api details
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/component/component.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/component/component.html
index b35b57577f..45db140bcf 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/component/component.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/with-@api/modules/x/component/component.html
@@ -57,7 +57,6 @@
         colspan={dynamic}
         command={dynamic}
         contenteditable={dynamic}
-        contextmenu={dynamic}
         crossorigin={dynamic}
         datetime={dynamic}
         details={dynamic}
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/expected.html
index d9b3fc257a..94aa7b3829 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/expected.html
@@ -1,6 +1,6 @@
 <x-component>
   <template shadowrootmode="open">
-    <x-child aria-activedescendant="foo" aria-atomic="foo" aria-autocomplete="foo" aria-busy="foo" aria-checked="foo" aria-colcount="foo" aria-colindex="foo" aria-colspan="foo" aria-controls="foo" aria-current="foo" aria-describedby="foo" aria-details="foo" aria-disabled="foo" aria-errormessage="foo" aria-expanded="foo" aria-flowto="foo" aria-haspopup="foo" aria-hidden="foo" aria-invalid="foo" aria-keyshortcuts="foo" aria-label="foo" aria-labelledby="foo" aria-level="foo" aria-live="foo" aria-modal="foo" aria-multiline="foo" aria-multiselectable="foo" aria-orientation="foo" aria-owns="foo" aria-placeholder="foo" aria-posinset="foo" aria-pressed="foo" aria-readonly="foo" aria-relevant="foo" aria-required="foo" aria-roledescription="foo" aria-rowcount="foo" aria-rowindex="foo" aria-rowspan="foo" aria-selected="foo" aria-setsize="foo" aria-sort="foo" aria-valuemax="foo" aria-valuemin="foo" aria-valuenow="foo" aria-valuetext="foo" contextmenu="foo" exportparts="foo" role="foo">
+    <x-child aria-activedescendant="foo" aria-atomic="foo" aria-autocomplete="foo" aria-busy="foo" aria-checked="foo" aria-colcount="foo" aria-colindex="foo" aria-colspan="foo" aria-controls="foo" aria-current="foo" aria-describedby="foo" aria-details="foo" aria-disabled="foo" aria-errormessage="foo" aria-expanded="foo" aria-flowto="foo" aria-haspopup="foo" aria-hidden="foo" aria-invalid="foo" aria-keyshortcuts="foo" aria-label="foo" aria-labelledby="foo" aria-level="foo" aria-live="foo" aria-modal="foo" aria-multiline="foo" aria-multiselectable="foo" aria-orientation="foo" aria-owns="foo" aria-placeholder="foo" aria-posinset="foo" aria-pressed="foo" aria-readonly="foo" aria-relevant="foo" aria-required="foo" aria-roledescription="foo" aria-rowcount="foo" aria-rowindex="foo" aria-rowspan="foo" aria-selected="foo" aria-setsize="foo" aria-sort="foo" aria-valuemax="foo" aria-valuemin="foo" aria-valuenow="foo" aria-valuetext="foo" exportparts="foo" role="foo">
       <template shadowrootmode="open">
         <span>
           accessKey: 
@@ -176,9 +176,6 @@
         <span>
           contentEditable: 
         </span>
-        <span>
-          contextMenu: 
-        </span>
         <span>
           crossorigin: 
         </span>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/child/child.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/child/child.html
index 82553d2a57..a254534229 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/child/child.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/child/child.html
@@ -57,7 +57,6 @@
     <span>colSpan: {colSpan}</span>
     <span>command: {command}</span>
     <span>contentEditable: {contentEditable}</span>
-    <span>contextMenu: {contextMenu}</span>
     <span>crossorigin: {crossorigin}</span>
     <span>datetime: {datetime}</span>
     <span>details: {details}</span>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/child/child.js b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/child/child.js
index b02ac7381a..a6106ee1c6 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/child/child.js
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/child/child.js
@@ -59,7 +59,6 @@ export default class extends LightningElement {
     colSpan
     command
     contentEditable
-    contextMenu
     crossorigin
     datetime
     details
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/component/component.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/component/component.html
index b35b57577f..45db140bcf 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/component/component.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-global-html/as-component-prop/without-@api/modules/x/component/component.html
@@ -57,7 +57,6 @@
         colspan={dynamic}
         command={dynamic}
         contenteditable={dynamic}
-        contextmenu={dynamic}
         crossorigin={dynamic}
         datetime={dynamic}
         details={dynamic}
diff --git a/packages/@lwc/shared/src/html-attributes.ts b/packages/@lwc/shared/src/html-attributes.ts
index 1622e7d893..a779a2eb09 100644
--- a/packages/@lwc/shared/src/html-attributes.ts
+++ b/packages/@lwc/shared/src/html-attributes.ts
@@ -64,7 +64,6 @@ const GLOBAL_ATTRIBUTE = /*@__PURE__*/ new Set([
     'autofocus',
     'class',
     'contenteditable',
-    'contextmenu',
     'dir',
     'draggable',
     'enterkeyhint',

From bfc799beb5340bc55752c1434a845546d899cdae Mon Sep 17 00:00:00 2001
From: Matheus Cardoso <matheus@cardo.so>
Date: Wed, 13 Nov 2024 20:00:25 -0300
Subject: [PATCH 3/3] chore(ssr):
 attribute-global-html/as-component-prop/with-`@api` no longer fails (#4854)

---
 .../@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts b/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
index 57602d76eb..35abd4f960 100644
--- a/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
+++ b/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
@@ -23,7 +23,6 @@ export const expectedFailures = new Set([
     'attribute-class/with-scoped-styles/dynamic/index.js',
     'attribute-component-global-html/index.js',
     'attribute-global-html/as-component-prop/undeclared/index.js',
-    'attribute-global-html/as-component-prop/with-@api/index.js',
     'attribute-global-html/as-component-prop/without-@api/index.js',
     'attribute-namespace/index.js',
     'attribute-style/basic/index.js',