From 8468cad2e6d8b12fafb55b4117f1f28babe939c0 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:31:32 -0400
Subject: [PATCH 1/4] Do not use ambiguous syntax with a function
---
tests/integration/helpers/app-version-test.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/integration/helpers/app-version-test.js b/tests/integration/helpers/app-version-test.js
index 3cc4389..9939496 100644
--- a/tests/integration/helpers/app-version-test.js
+++ b/tests/integration/helpers/app-version-test.js
@@ -9,7 +9,7 @@ module('Integration | Helper | {{app-version}}', function (hooks) {
test('it displays entire version', async function (assert) {
assert.expect(1);
- await render(hbs`{{app-version}}`);
+ await render(hbs`{{(app-version)}}`);
assert.ok(this.element.textContent, 'Version not empty');
});
From e716c1528ea6f3bf9602c2955a0a8ef6a470715e Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 15 Jun 2023 16:36:06 -0400
Subject: [PATCH 2/4] func is not a function. yay
---
addon/helpers/app-version.js | 38 +++++
app/helpers/app-version.js | 38 +----
ember-cli-build.js | 8 +
package.json | 1 +
tests/integration/helpers/app-version-test.js | 2 +-
yarn.lock | 140 +++++++++++-------
6 files changed, 139 insertions(+), 88 deletions(-)
create mode 100644 addon/helpers/app-version.js
diff --git a/addon/helpers/app-version.js b/addon/helpers/app-version.js
new file mode 100644
index 0000000..d33340c
--- /dev/null
+++ b/addon/helpers/app-version.js
@@ -0,0 +1,38 @@
+import { helper } from '@ember/component/helper';
+
+import config from 'ember-get-config';
+
+import {
+ shaRegExp,
+ versionRegExp,
+ versionExtendedRegExp,
+} from 'ember-cli-app-version/utils/regexp';
+
+export function appVersion(_, hash = {}) {
+ // e.g. 1.0.0-alpha.1+4jds75hf
+ let version = config.APP.version;
+
+ // Allow use of 'hideSha' and 'hideVersion' For backwards compatibility
+ let versionOnly = hash.versionOnly || hash.hideSha;
+ let shaOnly = hash.shaOnly || hash.hideVersion;
+
+ let match = null;
+
+ if (versionOnly) {
+ if (hash.showExtended) {
+ match = version.match(versionExtendedRegExp); // 1.0.0-alpha.1
+ }
+ // Fallback to just version
+ if (!match) {
+ match = version.match(versionRegExp); // 1.0.0
+ }
+ }
+
+ if (shaOnly) {
+ match = version.match(shaRegExp); // 4jds75hf
+ }
+
+ return match ? match[0] : version;
+}
+
+export default helper(appVersion);
diff --git a/app/helpers/app-version.js b/app/helpers/app-version.js
index a039907..04330a6 100644
--- a/app/helpers/app-version.js
+++ b/app/helpers/app-version.js
@@ -1,36 +1,8 @@
-import { helper } from '@ember/component/helper';
-import config from '../config/environment';
import {
- shaRegExp,
- versionRegExp,
- versionExtendedRegExp,
-} from 'ember-cli-app-version/utils/regexp';
+ default as Helper,
+ appVersion as _private,
+} from 'ember-cli-app-version/helpers/app-version';
-export function appVersion(_, hash = {}) {
- const version = config.APP.version;
- // e.g. 1.0.0-alpha.1+4jds75hf
+export const appVersion = _private;
- // Allow use of 'hideSha' and 'hideVersion' For backwards compatibility
- let versionOnly = hash.versionOnly || hash.hideSha;
- let shaOnly = hash.shaOnly || hash.hideVersion;
-
- let match = null;
-
- if (versionOnly) {
- if (hash.showExtended) {
- match = version.match(versionExtendedRegExp); // 1.0.0-alpha.1
- }
- // Fallback to just version
- if (!match) {
- match = version.match(versionRegExp); // 1.0.0
- }
- }
-
- if (shaOnly) {
- match = version.match(shaRegExp); // 4jds75hf
- }
-
- return match ? match[0] : version;
-}
-
-export default helper(appVersion);
+export default Helper;
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 366cbe5..ff52a85 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -21,5 +21,13 @@ module.exports = function (defaults) {
package: 'qunit',
},
],
+ pacakgeRules: [
+ {
+ package: 'dummy',
+ // Anyone already on embroider can import this if they need it.
+ // strict mode is well within reach for folks on embroider.
+ helpers: { '{{app-version}}': { safeToIgnore: true } },
+ },
+ ],
});
};
diff --git a/package.json b/package.json
index 30d005f..49f2865 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
},
"dependencies": {
"ember-cli-babel": "^7.26.11",
+ "ember-get-config": "^2.1.1",
"git-repo-info": "^2.1.1"
},
"devDependencies": {
diff --git a/tests/integration/helpers/app-version-test.js b/tests/integration/helpers/app-version-test.js
index 9939496..3cc4389 100644
--- a/tests/integration/helpers/app-version-test.js
+++ b/tests/integration/helpers/app-version-test.js
@@ -9,7 +9,7 @@ module('Integration | Helper | {{app-version}}', function (hooks) {
test('it displays entire version', async function (assert) {
assert.expect(1);
- await render(hbs`{{(app-version)}}`);
+ await render(hbs`{{app-version}}`);
assert.ok(this.element.textContent, 'Version not empty');
});
diff --git a/yarn.lock b/yarn.lock
index 92f23b3..679b891 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1366,12 +1366,12 @@
ember-cli-version-checker "^5.1.2"
semver "^7.3.5"
-"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0":
- version "1.10.0"
- resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
- integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
+"@embroider/macros@^0.50.0 || ^1.0.0":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.11.1.tgz#62eeb5bb7907ad01bdf750510c7f46c0192b6605"
+ integrity sha512-yg4Pl5Sw26lKrrtLwk2UEgYkKkztq+Hatn67QYL5A3I3T4IE/bRA3o6xvIslrJNnhyER7jCc2pwusxt3O4HubA==
dependencies:
- "@embroider/shared-internals" "2.0.0"
+ "@embroider/shared-internals" "2.1.0"
assert-never "^1.2.1"
babel-import-util "^1.1.0"
ember-cli-babel "^7.26.6"
@@ -1380,12 +1380,12 @@
resolve "^1.20.0"
semver "^7.3.2"
-"@embroider/macros@^1.11.0":
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.11.1.tgz#62eeb5bb7907ad01bdf750510c7f46c0192b6605"
- integrity sha512-yg4Pl5Sw26lKrrtLwk2UEgYkKkztq+Hatn67QYL5A3I3T4IE/bRA3o6xvIslrJNnhyER7jCc2pwusxt3O4HubA==
+"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.9.0":
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
+ integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
dependencies:
- "@embroider/shared-internals" "2.1.0"
+ "@embroider/shared-internals" "2.0.0"
assert-never "^1.2.1"
babel-import-util "^1.1.0"
ember-cli-babel "^7.26.6"
@@ -1431,13 +1431,13 @@
resolve "^1.20.0"
"@embroider/util@^1.9.0":
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.11.1.tgz#622390932542e6b7f8d5d28e956891306e664eb3"
- integrity sha512-IqzlEQahM2cfLvo4PULA2WyvROqr9jRmeSv0GGZzpitWCh6l4FDwweOLSArdlKSXdQxHkKhwBMCi//7DhKjRlg==
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.9.0.tgz#331c46bdf106c44cb1dd6baaa9030d322c13cfca"
+ integrity sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==
dependencies:
- "@embroider/macros" "^1.11.0"
+ "@embroider/macros" "^1.9.0"
broccoli-funnel "^3.0.5"
- ember-cli-babel "^7.26.11"
+ ember-cli-babel "^7.23.1"
"@eslint-community/eslint-utils@^4.2.0":
version "4.4.0"
@@ -2689,7 +2689,7 @@ babel-import-util@^0.2.0:
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
-babel-import-util@^1.1.0, babel-import-util@^1.3.0:
+babel-import-util@^1.1.0, babel-import-util@^1.2.0, babel-import-util@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e"
integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==
@@ -2732,6 +2732,16 @@ babel-plugin-ember-modules-api-polyfill@^3.5.0:
dependencies:
ember-rfc176-data "^0.3.17"
+babel-plugin-ember-template-compilation@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-1.0.2.tgz#e0695b8ad5a8fe6b2cbdff1eadb01cf402731ad6"
+ integrity sha512-4HBMksmlYsWEf/C/n3uW5rkBRbUp4FNaspzdQTAHgLbfCJnkLze8R6i6sUSge48y/Wne7mx+vcImI1o6rlUwXQ==
+ dependencies:
+ babel-import-util "^1.2.0"
+ line-column "^1.0.2"
+ magic-string "^0.26.0"
+ string.prototype.matchall "^4.0.5"
+
babel-plugin-ember-template-compilation@^2.0.0, babel-plugin-ember-template-compilation@^2.0.1:
version "2.0.3"
resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.3.tgz#8370e92eabc9987354eb7e3a84f6d5cf1d19b365"
@@ -4437,7 +4447,7 @@ electron-to-chromium@^1.4.251:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
-ember-auto-import@^2.5.0:
+ember-auto-import@^2.4.3, ember-auto-import@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.5.0.tgz#627607648e87d154f75cd3f70c435355ef7cced9"
integrity sha512-fKERUmpZLn4RJiCwTjS7D5zJxgnbF4E6GiSp1GYh53K96S+5UBs06r7ScDI52rq34z0+qdSrA6qiDJ3i/lWqKg==
@@ -4473,7 +4483,7 @@ ember-auto-import@^2.5.0:
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^3.0.0"
-ember-auto-import@^2.6.0, ember-auto-import@^2.6.3:
+ember-auto-import@^2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a"
integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==
@@ -4515,7 +4525,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
-ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
version "7.26.11"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -4567,7 +4577,27 @@ ember-cli-get-component-path-option@^1.0.0:
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
integrity sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA==
-ember-cli-htmlbars@^6.1.1, ember-cli-htmlbars@^6.2.0:
+ember-cli-htmlbars@^6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.1.tgz#f5b588572a5d18ad087560122b8dabc90145173d"
+ integrity sha512-DKf2rjzIVw9zWCuFsBGJScrgf5Mz7dSg08Cq+FWFYIxnpssINUbNUoB0NHWnUJK4QqCvaExOyOmjm0kO455CPg==
+ 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-htmlbars@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc"
integrity sha512-j5EGixjGau23HrqRiW/JjoAovg5UBHfjbyN7wX5ekE90knIEqUUj1z/Mo/cTx/J2VepQ2lE6HdXW9LWQ/WdMtw==
@@ -4827,6 +4857,14 @@ ember-destroyable-polyfill@^2.0.3:
ember-cli-version-checker "^5.1.1"
ember-compatibility-helpers "^1.2.1"
+ember-get-config@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-2.1.1.tgz#bede76c25d95dbefab8d30064abf7aa00bc19235"
+ integrity sha512-uNmv1cPG/4qsac8oIf5txJ2FZ8p88LEpG4P3dNcjsJS98Y8hd0GPMFwVqpnzI78Lz7VYRGQWY4jnE4qm5R3j4g==
+ dependencies:
+ "@embroider/macros" "^0.50.0 || ^1.0.0"
+ ember-cli-babel "^7.26.6"
+
ember-load-initializers@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz#8a47a656c1f64f9b10cecdb4e22a9d52ad9c7efa"
@@ -4843,19 +4881,19 @@ ember-page-title@^7.0.0:
ember-cli-babel "^7.26.6"
ember-qunit@^6.0.0:
- version "6.2.0"
- resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-6.2.0.tgz#4d492951035d1df5c7802c4ae6cf299c8f41d75b"
- integrity sha512-mC+0bp8DwWzJLn8SW3GS8KDZIkl4yLsNYwMi5Dw6+aFllq7FM2crd/dfY4MuOIHK7GKdjtmWJTMGnjSpeSayaw==
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-6.1.1.tgz#9e2b7835239e7ffd176e08e536975f66e59f75e5"
+ integrity sha512-3/jCpoecltFV6vm7GCtSDNRxBzWx96nP+QrbereJAnioSaGeLe+slKL3l80mGzMYDTvn7ESobZ+Ba+OQ1vMMKQ==
dependencies:
broccoli-funnel "^3.0.8"
broccoli-merge-trees "^3.0.2"
common-tags "^1.8.0"
- ember-auto-import "^2.6.0"
+ ember-auto-import "^2.4.3"
ember-cli-babel "^7.26.11"
ember-cli-test-loader "^3.0.0"
resolve-package-path "^4.0.3"
silent-error "^1.1.1"
- validate-peer-dependencies "^2.2.0"
+ validate-peer-dependencies "^2.1.0"
ember-resolver@^10.1.0:
version "10.1.0"
@@ -6456,16 +6494,11 @@ got@^9.6.0:
to-readable-stream "^1.0.0"
url-parse-lax "^3.0.0"
-graceful-fs@4.2.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@4.2.10, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
version "4.2.10"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-graceful-fs@^4.1.3:
- version "4.2.11"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
- integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
"graceful-readlink@>= 1.0.0":
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -8021,6 +8054,13 @@ magic-string@^0.25.7:
dependencies:
sourcemap-codec "^1.4.8"
+magic-string@^0.26.0:
+ version "0.26.7"
+ resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f"
+ integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==
+ dependencies:
+ sourcemap-codec "^1.4.8"
+
magic-string@^0.30.0:
version "0.30.0"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529"
@@ -10102,9 +10142,9 @@ reselect@^3.0.1:
integrity sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==
reselect@^4.0.0:
- version "4.1.8"
- resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
- integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
+ version "4.1.7"
+ resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.7.tgz#56480d9ff3d3188970ee2b76527bd94a95567a42"
+ integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==
resolve-alpn@^1.2.0:
version "1.2.1"
@@ -10304,20 +10344,20 @@ rxjs@^6.4.0, rxjs@^6.6.0:
dependencies:
tslib "^1.9.0"
-rxjs@^7.5.5, rxjs@^7.8.1:
- version "7.8.1"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
- integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
- dependencies:
- tslib "^2.1.0"
-
-rxjs@^7.5.7:
+rxjs@^7.5.5, rxjs@^7.5.7:
version "7.8.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
dependencies:
tslib "^2.1.0"
+rxjs@^7.8.1:
+ version "7.8.1"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+ integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+ dependencies:
+ tslib "^2.1.0"
+
sade@^1.7.3:
version "1.8.1"
resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
@@ -10458,9 +10498,9 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
semver@^7.3.8:
- version "7.5.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
- integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+ version "7.5.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
+ integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
dependencies:
lru-cache "^6.0.0"
@@ -11826,7 +11866,7 @@ validate-peer-dependencies@^1.1.0:
resolve-package-path "^3.1.0"
semver "^7.3.2"
-validate-peer-dependencies@^2.0.0:
+validate-peer-dependencies@^2.0.0, validate-peer-dependencies@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz#1ad8218b1b168aeb500165f9de2a3f53269ece56"
integrity sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ==
@@ -11834,14 +11874,6 @@ validate-peer-dependencies@^2.0.0:
resolve-package-path "^4.0.0"
semver "^7.3.2"
-validate-peer-dependencies@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.2.0.tgz#47b8ff008f66a66fc5d8699123844522c1d874f4"
- integrity sha512-8X1OWlERjiUY6P6tdeU9E0EwO8RA3bahoOVG7ulOZT5MqgNDUO/BQoVjYiHPcNe+v8glsboZRIw9iToMAA2zAA==
- dependencies:
- resolve-package-path "^4.0.3"
- semver "^7.3.8"
-
vary@^1, vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
From a2dc6d1a9d3ff58aa7114289234cac5cc4aa2de3 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 15 Jun 2023 17:36:59 -0400
Subject: [PATCH 3/4] Throw everything at the wall and see what sticks
---
.github/workflows/ci.yml | 2 +-
package.json | 4 +-
yarn.lock | 146 ++++++++++++++++-----------------------
3 files changed, 64 insertions(+), 88 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 89887dd..9b8a19b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,7 +66,7 @@ jobs:
- ember-canary
- ember-classic
- embroider-safe
- # - embroider-optimized
+ - embroider-optimized
steps:
- uses: actions/checkout@v3
diff --git a/package.json b/package.json
index 49f2865..6f892a7 100644
--- a/package.json
+++ b/package.json
@@ -50,13 +50,13 @@
"concurrently": "^8.2.0",
"ember-auto-import": "^2.6.3",
"ember-cli": "^4.12.0",
- "ember-cli-dependency-checker": "^3.3.1",
+ "ember-cli-dependency-checker": "^3.3.2",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.0.0",
- "ember-resolver": "^10.1.0",
+ "ember-resolver": "^10.1.1",
"ember-source": "^4.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.10.1",
diff --git a/yarn.lock b/yarn.lock
index 679b891..0832bda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1366,7 +1366,7 @@
ember-cli-version-checker "^5.1.2"
semver "^7.3.5"
-"@embroider/macros@^0.50.0 || ^1.0.0":
+"@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.11.0":
version "1.11.1"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.11.1.tgz#62eeb5bb7907ad01bdf750510c7f46c0192b6605"
integrity sha512-yg4Pl5Sw26lKrrtLwk2UEgYkKkztq+Hatn67QYL5A3I3T4IE/bRA3o6xvIslrJNnhyER7jCc2pwusxt3O4HubA==
@@ -1380,7 +1380,7 @@
resolve "^1.20.0"
semver "^7.3.2"
-"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.9.0":
+"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
@@ -1431,13 +1431,13 @@
resolve "^1.20.0"
"@embroider/util@^1.9.0":
- version "1.9.0"
- resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.9.0.tgz#331c46bdf106c44cb1dd6baaa9030d322c13cfca"
- integrity sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.11.1.tgz#622390932542e6b7f8d5d28e956891306e664eb3"
+ integrity sha512-IqzlEQahM2cfLvo4PULA2WyvROqr9jRmeSv0GGZzpitWCh6l4FDwweOLSArdlKSXdQxHkKhwBMCi//7DhKjRlg==
dependencies:
- "@embroider/macros" "^1.9.0"
+ "@embroider/macros" "^1.11.0"
broccoli-funnel "^3.0.5"
- ember-cli-babel "^7.23.1"
+ ember-cli-babel "^7.26.11"
"@eslint-community/eslint-utils@^4.2.0":
version "4.4.0"
@@ -2689,7 +2689,7 @@ babel-import-util@^0.2.0:
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
-babel-import-util@^1.1.0, babel-import-util@^1.2.0, babel-import-util@^1.3.0:
+babel-import-util@^1.1.0, babel-import-util@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e"
integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==
@@ -2732,16 +2732,6 @@ babel-plugin-ember-modules-api-polyfill@^3.5.0:
dependencies:
ember-rfc176-data "^0.3.17"
-babel-plugin-ember-template-compilation@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-1.0.2.tgz#e0695b8ad5a8fe6b2cbdff1eadb01cf402731ad6"
- integrity sha512-4HBMksmlYsWEf/C/n3uW5rkBRbUp4FNaspzdQTAHgLbfCJnkLze8R6i6sUSge48y/Wne7mx+vcImI1o6rlUwXQ==
- dependencies:
- babel-import-util "^1.2.0"
- line-column "^1.0.2"
- magic-string "^0.26.0"
- string.prototype.matchall "^4.0.5"
-
babel-plugin-ember-template-compilation@^2.0.0, babel-plugin-ember-template-compilation@^2.0.1:
version "2.0.3"
resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.3.tgz#8370e92eabc9987354eb7e3a84f6d5cf1d19b365"
@@ -3585,7 +3575,7 @@ chalk@^1.0.0:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -4447,7 +4437,7 @@ electron-to-chromium@^1.4.251:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
-ember-auto-import@^2.4.3, ember-auto-import@^2.5.0:
+ember-auto-import@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.5.0.tgz#627607648e87d154f75cd3f70c435355ef7cced9"
integrity sha512-fKERUmpZLn4RJiCwTjS7D5zJxgnbF4E6GiSp1GYh53K96S+5UBs06r7ScDI52rq34z0+qdSrA6qiDJ3i/lWqKg==
@@ -4483,7 +4473,7 @@ ember-auto-import@^2.4.3, ember-auto-import@^2.5.0:
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^3.0.0"
-ember-auto-import@^2.6.3:
+ember-auto-import@^2.6.0, ember-auto-import@^2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a"
integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==
@@ -4525,7 +4515,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
-ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
version "7.26.11"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -4561,43 +4551,23 @@ ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember
rimraf "^3.0.1"
semver "^5.5.0"
-ember-cli-dependency-checker@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.3.1.tgz#16b44d7a1a1e946f59859fad97f32e616d78323a"
- integrity sha512-Tg6OeijjXNKWkDm6057Tr0N9j9Vlz/ITewXWpn1A/+Wbt3EowBx5ZKfvoupqz05EznKgL1B/ecG0t+JN7Qm6MA==
+ember-cli-dependency-checker@^3.3.2:
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.3.2.tgz#94ed7e8e3d47e494082eb9ccfaa489d603ab6017"
+ integrity sha512-PwkrW5oYsdPWwt+0Tojufmv/hxVETTjkrEdK7ANQB2VSnqpA5UcYubwpQM9ONuR2J8wyNDMwEHlqIrk/FYtBsQ==
dependencies:
- chalk "^2.3.0"
- find-yarn-workspace-root "^1.1.0"
+ chalk "^2.4.2"
+ find-yarn-workspace-root "^1.2.1"
is-git-url "^1.0.0"
- resolve "^1.5.0"
- semver "^5.3.0"
+ resolve "^1.22.0"
+ semver "^5.7.1"
ember-cli-get-component-path-option@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
integrity sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA==
-ember-cli-htmlbars@^6.1.1:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.1.tgz#f5b588572a5d18ad087560122b8dabc90145173d"
- integrity sha512-DKf2rjzIVw9zWCuFsBGJScrgf5Mz7dSg08Cq+FWFYIxnpssINUbNUoB0NHWnUJK4QqCvaExOyOmjm0kO455CPg==
- 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-htmlbars@^6.2.0:
+ember-cli-htmlbars@^6.1.1, ember-cli-htmlbars@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc"
integrity sha512-j5EGixjGau23HrqRiW/JjoAovg5UBHfjbyN7wX5ekE90knIEqUUj1z/Mo/cTx/J2VepQ2lE6HdXW9LWQ/WdMtw==
@@ -4881,24 +4851,24 @@ ember-page-title@^7.0.0:
ember-cli-babel "^7.26.6"
ember-qunit@^6.0.0:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-6.1.1.tgz#9e2b7835239e7ffd176e08e536975f66e59f75e5"
- integrity sha512-3/jCpoecltFV6vm7GCtSDNRxBzWx96nP+QrbereJAnioSaGeLe+slKL3l80mGzMYDTvn7ESobZ+Ba+OQ1vMMKQ==
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-6.2.0.tgz#4d492951035d1df5c7802c4ae6cf299c8f41d75b"
+ integrity sha512-mC+0bp8DwWzJLn8SW3GS8KDZIkl4yLsNYwMi5Dw6+aFllq7FM2crd/dfY4MuOIHK7GKdjtmWJTMGnjSpeSayaw==
dependencies:
broccoli-funnel "^3.0.8"
broccoli-merge-trees "^3.0.2"
common-tags "^1.8.0"
- ember-auto-import "^2.4.3"
+ ember-auto-import "^2.6.0"
ember-cli-babel "^7.26.11"
ember-cli-test-loader "^3.0.0"
resolve-package-path "^4.0.3"
silent-error "^1.1.1"
- validate-peer-dependencies "^2.1.0"
+ validate-peer-dependencies "^2.2.0"
-ember-resolver@^10.1.0:
- version "10.1.0"
- resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-10.1.0.tgz#0ac7bb0105f8bd1d5a93603d4ccb5ef0a4205d9f"
- integrity sha512-Ju/ORUUbGnR83AgC3qV6fIVuM5tyi/nPRf9ggTM2+kdeGPLNTSkNZ0zSbjWEm0kerDezMjj/RoGuLvZl/L758w==
+ember-resolver@^10.1.1:
+ version "10.1.1"
+ resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-10.1.1.tgz#1106a2386337b13a9ee509a9ad2a18b53a728ab3"
+ integrity sha512-y1zzn6C4YGJui+tJzcCKlsf1oSOSVAkRrvmg8OwqVIKnALKKb9ihx2qLCslHg8x0wJvJgMtDMXgrczvQrZW0Lw==
dependencies:
ember-cli-babel "^7.26.11"
@@ -5866,7 +5836,7 @@ find-up@^6.3.0:
locate-path "^7.1.0"
path-exists "^5.0.0"
-find-yarn-workspace-root@^1.1.0:
+find-yarn-workspace-root@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
@@ -6494,11 +6464,16 @@ got@^9.6.0:
to-readable-stream "^1.0.0"
url-parse-lax "^3.0.0"
-graceful-fs@4.2.10, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@4.2.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
version "4.2.10"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+graceful-fs@^4.1.3:
+ version "4.2.11"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+ integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
"graceful-readlink@>= 1.0.0":
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -8054,13 +8029,6 @@ magic-string@^0.25.7:
dependencies:
sourcemap-codec "^1.4.8"
-magic-string@^0.26.0:
- version "0.26.7"
- resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f"
- integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==
- dependencies:
- sourcemap-codec "^1.4.8"
-
magic-string@^0.30.0:
version "0.30.0"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529"
@@ -10142,9 +10110,9 @@ reselect@^3.0.1:
integrity sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==
reselect@^4.0.0:
- version "4.1.7"
- resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.7.tgz#56480d9ff3d3188970ee2b76527bd94a95567a42"
- integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==
+ version "4.1.8"
+ resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
+ integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
resolve-alpn@^1.2.0:
version "1.2.1"
@@ -10344,20 +10312,20 @@ rxjs@^6.4.0, rxjs@^6.6.0:
dependencies:
tslib "^1.9.0"
-rxjs@^7.5.5, rxjs@^7.5.7:
- version "7.8.0"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
- integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
- dependencies:
- tslib "^2.1.0"
-
-rxjs@^7.8.1:
+rxjs@^7.5.5, rxjs@^7.8.1:
version "7.8.1"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
dependencies:
tslib "^2.1.0"
+rxjs@^7.5.7:
+ version "7.8.0"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
+ integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
+ dependencies:
+ tslib "^2.1.0"
+
sade@^1.7.3:
version "1.8.1"
resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
@@ -10480,7 +10448,7 @@ semver-diff@^4.0.0:
dependencies:
semver "^7.3.5"
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -10498,9 +10466,9 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
semver@^7.3.8:
- version "7.5.2"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
- integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
+ version "7.5.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
+ integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
dependencies:
lru-cache "^6.0.0"
@@ -11866,7 +11834,7 @@ validate-peer-dependencies@^1.1.0:
resolve-package-path "^3.1.0"
semver "^7.3.2"
-validate-peer-dependencies@^2.0.0, validate-peer-dependencies@^2.1.0:
+validate-peer-dependencies@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz#1ad8218b1b168aeb500165f9de2a3f53269ece56"
integrity sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ==
@@ -11874,6 +11842,14 @@ validate-peer-dependencies@^2.0.0, validate-peer-dependencies@^2.1.0:
resolve-package-path "^4.0.0"
semver "^7.3.2"
+validate-peer-dependencies@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.2.0.tgz#47b8ff008f66a66fc5d8699123844522c1d874f4"
+ integrity sha512-8X1OWlERjiUY6P6tdeU9E0EwO8RA3bahoOVG7ulOZT5MqgNDUO/BQoVjYiHPcNe+v8glsboZRIw9iToMAA2zAA==
+ dependencies:
+ resolve-package-path "^4.0.3"
+ semver "^7.3.8"
+
vary@^1, vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
From 2b90b71f8b99966c141fc42b99aa4b25243f8e96 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 15 Jun 2023 18:00:37 -0400
Subject: [PATCH 4/4] Try wrapping in macros
---
package.json | 1 +
tests/dummy/app/templates/application.hbs | 6 +++++-
tests/integration/helpers/app-version-test.js | 8 +++++++-
yarn.lock | 2 +-
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 6f892a7..022dab3 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^2.7.0",
+ "@embroider/macros": "^1.11.1",
"@embroider/test-setup": "^3.0.1",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
index ec9a9e6..058c069 100644
--- a/tests/dummy/app/templates/application.hbs
+++ b/tests/dummy/app/templates/application.hbs
@@ -2,4 +2,8 @@
EmberCLI App Version
-Your app version is {{app-version}}
+{{#if (macroDependencySatisfies "@embroider/core" "*")}}
+ Your app version is {{(app-version)}}
+{{else}}
+ Your app version is {{app-version}}
+{{/if}}
diff --git a/tests/integration/helpers/app-version-test.js b/tests/integration/helpers/app-version-test.js
index 3cc4389..f853b6a 100644
--- a/tests/integration/helpers/app-version-test.js
+++ b/tests/integration/helpers/app-version-test.js
@@ -9,7 +9,13 @@ module('Integration | Helper | {{app-version}}', function (hooks) {
test('it displays entire version', async function (assert) {
assert.expect(1);
- await render(hbs`{{app-version}}`);
+ await render(hbs`
+ {{#if (macroDependencySatisfies "@embroider/core" "*")}}
+ {{(app-version)}}
+ {{else}}
+ {{app-version}}
+ {{/if}}
+ `);
assert.ok(this.element.textContent, 'Version not empty');
});
diff --git a/yarn.lock b/yarn.lock
index 0832bda..51bc504 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1366,7 +1366,7 @@
ember-cli-version-checker "^5.1.2"
semver "^7.3.5"
-"@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.11.0":
+"@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.11.0", "@embroider/macros@^1.11.1":
version "1.11.1"
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.11.1.tgz#62eeb5bb7907ad01bdf750510c7f46c0192b6605"
integrity sha512-yg4Pl5Sw26lKrrtLwk2UEgYkKkztq+Hatn67QYL5A3I3T4IE/bRA3o6xvIslrJNnhyER7jCc2pwusxt3O4HubA==