Skip to content

Commit 1ccbdae

Browse files
committed
Merge branch 'master' into wjh/wtr-env-vars
2 parents 5b35d40 + 4eb2987 commit 1ccbdae

File tree

13 files changed

+580
-549
lines changed

13 files changed

+580
-549
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"release:publish:canary": "nx release publish --registry https://registry.npmjs.org --tag canary"
3838
},
3939
"devDependencies": {
40-
"@commitlint/cli": "^19.8.1",
40+
"@commitlint/cli": "^20.0.0",
4141
"@eslint/js": "9.36.0",
4242
"@lwc/eslint-plugin-lwc-internal": "link:./scripts/eslint-plugin",
4343
"@lwc/test-utils-lwc-internals": "link:./scripts/test-utils",
@@ -53,7 +53,7 @@
5353
"@types/babel__core": "^7.20.5",
5454
"@types/node": "^22.18.4",
5555
"@vitest/coverage-v8": "^3.2.4",
56-
"@vitest/eslint-plugin": "^1.3.12",
56+
"@vitest/eslint-plugin": "^1.3.13",
5757
"@vitest/ui": "^3.2.4",
5858
"bytes": "^3.1.2",
5959
"es-module-lexer": "^1.7.0",
@@ -66,15 +66,15 @@
6666
"husky": "^9.1.7",
6767
"isbinaryfile": "^5.0.6",
6868
"jsdom": "^26.1.0",
69-
"lint-staged": "^16.2.0",
69+
"lint-staged": "^16.2.3",
7070
"magic-string": "^0.30.19",
7171
"nx": "21.5.3",
7272
"prettier": "^3.6.2",
73-
"rollup": "^4.52.0",
73+
"rollup": "^4.52.3",
7474
"terser": "^5.44.0",
7575
"tslib": "^2.8.1",
7676
"typescript": "5.8.2",
77-
"typescript-eslint": "8.44.0",
77+
"typescript-eslint": "8.44.1",
7878
"vitest": "^3.2.4"
7979
},
8080
"lint-staged": {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ export default {
118118
async serve(ctx) {
119119
if (ctx.path.endsWith('.spec.js')) {
120120
return await transform(ctx);
121+
} else if (ctx.path === '/test_api_sanitizeAttribute') {
122+
// The test in /test/api/sanitizeAttribute makes network requests
123+
// The returned value doesn't matter; this is just to avoid
124+
// unnecessary logging output
125+
return '';
121126
}
122127
},
123128
};

packages/@lwc/integration-not-karma/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@web/dev-server-import-maps": "^0.2.1",
2222
"@web/dev-server-rollup": "^0.6.4",
2323
"@web/test-runner": "^0.20.2",
24-
"chai": "^6.0.1"
24+
"chai": "^6.2.0"
2525
},
2626
"volta": {
2727
"extends": "../../../package.json"

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* The URLs used in test are handled by the `serve` method defined in `serve-integration.js`.
3+
* What they serve doesn't matter, it's just to avoid a 404 warning logged to console
4+
*/
15
import {
26
createElement,
37
// Spy is created in a mock file and injected with the import map plugin
@@ -49,7 +53,7 @@ scenarios.forEach(({ type, attrName, tagName, Ctor }) => {
4953
document.body.appendChild(elm);
5054

5155
const use = elm.shadowRoot.querySelector('use');
52-
expect(use.getAttribute(attrName)).toBe('/foo');
56+
expect(use.getAttribute(attrName)).toBe('/test_api_sanitizeAttribute?foo');
5357
});
5458

5559
it('receives the right parameters', () => {
@@ -60,18 +64,18 @@ scenarios.forEach(({ type, attrName, tagName, Ctor }) => {
6064
'use',
6165
'http://www.w3.org/2000/svg',
6266
attrName,
63-
'/foo'
67+
'/test_api_sanitizeAttribute?foo'
6468
);
6569
});
6670

6771
it('replace the original attribute value with a string', () => {
68-
sanitizeAttributeSpy.mockReturnValue('/bar');
72+
sanitizeAttributeSpy.mockReturnValue('/test_api_sanitizeAttribute?bar');
6973

7074
const elm = createElement(tagName, { is: Ctor });
7175
document.body.appendChild(elm);
7276

7377
const use = elm.shadowRoot.querySelector('use');
74-
expect(use.getAttribute(attrName)).toBe('/bar');
78+
expect(use.getAttribute(attrName)).toBe('/test_api_sanitizeAttribute?bar');
7579
});
7680

7781
it('replace the original attribute value with undefined', () => {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LightningElement } from 'lwc';
22

33
export default class extends LightningElement {
4-
href = '/foo';
4+
href = '/test_api_sanitizeAttribute?foo';
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
22
<svg>
3-
<use href="/foo"></use>
3+
<use href="/test_api_sanitizeAttribute?foo"></use>
44
</svg>
55
</template>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LightningElement } from 'lwc';
22

33
export default class extends LightningElement {
4-
href = '/foo';
4+
href = '/test_api_sanitizeAttribute?foo';
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
22
<svg>
3-
<use xlink:href="/foo"></use>
3+
<use xlink:href="/test_api_sanitizeAttribute?foo"></use>
44
</svg>
55
</template>

packages/@lwc/integration-tests/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
},
2020
"devDependencies": {
2121
"@lwc/rollup-plugin": "8.22.3",
22-
"@wdio/cli": "^9.19.2",
23-
"@wdio/local-runner": "^9.19.2",
24-
"@wdio/mocha-framework": "^9.19.2",
25-
"@wdio/sauce-service": "^9.19.2",
26-
"@wdio/spec-reporter": "^9.19.2",
27-
"@wdio/static-server-service": "^9.19.2",
22+
"@wdio/cli": "^9.20.0",
23+
"@wdio/local-runner": "^9.20.0",
24+
"@wdio/mocha-framework": "^9.20.0",
25+
"@wdio/sauce-service": "^9.20.0",
26+
"@wdio/spec-reporter": "^9.20.0",
27+
"@wdio/static-server-service": "^9.20.0",
2828
"deepmerge": "^4.3.1",
2929
"dotenv": "^17.2.2",
3030
"lwc": "8.22.3",

packages/@lwc/integration-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"devDependencies": {
1616
"@rollup/plugin-replace": "^6.0.2",
1717
"@rollup/plugin-typescript": "^12.1.4",
18-
"rollup": "^4.52.0",
18+
"rollup": "^4.52.3",
1919
"rollup-plugin-livereload": "^2.0.5",
2020
"rollup-plugin-serve": "^3.0.0"
2121
}

0 commit comments

Comments
 (0)