Merge branch 'master' into rave/trojan-horse

Author: rax-it

package.json

@@ -53,7 +53,7 @@
         "@types/babel__core": "^7.20.5",
         "@types/node": "^22.18.0",
         "@vitest/coverage-v8": "^3.2.4",
-        "@vitest/eslint-plugin": "^1.3.4",
+        "@vitest/eslint-plugin": "^1.3.6",
         "@vitest/ui": "^3.2.4",
         "bytes": "^3.1.2",
         "es-module-lexer": "^1.7.0",

packages/@lwc/integration-not-karma/configs/plugins/serve-integration.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { rollup } from 'rollup';
 import lwcRollupPlugin from '@lwc/rollup-plugin';
 
@@ -9,6 +10,8 @@ import {
     DISABLE_SYNTHETIC_SHADOW_SUPPORT_IN_COMPILER,
 } from '../../helpers/options.js';
 
+const UTILS = fileURLToPath(new URL('../../helpers/utils.js', import.meta.url));
+
 /** Cache reused between each compilation to speed up the compilation time. */
 let cache;
 
@@ -22,7 +25,7 @@ const createRollupPlugin = (input, options) => {
         // Sourcemaps don't work with Istanbul coverage
         sourcemap: !process.env.COVERAGE,
         experimentalDynamicComponent: {
-            loader: 'test-utils',
+            loader: UTILS,
             strict: true,
         },
         enableDynamicComponents: true,
@@ -85,7 +88,7 @@ const transform = async (ctx) => {
 
         // Rollup should not attempt to resolve the engine and the test utils, Karma takes care of injecting it
         // globally in the page before running the tests.
-        external: ['lwc', 'wire-service', 'test-utils', '@test/loader'],
+        external: ['lwc', 'wire-service', '@test/loader', UTILS],
 
         onwarn(warning, warn) {
             // Ignore warnings from our own Rollup plugin

packages/@lwc/integration-not-karma/helpers/test-hydrate.js

@@ -1,8 +1,8 @@
 import * as LWC from 'lwc';
+import { spyConsole } from './console';
+import { setHooks } from './hooks';
 
-window.TestUtils.setHooks({
-    sanitizeHtmlContent: (content) => content,
-});
+setHooks({ sanitizeHtmlContent: (content) => content });
 
 function parseStringToDom(html) {
     return Document.parseHTMLUnsafe(html).body.firstChild;
@@ -28,7 +28,7 @@ async function runTest(ssrRendered, Component, testConfig) {
     let target = container.querySelector(selector);
 
     let testResult;
-    const consoleSpy = window.TestUtils.spyConsole();
+    const consoleSpy = spyConsole();
     setFeatureFlags(testConfig.requiredFeatureFlags, true);
 
     if (testConfig.test) {

packages/@lwc/integration-not-karma/mocks/lwc.mjs

@@ -1,11 +1,11 @@
 import { createElement } from 'lwc';
+import Light from 'x/light';
+import Shadow from 'x/shadow';
 import {
     attachReportingControlDispatcher,
     detachReportingControlDispatcher,
     nonStandardAriaProperties,
-} from 'test-utils';
-import Light from 'x/light';
-import Shadow from 'x/shadow';
+} from '../../../helpers/utils.js';
 
 // This test only works if the ARIA reflection polyfill is loaded
 describe.runIf(process.env.ENABLE_ARIA_REFLECTION_GLOBAL_POLYFILL)(

packages/@lwc/integration-not-karma/test/accessibility/non-standard-aria-props/index.spec.js

@@ -1,8 +1,11 @@
 import { createElement } from 'lwc';
-import { attachReportingControlDispatcher, detachReportingControlDispatcher } from 'test-utils';
 
 import AriaContainer from 'x/ariaContainer';
 import Valid from 'x/valid';
+import {
+    attachReportingControlDispatcher,
+    detachReportingControlDispatcher,
+} from '../../../helpers/utils.js';
 
 const expectedMessageForCrossRoot =
     'Error: [LWC warn]: Element <input> uses attribute "aria-labelledby" to reference element <label>, which is not in the same shadow root. This will break in native shadow DOM. For details, see: https://sfdc.co/synthetic-aria\n<x-aria-source>';

packages/@lwc/integration-not-karma/test/accessibility/synthetic-cross-root-aria/index.spec.js

@@ -15,7 +15,7 @@ import UiAnother from 'ui/another';
 import UiOutputPercent from 'ui/outputpercent';
 import ForceFoo from 'force/foo';
 import NestedHtmlTags from 'nested/htmlTags';
-import { extractDataIds } from 'test-utils';
+import { extractDataIds } from '../../helpers/utils.js';
 import testProps from './act-components/test-props';
 import testAttrs from './act-components/test-attrs';
 import testBodySlot from './act-components/test-body-slot';

packages/@lwc/integration-not-karma/test/act/index.spec.js

@@ -1,5 +1,4 @@
 import { LightningElement } from 'lwc';
-import { USE_COMMENTS_FOR_FRAGMENT_BOOKENDS } from 'test-utils';
 
 import ReflectElement from 'x/reflect';
 import LifecycleParent from 'x/lifecycleParent';
@@ -10,6 +9,8 @@ import AttrChanged from 'x/attrChanged';
 import ReflectCamel from 'x/reflectCamel';
 import WithChildElmsHasSlot from 'x/withChildElmsHasSlot';
 import WithChildElmsHasSlotLight from 'x/withChildElmsHasSlotLight';
+import { spyConsole } from '../../../helpers/utils.js';
+import { USE_COMMENTS_FOR_FRAGMENT_BOOKENDS } from '../../../helpers/utils.js';
 
 const vFragBookend = USE_COMMENTS_FOR_FRAGMENT_BOOKENDS ? '<!---->' : '';
 
@@ -68,7 +69,7 @@ it('should create custom element if it exists before customElements.define', ()
 describe('non-empty custom element', () => {
     let consoleSpy;
     beforeEach(() => {
-        consoleSpy = TestUtils.spyConsole();
+        consoleSpy = spyConsole();
     });
     afterEach(() => {
         consoleSpy.reset();

packages/@lwc/integration-not-karma/test/api/CustomElementConstructor-getter/index.spec.js

@@ -1,8 +1,11 @@
 import { createElement, LightningElement, setFeatureFlagForTest } from 'lwc';
-import { isNativeShadowRootInstance, isSyntheticShadowRootInstance } from 'test-utils';
 
 import Test from 'x/test';
 import ShadowRootGetter from 'x/shadowRootGetter';
+import {
+    isNativeShadowRootInstance,
+    isSyntheticShadowRootInstance,
+} from '../../../helpers/utils.js';
 
 function testInvalidOptions(type, option) {
     it(`throws a TypeError if option is a ${type}`, () => {

packages/@lwc/integration-not-karma/test/api/createElement/index.spec.js

@@ -1,6 +1,9 @@
 import { registerTemplate, freezeTemplate, setFeatureFlagForTest } from 'lwc';
 
-import { attachReportingControlDispatcher, detachReportingControlDispatcher } from 'test-utils';
+import {
+    attachReportingControlDispatcher,
+    detachReportingControlDispatcher,
+} from '../../../helpers/utils.js';
 
 describe('freezeTemplate', () => {
     let dispatcher;