From 5178670c6e1fb0c7a0754cc9e2fd5ee6f9b77aaf Mon Sep 17 00:00:00 2001 From: Tyler Wendlandt Date: Thu, 26 Oct 2023 07:59:34 -0600 Subject: [PATCH] CC-6796/upgrade hds (#83) * Upgrade hds packages * Set @hashicorp/design-system-components as a peerDep * Changeset * remove test tag on documentation overview page --------- Co-authored-by: Ella Cai --- .changeset/violet-eagles-fold.md | 5 ++ documentation/package.json | 4 +- toolkit/package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++-------- 4 files changed, 89 insertions(+), 28 deletions(-) create mode 100644 .changeset/violet-eagles-fold.md diff --git a/.changeset/violet-eagles-fold.md b/.changeset/violet-eagles-fold.md new file mode 100644 index 00000000..f5d4e746 --- /dev/null +++ b/.changeset/violet-eagles-fold.md @@ -0,0 +1,5 @@ +--- +'@hashicorp/consul-ui-toolkit': major +--- + +Upgrade @hashicorp/design-system-components to 3.0.2 and set as peerDependency diff --git a/documentation/package.json b/documentation/package.json index 3f999be8..eaf71171 100644 --- a/documentation/package.json +++ b/documentation/package.json @@ -30,8 +30,8 @@ "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@hashicorp/consul-ui-toolkit": "^2.0.0", - "@hashicorp/design-system-components": "^2.13.0", - "@hashicorp/ember-flight-icons": "^3.1.2", + "@hashicorp/design-system-components": "^3.0.2", + "@hashicorp/ember-flight-icons": "^4.0.1", "@types/qunit": "latest", "@typescript-eslint/eslint-plugin": "^5.2.0", "@typescript-eslint/parser": "^5.2.0", diff --git a/toolkit/package.json b/toolkit/package.json index fb5d8811..a6dccb9c 100644 --- a/toolkit/package.json +++ b/toolkit/package.json @@ -53,7 +53,6 @@ "@babel/plugin-transform-typescript": "^7.22.10", "@babel/preset-typescript": "^7.21.0", "@embroider/addon-dev": "^3.0.0", - "@hashicorp/design-system-components": "^2.13.0", "@rollup/plugin-babel": "^5.3.0", "@tsconfig/ember": "^3.0.0", "@types/ember": "^4.0.3", @@ -77,6 +76,9 @@ "sass": "^1.60.0", "typescript": "^5.1.6" }, + "peerDependencies": { + "@hashicorp/design-system-components": "^3.0.2" + }, "publishConfig": { "registry": "https://registry.npmjs.org" }, diff --git a/yarn.lock b/yarn.lock index a1e66bfe..1a850662 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1791,6 +1791,14 @@ walk-sync "^3.0.0" yargs "^17.0.1" +"@embroider/addon-shim@1.8.3": + version "1.8.3" + resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.3.tgz#2368510b8ce42d50d02cb3289c32e260dfa34bd9" + integrity sha512-7pyHwzT6ESXc3nZsB8rfnirLkUhQWdvj6CkYH+0MUPN74mX4rslf7pnBqZE/KZkW3uBIaBYvU8fxi0hcKC/Paw== + dependencies: + "@embroider/shared-internals" "^1.8.3" + semver "^7.3.5" + "@embroider/addon-shim@^1.0.0", "@embroider/addon-shim@^1.2.0", "@embroider/addon-shim@^1.5.0", "@embroider/addon-shim@^1.8.0", "@embroider/addon-shim@^1.8.4": version "1.8.4" resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.4.tgz#0e7f32c5506bf0f3eb0840506e31c36c7053763c" @@ -1863,6 +1871,20 @@ resolve "^1.20.0" semver "^7.3.2" +"@embroider/macros@^1.13.0": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.2.tgz#07dda11313a2539f403404881b729e622a80ca17" + integrity sha512-AUgJ71xG8kjuTx8XB1AQNBiebJuXRfhcHr318dCwnQz9VRXdYSnEEqf38XRvGYIoCvIyn/3c72LrSwzaJqknOA== + dependencies: + "@embroider/shared-internals" "2.5.0" + assert-never "^1.2.1" + babel-import-util "^2.0.0" + ember-cli-babel "^7.26.6" + find-up "^5.0.0" + lodash "^4.17.21" + resolve "^1.20.0" + semver "^7.3.2" + "@embroider/shared-internals@2.0.0", "@embroider/shared-internals@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316" @@ -1892,6 +1914,35 @@ semver "^7.3.5" typescript-memoize "^1.0.1" +"@embroider/shared-internals@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.0.tgz#4a0b5127c589718fae60fc22f81374ed558b944a" + integrity sha512-7qzrb7GVIyNqeY0umxoeIvjDC+ay1b+wb2yCVuYTUYrFfLAkLEy9FNI3iWCi3RdQ9OFjgcAxAnwsAiPIMZZ3pQ== + dependencies: + babel-import-util "^2.0.0" + debug "^4.3.2" + ember-rfc176-data "^0.3.17" + fs-extra "^9.1.0" + js-string-escape "^1.0.1" + lodash "^4.17.21" + resolve-package-path "^4.0.1" + semver "^7.3.5" + typescript-memoize "^1.0.1" + +"@embroider/shared-internals@^1.8.3": + version "1.8.3" + resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.8.3.tgz#52d868dc80016e9fe983552c0e516f437bf9b9f9" + integrity sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w== + dependencies: + babel-import-util "^1.1.0" + ember-rfc176-data "^0.3.17" + fs-extra "^9.1.0" + js-string-escape "^1.0.1" + lodash "^4.17.21" + resolve-package-path "^4.0.1" + semver "^7.3.5" + typescript-memoize "^1.0.1" + "@embroider/test-setup@^1.8.3": version "1.8.3" resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-1.8.3.tgz#445b9fe5a363ce50367ac2114750597f98d7806d" @@ -1900,6 +1951,15 @@ lodash "^4.17.21" resolve "^1.20.0" +"@embroider/util@^1.0.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.12.0.tgz#4b7828650b55f8498f1e78bb63e27e77835e926f" + integrity sha512-P4M1QADEH9ceIYC9mwHeV+6DDgEIQQYFfZi728nVKqTAxakXoiLgu/BCyQmEGyow9fYEPYaC1boDCZxW2JQAXg== + dependencies: + "@embroider/macros" "^1.13.0" + broccoli-funnel "^3.0.5" + ember-cli-babel "^7.26.11" + "@embroider/util@^1.9.0": version "1.10.0" resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.10.0.tgz#8320d73651e7f5d48dac1b71fb9e6d21cac7c803" @@ -2074,24 +2134,24 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5" integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA== -"@hashicorp/design-system-components@^2.13.0": - version "2.13.0" - resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-2.13.0.tgz#c47ee3d17da47a6672de47c85e386d7d324037a0" - integrity sha512-PgoXbK4LWtj2uh/TIp2JiaEN8Ugc88EvEZSi/CzUC2Vroc9wCrYHHQH2JwNTqLTVeNIvptpRRup25bKV6/059w== +"@hashicorp/design-system-components@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-3.0.2.tgz#f9bf18f0f20f6396d4afc2ed138056c27dff8a38" + integrity sha512-Pt3dgCxzutIJ3LDtVgT0NSU5oTV8OFzgK9Nx1tTzIpMOfbCRzZuBmJB06ZPCdyP9Vs7lQVrn/kKzZaKJejrXiQ== dependencies: "@ember/render-modifiers" "^2.0.5" "@ember/test-waiters" "^3.0.2" "@hashicorp/design-system-tokens" "^1.9.0" - "@hashicorp/ember-flight-icons" "^3.1.3" + "@hashicorp/ember-flight-icons" "^4.0.1" dialog-polyfill "^0.5.6" ember-a11y-refocus "^3.0.2" ember-auto-import "^2.6.3" ember-cached-decorator-polyfill "^0.1.4" ember-cli-babel "^7.26.11" - ember-cli-clipboard "^1.0.0" ember-cli-htmlbars "^6.2.0" ember-cli-sass "^10.0.1" ember-composable-helpers "^4.5.0" + ember-element-helper "^0.8.5" ember-focus-trap "^1.0.2" ember-keyboard "^8.2.0" ember-stargate "^0.4.3" @@ -2105,30 +2165,16 @@ resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-1.9.0.tgz#1cfd2627d838214c609f25ff6696b3f3d516d9e5" integrity sha512-zmMpnKv4vulhVFVCpqf3oAAR5fQeDDnMxbeJIZllLFCgF2JFoL6C/Irghx4WnBAG8GkLs8CbxjPVtFjSYq+V8w== -"@hashicorp/ember-flight-icons@^3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-3.1.2.tgz#39982cae2d1ba6a25cd3f8aa336cae674b2c463c" - integrity sha512-aroJ4xd/+6/HTTJnK7KCGNh77Eei8aDpQquEeqBkTT+TK5+C8y043J8joTUAOXq1brIaOwGtd9WuWPpJbb/Csw== - dependencies: - "@hashicorp/flight-icons" "^2.19.0" - ember-auto-import "^2.6.3" - ember-cli-babel "^7.26.11" - ember-cli-htmlbars "^6.2.0" - -"@hashicorp/ember-flight-icons@^3.1.3": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-3.1.3.tgz#0a28667c1cb5908dd1bb73d30991508bfbf399d3" - integrity sha512-Cy/zD6aKqwN1Q+jnF1wJ2QzRx4/6XIVM4x3qO0poi2RHBSzZS/jxwAIqyDXdKiqJha7i/vWP3aGQmDEBqoGKjA== +"@hashicorp/ember-flight-icons@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-4.0.1.tgz#08499f495f8f9ff9eb9eb6c439f1861f8411c047" + integrity sha512-8xkU+2ATX/a5pofmwO51YXgwHamG6YUpxOXxcPbA+9/TKNn1HFbrk3TWJBuDIwz2kdk9hXRZBri2XIR18BFrTA== dependencies: "@hashicorp/flight-icons" "^2.20.0" ember-auto-import "^2.6.3" ember-cli-babel "^7.26.11" ember-cli-htmlbars "^6.2.0" - -"@hashicorp/flight-icons@^2.19.0": - version "2.19.0" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.19.0.tgz#4088574887232bb50a3c1d6e5044456c90b88e40" - integrity sha512-FzEHAOLSQMS5yJorF5H3xP4BKfpIUFRnQgkFl6i1RmvwpOJQgeoz9w/QqWvjh+H/DhFomeC6OxHGgD6rZL7phw== + ember-get-config "^2.1.1" "@hashicorp/flight-icons@^2.20.0": version "2.20.0" @@ -6207,6 +6253,14 @@ ember-disable-prototype-extensions@^1.1.3: resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e" integrity sha512-SB9NcZ27OtoUk+gfalsc3QU17+54OoqR668qHcuvHByk4KAhGxCKlkm9EBlKJcGr7yceOOAJqohTcCEBqfRw9g== +ember-element-helper@^0.8.5: + version "0.8.5" + resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.8.5.tgz#5a53d4e3aa8379694c2002a3097269aeb7c2621b" + integrity sha512-yZYzuasn6ZC8Nwv0MpaLYGtm68ZxIBSNSe/CYxNWkDdgcuAb2lAG1gx37XkwBIiwPQET0W2agwq7++/HwdMF8g== + dependencies: + "@embroider/addon-shim" "1.8.3" + "@embroider/util" "^1.0.0" + ember-fetch@^8.1.2: version "8.1.2" resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-8.1.2.tgz#651839780519319309127054786bf35cd4b84543"