Skip to content

Commit

Permalink
[not verified] Merge branch 'master' into fix/boost-and-general-linti…
Browse files Browse the repository at this point in the history
…ng-formatting

* master:
  docker: Add script to create "fake" translations for testing i18n (#21407)
  Add webpack-config package (#21482)
  Update dependency composer/semver to v3.2.6 (#21608)
  Update dependency eslint-plugin-import to v2.25.2 (#21607)
  Update JS unit testing packages (#21605)
  Admin page: Fix pricing/currency displayed on the upgrade page (#21594)
  Update dependency @rollup/plugin-node-resolve to v13.0.6 (#21599)
  Publicize: Add new publicize icon toggle component (#20957)
  Search: hide search menu for atomic sites (#21565)
  Allow /wp/v2/sites/1234/batch endpoint to process widget updates (#21549)
  tooling: Add `.mjs` as a JavaScript extension (#21589)
  Jetpack: PHPCS src/class-tracking (#21583)
  Publicize: make the default social media message blank (#21477)
  • Loading branch information
davidlonjon committed Nov 2, 2021
2 parents b475647 + 385bf54 commit cf79f69
Show file tree
Hide file tree
Showing 65 changed files with 2,476 additions and 924 deletions.
2 changes: 1 addition & 1 deletion .github/files/lint-project-structure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@automattic/jetpack-connection",
"@automattic/jetpack-idc",
"@automattic/jetpack-storybook",
"@automattic/jetpack-webpack-config",
"automattic/jetpack-a8c-mc-stats",
"automattic/jetpack-abtest",
"automattic/jetpack-admin-ui",
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ jobs:
- '**.cjs'
- '**.js'
- '**.jsx'
- '**.mjs'
- '**.ts'
- '**.svelte'
- '**.tsx'
excludelist:
# If any PHP or JS file changed or was deleted, we need to check the excludelist.
- modified|deleted:
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,.svelte --git",
"lint-file": "eslint --ext .js,.jsx,.cjs,.ts,.svelte",
"lint-changed": "eslint-changed --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.svelte --git",
"lint-file": "eslint --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.svelte",
"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,svelte}\"",
"reformat-files": "prettier --ignore-path .eslintignore --write \"**/*.{js,jsx,cjs,mjs,ts,tsx,svelte,json}\"",
"version-packages": "bash ./tools/version-packages.sh"
},
"husky": {
Expand Down
Loading

0 comments on commit cf79f69

Please sign in to comment.