Merge branch 'master' into jhefferman/dedupe-coverage-scope-token-fix

jhefferman-sfdc · jhefferman-sfdc · commit 1c695dc2357c · 2025-08-01T10:19:34.000-06:00
diff --git a/.git2gus/config.json b/.git2gus/config.json
@@ -1,5 +1,5 @@
 {
     "productTag": "a1aB0000000g309IAA",
-    "defaultBuild": "256",
+    "defaultBuild": "258",
     "hideWorkItemUrl": true
 }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -49,21 +49,15 @@ updates:
               patterns:
                   - 'webdriverio'
                   - '@wdio/*'
-              update-types:
-                  - 'major'
-                  - 'minor'
-                  - 'patch'
           vitest:
               patterns:
                   - 'vitest'
                   - '@vitest/*'
-              update-types:
-                  - 'major'
-                  - 'minor'
-                  - 'patch'
           # Non-major version bumps hopefully shouldn't break anything,
           # so let's group them together into a single PR!
           theoretically-non-breaking:
               update-types:
                   - 'minor'
                   - 'patch'
+              exclude-patterns:
+                  - '@wdio/*'
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -51,7 +51,7 @@ jobs:
             - name: Check package.json integrity
               run: node ./scripts/tasks/check-and-rewrite-package-json.js --test
             - name: Check licenses are up to date
-              run: node ./scripts/tasks/generate-license-files.js --test
+              run: node ./scripts/tasks/generate-license-files.mjs --test
             - name: Verify @lwc/shared is tree-shakable
               run: node ./scripts/tasks/verify-treeshakable.mjs ./packages/@lwc/shared/dist/index.js
             - name: Verify that dependencies are declared
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -1,5 +1,5 @@
 set -e
 node ./scripts/tasks/check-and-rewrite-package-json.js --test
-node ./scripts/tasks/generate-license-files.js --test
+node ./scripts/tasks/generate-license-files.mjs --test
 node ./scripts/tasks/verify-treeshakable.mjs ./packages/@lwc/shared/dist/index.js
 node ./scripts/tasks/check-imports-are-declared-dependencies.js
diff --git a/package.json b/package.json
@@ -38,26 +38,26 @@
     },
     "devDependencies": {
         "@commitlint/cli": "^19.8.1",
-        "@eslint/js": "9.31.0",
+        "@eslint/js": "9.32.0",
         "@lwc/eslint-plugin-lwc-internal": "link:./scripts/eslint-plugin",
         "@lwc/test-utils-lwc-internals": "link:./scripts/test-utils",
-        "@nx/js": "21.2.3",
+        "@nx/js": "21.3.10",
         "@rollup/plugin-commonjs": "^28.0.6",
         "@rollup/plugin-inject": "^5.0.5",
         "@rollup/plugin-node-resolve": "^16.0.1",
         "@rollup/plugin-replace": "^6.0.2",
         "@rollup/plugin-typescript": "^12.1.4",
         "@swc-node/register": "~1.10.10",
-        "@swc/core": "~1.12.14",
+        "@swc/core": "~1.13.3",
         "@swc/helpers": "~0.5.17",
         "@types/babel__core": "^7.20.5",
-        "@types/node": "^22.14.1",
+        "@types/node": "^22.17.0",
         "@vitest/coverage-v8": "^3.2.4",
         "@vitest/eslint-plugin": "^1.3.4",
         "@vitest/ui": "^3.2.4",
         "bytes": "^3.1.2",
         "es-module-lexer": "^1.7.0",
-        "eslint": "9.31.0",
+        "eslint": "9.32.0",
         "eslint-config-flat-gitignore": "^2.1.0",
         "eslint-plugin-header": "^3.1.1",
         "eslint-plugin-import": "^2.32.0",
@@ -66,22 +66,22 @@
         "husky": "^9.1.7",
         "isbinaryfile": "^5.0.4",
         "jsdom": "^26.1.0",
-        "lint-staged": "^15.5.1",
+        "lint-staged": "^16.1.2",
         "magic-string": "^0.30.17",
-        "nx": "21.2.3",
+        "nx": "21.3.10",
         "prettier": "^3.6.2",
-        "rollup": "^4.45.0",
+        "rollup": "^4.46.2",
         "terser": "^5.43.1",
         "tslib": "^2.8.1",
         "typescript": "5.8.2",
-        "typescript-eslint": "8.36.0",
+        "typescript-eslint": "8.38.0",
         "vitest": "^3.2.4"
     },
     "lint-staged": {
         "*.{js,mjs,ts,only,skip}": "eslint --cache",
         "*.{css,js,json,md,mjs,ts,yaml,yml}": "prettier --check",
         "{packages/**/package.json,scripts/tasks/check-and-rewrite-package-json.js}": "node ./scripts/tasks/check-and-rewrite-package-json.js --test",
-        "{LICENSE-CORE.md,**/LICENSE.md,yarn.lock,scripts/tasks/generate-license-files.js,scripts/shared/bundled-dependencies.js}": "node ./scripts/tasks/generate-license-files.js --test"
+        "{LICENSE-CORE.md,**/LICENSE.md,yarn.lock,scripts/tasks/generate-license-files.mjs,scripts/shared/bundled-dependencies.js}": "node ./scripts/tasks/generate-license-files.mjs --test"
     },
     "workspaces": [
         "packages/@lwc/*",
diff --git a/packages/@lwc/integration-tests/package.json b/packages/@lwc/integration-tests/package.json
@@ -26,7 +26,7 @@
         "@wdio/spec-reporter": "^9.17.0",
         "@wdio/static-server-service": "^9.16.2",
         "deepmerge": "^4.3.1",
-        "dotenv": "^17.2.0",
+        "dotenv": "^17.2.1",
         "lwc": "8.20.2",
         "minimist": "^1.2.8",
         "webdriverio": "^9.0.7"
diff --git a/packages/@lwc/integration-types/package.json b/packages/@lwc/integration-types/package.json
@@ -15,7 +15,7 @@
     "devDependencies": {
         "@rollup/plugin-replace": "^6.0.2",
         "@rollup/plugin-typescript": "^12.1.4",
-        "rollup": "^4.45.0",
+        "rollup": "^4.46.2",
         "rollup-plugin-livereload": "^2.0.5",
         "rollup-plugin-serve": "^3.0.0"
     }
diff --git a/packages/@lwc/ssr-compiler/package.json b/packages/@lwc/ssr-compiler/package.json
@@ -48,7 +48,7 @@
         }
     },
     "dependencies": {
-        "@babel/types": "7.28.1",
+        "@babel/types": "7.28.2",
         "@lwc/errors": "8.20.2",
         "@lwc/shared": "8.20.2",
         "@lwc/template-compiler": "8.20.2",
diff --git a/packages/@lwc/template-compiler/package.json b/packages/@lwc/template-compiler/package.json
@@ -53,7 +53,7 @@
         "he": "~1.2.0"
     },
     "devDependencies": {
-        "@parse5/tools": "^0.6.0",
+        "@parse5/tools": "^0.7.0",
         "@types/estree": "^1.0.8",
         "@types/he": "^1.2.3",
         "estree-walker": "~3.0.3",
diff --git a/playground/package.json b/playground/package.json
@@ -13,7 +13,7 @@
         "@rollup/plugin-replace": "^6.0.2",
         "@rollup/plugin-typescript": "^12.1.4",
         "lwc": "8.20.2",
-        "rollup": "^4.45.0",
+        "rollup": "^4.46.2",
         "rollup-plugin-livereload": "^2.0.5",
         "rollup-plugin-serve": "^3.0.0",
         "tslib": "^2.8.1"
diff --git a/scripts/tasks/generate-license-files.js b/scripts/tasks/generate-license-files.js
diff --git a/scripts/tasks/generate-license-files.mjs b/scripts/tasks/generate-license-files.mjs
@@ -0,0 +1,122 @@
+import path from 'node:path';
+import { readFile, writeFile, stat, readdir } from 'node:fs/promises';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import prettier from 'prettier';
+import { BUNDLED_DEPENDENCIES } from '../shared/bundled-dependencies.js';
+
+// We're using ESM here, but some packages still only export CJS, so we also need `require`
+const require = createRequire(import.meta.url);
+
+const atLwcPackages = (await readdir('packages/@lwc'))
+    // skip dotfiles like .DS_Store
+    .filter((_) => !_.startsWith('.'))
+    .map((_) => `@lwc/${_}`);
+
+// Generate our LICENSE files for each package, including any bundled dependencies
+// This is modeled after how Rollup does it:
+// https://github.com/rollup/rollup/blob/0b665c3/build-plugins/generate-license-file.ts
+
+// Async fs.existsSync
+async function exists(filename) {
+    try {
+        await stat(filename);
+        return true;
+    } catch (_err) {
+        return false;
+    }
+}
+
+/**
+ * Tries `require.resolve` with additional paths (`packages/@lwc/___/node_modules`)
+ * and `import.meta.resolve` (unmodified) to find a package's entrypoint.
+ */
+function tryResolve(specifier) {
+    try {
+        // As far as I can tell, there's no way to modify the `import` lookup paths
+        return fileURLToPath(import.meta.resolve(specifier));
+    } catch (err) {
+        // We expect to see missing packages, but throw other errors
+        if (err.code !== 'ERR_MODULE_NOT_FOUND') {
+            throw err;
+        }
+    }
+    // `require.resolve` accepts a second parameter of additional places to look
+    return require.resolve(specifier, {
+        paths: atLwcPackages.map((pkg) => path.join('packages', pkg, 'node_modules')),
+    });
+}
+
+/**
+ * Finds a dependency in our monorepo.
+ * @param {string} specifier - package name to find
+ */
+function findPackageDirectory(specifier) {
+    const resolved = tryResolve(specifier);
+    // An import can resolve to a nested directory, e.g. dist/index.js. We want the package
+    // root, which will always be the last node_modules/${specifier}.
+    const lookup = path.join('/node_modules', specifier);
+    return resolved.slice(0, resolved.lastIndexOf(lookup) + lookup.length);
+}
+
+async function findLicenseText(depName) {
+    // Iterate through possible names for the license file
+    const names = ['LICENSE', 'LICENSE.md', 'LICENSE.txt'];
+
+    const resolvedDepPath = findPackageDirectory(depName);
+
+    for (const name of names) {
+        const fullFilePath = path.join(resolvedDepPath, name);
+        if (await exists(fullFilePath)) {
+            return (await readFile(fullFilePath, 'utf-8')).trim();
+        }
+    }
+
+    // Get the license from the package.json if we can't find it elsewhere
+    const { license, version } = JSON.parse(
+        await readFile(path.join(resolvedDepPath, 'package.json'), 'utf-8')
+    );
+
+    return `${license} license defined in package.json in v${version}.`;
+}
+
+const coreLicense = await readFile('LICENSE-CORE.md', 'utf-8');
+
+const bundledLicenses = await Promise.all(
+    BUNDLED_DEPENDENCIES.map(async (depName) => {
+        return `## ${depName}\n\n` + (await findLicenseText(depName));
+    })
+);
+const newLicense =
+    `# LWC core license\n\n${coreLicense}\n# Licenses of bundled dependencies\n\n${bundledLicenses.join(
+        '\n'
+    )}`.trim() + '\n';
+
+const formattedLicense = await prettier.format(newLicense, {
+    parser: 'markdown',
+});
+
+// Check against current top-level license for changes
+const shouldWarnChanges =
+    process.argv.includes('--test') && formattedLicense !== (await readFile('LICENSE.md', 'utf-8'));
+
+// Top level license
+await writeFile('LICENSE.md', formattedLicense, 'utf-8');
+
+// License file for each package as well, so that we publish it to npm
+
+const packages = ['lwc', ...atLwcPackages];
+
+await Promise.all(
+    packages.map(async (pkg) => {
+        await writeFile(path.join('packages/', pkg, 'LICENSE.md'), formattedLicense, 'utf-8');
+    })
+);
+
+if (shouldWarnChanges) {
+    const relativeFilename = path.relative(process.cwd(), import.meta.filename);
+    throw new Error(
+        'Either the LWC core license or the license of a bundled dependency has been updated.\n' +
+            `Please run \`node ${relativeFilename}\` and commit the result.`
+    );
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"productTag": "a1aB0000000g309IAA",`
`3`		`- "defaultBuild": "256",`
	`3`	`+ "defaultBuild": "258",`
`4`	`4`	`"hideWorkItemUrl": true`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"devDependencies": {`
`16`	`16`	`"@rollup/plugin-replace": "^6.0.2",`
`17`	`17`	`"@rollup/plugin-typescript": "^12.1.4",`
`18`		`- "rollup": "^4.45.0",`
	`18`	`+ "rollup": "^4.46.2",`
`19`	`19`	`"rollup-plugin-livereload": "^2.0.5",`
`20`	`20`	`"rollup-plugin-serve": "^3.0.0"`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`}`
`49`	`49`	`},`
`50`	`50`	`"dependencies": {`
`51`		`- "@babel/types": "7.28.1",`
	`51`	`+ "@babel/types": "7.28.2",`
`52`	`52`	`"@lwc/errors": "8.20.2",`
`53`	`53`	`"@lwc/shared": "8.20.2",`
`54`	`54`	`"@lwc/template-compiler": "8.20.2",`