Merge remote-tracking branch 'origin/master' into hydration-warn

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'],

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>

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>

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}

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>

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>

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

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}

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>

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>

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

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}

packages/@lwc/shared/src/html-attributes.ts

@@ -64,7 +64,6 @@ const GLOBAL_ATTRIBUTE = /*@__PURE__*/ new Set([
     'autofocus',
     'class',
     'contenteditable',
-    'contextmenu',
     'dir',
     'draggable',
     'enterkeyhint',

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',

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) {

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')));
+    }
+}