Merge branch 'master' into deployment-details-rest

.husky/pre-push

@@ -14,5 +14,5 @@
 # limitations under the License
 . "$(dirname "$0")/_/husky.sh"
 
-make check
-make test
+npm run check
+npm run test

aio/scripts/pre-commit-i18n.sh

@@ -18,7 +18,7 @@ ROOT_DIR="$(cd $(dirname "${BASH_SOURCE}")/../.. && pwd -P)"
 . "${ROOT_DIR}/aio/scripts/conf.sh"
 
 # Extract i18n messages for update check.
-ng extract-i18n --output-path "${I18N_DIR}" --out-file "messages.new.xlf"
+${NG_BIN} extract-i18n --output-path "${I18N_DIR}" --out-file "messages.new.xlf"
 
 # Generate MD5 existing and new messages file
 MD5_OLD=$(md5sum "${I18N_DIR}/messages.xlf" | cut -c -32)

docs/developer/code-conventions.md

@@ -41,7 +41,7 @@ We use following tools and settings for each check and formatting:
 | ts      | [gts](https://github.com/google/gts)                                     | `eslintConfig` in [`package.json`](../../package.json) and [`.prettierrc.js`](../../.prettierrc.js) |
 | scss    | [stylelint](https://github.com/stylelint/stylelint)                      | `stylelint` in [`package.json`](../../package.json) |
 | html    | [js-beautify](https://github.com/beautify-web/js-beautify)               | options in [`format.sh`](../../aio/scripts/format.sh) |
-| license | [licence-check-and-add](https://github.com/awjh/license-check-and-add)   | [`license-checker-config.json`](../../license-checker-config.json)
+| license | [license-check-and-add](https://github.com/awjh/license-check-and-add)   | [`license-checker-config.json`](../../license-checker-config.json)
 | i18n    | [xliffmerge](https://github.com/martinroob/ngx-i18nsupport)              | `xliffmergeOptions` in [`package.json`](../../package.json) |
 
 ----