Merge remote-tracking branch 'origin/master' into add/webpack-config-…

…js-package

.github/files/lint-project-structure.sh

@@ -78,7 +78,7 @@ for PROJECT in projects/*/*; do
 
 	# - package.json for js modules should look like a library to renovate.
 	if [[ "$PROJECT" == projects/js-packages/* && -e "$PROJECT/package.json" ]]; then
-		! IFS= read -r INDEX < <( ls -- "$PROJECT"/index.{js,jsx,cjs,ts,tsx,d.ts} 2>/dev/null )
+		! IFS= read -r INDEX < <( ls -- "$PROJECT"/index.{js,jsx,cjs,mjs,ts,tsx,d.ts} 2>/dev/null )
 		if [[ -n "$INDEX" ]] && ! jq -e '.private // .main // .exports' "$PROJECT/package.json" >/dev/null; then
 			echo "::error file=$PROJECT/package.json::$SLUG appears to be a library (it has ${INDEX#$PROJECT/}), but does not specify \`.main\` or \`.exports\` in package.json. This will confuse renovate."
 		fi

.github/workflows/linting.yml

@@ -70,7 +70,9 @@ jobs:
                 - '**.cjs'
                 - '**.js'
                 - '**.jsx'
+                - '**.mjs'
                 - '**.ts'
+                - '**.tsx'
             excludelist:
               # If any PHP or JS file changed or was deleted, we need to check the excludelist.
               - modified|deleted:

package.json

@@ -62,13 +62,13 @@
 		"docker:wp": "printf '\\e[30;43m`pnpm run docker:wp` is deprecated. Use the Jetpack CLI instead.\\e[0m\\n'; jetpack docker wp",
 		"install-if-deps-outdated": "pnpm install --no-prod --frozen-lockfile",
 		"lint": "pnpm run lint-file -- .",
-		"lint-changed": "eslint-changed --ext .js,.jsx,.cjs,.ts --git",
-		"lint-file": "eslint --ext .js,.jsx,.cjs,.ts",
+		"lint-changed": "eslint-changed --ext .js,.jsx,.cjs,.mjs,.ts,.tsx --git",
+		"lint-file": "eslint --ext .js,.jsx,.cjs,.mjs,.ts,.tsx",
 		"lint-required": "node -e \"const fs = require('fs'); fs.copyFileSync('.eslintignore','.eslintignore-required'); const w=fs.createWriteStream('.eslintignore-required',{flags:'a'}); w.write('\\n# tools/eslint-excludelist.json\\n'); w.end(JSON.parse(fs.readFileSync('tools/eslint-excludelist.json','utf8')).join('\\n')+'\\n')\" && pnpm run lint -- --max-warnings=0 --ignore-path .eslintignore-required",
 		"php:autofix": "composer phpcs:fix",
 		"php:compatibility": "composer phpcs:compatibility",
 		"php:lint": "composer phpcs:lint",
-		"reformat-files": "prettier --ignore-path .eslintignore --write \"**/*.{js,jsx,cjs,ts,json}\"",
+		"reformat-files": "prettier --ignore-path .eslintignore --write \"**/*.{js,jsx,cjs,mjs,ts,tsx,json}\"",
 		"version-packages": "bash ./tools/version-packages.sh"
 	},
 	"husky": {