From 55408c7318ab26974d6651c3d0ef7eb8b63fbba6 Mon Sep 17 00:00:00 2001
From: rmccar <42928680+rmccar@users.noreply.github.com>
Date: Thu, 19 Sep 2024 11:45:13 +0100
Subject: [PATCH 1/2] Update husky to v9 (#3345)
---
.husky/post-checkout | 2 --
.husky/pre-commit | 2 --
package.json | 2 +-
yarn.lock | 8 ++++----
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/.husky/post-checkout b/.husky/post-checkout
index f9b2b6b03f..c49b8763c0 100755
--- a/.husky/post-checkout
+++ b/.husky/post-checkout
@@ -1,6 +1,4 @@
-#!/bin/sh
[ -n "$NETLIFY" ] && exit 0
-. "$(dirname "$0")/_/husky.sh"
yarn tidy-clean
yarn install --check-files
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 90861ad8cc..703edf362b 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,5 +1,3 @@
-#!/bin/sh
[ -n "$NETLIFY" ] && exit 0
-. "$(dirname "$0")/_/husky.sh"
yarn lint-staged
diff --git a/package.json b/package.json
index ca466fed19..e0771811f5 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
"gulp-sourcemaps": "^3.0.0",
"gulp-terser": "^2.0.1",
"http-server": "^14.1.1",
- "husky": "^8.0.3",
+ "husky": "^9.1.6",
"jest": "^29.6.1",
"jest-axe": "^8.0.0",
"jest-environment-jsdom": "^29.6.1",
diff --git a/yarn.lock b/yarn.lock
index c467968be2..17c9ca2cf3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5979,10 +5979,10 @@ human-signals@^5.0.0:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
-husky@^8.0.3:
- version "8.0.3"
- resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"
- integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==
+husky@^9.1.6:
+ version "9.1.6"
+ resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.6.tgz#e23aa996b6203ab33534bdc82306b0cf2cb07d6c"
+ integrity sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==
iconv-lite@0.4.24:
version "0.4.24"
From 82265a81e431c85dfe115a596a71ef99a35b5da4 Mon Sep 17 00:00:00 2001
From: rmccar <42928680+rmccar@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:05:00 +0100
Subject: [PATCH 2/2] Remove space from button newWindowDescription (#3363)
---
src/components/button/_macro.njk | 2 +-
src/components/button/_macro.spec.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/button/_macro.njk b/src/components/button/_macro.njk
index 3dc20ecaf3..ba06e0abfc 100644
--- a/src/components/button/_macro.njk
+++ b/src/components/button/_macro.njk
@@ -111,7 +111,7 @@
{%- endif -%}
{% if params.url and params.newWindow %}
- ({{ params.newWindowDescription | default("opens in a new tab") }})
+ ({{ params.newWindowDescription | default("opens in a new tab") }})
{% endif %}
{% if params.buttonContext %}
{{ params.buttonContext }}
diff --git a/src/components/button/_macro.spec.js b/src/components/button/_macro.spec.js
index 19c2786ea3..b64c38240c 100644
--- a/src/components/button/_macro.spec.js
+++ b/src/components/button/_macro.spec.js
@@ -393,7 +393,7 @@ describe('macro: button', () => {
}),
);
- expect($('.ons-btn__new-window-description').text()).toBe(' (opens in a new tab)');
+ expect($('.ons-btn__new-window-description').text()).toBe('(opens in a new tab)');
});
it('has a custom new window description when `newWindow` is `true` and `newWindowDescription` is provided', () => {
@@ -405,7 +405,7 @@ describe('macro: button', () => {
}),
);
- expect($('.ons-btn__new-window-description').text()).toBe(' (custom opens in a new window text)');
+ expect($('.ons-btn__new-window-description').text()).toBe('(custom opens in a new window text)');
});
it('has the `download` attribute when `variants` contains "download"', () => {