From 96cf75bfdb0205c29764a1f5705c8e2f60d29233 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 31 Aug 2022 11:41:50 -0700 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20ember=20depen?= =?UTF-8?q?dencies=20in=20anticipation=20of=20ember=204=20(#1280)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 💡 replace ember notify with flash in notify decorator * refactor: 💡 remove embery-notify and replace last instance * chore: 🤖 upgrade ember dependencies in anticipation of ember 4 --- addons/api/package.json | 2 +- addons/auth/package.json | 4 ++-- addons/core/package.json | 4 ++-- addons/rose/package.json | 4 ++-- ui/admin/package.json | 4 ++-- ui/desktop/package.json | 4 ++-- yarn.lock | 50 ++++++++++++++++++++++++++++------------ 7 files changed, 46 insertions(+), 26 deletions(-) diff --git a/addons/api/package.json b/addons/api/package.json index a3c98e264..265417370 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -28,7 +28,7 @@ "ember-auto-import": "^2.4.2", "ember-can": "^3.1.0", "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.1.0", "ember-cli-mirage": "^2.2.0", "ember-data": "^3.20.0", "ember-data-model-fragments": "5.0.0-beta.2", diff --git a/addons/auth/package.json b/addons/auth/package.json index 04dcf8a41..0336a2e74 100644 --- a/addons/auth/package.json +++ b/addons/auth/package.json @@ -23,9 +23,9 @@ "dependencies": { "ember-auto-import": "^2.4.2", "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.1.0", "ember-fetch": "^8.1.1", - "ember-simple-auth": "^4.0.0" + "ember-simple-auth": "^4.2.2" }, "devDependencies": { "@babel/eslint-parser": "^7.18.2", diff --git a/addons/core/package.json b/addons/core/package.json index 2e3bccdcc..1828dd7d3 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -36,7 +36,7 @@ "ember-auto-import": "^2.4.2", "ember-browser-services": "^2.0.0", "ember-cli-babel": "^7.26.8", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.1.0", "ember-feature-flags": "^6.0.0", "ember-intl": "^5.7.0", "ember-loading": "^2.0.0", @@ -61,7 +61,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", - "ember-inline-svg": "^1.0.0", + "ember-inline-svg": "^1.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", "ember-page-title": "^7.0.0", diff --git a/addons/rose/package.json b/addons/rose/package.json index 5f0371cd2..c914e30a9 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -35,7 +35,7 @@ "ember-auto-import": "^2.4.2", "ember-cli-babel": "^7.26.8", "ember-cli-clipboard": "^0.16.0", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.1.0", "ember-composable-helpers": "^5.0.0", "ember-focus-trap": "^0.7.0", "ember-named-blocks-polyfill": "^0.2.5", @@ -76,7 +76,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", - "ember-inline-svg": "^1.0.0", + "ember-inline-svg": "^1.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", "ember-modifier": "^1.0.3", diff --git a/ui/admin/package.json b/ui/admin/package.json index ec5a9a291..4923fe366 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -61,7 +61,7 @@ "ember-cli-content-security-policy": "^2.0.3", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-flash": "^4.0.0", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.1.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sass": "^10.0.1", "ember-cli-sri": "^2.1.1", @@ -69,7 +69,7 @@ "ember-cli-terser": "^4.0.2", "ember-exam": "^6.1.0", "ember-export-application-global": "^2.0.1", - "ember-inline-svg": "^1.0.0", + "ember-inline-svg": "^1.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", "ember-modifier": "^2.1.2", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 46b9d55a0..455c7c1c5 100755 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -79,7 +79,7 @@ "ember-cli-code-coverage": "^1.0.3", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-flash": "^4.0.0", - "ember-cli-htmlbars": "^5.7.1", + "ember-cli-htmlbars": "^6.1.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sass": "^10.0.1", "ember-cli-sri": "^2.1.1", @@ -88,7 +88,7 @@ "ember-electron": "^3.1.1", "ember-exam": "^6.1.0", "ember-export-application-global": "^2.0.1", - "ember-inline-svg": "^1.0.0", + "ember-inline-svg": "^1.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator": "^1.0.0", "ember-modifier": "^2.1.2", diff --git a/yarn.lock b/yarn.lock index c600b5144..c922a9400 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8907,7 +8907,7 @@ broccoli-file-creator@^1.1.1: broccoli-plugin "^1.1.0" mkdirp "^0.5.1" -broccoli-file-creator@^2.0.0, broccoli-file-creator@^2.1.1: +broccoli-file-creator@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz#7351dd2496c762cfce7736ce9b49e3fce0c7b7db" integrity sha512-YpjOExWr92C5vhnK0kmD81kM7U09kdIRZk9w4ZDCDHuHXW+VE/x6AGEOQQW3loBQQ6Jk+k+TSm8dESy4uZsnjw== @@ -9020,7 +9020,7 @@ broccoli-merge-files@^0.8.0: lodash.defaults "^4.2.0" p-event "^2.3.1" -"broccoli-merge-trees@^2.0.0 || ^3.0.0", broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2, broccoli-merge-trees@~3.0.2: +broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2, broccoli-merge-trees@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d" integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A== @@ -9028,7 +9028,7 @@ broccoli-merge-files@^0.8.0: broccoli-plugin "^1.3.0" merge-trees "^2.0.0" -broccoli-merge-trees@^4.2.0: +broccoli-merge-trees@^4.0.0, broccoli-merge-trees@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c" integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw== @@ -12102,6 +12102,26 @@ ember-cli-htmlbars@^6.0.1: strip-bom "^4.0.0" walk-sync "^2.2.0" +ember-cli-htmlbars@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.0.tgz#97150c2a6f9a981475599d74817df66f5d816c2b" + integrity sha512-kT+MA2JsNLk10HpxAjpB5HHtR0WCoxZEUwLsy/BBww5lXmsrf34QzmTw7SL6DabZVxs+YCb9RhU9KTmFygGxCg== + dependencies: + "@ember/edition-utils" "^1.2.0" + babel-plugin-ember-template-compilation "^1.0.0" + babel-plugin-htmlbars-inline-precompile "^5.3.0" + broccoli-debug "^0.6.5" + broccoli-persistent-filter "^3.1.2" + broccoli-plugin "^4.0.3" + ember-cli-version-checker "^5.1.2" + fs-tree-diff "^2.0.1" + hash-for-dep "^1.5.1" + heimdalljs-logger "^0.1.10" + js-string-escape "^1.0.1" + semver "^7.3.4" + silent-error "^1.1.1" + walk-sync "^2.2.0" + ember-cli-inject-live-reload@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.1.0.tgz#ef63c733c133024d5726405a3c247fa12e88a385" @@ -12652,10 +12672,10 @@ ember-inflector@^3.0.1: dependencies: ember-cli-babel "^6.6.0" -ember-inline-svg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-inline-svg/-/ember-inline-svg-1.0.0.tgz#d8c243667a9277b0fef06eb63e4f1c4cf1e8013e" - integrity sha512-ayuuPvUk+Hzw/NkpsMvXorFaJcfKkkMRS9DPdu/FtG2Wh8ioROZqrEUsyiDrRJvdxAR/Cx1XuEO5XVWKWu0i6g== +ember-inline-svg@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ember-inline-svg/-/ember-inline-svg-1.0.1.tgz#fa1e8ef56823274680d363b21fb1127a95ae98a3" + integrity sha512-dRf6zRpFunXms8ba095vT4pppTItwYZGy9fjpd9zq5Eqx+97bukv+NffM+shtah1WHrMLj/j8XnxEalENAOiag== dependencies: broccoli-caching-writer "^3.0.3" broccoli-flatiron "~0.1.3" @@ -12663,7 +12683,7 @@ ember-inline-svg@^1.0.0: broccoli-merge-trees "~3.0.2" ember-cli-babel "^7.11.1" ember-cli-htmlbars "^4.0.0" - merge "^1.2.1" + merge "^2.1.1" mkdirp "^0.5.1" promise-map-series "^0.2.1" svgo "~1.2.2" @@ -12842,15 +12862,15 @@ ember-router-generator@^2.0.0: "@babel/traverse" "^7.4.5" recast "^0.18.1" -ember-simple-auth@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-4.0.0.tgz#03efe3272f3f3ff9cd1646ce16189a1a1275f69e" - integrity sha512-OrVsAs+w9HJx8V1dlxcCuhkvwwaOjkD2rzetGqmsuUNNrBb1zghLmeKNeaQj4XIML4fungmCHh0o7MI/hq/y8Q== +ember-simple-auth@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-4.2.2.tgz#5c1de1bb13a75e519e512fb82cba7cc1e277b07c" + integrity sha512-D7W6OREUvf5OzeB0ePptSNBilccchRYukH4f7mkbL6WT+z6VEqRRAIaQuBZdFM6lrcSFGmzctINLZJwsIpI3wg== dependencies: base-64 "^0.1.0" - broccoli-file-creator "^2.0.0" + broccoli-file-creator "^2.1.1" broccoli-funnel "^1.2.0 || ^2.0.0" - broccoli-merge-trees "^2.0.0 || ^3.0.0" + broccoli-merge-trees "^4.0.0" ember-cli-babel "^7.20.5" ember-cli-is-package-missing "^1.0.0" ember-cookies "^0.5.0" @@ -19329,7 +19349,7 @@ merge2@^1.2.3, merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -merge@^1.2.0, merge@^1.2.1, merge@^2.1.0, merge@^2.1.1: +merge@^1.2.0, merge@^2.1.0, merge@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98" integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==