Date: Mon, 10 Jan 2022 21:26:01 -0500
Subject: [PATCH 16/25] linter updates
---
.eslintignore | 1 +
package.json | 42 ++---
test-app/.eslintrc.js | 25 ++-
.../templates/components/partials/diff.hbs | 5 +-
test-app/config/ember-cli-update.json | 20 ++
test-app/config/targets.js | 20 +-
test-app/package.json | 45 ++---
test-app/scenarios.js | 3 +-
test-app/tests/index.html | 2 +-
test-app/tests/integration/moment-test.js | 2 +-
yarn.lock | 172 ++++++++++++------
11 files changed, 216 insertions(+), 121 deletions(-)
create mode 100644 test-app/config/ember-cli-update.json
diff --git a/.eslintignore b/.eslintignore
index e26869ce..17347313 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -15,6 +15,7 @@
# misc
/coverage/
!.*
+.*/
.eslintcache
# ember-try
diff --git a/package.json b/package.json
index 4afed53c..f47f5435 100644
--- a/package.json
+++ b/package.json
@@ -44,60 +44,60 @@
"devDependencies": {
"@babel/core": "^7.16.7",
"@ember/optional-features": "^2.0.0",
- "@ember/test-helpers": "^2.2.8",
+ "@ember/test-helpers": "^2.6.0",
"@embroider/addon-dev": "^0.50.0",
"@embroider/compat": "npm:@embroider/compat@latest",
"@embroider/core": "npm:@embroider/core@latest",
"@embroider/test-setup": "^0.50.0",
"@embroider/webpack": "npm:@embroider/webpack@latest",
- "@glimmer/component": "^1.0.3",
- "@glimmer/tracking": "^1.0.3",
+ "@glimmer/component": "^1.0.4",
+ "@glimmer/tracking": "^1.0.4",
"@rollup/plugin-babel": "^5.3.0",
"babel-eslint": "^10.1.0",
"ember-auto-import": "^2.2.4",
"ember-cli-3.16": "npm:ember-cli@~3.16.0",
"ember-cli-3.20": "npm:ember-cli@~3.20.0",
"ember-cli-3.24": "npm:ember-cli@~3.24.0",
- "ember-cli-3.28": "npm:ember-cli@~3.24.0",
- "ember-cli-babel": "^7.23.0",
+ "ember-cli-babel": "^7.26.10",
"ember-cli-beta": "npm:ember-cli@beta",
- "ember-cli-htmlbars": "^5.3.1",
- "ember-cli-inject-live-reload": "^2.0.2",
+ "ember-cli-htmlbars": "^5.7.2",
+ "ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-latest": "npm:ember-cli@latest",
"ember-cli-sri": "^2.1.1",
- "ember-cli-terser": "^4.0.1",
- "ember-cli": "~3.28.0",
+ "ember-cli-terser": "^4.0.2",
+ "ember-cli": "~3.28.5",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "0.1.6",
- "ember-page-title": "^6.0.3",
- "ember-qunit": "^5.1.4",
- "ember-resolver": "^8.0.2",
+ "ember-page-title": "^6.2.2",
+ "ember-qunit": "^5.1.5",
+ "ember-resolver": "^8.0.3",
"ember-source-3.16": "npm:ember-source@~3.16.0",
"ember-source-3.20": "npm:ember-source@~3.20.0",
- "ember-source-3.28": "npm:ember-source@~3.28.0",
+ "ember-source-3.24": "npm:ember-source@~3.24.0",
"ember-source-beta": "npm:ember-source@beta",
"ember-source-canary": "npm:ember-source@alpha",
"ember-source-channel-url": "^3.0.0",
"ember-source-latest": "npm:ember-source@latest",
- "ember-source": "~3.24.0",
- "ember-template-lint": "^2.15.0",
+ "ember-source": "~3.28.8",
+ "ember-template-lint": "^3.15.0",
"ember-try": "^1.4.0",
- "eslint-config-prettier": "^7.1.0",
- "eslint-plugin-ember": "^10.1.1",
+ "eslint-config-prettier": "^8.3.0",
+ "eslint-plugin-ember": "^10.5.8",
"eslint-plugin-node": "^11.1.0",
- "eslint-plugin-prettier": "^3.3.1",
- "eslint": "^7.17.0",
+ "eslint-plugin-prettier": "^3.4.1",
+ "eslint-plugin-qunit": "^6.2.0",
+ "eslint": "^7.32.0",
"jquery": "^3.6.0",
"loader.js": "^4.7.0",
"moment-timezone": "^0.5.33",
"moment": "^2.29.1",
"npm-run-all": "^4.1.5",
- "prettier": "^2.2.1",
+ "prettier": "^2.5.1",
"qunit-console-grouper": "^0.3.0",
"qunit-dom": "^1.6.0",
- "qunit": "^2.16.0",
+ "qunit": "^2.17.2",
"rollup": "^2.63.0",
"scenario-tester": "^2.0.1",
"webpack": "^5.65.0"
diff --git a/test-app/.eslintrc.js b/test-app/.eslintrc.js
index 65a101ed..d8a1b05c 100644
--- a/test-app/.eslintrc.js
+++ b/test-app/.eslintrc.js
@@ -27,15 +27,17 @@ module.exports = {
// node files
{
files: [
- '.eslintrc.js',
- '.prettierrc.js',
- '.template-lintrc.js',
- 'ember-cli-build.js',
- 'index.js',
- 'testem.js',
- 'blueprints/*/index.js',
- 'config/**/*.js',
- 'scenarios.js',
+ './.eslintrc.js',
+ './.prettierrc.js',
+ './.template-lintrc.js',
+ './ember-cli-build.js',
+ './testem.js',
+ './blueprints/*/index.js',
+ './config/**/*.js',
+ './lib/*/index.js',
+ './server/**/*.js',
+ './scenarios.js',
+ './tests/.eslintrc.js',
],
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**'],
parserOptions: {
@@ -48,5 +50,10 @@ module.exports = {
plugins: ['node'],
extends: ['plugin:node/recommended'],
},
+ {
+ // Test files:
+ files: ['tests/**/*-test.{js,ts}'],
+ extends: ['plugin:qunit/recommended'],
+ },
],
};
diff --git a/test-app/app/templates/components/partials/diff.hbs b/test-app/app/templates/components/partials/diff.hbs
index ff46e587..b8878cfa 100644
--- a/test-app/app/templates/components/partials/diff.hbs
+++ b/test-app/app/templates/components/partials/diff.hbs
@@ -15,8 +15,9 @@
{{moment-diff this.currentTime this.inTwelveHours precision='day' float=true}}
- \{{moment-diff this.currentTime this.inTwelveHours precision='day'
- float=true}}
+ {{! template linter bug: https://github.com/ember-template-lint/ember-template-lint/issues/2330 }}
+ {{! template-lint-disable no-unbalanced-curlies}}
+ \{{moment-diff this.currentTime this.inTwelveHours precision='day' float=true}}
diff --git a/test-app/config/ember-cli-update.json b/test-app/config/ember-cli-update.json
new file mode 100644
index 00000000..061d041d
--- /dev/null
+++ b/test-app/config/ember-cli-update.json
@@ -0,0 +1,20 @@
+{
+ "schemaVersion": "1.0.0",
+ "packages": [
+ {
+ "name": "ember-cli",
+ "version": "3.28.5",
+ "blueprints": [
+ {
+ "name": "app",
+ "outputRepo": "https://github.com/ember-cli/ember-new-output",
+ "codemodsSource": "ember-app-codemods-manifest@1",
+ "isBaseBlueprint": true,
+ "options": [
+ "--no-welcome"
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/test-app/config/targets.js b/test-app/config/targets.js
index 4b33327e..3cd797ab 100644
--- a/test-app/config/targets.js
+++ b/test-app/config/targets.js
@@ -6,12 +6,20 @@ const browsers = [
'last 1 Safari versions',
];
-const isCI = Boolean(process.env.CI);
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
- browsers.push('ie 11');
-}
+// Ember's browser support policy is changing, and IE11 support will end in
+// v4.0 onwards.
+//
+// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
+//
+// If you need IE11 support on a version of Ember that still offers support
+// for it, uncomment the code block below.
+//
+// const isCI = Boolean(process.env.CI);
+// const isProduction = process.env.EMBER_ENV === 'production';
+//
+// if (isCI || isProduction) {
+// browsers.push('ie 11');
+// }
module.exports = {
browsers,
diff --git a/test-app/package.json b/test-app/package.json
index a2b6f840..d66f9784 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -6,7 +6,7 @@
"license": "MIT",
"scripts": {
"build": "ember build --environment=production",
- "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+ "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -19,49 +19,50 @@
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
- "@ember/test-helpers": "^2.2.8",
+ "@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^0.50.0",
- "@glimmer/component": "^1.0.3",
- "@glimmer/tracking": "^1.0.3",
+ "@glimmer/component": "^1.0.4",
+ "@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"ember-auto-import": "^2.2.4",
- "ember-cli-babel": "^7.23.0",
- "ember-cli-htmlbars": "^5.3.1",
- "ember-cli-inject-live-reload": "^2.0.2",
+ "ember-cli": "~3.28.5",
+ "ember-cli-babel": "^7.26.10",
+ "ember-cli-htmlbars": "^5.7.2",
+ "ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
- "ember-cli-terser": "^4.0.1",
- "ember-cli": "~3.28.0",
+ "ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "0.1.6",
"ember-moment": "file:..",
- "ember-page-title": "^6.0.3",
- "ember-qunit": "^5.1.4",
- "ember-resolver": "^8.0.2",
+ "ember-page-title": "^6.2.2",
+ "ember-qunit": "^5.1.5",
+ "ember-resolver": "^8.0.3",
+ "ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
- "ember-source": "~3.24.0",
- "ember-template-lint": "^2.15.0",
+ "ember-template-lint": "^3.15.0",
"ember-try": "^1.4.0",
- "eslint-config-prettier": "^7.1.0",
- "eslint-plugin-ember": "^10.1.1",
+ "eslint": "^7.32.0",
+ "eslint-config-prettier": "^8.3.0",
+ "eslint-plugin-ember": "^10.5.8",
"eslint-plugin-node": "^11.1.0",
- "eslint-plugin-prettier": "^3.3.1",
- "eslint": "^7.17.0",
+ "eslint-plugin-prettier": "^3.4.1",
+ "eslint-plugin-qunit": "^6.2.0",
"jquery": "^3.6.0",
"loader.js": "^4.7.0",
- "moment-timezone": "^0.5.33",
"moment": "^2.29.1",
+ "moment-timezone": "^0.5.33",
"npm-run-all": "^4.1.5",
- "prettier": "^2.2.1",
+ "prettier": "^2.5.1",
+ "qunit": "^2.17.2",
"qunit-console-grouper": "^0.3.0",
"qunit-dom": "^1.6.0",
- "qunit": "^2.16.0",
"scenario-tester": "^2.0.1",
"webpack": "^5.65.0"
},
"engines": {
- "node": "10.* || >= 12"
+ "node": "12.* || 14.* || >= 16"
},
"ember": {
"edition": "octane"
diff --git a/test-app/scenarios.js b/test-app/scenarios.js
index 1a28b7e1..9d4f33e7 100644
--- a/test-app/scenarios.js
+++ b/test-app/scenarios.js
@@ -56,17 +56,16 @@ async function lts_3_24(project) {
});
project.linkDevDependency('ember-source', {
baseDir: __dirname,
+ resolveName: 'ember-source-3.24',
});
}
async function lts_3_28(project) {
project.linkDevDependency('ember-cli', {
baseDir: __dirname,
- resolveName: 'ember-cli-3.28',
});
project.linkDevDependency('ember-source', {
baseDir: __dirname,
- resolveName: 'ember-source-3.28',
});
}
diff --git a/test-app/tests/index.html b/test-app/tests/index.html
index c2d47227..0ecd8197 100644
--- a/test-app/tests/index.html
+++ b/test-app/tests/index.html
@@ -28,7 +28,7 @@
-
+
diff --git a/test-app/tests/integration/moment-test.js b/test-app/tests/integration/moment-test.js
index 4774cbe5..8b0c00ee 100644
--- a/test-app/tests/integration/moment-test.js
+++ b/test-app/tests/integration/moment-test.js
@@ -22,7 +22,7 @@ module('moment', function (hooks) {
assert.dom(this.element).hasText('a day ago');
});
- test('moment-from and moment integration', async function (assert) {
+ test('moment-to and moment integration', async function (assert) {
assert.expect(1);
this.set('tomorrow', moment().add(1, 'day'));
diff --git a/yarn.lock b/yarn.lock
index 4accd542..ac215291 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -991,6 +991,16 @@
resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
+"@ember-template-lint/todo-utils@^10.0.0":
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/@ember-template-lint/todo-utils/-/todo-utils-10.0.0.tgz#085aafcf31ca04ba4d3a9460f088aed752b90ea8"
+ integrity sha512-US8VKnetBOl8KfKz+rXGsosz6rIETNwSz2F2frM8hIoJfF/d6ME1Iz1K7tPYZEE6SoKqZFlBs5XZPSmzRnabjA==
+ dependencies:
+ "@types/eslint" "^7.2.13"
+ fs-extra "^9.1.0"
+ slash "^3.0.0"
+ tslib "^2.2.0"
+
"@ember/edition-utils@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
@@ -1008,7 +1018,7 @@
mkdirp "^1.0.4"
silent-error "^1.1.1"
-"@ember/test-helpers@^2.2.8":
+"@ember/test-helpers@^2.6.0":
version "2.6.0"
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.6.0.tgz#d687515c6ab49ba72717fc62046970ef4a72ea9c"
integrity sha512-N5sr3layWk60wB3maCy+/5hFHQRcTh8aqxcZTSs3Od9QkuHdWBtRgMGLP/35mXpJlgWuu3xqLpt6u3dGHc8gCg==
@@ -1306,7 +1316,7 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"
-"@glimmer/component@^1.0.3":
+"@glimmer/component@^1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.4.tgz#1c85a5181615a6647f6acfaaed68e28ad7e9626e"
integrity sha512-sS4N8wtcKfYdUJ6O3m8nbTut6NjErdz94Ap8VB1ekcg4WSD+7sI7Nmv6kt2rdPoe363nUdjUbRBzHNWhLzraBw==
@@ -1428,7 +1438,7 @@
"@handlebars/parser" "^1.1.0"
simple-html-tokenizer "^0.5.10"
-"@glimmer/tracking@^1.0.3":
+"@glimmer/tracking@^1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.0.4.tgz#f1bc1412fe5e2236d0f8d502994a8f88af1bbb21"
integrity sha512-F+oT8I55ba2puSGIzInmVrv/8QA2PcK1VD+GWgFMhF6WC97D+uZX7BFg+a3s/2N4FVBq5KHE+QxZzgazM151Yw==
@@ -1641,6 +1651,14 @@
"@types/estree" "*"
"@types/json-schema" "*"
+"@types/eslint@^7.2.13":
+ version "7.29.0"
+ resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"
+ integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==
+ dependencies:
+ "@types/estree" "*"
+ "@types/json-schema" "*"
+
"@types/estree@*", "@types/estree@^0.0.50":
version "0.0.50"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
@@ -4132,7 +4150,7 @@ chalk@^3.0.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -4750,6 +4768,11 @@ data-urls@^2.0.0:
whatwg-mimetype "^2.3.0"
whatwg-url "^8.0.0"
+date-fns@^2.28.0:
+ version "2.28.0"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
+ integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+
debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -5284,7 +5307,7 @@ ember-auto-import@^2.2.0, ember-auto-import@^2.2.4:
watch-detector "^1.0.0"
yam "^1.0.0"
-"ember-cli-3.24@npm:ember-cli@~3.24.0", "ember-cli-3.28@npm:ember-cli@~3.24.0":
+"ember-cli-3.24@npm:ember-cli@~3.24.0":
version "3.24.0"
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.24.0.tgz#dbda4938e74fdafe4da1c42b49356f9d14c10697"
integrity sha512-dLurYpluRcE+XjCHy/JzUBcW4dBKhjmXH3zUjyof89gFjj+8EFjB0b2tqyS6buKqBasinVaX8lZZVIXYCdFtNA==
@@ -5405,7 +5428,7 @@ ember-cli-babel@^6.0.0-beta.4:
ember-cli-version-checker "^2.1.2"
semver "^5.5.0"
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.10, 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==
@@ -5543,7 +5566,7 @@ 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 sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
-ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1:
+ember-cli-htmlbars@^5.7.1, ember-cli-htmlbars@^5.7.2:
version "5.7.2"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8"
integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==
@@ -5565,7 +5588,7 @@ ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1:
strip-bom "^4.0.0"
walk-sync "^2.2.0"
-ember-cli-inject-live-reload@^2.0.2:
+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"
integrity sha512-YV5wYRD5PJHmxaxaJt18u6LE6Y+wo455BnmcpN+hGNlChy2piM9/GMvYgTAz/8Vin8RJ5KekqP/w/NEaRndc/A==
@@ -5714,7 +5737,7 @@ ember-cli-string-utils@^1.1.0:
resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
-ember-cli-terser@^4.0.1:
+ember-cli-terser@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.2.tgz#c436a9e4159f76a615b051cba0584844652b7dcd"
integrity sha512-Ej77K+YhCZImotoi/CU2cfsoZaswoPlGaM5TB3LvjvPDlVPRhxUHO2RsaUVC5lsGeRLRiHCOxVtoJ6GyqexzFA==
@@ -5797,7 +5820,7 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
semver "^7.3.4"
silent-error "^1.1.1"
-ember-cli@~3.28.0:
+ember-cli@~3.28.5:
version "3.28.5"
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.5.tgz#9c91266e412f6d537b47a88e4b63a2b56db35483"
integrity sha512-Y/UdbUOTeKHGMCP3XtE5g14JUTYyeQTdjPvHuv11FFx5HQBtHqqWLY6U1ivMDukDkQ4i2v6TyaUcKVo4e8PtyQ==
@@ -5941,14 +5964,14 @@ ember-maybe-import-regenerator@0.1.6:
ember-cli-babel "^6.0.0-beta.4"
regenerator-runtime "^0.9.5"
-ember-page-title@^6.0.3:
+ember-page-title@^6.2.2:
version "6.2.2"
resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-6.2.2.tgz#980838c44e96cba1d00f42435d707936af627324"
integrity sha512-YTXA+cylZrh9zO0zwjlaAGReT2MVOxAMnVO1OOygFrs1JBs4D6CKV3tImoilg3AvIXFBeJfFNNUbJOdRd9IGGg==
dependencies:
ember-cli-babel "^7.23.1"
-ember-qunit@^5.1.4:
+ember-qunit@^5.1.5:
version "5.1.5"
resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-5.1.5.tgz#24a7850f052be24189ff597dfc31b923e684c444"
integrity sha512-2cFA4oMygh43RtVcMaBrr086Tpdhgbn3fVZ2awLkzF/rnSN0D0PSRpd7hAD7OdBPerC/ZYRwzVyGXLoW/Zes4A==
@@ -5963,7 +5986,7 @@ ember-qunit@^5.1.4:
silent-error "^1.1.1"
validate-peer-dependencies "^1.2.0"
-ember-resolver@^8.0.2:
+ember-resolver@^8.0.3:
version "8.0.3"
resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-8.0.3.tgz#40f243aa58281bf195c695fe84a6b291e204690a"
integrity sha512-fA53fxfG821BRqNiB9mQDuzZpzSRcSAYZTYBlRQOHsJwoYdjyE7idz4YcytbSsa409G5J2kP6B+PiKOBh0odlw==
@@ -6049,21 +6072,19 @@ ember-router-generator@^2.0.0:
semver "^6.1.1"
silent-error "^1.1.1"
-"ember-source-3.28@npm:ember-source@~3.28.0":
- version "3.28.8"
- resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.8.tgz#c58fd4a1538d6c4b9aebe76c764cabf5396c64d9"
- integrity sha512-hA15oYzbRdi9983HIemeVzzX2iLcMmSPp6akUiMQhFZYWPrKksbPyLrO6YpZ4hNM8yBjQSDXEkZ1V3yxBRKjUA==
+"ember-source-3.24@npm:ember-source@~3.24.0":
+ version "3.24.6"
+ resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.24.6.tgz#cf185b93fb16ad8475e98ebc47e6fb50b7de2556"
+ integrity sha512-F/CNQQLeF0QFKz7ahJ0JQQBbbvL8sx5XhsNJ9GnfjLA9ozGE1/nFfgkIOrcFszIVjMZKmEvq6RdsbbhOptfeNg==
dependencies:
"@babel/helper-module-imports" "^7.8.3"
"@babel/plugin-transform-block-scoping" "^7.8.3"
"@babel/plugin-transform-object-assign" "^7.8.3"
"@ember/edition-utils" "^1.2.0"
- "@glimmer/vm-babel-plugins" "0.80.3"
- babel-plugin-debug-macros "^0.3.4"
+ babel-plugin-debug-macros "^0.3.3"
babel-plugin-filter-imports "^4.0.0"
broccoli-concat "^4.2.4"
broccoli-debug "^0.6.4"
- broccoli-file-creator "^2.1.1"
broccoli-funnel "^2.0.2"
broccoli-merge-trees "^4.2.0"
chalk "^4.0.0"
@@ -6076,9 +6097,9 @@ ember-router-generator@^2.0.0:
ember-cli-version-checker "^5.1.1"
ember-router-generator "^2.0.0"
inflection "^1.12.0"
- jquery "^3.5.1"
+ jquery "^3.5.0"
resolve "^1.17.0"
- semver "^7.3.4"
+ semver "^6.1.1"
silent-error "^1.1.1"
"ember-source-beta@npm:ember-source@beta":
@@ -6195,19 +6216,21 @@ ember-source-channel-url@^3.0.0:
semver "^7.3.4"
silent-error "^1.1.1"
-ember-source@~3.24.0:
- version "3.24.6"
- resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.24.6.tgz#cf185b93fb16ad8475e98ebc47e6fb50b7de2556"
- integrity sha512-F/CNQQLeF0QFKz7ahJ0JQQBbbvL8sx5XhsNJ9GnfjLA9ozGE1/nFfgkIOrcFszIVjMZKmEvq6RdsbbhOptfeNg==
+ember-source@~3.28.8:
+ version "3.28.8"
+ resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.8.tgz#c58fd4a1538d6c4b9aebe76c764cabf5396c64d9"
+ integrity sha512-hA15oYzbRdi9983HIemeVzzX2iLcMmSPp6akUiMQhFZYWPrKksbPyLrO6YpZ4hNM8yBjQSDXEkZ1V3yxBRKjUA==
dependencies:
"@babel/helper-module-imports" "^7.8.3"
"@babel/plugin-transform-block-scoping" "^7.8.3"
"@babel/plugin-transform-object-assign" "^7.8.3"
"@ember/edition-utils" "^1.2.0"
- babel-plugin-debug-macros "^0.3.3"
+ "@glimmer/vm-babel-plugins" "0.80.3"
+ babel-plugin-debug-macros "^0.3.4"
babel-plugin-filter-imports "^4.0.0"
broccoli-concat "^4.2.4"
broccoli-debug "^0.6.4"
+ broccoli-file-creator "^2.1.1"
broccoli-funnel "^2.0.2"
broccoli-merge-trees "^4.2.0"
chalk "^4.0.0"
@@ -6220,29 +6243,33 @@ ember-source@~3.24.0:
ember-cli-version-checker "^5.1.1"
ember-router-generator "^2.0.0"
inflection "^1.12.0"
- jquery "^3.5.0"
+ jquery "^3.5.1"
resolve "^1.17.0"
- semver "^6.1.1"
+ semver "^7.3.4"
silent-error "^1.1.1"
-ember-template-lint@^2.15.0:
- version "2.21.0"
- resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.21.0.tgz#7e120abf309a8810eeed26c52377943faf15a95b"
- integrity sha512-19QbEqJQdMfcRS7PsQsubflRowEtnkbD0tpYR4q/xq4lodmhU7hhOFvlTQgbxD/jwW5Ur+tkOwH4KFy9JwOyXA==
+ember-template-lint@^3.15.0:
+ version "3.16.0"
+ resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-3.16.0.tgz#7af2ec8d4386f4726be08c14c39ba121c56f0896"
+ integrity sha512-hbP4JefkOLx9tMkrZ3UIvdBNoEnrT7rg6c70tIxpB9F+KpPneDbmpGMBsQVhhK4BirTXIFwAIfnwKcwkIk3bPQ==
dependencies:
- chalk "^4.0.0"
- ember-template-recast "^5.0.1"
+ "@ember-template-lint/todo-utils" "^10.0.0"
+ chalk "^4.1.2"
+ ci-info "^3.3.0"
+ date-fns "^2.28.0"
+ ember-template-recast "^5.0.3"
find-up "^5.0.0"
- fuse.js "^6.4.6"
+ fuse.js "^6.5.3"
get-stdin "^8.0.0"
- globby "^11.0.2"
- is-glob "^4.0.1"
- micromatch "^4.0.2"
+ globby "^11.0.4"
+ is-glob "^4.0.3"
+ micromatch "^4.0.4"
+ requireindex "^1.2.0"
resolve "^1.20.0"
- v8-compile-cache "^2.2.0"
+ v8-compile-cache "^2.3.0"
yargs "^16.2.0"
-ember-template-recast@^5.0.1:
+ember-template-recast@^5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-5.0.3.tgz#79df27a70bdce7be17f14db13886afde1e9d02d6"
integrity sha512-qsJYQhf29Dk6QMfviXhUPE+byMOs6iRQxUDHgkj8yqjeppvjHaFG96hZi/NAXJTm/M7o3PpfF5YlmeaKtI9UeQ==
@@ -6487,12 +6514,12 @@ escodegen@^2.0.0:
optionalDependencies:
source-map "~0.6.1"
-eslint-config-prettier@^7.1.0:
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
- integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
+eslint-config-prettier@^8.3.0:
+ version "8.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
+ integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
-eslint-plugin-ember@^10.1.1:
+eslint-plugin-ember@^10.5.8:
version "10.5.8"
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.5.8.tgz#87e004a5ebed88f94008364554daf57df2c9c718"
integrity sha512-d21mJ+F+htgi6HhrjwbOfllJojF4ZWGruW13HkBoGS2SaHqKUyvIH/8j3EjSxlsGFiNfhTEUWkNaUSLJxgbtWg==
@@ -6526,13 +6553,21 @@ eslint-plugin-node@^11.1.0:
resolve "^1.10.1"
semver "^6.1.0"
-eslint-plugin-prettier@^3.3.1:
+eslint-plugin-prettier@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
dependencies:
prettier-linter-helpers "^1.0.0"
+eslint-plugin-qunit@^6.2.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-6.2.0.tgz#f4efda29da99523e560848d9592c39c0590c308d"
+ integrity sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw==
+ dependencies:
+ eslint-utils "^3.0.0"
+ requireindex "^1.2.0"
+
eslint-scope@5.1.1, eslint-scope@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -6573,7 +6608,7 @@ eslint-visitor-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-eslint@^7.17.0:
+eslint@^7.32.0:
version "7.32.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
@@ -6908,6 +6943,17 @@ fast-glob@^3.0.3, fast-glob@^3.1.1:
merge2 "^1.3.0"
micromatch "^4.0.4"
+fast-glob@^3.2.9:
+ version "3.2.10"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.10.tgz#2734f83baa7f43b7fd41e13bc34438f4ffe284ee"
+ integrity sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==
+ dependencies:
+ "@nodelib/fs.stat" "^2.0.2"
+ "@nodelib/fs.walk" "^1.2.3"
+ glob-parent "^5.1.2"
+ merge2 "^1.3.0"
+ micromatch "^4.0.4"
+
fast-json-stable-stringify@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -7430,7 +7476,7 @@ functional-red-black-tree@^1.0.1:
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-fuse.js@^6.4.6:
+fuse.js@^6.5.3:
version "6.5.3"
resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.5.3.tgz#7446c0acbc4ab0ab36fa602e97499bdb69452b93"
integrity sha512-sA5etGE7yD/pOqivZRBvUBd/NaL2sjAu6QuSaFoe1H2BrJSkH/T/UXAJ8CdXdw7DvY3Hs8CXKYkDWX7RiP5KOg==
@@ -7683,7 +7729,7 @@ globby@^10.0.1:
merge2 "^1.2.3"
slash "^3.0.0"
-globby@^11.0.2, globby@^11.0.3:
+globby@^11.0.3:
version "11.0.4"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -7695,6 +7741,18 @@ globby@^11.0.2, globby@^11.0.3:
merge2 "^1.3.0"
slash "^3.0.0"
+globby@^11.0.4:
+ version "11.1.0"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+ integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+ dependencies:
+ array-union "^2.1.0"
+ dir-glob "^3.0.1"
+ fast-glob "^3.2.9"
+ ignore "^5.2.0"
+ merge2 "^1.4.1"
+ slash "^3.0.0"
+
globrex@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
@@ -8078,7 +8136,7 @@ ignore@^4.0.6:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-ignore@^5.1.1, ignore@^5.1.4:
+ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -8377,7 +8435,7 @@ is-glob@^3.1.0:
dependencies:
is-extglob "^2.1.0"
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -9397,7 +9455,7 @@ merge-trees@^2.0.0:
fs-updater "^1.0.4"
heimdalljs "^0.2.5"
-merge2@^1.2.3, merge2@^1.3.0:
+merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -10439,7 +10497,7 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"
-prettier@^2.2.1:
+prettier@^2.5.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
@@ -10639,7 +10697,7 @@ qunit-dom@^1.6.0:
ember-cli-babel "^7.23.0"
ember-cli-version-checker "^5.1.1"
-qunit@^2.16.0:
+qunit@^2.17.2:
version "2.17.2"
resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.17.2.tgz#5cb278e131d931f25c109a0fdb0518be7754c25a"
integrity sha512-17isVvuOmALzsPjiV7wFg/6O5vJYXBrQZPwocfQSSh0I/rXvfX7bKMFJ4GMVW3U4P8r2mBeUy8EAngti4QD2Vw==
@@ -12316,7 +12374,7 @@ tslib@^1.9.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-tslib@^2.0.3:
+tslib@^2.0.3, tslib@^2.2.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -12595,7 +12653,7 @@ uuid@^8.1.0, uuid@^8.3.0, uuid@^8.3.1, uuid@^8.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
From b833595b432d35ebde4d2a2e4afe5eecab11f59f Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Mon, 10 Jan 2022 22:00:01 -0500
Subject: [PATCH 17/25] fixing implicit-this deprecations in test suite
---
test-app/tests/integration/moment-test.js | 16 ++++++++++-----
test-app/tests/unit/helpers/is-after-test.js | 4 ++--
.../tests/unit/helpers/is-between-test.js | 6 +++---
.../unit/helpers/is-same-or-after-test.js | 4 ++--
test-app/tests/unit/helpers/is-same-test.js | 2 +-
.../tests/unit/helpers/moment-add-test.js | 10 +++++-----
.../unit/helpers/moment-calendar-test.js | 2 +-
.../tests/unit/helpers/moment-diff-test.js | 12 ++++++-----
.../unit/helpers/moment-duration-test.js | 16 +++++++--------
.../tests/unit/helpers/moment-format-test.js | 20 ++++++++++---------
.../unit/helpers/moment-from-now-test.js | 16 +++++++--------
.../tests/unit/helpers/moment-from-test.js | 12 +++++------
.../unit/helpers/moment-subtract-test.js | 12 ++++++-----
.../tests/unit/helpers/moment-to-now-test.js | 18 ++++++++---------
test-app/tests/unit/helpers/moment-to-test.js | 12 +++++------
test-app/tests/unit/helpers/utc-test.js | 8 ++++++--
16 files changed, 93 insertions(+), 77 deletions(-)
diff --git a/test-app/tests/integration/moment-test.js b/test-app/tests/integration/moment-test.js
index 8b0c00ee..6a3623fb 100644
--- a/test-app/tests/integration/moment-test.js
+++ b/test-app/tests/integration/moment-test.js
@@ -17,7 +17,7 @@ module('moment', function (hooks) {
assert.expect(1);
this.set('tomorrow', moment().add(1, 'day'));
- await render(hbs`{{moment-from (moment) tomorrow}}`);
+ await render(hbs`{{moment-from (moment) this.tomorrow}}`);
assert.dom(this.element).hasText('a day ago');
});
@@ -26,7 +26,7 @@ module('moment', function (hooks) {
assert.expect(1);
this.set('tomorrow', moment().add(1, 'day'));
- await render(hbs`{{moment-to (moment) tomorrow}}`);
+ await render(hbs`{{moment-to (moment) this.tomorrow}}`);
assert.dom(this.element).hasText('in a day');
});
@@ -40,7 +40,9 @@ module('moment', function (hooks) {
date: '5/3/10',
});
- await render(hbs`{{moment-format (moment date inputFormat) outputFormat}}`);
+ await render(
+ hbs`{{moment-format (moment this.date this.inputFormat) this.outputFormat}}`
+ );
assert.dom(this.element).hasText('May 3, 2010');
});
@@ -54,7 +56,9 @@ module('moment', function (hooks) {
});
this.service.changeLocale('fr');
- await render(hbs`{{moment-format (moment date inputFormat) outputFormat}}`);
+ await render(
+ hbs`{{moment-format (moment this.date this.inputFormat) this.outputFormat}}`
+ );
assert.dom(this.element).hasText('mai 3, 2010');
});
@@ -93,7 +97,9 @@ module('moment', function (hooks) {
});
this.service.setLocale('fr');
- await render(hbs`{{moment-format (moment date inputFormat) outputFormat}}`);
+ await render(
+ hbs`{{moment-format (moment this.date this.inputFormat) this.outputFormat}}`
+ );
assert.dom(this.element).hasText('mai 3, 2010');
});
diff --git a/test-app/tests/unit/helpers/is-after-test.js b/test-app/tests/unit/helpers/is-after-test.js
index de38ddb5..8b60840a 100644
--- a/test-app/tests/unit/helpers/is-after-test.js
+++ b/test-app/tests/unit/helpers/is-after-test.js
@@ -19,7 +19,7 @@ module('is-after', function (hooks) {
});
this.set('context', context);
- await render(hbs`{{is-after context.date}}`);
+ await render(hbs`{{is-after this.context.date}}`);
assert.dom(this.element).hasText('false');
});
@@ -34,7 +34,7 @@ module('is-after', function (hooks) {
});
this.set('context', context);
- await render(hbs`{{is-after context.date precision='year'}}`);
+ await render(hbs`{{is-after this.context.date precision='year'}}`);
assert.dom(this.element).hasText('true');
});
diff --git a/test-app/tests/unit/helpers/is-between-test.js b/test-app/tests/unit/helpers/is-between-test.js
index 0e6a3544..8f704610 100644
--- a/test-app/tests/unit/helpers/is-between-test.js
+++ b/test-app/tests/unit/helpers/is-between-test.js
@@ -19,7 +19,7 @@ module('is-between', function (hooks) {
});
this.set('context', context);
- await render(hbs`{{is-between '2010-10-19' context.date}}`);
+ await render(hbs`{{is-between '2010-10-19' this.context.date}}`);
assert.dom(this.element).hasText('true');
});
@@ -35,7 +35,7 @@ module('is-between', function (hooks) {
this.set('context', context);
await render(
- hbs`{{is-between '2010-10-19' context.date precision='year'}}`
+ hbs`{{is-between '2010-10-19' this.context.date precision='year'}}`
);
assert.dom(this.element).hasText('true');
});
@@ -52,7 +52,7 @@ module('is-between', function (hooks) {
this.set('context', context);
await render(
- hbs`{{is-between '2010-10-19' context.date precision='year' inclusivity='()'}}`
+ hbs`{{is-between '2010-10-19' this.context.date precision='year' inclusivity='()'}}`
);
assert.dom(this.element).hasText('false');
});
diff --git a/test-app/tests/unit/helpers/is-same-or-after-test.js b/test-app/tests/unit/helpers/is-same-or-after-test.js
index 1d5ccf30..a70da523 100644
--- a/test-app/tests/unit/helpers/is-same-or-after-test.js
+++ b/test-app/tests/unit/helpers/is-same-or-after-test.js
@@ -19,7 +19,7 @@ module('is-same-or-after', function (hooks) {
});
this.set('context', context);
- await render(hbs`{{is-same-or-after context.date}}`);
+ await render(hbs`{{is-same-or-after this.context.date}}`);
assert.dom(this.element).hasText('false');
});
@@ -34,7 +34,7 @@ module('is-same-or-after', function (hooks) {
});
this.set('context', context);
- await render(hbs`{{is-same-or-after context.date precision='year'}}`);
+ await render(hbs`{{is-same-or-after this.context.date precision='year'}}`);
assert.dom(this.element).hasText('true');
});
diff --git a/test-app/tests/unit/helpers/is-same-test.js b/test-app/tests/unit/helpers/is-same-test.js
index 4f2db75f..aca42c7e 100644
--- a/test-app/tests/unit/helpers/is-same-test.js
+++ b/test-app/tests/unit/helpers/is-same-test.js
@@ -25,7 +25,7 @@ module('is-same', function (hooks) {
});
this.set('context', context);
- await render(hbs`{{is-same context.date precision='year'}}`);
+ await render(hbs`{{is-same this.context.date precision='year'}}`);
assert.dom(this.element).hasText('true');
});
diff --git a/test-app/tests/unit/helpers/moment-add-test.js b/test-app/tests/unit/helpers/moment-add-test.js
index b2a835f5..ebaae5da 100644
--- a/test-app/tests/unit/helpers/moment-add-test.js
+++ b/test-app/tests/unit/helpers/moment-add-test.js
@@ -21,7 +21,7 @@ module('moment-add', function (hooks) {
.add(duration)
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-add duration}}`);
+ await render(hbs`{{moment-add this.duration}}`);
//assert.ok(this.$().text().match());
assert.dom(this.element).hasText(new RegExp(expectedString));
});
@@ -40,7 +40,7 @@ module('moment-add', function (hooks) {
.add(number, precision)
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-add number precision}}`);
+ await render(hbs`{{moment-add this.number this.precision}}`);
assert.dom(this.element).hasText(new RegExp(expectedString));
});
@@ -54,7 +54,7 @@ module('moment-add', function (hooks) {
.add(duration)
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-add '2016-06-01' duration}}`);
+ await render(hbs`{{moment-add '2016-06-01' this.duration}}`);
assert.dom(this.element).hasText(new RegExp(expectedString));
});
@@ -68,7 +68,7 @@ module('moment-add', function (hooks) {
.add(number, 'days')
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-add number precision='days'}}`);
+ await render(hbs`{{moment-add this.number precision='days'}}`);
assert.dom(this.element).hasText(new RegExp(expectedString));
});
@@ -82,7 +82,7 @@ module('moment-add', function (hooks) {
.add(number, 'days')
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-add '2016-06-01' number precision='days'}}`);
+ await render(hbs`{{moment-add '2016-06-01' this.number precision='days'}}`);
assert.dom(this.element).hasText(new RegExp(expectedString));
});
});
diff --git a/test-app/tests/unit/helpers/moment-calendar-test.js b/test-app/tests/unit/helpers/moment-calendar-test.js
index d344ee0b..1146a7cf 100644
--- a/test-app/tests/unit/helpers/moment-calendar-test.js
+++ b/test-app/tests/unit/helpers/moment-calendar-test.js
@@ -70,7 +70,7 @@ module('moment-calendar', function (hooks) {
});
await render(
- hbs`{{moment-calendar this.date this.referenceDate lastDay=lastDay timeZone='America/New_York'}}`
+ hbs`{{moment-calendar this.date this.referenceDate lastDay=this.lastDay timeZone='America/New_York'}}`
);
assert.dom(this.element).hasText('Yesterday!');
});
diff --git a/test-app/tests/unit/helpers/moment-diff-test.js b/test-app/tests/unit/helpers/moment-diff-test.js
index 368ac752..30e21537 100644
--- a/test-app/tests/unit/helpers/moment-diff-test.js
+++ b/test-app/tests/unit/helpers/moment-diff-test.js
@@ -19,7 +19,7 @@ module('moment-diff', function (hooks) {
dateB: momentService.moment('2017-01-15'),
});
- await render(hbs`{{moment-diff dateA dateB}}`);
+ await render(hbs`{{moment-diff this.dateA this.dateB}}`);
assert.dom(this.element).hasText('432000000');
});
@@ -31,7 +31,7 @@ module('moment-diff', function (hooks) {
dateString: '2017-01-15',
});
- await render(hbs`{{moment-diff dateMoment dateString}}`);
+ await render(hbs`{{moment-diff this.dateMoment this.dateString}}`);
assert.dom(this.element).hasText('432000000');
});
@@ -43,7 +43,7 @@ module('moment-diff', function (hooks) {
dateB: momentService.moment('2017-01-10'),
});
- await render(hbs`{{moment-diff dateA dateB}}`);
+ await render(hbs`{{moment-diff this.dateA this.dateB}}`);
assert.dom(this.element).hasText('-432000000');
});
@@ -55,7 +55,7 @@ module('moment-diff', function (hooks) {
dateB: momentService.moment().add(5, 'day'),
});
- await render(hbs`{{moment-diff dateA dateB precision='day'}}`);
+ await render(hbs`{{moment-diff this.dateA this.dateB precision='day'}}`);
assert.dom().hasText('5');
});
@@ -67,7 +67,9 @@ module('moment-diff', function (hooks) {
dateB: momentService.moment().add(6, 'month'),
});
- await render(hbs`{{moment-diff dateA dateB precision='year' float=true}}`);
+ await render(
+ hbs`{{moment-diff this.dateA this.dateB precision='year' float=true}}`
+ );
assert.dom().containsText('.5'); // good ol' rounding error
});
});
diff --git a/test-app/tests/unit/helpers/moment-duration-test.js b/test-app/tests/unit/helpers/moment-duration-test.js
index edf8d1d6..e1e53fcd 100644
--- a/test-app/tests/unit/helpers/moment-duration-test.js
+++ b/test-app/tests/unit/helpers/moment-duration-test.js
@@ -15,7 +15,7 @@ module('moment-duration', function (hooks) {
assert.expect(1);
this.set('date', 86400000);
- await render(hbs`{{moment-duration date}}`);
+ await render(hbs`{{moment-duration this.date}}`);
assert.dom(this.element).hasText('a day');
});
@@ -23,7 +23,7 @@ module('moment-duration', function (hooks) {
assert.expect(1);
this.set('date', '');
- await render(hbs`{{moment-duration date}}`);
+ await render(hbs`{{moment-duration this.date}}`);
assert.dom(this.element).hasText('a few seconds');
});
@@ -40,7 +40,7 @@ module('moment-duration', function (hooks) {
years: 2,
});
- await render(hbs`{{moment-duration date}}`);
+ await render(hbs`{{moment-duration this.date}}`);
assert.dom(this.element).hasText('2 years');
});
@@ -48,7 +48,7 @@ module('moment-duration', function (hooks) {
assert.expect(1);
this.set('date', '23:59:59');
- await render(hbs`{{moment-duration date}}`);
+ await render(hbs`{{moment-duration this.date}}`);
assert.dom(this.element).hasText('a day');
});
@@ -60,7 +60,7 @@ module('moment-duration', function (hooks) {
date: 1,
});
- await render(hbs`{{moment-duration date unit}}`);
+ await render(hbs`{{moment-duration this.date this.unit}}`);
assert.dom(this.element).hasText('a minute');
});
@@ -73,7 +73,7 @@ module('moment-duration', function (hooks) {
date: 1,
});
- await render(hbs`{{moment-duration date unit}}`);
+ await render(hbs`{{moment-duration this.date this.unit}}`);
assert.dom(this.element).hasText('a day');
});
@@ -85,7 +85,7 @@ module('moment-duration', function (hooks) {
date: null,
});
- await render(hbs`{{moment-duration date unit}}`);
+ await render(hbs`{{moment-duration this.date this.unit}}`);
assert.dom(this.element).hasText('a few seconds');
});
@@ -93,7 +93,7 @@ module('moment-duration', function (hooks) {
assert.expect(1);
this.set('date', 86400000);
- await render(hbs`{{moment-duration date locale='es'}}`);
+ await render(hbs`{{moment-duration this.date locale='es'}}`);
assert.dom(this.element).hasText('un dÃa'); // note: that's not an `i` in dÃa
});
});
diff --git a/test-app/tests/unit/helpers/moment-format-test.js b/test-app/tests/unit/helpers/moment-format-test.js
index e84c6b0c..5f2c46f9 100644
--- a/test-app/tests/unit/helpers/moment-format-test.js
+++ b/test-app/tests/unit/helpers/moment-format-test.js
@@ -21,7 +21,7 @@ module('moment-format', function (hooks) {
assert.expect(1);
this.set('date', date(date(0)));
- await render(hbs`{{moment-format date}}`);
+ await render(hbs`{{moment-format this.date}}`);
assert.dom(this.element).hasText('Wednesday, December 31, 1969 7:00 PM');
});
@@ -29,7 +29,7 @@ module('moment-format', function (hooks) {
assert.expect(2);
this.set('date', date(date(0)));
- await render(hbs`{{moment-format date}}`);
+ await render(hbs`{{moment-format this.date}}`);
const service = this.owner.lookup('service:moment');
@@ -49,7 +49,7 @@ module('moment-format', function (hooks) {
date: date(Date.parse('2011-10-10T14:48:00-05:00')),
});
- await render(hbs`{{moment-format date format}}`);
+ await render(hbs`{{moment-format this.date this.format}}`);
assert.dom(this.element).hasText('October 10, 2011');
});
@@ -62,7 +62,9 @@ module('moment-format', function (hooks) {
date: '5/3/10',
});
- await render(hbs`{{moment-format date outputFormat inputFormat}}`);
+ await render(
+ hbs`{{moment-format this.date this.outputFormat this.inputFormat}}`
+ );
assert.dom(this.element).hasText('May 3, 2010');
});
@@ -75,7 +77,7 @@ module('moment-format', function (hooks) {
this.set('context', context);
- await render(hbs`{{moment-format context.date}}`);
+ await render(hbs`{{moment-format this.context.date}}`);
assert.dom(this.element).hasText('Wednesday, December 31, 1969 7:00 PM');
run(function () {
@@ -89,7 +91,7 @@ module('moment-format', function (hooks) {
assert.expect(1);
this.set('date', date(date(0)));
- await render(hbs`{{moment-format date 'LLLL' locale='es'}}`);
+ await render(hbs`{{moment-format this.date 'LLLL' locale='es'}}`);
assert
.dom(this.element)
.hasText('miércoles, 31 de diciembre de 1969 19:00');
@@ -100,7 +102,7 @@ module('moment-format', function (hooks) {
this.set('date', 0);
await render(
- hbs`{{moment-format date 'LLLL' timeZone='America/New_York'}}`
+ hbs`{{moment-format this.date 'LLLL' timeZone='America/New_York'}}`
);
assert.dom(this.element).hasText('Wednesday, December 31, 1969 7:00 PM');
});
@@ -110,7 +112,7 @@ module('moment-format', function (hooks) {
this.set('date', 0);
await render(
- hbs`{{moment-format date 'LLLL' timeZone='America/Los_Angeles'}}`
+ hbs`{{moment-format this.date 'LLLL' timeZone='America/Los_Angeles'}}`
);
assert.dom(this.element).hasText('Wednesday, December 31, 1969 4:00 PM');
});
@@ -134,7 +136,7 @@ module('moment-format', function (hooks) {
);
this.set('date', date(0));
- await render(hbs`{{moment-format date (get-format 'global-format')}}`);
+ await render(hbs`{{moment-format this.date (get-format 'global-format')}}`);
assert.dom(this.element).hasText('12/31/1969');
});
});
diff --git a/test-app/tests/unit/helpers/moment-from-now-test.js b/test-app/tests/unit/helpers/moment-from-now-test.js
index 426e33bd..236f63f3 100644
--- a/test-app/tests/unit/helpers/moment-from-now-test.js
+++ b/test-app/tests/unit/helpers/moment-from-now-test.js
@@ -25,7 +25,7 @@ module('moment-from-now', function (hooks) {
this.set('context', context);
- await render(hbs`{{moment-from-now context.date}}`);
+ await render(hbs`{{moment-from-now this.context.date}}`);
assert.dom(this.element).hasText('3 days ago');
});
@@ -37,9 +37,9 @@ module('moment-from-now', function (hooks) {
dateA: momentService.moment().add(3, 'day'),
});
- await render(hbs`{{moment-to-now dateA hideAffix=true}}`);
+ await render(hbs`{{moment-to-now this.dateA hideAffix=true}}`);
assert.dom(this.element).hasText('3 days');
- await render(hbs`{{moment-to-now dateA hideAffix=false}}`);
+ await render(hbs`{{moment-to-now this.dateA hideAffix=false}}`);
assert.dom(this.element).hasText('3 days ago');
});
@@ -54,7 +54,7 @@ module('moment-from-now', function (hooks) {
date: threeDaysAgo,
});
- await render(hbs`{{moment-from-now date inputFormat}}`);
+ await render(hbs`{{moment-from-now this.date this.inputFormat}}`);
assert.dom(this.element).hasText('3 days ago');
});
@@ -68,7 +68,7 @@ module('moment-from-now', function (hooks) {
this.set('context', context);
- await render(hbs`{{moment-from-now context.date}}`);
+ await render(hbs`{{moment-from-now this.context.date}}`);
assert.dom(this.element).hasText('an hour ago');
run(function () {
@@ -84,7 +84,7 @@ module('moment-from-now', function (hooks) {
const momentService = this.owner.lookup('service:moment');
this.set('date', momentService.moment().subtract(1, 'hour'));
- await render(hbs`{{moment-from-now date locale='es'}}`);
+ await render(hbs`{{moment-from-now this.date locale='es'}}`);
assert.dom(this.element).hasText('hace una hora');
});
@@ -92,13 +92,13 @@ module('moment-from-now', function (hooks) {
assert.expect(1);
this.set('date', null);
- await render(hbs`{{moment-from-now date allow-empty=true}}`);
+ await render(hbs`{{moment-from-now this.date allow-empty=true}}`);
assert.dom(this.element).hasText('');
});
test('localize arabic - issue 239', async function (assert) {
this.set('date', new Date());
- await render(hbs`{{moment-from-now date locale='ar' hideAffix=true}}`);
+ await render(hbs`{{moment-from-now this.date locale='ar' hideAffix=true}}`);
assert.dom(this.element).hasText('ثانية واØدة');
});
});
diff --git a/test-app/tests/unit/helpers/moment-from-test.js b/test-app/tests/unit/helpers/moment-from-test.js
index 0fbc87cb..005bf194 100644
--- a/test-app/tests/unit/helpers/moment-from-test.js
+++ b/test-app/tests/unit/helpers/moment-from-test.js
@@ -18,7 +18,7 @@ module('moment-from', function (hooks) {
this.set('date', momentService.moment().add(3, 'day'));
- await render(hbs`{{moment-from date}}`);
+ await render(hbs`{{moment-from this.date}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -31,7 +31,7 @@ module('moment-from', function (hooks) {
dateB: momentService.moment().add(3, 'day'),
});
- await render(hbs`{{moment-from dateB dateA}}`);
+ await render(hbs`{{moment-from this.dateB this.dateA}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -44,9 +44,9 @@ module('moment-from', function (hooks) {
dateB: momentService.moment().add(3, 'day'),
});
- await render(hbs`{{moment-from dateB dateA hideAffix=true}}`);
+ await render(hbs`{{moment-from this.dateB this.dateA hideAffix=true}}`);
assert.dom(this.element).hasText('3 days');
- await render(hbs`{{moment-from dateB dateA hideAffix=false}}`);
+ await render(hbs`{{moment-from this.dateB this.dateA hideAffix=false}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -59,7 +59,7 @@ module('moment-from', function (hooks) {
dateB: momentService.moment().subtract(3, 'day'),
});
- await render(hbs`{{moment-from dateA dateB true}}`);
+ await render(hbs`{{moment-from this.dateA this.dateB true}}`);
assert.dom(this.element).hasText('3 days');
});
@@ -70,7 +70,7 @@ module('moment-from', function (hooks) {
this.set('dateA', momentService.moment());
this.set('dateB', momentService.moment().subtract(2, 'day'));
- await render(hbs`{{moment-from dateA dateB locale='es'}}`);
+ await render(hbs`{{moment-from this.dateA this.dateB locale='es'}}`);
assert.dom(this.element).hasText('en 2 dÃas');
});
});
diff --git a/test-app/tests/unit/helpers/moment-subtract-test.js b/test-app/tests/unit/helpers/moment-subtract-test.js
index 189e53ef..39f8acf4 100644
--- a/test-app/tests/unit/helpers/moment-subtract-test.js
+++ b/test-app/tests/unit/helpers/moment-subtract-test.js
@@ -21,7 +21,7 @@ module('moment-subtract', function (hooks) {
.subtract(duration)
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-subtract duration}}`);
+ await render(hbs`{{moment-subtract this.duration}}`);
assert.dom().containsText(expectedString);
});
@@ -39,7 +39,7 @@ module('moment-subtract', function (hooks) {
.subtract(number, precision)
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-subtract number precision}}`);
+ await render(hbs`{{moment-subtract this.number this.precision}}`);
assert.dom().containsText(expectedString);
});
@@ -53,7 +53,7 @@ module('moment-subtract', function (hooks) {
.subtract(duration)
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-subtract '2016-06-01' duration}}`);
+ await render(hbs`{{moment-subtract '2016-06-01' this.duration}}`);
assert.dom().containsText(expectedString);
});
@@ -67,7 +67,7 @@ module('moment-subtract', function (hooks) {
.subtract(number, 'days')
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-subtract number precision='days'}}`);
+ await render(hbs`{{moment-subtract this.number precision='days'}}`);
assert.dom().containsText(expectedString);
});
@@ -81,7 +81,9 @@ module('moment-subtract', function (hooks) {
.subtract(number, 'days')
.format('ddd MMM DD YYYY');
- await render(hbs`{{moment-subtract '2016-06-01' number precision='days'}}`);
+ await render(
+ hbs`{{moment-subtract '2016-06-01' this.number precision='days'}}`
+ );
assert.dom().containsText(expectedString);
});
});
diff --git a/test-app/tests/unit/helpers/moment-to-now-test.js b/test-app/tests/unit/helpers/moment-to-now-test.js
index 476f3783..7c63615d 100644
--- a/test-app/tests/unit/helpers/moment-to-now-test.js
+++ b/test-app/tests/unit/helpers/moment-to-now-test.js
@@ -21,7 +21,7 @@ module('moment-to-now', function (hooks) {
dateA: momentService.moment().subtract(3, 'day'),
});
- await render(hbs`{{moment-to-now dateA}}`);
+ await render(hbs`{{moment-to-now this.dateA}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -33,9 +33,9 @@ module('moment-to-now', function (hooks) {
date: momentService.moment().subtract(3, 'day'),
});
- await render(hbs`{{moment-to-now date hideAffix=true}}`);
+ await render(hbs`{{moment-to-now this.date hideAffix=true}}`);
assert.dom(this.element).hasText('3 days');
- await render(hbs`{{moment-to-now date hideAffix=false}}`);
+ await render(hbs`{{moment-to-now this.date hideAffix=false}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -48,7 +48,7 @@ module('moment-to-now', function (hooks) {
date: momentService.moment().subtract(3, 'day'),
});
- await render(hbs`{{moment-to-now date format}}`);
+ await render(hbs`{{moment-to-now this.date this.format}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -61,7 +61,7 @@ module('moment-to-now', function (hooks) {
});
this.set('context', context);
- await render(hbs`{{moment-to-now context.date}}`);
+ await render(hbs`{{moment-to-now this.context.date}}`);
assert.dom(this.element).hasText('in an hour');
run(function () {
@@ -76,7 +76,7 @@ module('moment-to-now', function (hooks) {
const momentService = this.owner.lookup('service:moment');
this.set('date', momentService.moment().subtract(1, 'hour'));
- await render(hbs`{{moment-to-now date locale='es'}}`);
+ await render(hbs`{{moment-to-now this.date locale='es'}}`);
assert.dom(this.element).hasText('en una hora');
});
@@ -84,7 +84,7 @@ module('moment-to-now', function (hooks) {
assert.expect(1);
this.set('date', null);
- await render(hbs`{{moment-to-now date allow-empty=true}}`);
+ await render(hbs`{{moment-to-now this.date allow-empty=true}}`);
assert.dom(this.element).hasText('');
});
@@ -92,7 +92,7 @@ module('moment-to-now', function (hooks) {
assert.expect(1);
this.set('date', null);
- await render(hbs`{{moment-to-now date}}`);
+ await render(hbs`{{moment-to-now this.date}}`);
assert.dom(this.element).hasText('');
});
@@ -100,7 +100,7 @@ module('moment-to-now', function (hooks) {
assert.expect(1);
this.set('date', null);
- await render(hbs`{{moment-to-now date allow-empty=false}}`);
+ await render(hbs`{{moment-to-now this.date allow-empty=false}}`);
assert.dom(this.element).hasText('Invalid date');
});
});
diff --git a/test-app/tests/unit/helpers/moment-to-test.js b/test-app/tests/unit/helpers/moment-to-test.js
index 6762e592..bacb90d0 100644
--- a/test-app/tests/unit/helpers/moment-to-test.js
+++ b/test-app/tests/unit/helpers/moment-to-test.js
@@ -17,7 +17,7 @@ module('moment-to', function (hooks) {
this.set('date', momentService.moment().subtract(3, 'day'));
- await render(hbs`{{moment-to date}}`);
+ await render(hbs`{{moment-to this.date}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -30,7 +30,7 @@ module('moment-to', function (hooks) {
dateB: momentService.moment().subtract(3, 'day'),
});
- await render(hbs`{{moment-to dateB dateA}}`);
+ await render(hbs`{{moment-to this.dateB this.dateA}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -43,9 +43,9 @@ module('moment-to', function (hooks) {
dateB: momentService.moment().add(3, 'day'),
});
- await render(hbs`{{moment-to dateA dateB hideAffix=true}}`);
+ await render(hbs`{{moment-to this.dateA this.dateB hideAffix=true}}`);
assert.dom(this.element).hasText('3 days');
- await render(hbs`{{moment-to dateA dateB hideAffix=false}}`);
+ await render(hbs`{{moment-to this.dateA this.dateB hideAffix=false}}`);
assert.dom(this.element).hasText('in 3 days');
});
@@ -58,7 +58,7 @@ module('moment-to', function (hooks) {
dateB: momentService.moment().add(3, 'day'),
});
- await render(hbs`{{moment-to dateA dateB true}}`);
+ await render(hbs`{{moment-to this.dateA this.dateB true}}`);
assert.dom(this.element).hasText('3 days');
});
@@ -69,7 +69,7 @@ module('moment-to', function (hooks) {
this.set('dateA', momentService.moment());
this.set('dateB', momentService.moment().add(2, 'day'));
- await render(hbs`{{moment-to dateA dateB locale='es'}}`);
+ await render(hbs`{{moment-to this.dateA this.dateB locale='es'}}`);
assert.dom(this.element).hasText('en 2 dÃas');
});
});
diff --git a/test-app/tests/unit/helpers/utc-test.js b/test-app/tests/unit/helpers/utc-test.js
index 6f78cbf3..99a070a2 100644
--- a/test-app/tests/unit/helpers/utc-test.js
+++ b/test-app/tests/unit/helpers/utc-test.js
@@ -55,10 +55,14 @@ module('utc', function (hooks) {
this.set('estValue', estValue);
const utcValue = momentService.utc(utcTimeStr, fmtStr);
this.set('utcValue', utcValue);
- await render(hbs`{{moment-format (utc estValue) 'YYYY-MM-DDTHH:mm:ss Z'}}`);
+ await render(
+ hbs`{{moment-format (utc this.estValue) 'YYYY-MM-DDTHH:mm:ss Z'}}`
+ );
assert.dom(this.element).hasText(utcTimeStr);
- await render(hbs`{{moment-format (utc utcValue) 'YYYY-MM-DDTHH:mm:ss Z'}}`);
+ await render(
+ hbs`{{moment-format (utc this.utcValue) 'YYYY-MM-DDTHH:mm:ss Z'}}`
+ );
assert.dom(this.element).hasText(utcTimeStr);
});
});
From 1552778d16a0b3f6f394dcfb9c8ab8c47bd2e043 Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Mon, 10 Jan 2022 22:17:35 -0500
Subject: [PATCH 18/25] working and deprecation free on ember 4.0
---
package.json | 2 +-
src/helpers/moment-calendar.js | 14 ++++++--------
test-app/package.json | 2 +-
test-app/scenarios.js | 22 +++++++++++-----------
yarn.lock | 12 ++++++------
5 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/package.json b/package.json
index f47f5435..7d17bd0f 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "0.1.6",
- "ember-page-title": "^6.2.2",
+ "ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source-3.16": "npm:ember-source@~3.16.0",
diff --git a/src/helpers/moment-calendar.js b/src/helpers/moment-calendar.js
index f20e7a97..31efac3b 100644
--- a/src/helpers/moment-calendar.js
+++ b/src/helpers/moment-calendar.js
@@ -1,5 +1,3 @@
-import { assign } from '@ember/polyfills';
-
import computeFn from '../utils/helper-compute';
import BaseHelper from './-base';
@@ -16,12 +14,12 @@ export default BaseHelper.extend({
const moment = this.moment;
const { locale, timeZone } = formatHash;
const [date, referenceTime, formats] = params;
- const clone = { ...formatHash };
-
- delete clone.locale;
- delete clone.timeZone;
-
- const mergedFormats = assign(clone, formats);
+ const mergedFormats = {
+ ...formatHash,
+ locale: null,
+ timeZone: null,
+ ...formats,
+ };
return this.morphMoment(moment.moment(date), { locale, timeZone }).calendar(
referenceTime,
diff --git a/test-app/package.json b/test-app/package.json
index d66f9784..8bdf2df5 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -36,7 +36,7 @@
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "0.1.6",
"ember-moment": "file:..",
- "ember-page-title": "^6.2.2",
+ "ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~3.28.8",
diff --git a/test-app/scenarios.js b/test-app/scenarios.js
index 9d4f33e7..887ef9a1 100644
--- a/test-app/scenarios.js
+++ b/test-app/scenarios.js
@@ -7,7 +7,7 @@ Scenarios.fromDir(__dirname)
lts_3_20,
lts_3_24,
lts_3_28,
- // release,
+ release,
// beta,
// canary,
embroider,
@@ -69,16 +69,16 @@ async function lts_3_28(project) {
});
}
-// async function release(project) {
-// project.linkDevDependency('ember-cli', {
-// baseDir: __dirname,
-// resolveName: 'ember-cli-latest',
-// });
-// project.linkDevDependency('ember-source', {
-// baseDir: __dirname,
-// resolveName: 'ember-source-latest',
-// });
-// }
+async function release(project) {
+ project.linkDevDependency('ember-cli', {
+ baseDir: __dirname,
+ resolveName: 'ember-cli-latest',
+ });
+ project.linkDevDependency('ember-source', {
+ baseDir: __dirname,
+ resolveName: 'ember-source-latest',
+ });
+}
// async function beta(project) {
// project.linkDevDependency('ember-cli', {
diff --git a/yarn.lock b/yarn.lock
index ac215291..5d3dc423 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5428,7 +5428,7 @@ ember-cli-babel@^6.0.0-beta.4:
ember-cli-version-checker "^2.1.2"
semver "^5.5.0"
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.10, 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==
@@ -5964,12 +5964,12 @@ ember-maybe-import-regenerator@0.1.6:
ember-cli-babel "^6.0.0-beta.4"
regenerator-runtime "^0.9.5"
-ember-page-title@^6.2.2:
- version "6.2.2"
- resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-6.2.2.tgz#980838c44e96cba1d00f42435d707936af627324"
- integrity sha512-YTXA+cylZrh9zO0zwjlaAGReT2MVOxAMnVO1OOygFrs1JBs4D6CKV3tImoilg3AvIXFBeJfFNNUbJOdRd9IGGg==
+ember-page-title@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-7.0.0.tgz#11bebd4901d80757646c9006954a13e4fc187421"
+ integrity sha512-oq6+HYbeVD/BnxIO5AkP4gWlsatdgW2HFO10F8+XQiJZrwa7cC7Wm54JNGqQkavkDQTgNSiy1Fe2NILJ14MmAg==
dependencies:
- ember-cli-babel "^7.23.1"
+ ember-cli-babel "^7.26.6"
ember-qunit@^5.1.5:
version "5.1.5"
From ff8e97b96d16f2a20a82dcda57d19aceb7f3e9be Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Mon, 10 Jan 2022 22:17:57 -0500
Subject: [PATCH 19/25] try re-enabling beta and canary
---
test-app/scenarios.js | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/test-app/scenarios.js b/test-app/scenarios.js
index 887ef9a1..da6f58b1 100644
--- a/test-app/scenarios.js
+++ b/test-app/scenarios.js
@@ -8,8 +8,8 @@ Scenarios.fromDir(__dirname)
lts_3_24,
lts_3_28,
release,
- // beta,
- // canary,
+ beta,
+ canary,
embroider,
})
.forEachScenario((scenario) => {
@@ -80,23 +80,23 @@ async function release(project) {
});
}
-// async function beta(project) {
-// project.linkDevDependency('ember-cli', {
-// baseDir: __dirname,
-// resolveName: 'ember-cli-beta',
-// });
-// project.linkDevDependency('ember-source', {
-// baseDir: __dirname,
-// resolveName: 'ember-source-beta',
-// });
-// }
+async function beta(project) {
+ project.linkDevDependency('ember-cli', {
+ baseDir: __dirname,
+ resolveName: 'ember-cli-beta',
+ });
+ project.linkDevDependency('ember-source', {
+ baseDir: __dirname,
+ resolveName: 'ember-source-beta',
+ });
+}
-// async function canary(project) {
-// project.linkDevDependency('ember-source', {
-// baseDir: __dirname,
-// resolveName: 'ember-source-canary',
-// });
-// }
+async function canary(project) {
+ project.linkDevDependency('ember-source', {
+ baseDir: __dirname,
+ resolveName: 'ember-source-canary',
+ });
+}
async function embroider(project) {
project.linkDevDependency('@embroider/core', {
From 22e662d9a1bda76d4f4ff16ad8bf839a22b06842 Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Tue, 11 Jan 2022 00:08:13 -0500
Subject: [PATCH 20/25] beginning to update docs
---
README.md | 126 +++++++++++++++++++-----------------------------------
1 file changed, 43 insertions(+), 83 deletions(-)
diff --git a/README.md b/README.md
index 74aee3e1..1e43e033 100644
--- a/README.md
+++ b/README.md
@@ -5,19 +5,61 @@
[moment.js](http://momentjs.com) template helpers for Ember.js
+## The State of Moment in Ember Apps & Addons
+
+Historically, multiple addons including `ember-moment` pushed their own copy of `moment` and/or `moment-timezone` into your app. This makes it hard to guarantee that an app won't get multiple copies and that the app will have control over the exact locale and timezone data included in those copies. Since moment is quite large, this can have an outsized negative impact.
+
+Instead, we now instruct apps to directly depend on `moment` (or `moment-timzeone`) and import it directly (via `ember-auto-import`, which is included in the default Ember app blueprint). Addons like `ember-moment` can use `peerDependencies` to guarantee that they are sharing the same `moment` (or `moment-timezone`) as the app. An addon that wants to depend on `ember-moment` should likewise declare a `peerDependency` on `moment` so the app's copy of `moment` is available to both the addon and `ember-moment`.
+
+Apps should configure their locale and timezone support (which can have a large impact on bundle size) by following Moment's documentation about Webpack:
+
+ - https://momentjs.com/docs/#/use-it/webpack/
+ - https://momentjs.com/timezone/docs/#/use-it/webpack/
+
+and passing the resulting webpack configuration to either ember-auto-import or Embroider. For example:
+
+```js
+const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
+const MomentTimezoneDataPlugin = require('moment-timezone-data-webpack-plugin');
+
+module.exports = function (defaults) {
+ let app = new EmberApp(defaults, {
+ autoImport: {
+ webpack: {
+ plugins: [
+ // This example config cuts 390kB of Javascript from the production build.
+
+ new MomentLocalesPlugin({
+ // 'en' is built into moment and cannot be removed. This strips the others.
+ localesToKeep: [],
+ }),
+
+ new MomentTimezoneDataPlugin({
+ // Keep timezone data for the US, covering all possible years.
+ matchCountries: 'US',
+ }),
+ ],
+ },
+ },
+ });
+```
+
+You should make sure there are no copies of `ember-cli-moment-shim` in your dependencies, it will force a redundant copy into your app.
+
+Moment itself is no longer actively developed and new projects should not add it. You can look at alternative libraries like Luxon, or better yet keep an eye on [Temporal](https://github.com/tc39/proposal-temporal) which is likely to add moment-like capabilities directly to Javascript quite soon.
## Compatibility
* Ember.js v3.16 or above
* Ember CLI v2.13 or above
* Node.js v10 or above
+* ember-auto-import 2.0 or above
## Table of Contents
- [Installing](#installing)
-- [Upgrading](#upgrading)
- [Usage](#usage)
- [Helpers](#helpers)
- [moment](#moment)
@@ -61,10 +103,6 @@ Compatibility:
the `ember-classic` branch is in maintenance mode, and will only receive bugfixes
- Ember Octane+ : >= v9 // the [default](https://github.com/adopted-ember-addons/ember-moment/tree/master) branch
-## Upgrading
-
-It's advisable to run `ember g ember-moment` between upgrades as dependencies may have been added, removed, or upgraded between releases. Please try this, along with clearing `node_modules` and `bower_components` before reporting issues after upgrading.
-
## Usage
## Helpers
@@ -414,35 +452,8 @@ part of a helper that *is* a value in which case it is useful for "live" updatin
{{moment-format '' allow-empty=true}} {{!-- --}}
```
-## ES6 Moment
-
-This addon provides the ability to import moment as an ES6 module.
-
-```js
-import moment from 'moment';
-```
-
## Configuration Options
-### Include Moment Timezone
-
-You can optionally include the Moment Timezone package in your `config/environment.js` like so:
-
-```js
-// config/environment.js
-module.exports = function() {
- return {
- moment: {
- // Options:
- // 'all' - all years, all timezones
- // 'subset' - 2012-2022, all timezones
- // 'none' - no data, just timezone API
- includeTimezone: 'all'
- }
- }
-};
-```
-
### Global Default Output Format
Your application may require a default format other than the default, ISO 8601. For example, you may want dates to fallback on the localized shorthand format `L` by default.
@@ -487,57 +498,6 @@ module.exports = function() {
};
```
-### i18n support
-
-#### Cherry pick locales (optimal)
-
-```js
-// config/environment.js
-module.exports = function(environment) {
- return {
- moment: {
- // To cherry-pick specific locale support into your application.
- // Full list of locales: https://github.com/moment/moment/tree/2.10.3/locale
- includeLocales: ['es', 'fr-ca']
- }
- };
-```
-
-#### Include all locales into build
-
-```js
-// config/environment.js
-module.exports = function(environment) {
- return {
- moment: {
- includeLocales: true
- }
- };
-```
-
-*NOTE: English is bundled automatically, no need to add `en` in `includeLocales`*
-
-#### Write all the locales to a folder relative to `dist`
-
-Alternatively, you can copy all of moment's locale files into your `dist` directory.
-
-```js
-// config.environment.js
-module.exports = function(environment) {
- return {
- moment: {
- // This will output _all_ locale scripts to assets/moment-locales
- // this option does not respect includeLocales
- localeOutputPath: 'assets/moment-locales'
- }
- };
-```
-
-This allows you to load them on demand when you need them:
-
-```js
-Ember.$.getScript('/assets/moment-locales/fr.js');
-```
### Configure default runtime locale/timeZone
From 081da49a9540c5ba57448ad69adb1787cc617af2 Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Tue, 11 Jan 2022 00:10:06 -0500
Subject: [PATCH 21/25] test-app needs moment-timezone OR moment but not both
---
test-app/package.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/test-app/package.json b/test-app/package.json
index 8bdf2df5..d5bcba21 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -51,7 +51,6 @@
"eslint-plugin-qunit": "^6.2.0",
"jquery": "^3.6.0",
"loader.js": "^4.7.0",
- "moment": "^2.29.1",
"moment-timezone": "^0.5.33",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
From 6be0f214b40196ebda13f9484dd1416b72ddcdf1 Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Thu, 13 Jan 2022 01:57:44 -0500
Subject: [PATCH 22/25] support both moment-timezone and moment
The test-app only tests with moment-timezone, because that assumption is baked into many tests that have existed for a long time.
---
package.json | 2 +-
rollup.config.js | 6 ++++-
src/helpers/moment-duration.js | 2 +-
src/helpers/now.js | 3 +--
src/helpers/unix.js | 3 +--
src/helpers/utc.js | 2 +-
src/index.js | 30 +++++++++++++++++++++++
src/services/moment.js | 2 +-
test-app/app/routes/smoke.js | 2 +-
test-app/tests/integration/moment-test.js | 2 +-
test-app/tests/unit/helpers/now-test.js | 2 +-
test-app/tests/unit/helpers/utc-test.js | 2 +-
yarn.lock | 2 +-
13 files changed, 46 insertions(+), 14 deletions(-)
create mode 100644 src/index.js
diff --git a/package.json b/package.json
index 7d17bd0f..0bff524e 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
"license": "MIT",
"author": "",
"exports": {
+ ".": "./dist/index.js",
"./*": "./dist/*",
"./addon-main.js": "./addon-main.js"
},
@@ -92,7 +93,6 @@
"jquery": "^3.6.0",
"loader.js": "^4.7.0",
"moment-timezone": "^0.5.33",
- "moment": "^2.29.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit-console-grouper": "^0.3.0",
diff --git a/rollup.config.js b/rollup.config.js
index d26f90f0..f6614334 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -14,7 +14,11 @@ export default {
plugins: [
// These are the modules that users should be able to import from your
// addon. Anything not listed here may get optimized away.
- addon.publicEntrypoints(['helpers/**/*.js', 'services/**/*.js']),
+ addon.publicEntrypoints([
+ 'helpers/**/*.js',
+ 'services/**/*.js',
+ 'index.js',
+ ]),
// These are the modules that should get reexported into the traditional
// "app" tree. Things in here should also be in publicEntrypoints above, but
diff --git a/src/helpers/moment-duration.js b/src/helpers/moment-duration.js
index 4f2b49b1..f7b0388d 100644
--- a/src/helpers/moment-duration.js
+++ b/src/helpers/moment-duration.js
@@ -1,5 +1,5 @@
-import moment from 'moment';
import BaseHelper from './-base';
+import { momentOrMomentTimezone as moment } from '../index';
export default BaseHelper.extend({
compute(params, { locale, timeZone }) {
diff --git a/src/helpers/now.js b/src/helpers/now.js
index 415c5d11..3f1b68e0 100644
--- a/src/helpers/now.js
+++ b/src/helpers/now.js
@@ -1,5 +1,4 @@
-import moment from 'moment';
-
+import { momentOrMomentTimezone as moment } from '../index';
import BaseHelper from './-base';
export default BaseHelper.extend({
diff --git a/src/helpers/unix.js b/src/helpers/unix.js
index 05548128..8d305927 100644
--- a/src/helpers/unix.js
+++ b/src/helpers/unix.js
@@ -1,5 +1,4 @@
-import moment from 'moment';
-
+import { momentOrMomentTimezone as moment } from '../index';
import BaseHelper from './-base';
export default BaseHelper.extend({
diff --git a/src/helpers/utc.js b/src/helpers/utc.js
index 253c00b3..59b5f0c4 100644
--- a/src/helpers/utc.js
+++ b/src/helpers/utc.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import { momentOrMomentTimezone as moment } from '../index';
import BaseHelper from './-base';
export default BaseHelper.extend({
diff --git a/src/index.js b/src/index.js
new file mode 100644
index 00000000..d2630b51
--- /dev/null
+++ b/src/index.js
@@ -0,0 +1,30 @@
+import {
+ dependencySatisfies,
+ macroCondition,
+ importSync,
+} from '@embroider/macros';
+
+// This is the copy of moment or moment-timezone that ember-moment is using.
+//
+// Apps shouldn't need to use this, because they should pick one or the other
+// and import it directly.
+//
+// An addon that depends on ember-moment and needs moment-timezone should
+// declare a peerDep on moment-timezone and import moment-timezone directly, and
+// there the addon should not need to use this.
+//
+// An addon that depends on ember-moment and doesn't care about timezone
+// features should declare optional peerDeps on both moment and moment-timezone,
+// allowing the app to pick either. In this scenario, the addon may want to use
+// this to get convenient access to whichever the app picked.
+export const momentOrMomentTimezone = (() => {
+ if (macroCondition(dependencySatisfies('moment-timezone', '*'))) {
+ return importSync('moment-timezone').default;
+ } else if (macroCondition(dependencySatisfies('moment', '*'))) {
+ return importSync('moment').default;
+ } else {
+ throw new Error(
+ `ember-moment was unable to detect either moment-timezone or moment. Please add one of those to your app.`
+ );
+ }
+})();
diff --git a/src/services/moment.js b/src/services/moment.js
index 14f1d671..46df184e 100644
--- a/src/services/moment.js
+++ b/src/services/moment.js
@@ -1,7 +1,7 @@
import Service from '@ember/service';
import Evented from '@ember/object/evented';
import { getOwner } from '@ember/application';
-import moment from 'moment-timezone';
+import { momentOrMomentTimezone as moment } from '../index';
import { computed, set, setProperties } from '@ember/object';
// eslint-disable-next-line ember/no-classic-classes
diff --git a/test-app/app/routes/smoke.js b/test-app/app/routes/smoke.js
index b8e6943c..2a8486c3 100644
--- a/test-app/app/routes/smoke.js
+++ b/test-app/app/routes/smoke.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import moment from 'moment';
+import moment from 'moment-timezone';
export default class Smoke extends Route {
setupController(controller, model) {
diff --git a/test-app/tests/integration/moment-test.js b/test-app/tests/integration/moment-test.js
index 6a3623fb..2868ec69 100644
--- a/test-app/tests/integration/moment-test.js
+++ b/test-app/tests/integration/moment-test.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import moment from 'moment-timezone';
import hbs from 'htmlbars-inline-precompile';
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
diff --git a/test-app/tests/unit/helpers/now-test.js b/test-app/tests/unit/helpers/now-test.js
index a46ed893..273c91eb 100644
--- a/test-app/tests/unit/helpers/now-test.js
+++ b/test-app/tests/unit/helpers/now-test.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import moment from 'moment-timezone';
import hbs from 'htmlbars-inline-precompile';
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
diff --git a/test-app/tests/unit/helpers/utc-test.js b/test-app/tests/unit/helpers/utc-test.js
index 99a070a2..f75fb5ca 100644
--- a/test-app/tests/unit/helpers/utc-test.js
+++ b/test-app/tests/unit/helpers/utc-test.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import moment from 'moment-timezone';
import hbs from 'htmlbars-inline-precompile';
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
diff --git a/yarn.lock b/yarn.lock
index 5d3dc423..13db8ba9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9624,7 +9624,7 @@ moment-timezone@^0.5.33:
dependencies:
moment ">= 2.9.0"
-"moment@>= 2.9.0", moment@^2.29.1:
+"moment@>= 2.9.0":
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
From 04174a8f8b36e766b5a6a2233c4819dd6ab09174 Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Sat, 15 Jan 2022 02:06:56 -0500
Subject: [PATCH 23/25] updating ember-auto-import
---
package.json | 8 +-
test-app/package.json | 2 +-
yarn.lock | 459 +++++++++++++++++++-----------------------
3 files changed, 209 insertions(+), 260 deletions(-)
diff --git a/package.json b/package.json
index 0bff524e..7930fdbb 100644
--- a/package.json
+++ b/package.json
@@ -40,22 +40,22 @@
"prepublishOnly": "rollup --config"
},
"dependencies": {
- "@embroider/addon-shim": "^0.50.0"
+ "@embroider/addon-shim": "^0.50.2"
},
"devDependencies": {
"@babel/core": "^7.16.7",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
- "@embroider/addon-dev": "^0.50.0",
+ "@embroider/addon-dev": "^0.50.2",
"@embroider/compat": "npm:@embroider/compat@latest",
"@embroider/core": "npm:@embroider/core@latest",
- "@embroider/test-setup": "^0.50.0",
+ "@embroider/test-setup": "npm:@embroider/test-setup@latest",
"@embroider/webpack": "npm:@embroider/webpack@latest",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@rollup/plugin-babel": "^5.3.0",
"babel-eslint": "^10.1.0",
- "ember-auto-import": "^2.2.4",
+ "ember-auto-import": "^2.3.0",
"ember-cli-3.16": "npm:ember-cli@~3.16.0",
"ember-cli-3.20": "npm:ember-cli@~3.20.0",
"ember-cli-3.24": "npm:ember-cli@~3.24.0",
diff --git a/test-app/package.json b/test-app/package.json
index d5bcba21..25c3c453 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -24,7 +24,7 @@
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
- "ember-auto-import": "^2.2.4",
+ "ember-auto-import": "^2.3.0",
"ember-cli": "~3.28.5",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^5.7.2",
diff --git a/yarn.lock b/yarn.lock
index 13db8ba9..2ce94b2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,10 +16,10 @@
dependencies:
"@babel/highlight" "^7.16.7"
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4":
- version "7.16.4"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"
- integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
+ integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
"@babel/core@^7.1.6", "@babel/core@^7.10.2", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.13.8", "@babel/core@^7.14.5", "@babel/core@^7.16.0", "@babel/core@^7.16.7", "@babel/core@^7.3.4", "@babel/core@^7.7.7":
version "7.16.7"
@@ -42,12 +42,12 @@
semver "^6.3.0"
source-map "^0.5.0"
-"@babel/generator@^7.16.7":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.7.tgz#b42bf46a3079fa65e1544135f32e7958f048adbb"
- integrity sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==
+"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
+ integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
dependencies:
- "@babel/types" "^7.16.7"
+ "@babel/types" "^7.16.8"
jsesc "^2.5.1"
source-map "^0.5.0"
@@ -188,14 +188,14 @@
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
-"@babel/helper-remap-async-to-generator@^7.16.7":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.7.tgz#5ce2416990d55eb6e099128338848ae8ffa58a9a"
- integrity sha512-C3o117GnP/j/N2OWo+oepeWbFEKRfNaay+F1Eo5Mj3A1SRjyx+qaFhm23nlipub7Cjv2azdUUiDH+VlpdwUFRg==
+"@babel/helper-remap-async-to-generator@^7.16.8":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
+ integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
dependencies:
"@babel/helper-annotate-as-pure" "^7.16.7"
- "@babel/helper-wrap-function" "^7.16.7"
- "@babel/types" "^7.16.7"
+ "@babel/helper-wrap-function" "^7.16.8"
+ "@babel/types" "^7.16.8"
"@babel/helper-replace-supers@^7.16.7":
version "7.16.7"
@@ -239,15 +239,15 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-"@babel/helper-wrap-function@^7.16.7":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.7.tgz#8ddf9eaa770ed43de4bc3687f3f3b0d6d5ecf014"
- integrity sha512-7a9sABeVwcunnztZZ7WTgSw6jVYLzM1wua0Z4HIXm9S3/HC96WKQTkFgGEaj5W06SHHihPJ6Le6HzS5cGOQMNw==
+"@babel/helper-wrap-function@^7.16.8":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
+ integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
dependencies:
"@babel/helper-function-name" "^7.16.7"
"@babel/template" "^7.16.7"
- "@babel/traverse" "^7.16.7"
- "@babel/types" "^7.16.7"
+ "@babel/traverse" "^7.16.8"
+ "@babel/types" "^7.16.8"
"@babel/helpers@^7.16.7":
version "7.16.7"
@@ -267,10 +267,10 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.16.7", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.7.tgz#d372dda9c89fcec340a82630a9f533f2fe15877e"
- integrity sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==
+"@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.16.7", "@babel/parser@^7.16.8", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
+ integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
version "7.16.7"
@@ -288,16 +288,16 @@
"@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
"@babel/plugin-proposal-optional-chaining" "^7.16.7"
-"@babel/plugin-proposal-async-generator-functions@^7.16.7":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.7.tgz#739adc1212a9e4892de440cd7dfffb06172df78d"
- integrity sha512-TTXBT3A5c11eqRzaC6beO6rlFT3Mo9C2e8eB44tTr52ESXSK2CIc2fOp1ynpAwQA8HhBMho+WXhMHWlAe3xkpw==
+"@babel/plugin-proposal-async-generator-functions@^7.16.8":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
+ integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
dependencies:
"@babel/helper-plugin-utils" "^7.16.7"
- "@babel/helper-remap-async-to-generator" "^7.16.7"
+ "@babel/helper-remap-async-to-generator" "^7.16.8"
"@babel/plugin-syntax-async-generators" "^7.8.4"
-"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
version "7.16.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -314,7 +314,7 @@
"@babel/helper-plugin-utils" "^7.16.7"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
-"@babel/plugin-proposal-decorators@^7.13.5":
+"@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7":
version "7.16.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.7.tgz#922907d2e3e327f5b07d2246bcfc0bd438f360d2"
integrity sha512-DoEpnuXK14XV9btI1k8tzNGCutMclpj4yru8aXKoHlVmbO1s+2A+g2+h4JhcjrxkFJqzbymnLG6j/niOf3iFXQ==
@@ -544,14 +544,14 @@
dependencies:
"@babel/helper-plugin-utils" "^7.16.7"
-"@babel/plugin-transform-async-to-generator@^7.16.7":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.7.tgz#646e1262ac341b587ff5449844d4492dbb10ac4b"
- integrity sha512-pFEfjnK4DfXCfAlA5I98BYdDJD8NltMzx19gt6DAmfE+2lXRfPUoa0/5SUjT4+TDE1W/rcxU/1lgN55vpAjjdg==
+"@babel/plugin-transform-async-to-generator@^7.16.8":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
+ integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
dependencies:
"@babel/helper-module-imports" "^7.16.7"
"@babel/helper-plugin-utils" "^7.16.7"
- "@babel/helper-remap-async-to-generator" "^7.16.7"
+ "@babel/helper-remap-async-to-generator" "^7.16.8"
"@babel/plugin-transform-block-scoped-functions@^7.16.7":
version "7.16.7"
@@ -657,10 +657,10 @@
"@babel/helper-plugin-utils" "^7.16.7"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.16.7":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.7.tgz#fd119e6a433c527d368425b45df361e1e95d3c1a"
- integrity sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w==
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
+ integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
dependencies:
"@babel/helper-module-transforms" "^7.16.7"
"@babel/helper-plugin-utils" "^7.16.7"
@@ -686,10 +686,10 @@
"@babel/helper-module-transforms" "^7.16.7"
"@babel/helper-plugin-utils" "^7.16.7"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.7":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.7.tgz#749d90d94e73cf62c60a0cc8d6b94d29305a81f2"
- integrity sha512-kFy35VwmwIQwCjwrAQhl3+c/kr292i4KdLPKp5lPH03Ltc51qnFlIADoyPxc/6Naz3ok3WdYKg+KK6AH+D4utg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
+ integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
dependencies:
"@babel/helper-create-regexp-features-plugin" "^7.16.7"
@@ -744,14 +744,14 @@
"@babel/helper-plugin-utils" "^7.16.7"
"@babel/plugin-transform-runtime@^7.12.1", "@babel/plugin-transform-runtime@^7.13.9", "@babel/plugin-transform-runtime@^7.14.5":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.7.tgz#1da184cb83a2287a01956c10c60e66dd503c18aa"
- integrity sha512-2FoHiSAWkdq4L06uaDN3rS43i6x28desUVxq+zAFuE6kbWYQeiLPJI5IC7Sg9xKYVcrBKSQkVUfH6aeQYbl9QA==
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.8.tgz#3339368701103edae708f0fba9e4bfb70a3e5872"
+ integrity sha512-6Kg2XHPFnIarNweZxmzbgYnnWsXxkx9WQUVk2sksBRL80lBC1RAQV3wQagWxdCHiYHqPN+oenwNIuttlYgIbQQ==
dependencies:
"@babel/helper-module-imports" "^7.16.7"
"@babel/helper-plugin-utils" "^7.16.7"
babel-plugin-polyfill-corejs2 "^0.3.0"
- babel-plugin-polyfill-corejs3 "^0.4.0"
+ babel-plugin-polyfill-corejs3 "^0.5.0"
babel-plugin-polyfill-regenerator "^0.3.0"
semver "^6.3.0"
@@ -792,9 +792,9 @@
"@babel/helper-plugin-utils" "^7.16.7"
"@babel/plugin-transform-typescript@^7.13.0":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.7.tgz#33f8c2c890fbfdc4ef82446e9abb8de8211a3ff3"
- integrity sha512-Hzx1lvBtOCWuCEwMmYOfpQpO7joFeXLgoPuzZZBtTxXqSqUGUubvFGZv2ygo1tB5Bp9q6PXV3H0E/kf7KM0RLA==
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0"
+ integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==
dependencies:
"@babel/helper-create-class-features-plugin" "^7.16.7"
"@babel/helper-plugin-utils" "^7.16.7"
@@ -840,18 +840,18 @@
core-js "^2.6.5"
regenerator-runtime "^0.13.4"
-"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.14.5", "@babel/preset-env@^7.16.5":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.7.tgz#c491088856d0b3177822a2bf06cb74d76327aa56"
- integrity sha512-urX3Cee4aOZbRWOSa3mKPk0aqDikfILuo+C7qq7HY0InylGNZ1fekq9jmlr3pLWwZHF4yD7heQooc2Pow2KMyQ==
+"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.14.5", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.8.tgz#e682fa0bcd1cf49621d64a8956318ddfb9a05af9"
+ integrity sha512-9rNKgVCdwHb3z1IlbMyft6yIXIeP3xz6vWvGaLHrJThuEIqWfHb0DNBH9VuTgnDfdbUDhkmkvMZS/YMCtP7Elg==
dependencies:
- "@babel/compat-data" "^7.16.4"
+ "@babel/compat-data" "^7.16.8"
"@babel/helper-compilation-targets" "^7.16.7"
"@babel/helper-plugin-utils" "^7.16.7"
"@babel/helper-validator-option" "^7.16.7"
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
- "@babel/plugin-proposal-async-generator-functions" "^7.16.7"
+ "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
"@babel/plugin-proposal-class-properties" "^7.16.7"
"@babel/plugin-proposal-class-static-block" "^7.16.7"
"@babel/plugin-proposal-dynamic-import" "^7.16.7"
@@ -881,7 +881,7 @@
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
"@babel/plugin-syntax-top-level-await" "^7.14.5"
"@babel/plugin-transform-arrow-functions" "^7.16.7"
- "@babel/plugin-transform-async-to-generator" "^7.16.7"
+ "@babel/plugin-transform-async-to-generator" "^7.16.8"
"@babel/plugin-transform-block-scoped-functions" "^7.16.7"
"@babel/plugin-transform-block-scoping" "^7.16.7"
"@babel/plugin-transform-classes" "^7.16.7"
@@ -895,10 +895,10 @@
"@babel/plugin-transform-literals" "^7.16.7"
"@babel/plugin-transform-member-expression-literals" "^7.16.7"
"@babel/plugin-transform-modules-amd" "^7.16.7"
- "@babel/plugin-transform-modules-commonjs" "^7.16.7"
+ "@babel/plugin-transform-modules-commonjs" "^7.16.8"
"@babel/plugin-transform-modules-systemjs" "^7.16.7"
"@babel/plugin-transform-modules-umd" "^7.16.7"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.7"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
"@babel/plugin-transform-new-target" "^7.16.7"
"@babel/plugin-transform-object-super" "^7.16.7"
"@babel/plugin-transform-parameters" "^7.16.7"
@@ -913,11 +913,11 @@
"@babel/plugin-transform-unicode-escapes" "^7.16.7"
"@babel/plugin-transform-unicode-regex" "^7.16.7"
"@babel/preset-modules" "^0.1.5"
- "@babel/types" "^7.16.7"
+ "@babel/types" "^7.16.8"
babel-plugin-polyfill-corejs2 "^0.3.0"
- babel-plugin-polyfill-corejs3 "^0.4.0"
+ babel-plugin-polyfill-corejs3 "^0.5.0"
babel-plugin-polyfill-regenerator "^0.3.0"
- core-js-compat "^3.19.1"
+ core-js-compat "^3.20.2"
semver "^6.3.0"
"@babel/preset-modules@^0.1.5":
@@ -954,26 +954,26 @@
"@babel/parser" "^7.16.7"
"@babel/types" "^7.16.7"
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.16.7", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.7.tgz#dac01236a72c2560073658dd1a285fe4e0865d76"
- integrity sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.8.tgz#bab2f2b09a5fe8a8d9cad22cbfe3ba1d126fef9c"
+ integrity sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==
dependencies:
"@babel/code-frame" "^7.16.7"
- "@babel/generator" "^7.16.7"
+ "@babel/generator" "^7.16.8"
"@babel/helper-environment-visitor" "^7.16.7"
"@babel/helper-function-name" "^7.16.7"
"@babel/helper-hoist-variables" "^7.16.7"
"@babel/helper-split-export-declaration" "^7.16.7"
- "@babel/parser" "^7.16.7"
- "@babel/types" "^7.16.7"
+ "@babel/parser" "^7.16.8"
+ "@babel/types" "^7.16.8"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
- version "7.16.7"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159"
- integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==
+"@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
+ version "7.16.8"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
+ integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
dependencies:
"@babel/helper-validator-identifier" "^7.16.7"
to-fast-properties "^2.0.0"
@@ -1040,12 +1040,12 @@
ember-cli-version-checker "^5.1.2"
semver "^7.3.5"
-"@embroider/addon-dev@^0.50.0":
- version "0.50.0"
- resolved "https://registry.yarnpkg.com/@embroider/addon-dev/-/addon-dev-0.50.0.tgz#5aa4245df9b0aeab4d568c2fe7b929cd6d1a6941"
- integrity sha512-A2agk16vlbr7t2MrPq7FnQiJlq6EJOTpvhungc8v+qyAp1TC21jK14sM8aRS3qJEXSjChUtEucMJjPivJOPnSg==
+"@embroider/addon-dev@^0.50.2":
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/addon-dev/-/addon-dev-0.50.2.tgz#3eb533f55b3e7268abecaca170bce0df0e9c8ae5"
+ integrity sha512-RbdwcnQsda1pYNTf+qj6YueCuhidsaBcaqQSIFgaKyELPzM9xXFPYaoMvZgyLo1Pv+3YwuanAcR9EDzrMIijCg==
dependencies:
- "@embroider/shared-internals" "^0.50.0"
+ "@embroider/shared-internals" "^0.50.2"
"@rollup/pluginutils" "^4.1.1"
fs-extra "^10.0.0"
minimatch "^3.0.4"
@@ -1054,37 +1054,37 @@
walk-sync "^3.0.0"
yargs "^17.0.1"
-"@embroider/addon-shim@^0.50.0":
- version "0.50.0"
- resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-0.50.0.tgz#2fbfdb8d111981cab566b84144c381233a451644"
- integrity sha512-5ivCrDtuof9anJvuiw7phCWo+7U7UYJFq4H7znUIEwZfURin3oXon2wRVvNiyzSTbRQrfic3rON7X+ebiI79pA==
+"@embroider/addon-shim@^0.50.2":
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-0.50.2.tgz#9be2ed8cee1086cef63c5baecf8dde8dcdacc24e"
+ integrity sha512-a+pFlXZPovcCNFo05HxXBW9ole43mPyFZnkhvZlLF0f1sHEn9j0sD1Ld2BM/NCERmHcYz9eXQnX1FPNLCDoGEA==
dependencies:
- "@embroider/shared-internals" "^0.50.0"
+ "@embroider/shared-internals" "^0.50.2"
semver "^7.3.5"
-"@embroider/babel-loader-8@0.49.0":
- version "0.49.0"
- resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-0.49.0.tgz#4c157417b80d339d217a47cbceaed186f4da5f7d"
- integrity sha512-Pggo2ERxxtojiK6dQTOth3Fvnq/A8xY0tAfjAOS3DbCMWiQTJ/4sHZzokmo5JA8dB0VTRStzs9SzWvVVh+swbg==
+"@embroider/babel-loader-8@0.50.2":
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-0.50.2.tgz#1d56dc9edffdb141eb8927589209eaab2e585b33"
+ integrity sha512-0iIsATanWYjLBn371dOr+rkI3yVAmX8Uao1gvH/GTd1f5GoLdMzNNHB4WsASMydg2uCUtOOjVZQOnWCxUBJvVw==
dependencies:
"@babel/core" "^7.14.5"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
- "@embroider/core" "0.49.0"
+ "@embroider/core" "0.50.2"
babel-loader "8"
"@embroider/compat@npm:@embroider/compat@latest":
- version "0.49.0"
- resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.49.0.tgz#36febce2af757618907874a1bee5fa949fb68f3d"
- integrity sha512-Y9+o3TTmI/NPE4Kh+yj2ASeZIhYg3VJBgQdhVemlmEvrv/ExjgCxDMnMGpYVBvFWBGbWUGZkMy8JJxRgnVqjLg==
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.50.2.tgz#1e4e315da8b40c441619a7c1376d4e6bf2a54fba"
+ integrity sha512-AwjGrrwkieCapOFqg9NQF4CPw6Fjs8GOOCzeC5uZOV+f8YzbcQ4us1PKrgWuESFhSpcsQ4urYnrMPYuhUS12HA==
dependencies:
"@babel/code-frame" "^7.14.5"
"@babel/core" "^7.14.5"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
"@babel/preset-env" "^7.14.5"
"@babel/traverse" "^7.14.5"
- "@embroider/macros" "0.49.0"
- "@embroider/shared-internals" "0.49.0"
+ "@embroider/macros" "0.50.2"
+ "@embroider/shared-internals" "0.50.2"
"@types/babel__code-frame" "^7.0.2"
"@types/yargs" "^17.0.3"
assert-never "^1.1.0"
@@ -1155,10 +1155,10 @@
walk-sync "^1.1.3"
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
-"@embroider/core@0.49.0", "@embroider/core@npm:@embroider/core@latest":
- version "0.49.0"
- resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.49.0.tgz#134b126d375ffaa1401bd67ce8ee23133a9af7db"
- integrity sha512-n88xgifyM1wpR4arRVpUDmzH5v/kaf+u39zuuQggbl3tvqlYcm4yk+mT5oJhAJUfuBvN/vCXijwcFEXsYgK0PA==
+"@embroider/core@0.50.2", "@embroider/core@npm:@embroider/core@latest":
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.50.2.tgz#6e8777c81f7d555d1b07c19a2cf0158bc6f2cdef"
+ integrity sha512-l5L34a9FzBBRwRn0O7vbtDbHyP9Q+NL5dHubb1G6HI0JrDk36cksEzwCVVH+V82EcuyV4+NVzymbFCycv6J7IA==
dependencies:
"@babel/core" "^7.14.5"
"@babel/parser" "^7.14.5"
@@ -1166,8 +1166,8 @@
"@babel/plugin-transform-runtime" "^7.14.5"
"@babel/runtime" "^7.14.5"
"@babel/traverse" "^7.14.5"
- "@embroider/macros" "0.49.0"
- "@embroider/shared-internals" "0.49.0"
+ "@embroider/macros" "0.50.2"
+ "@embroider/shared-internals" "0.50.2"
assert-never "^1.2.1"
babel-import-util "^1.1.0"
babel-plugin-ember-template-compilation "^1.0.0"
@@ -1192,10 +1192,10 @@
walk-sync "^3.0.0"
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
-"@embroider/hbs-loader@0.49.0":
- version "0.49.0"
- resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.49.0.tgz#a3135570864f6984b43132ad07cd1c8b42ad5fee"
- integrity sha512-yrgoDlJsKH+sg3CGrsCoU8yNasRhQlJ0j/3D6rcmNqyRGaRKo7EUE0cDOd/LNOOb0aIBhVcUbocLYMq5jWw/ZQ==
+"@embroider/hbs-loader@0.50.2":
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.50.2.tgz#49b4aa4de66ce05122e7d87810a26cf59f5ae01d"
+ integrity sha512-Ir6Gocv7rTaD6Dqz6UUSBfj9iO8X5eZJEo+SDC5o32f+hsF4/eMce2tvd6BlY1pgJ70mf6PKMEehd+DwO4djKQ==
"@embroider/macros@0.33.0":
version "0.33.0"
@@ -1212,49 +1212,24 @@
resolve "^1.8.1"
semver "^7.3.2"
-"@embroider/macros@0.49.0":
- version "0.49.0"
- resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.49.0.tgz#65b4ed734d1266013a452aed2a3adb8694832112"
- integrity sha512-4VsvlE0h8l1LPI6V2VufQimf7LGkSXd9AJLsrGs4/W8SqqdJHv4oY2DGzX1c0Te4VcD61lIzCkeOkzN2PMV3WQ==
+"@embroider/macros@0.50.2", "@embroider/macros@^0.50.0":
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.50.2.tgz#9ec7d0bb1fa846410fc6c209a69b782640942b11"
+ integrity sha512-nPRE8fanqbIik4+WBm/roW3sxNkMp6WnuZT/IM8wdmgkYU55uH+eyJXT7XW0UGy9IQv6YJ2QTRz46cq9N0/4qg==
dependencies:
- "@embroider/shared-internals" "0.49.0"
+ "@embroider/shared-internals" "0.50.2"
assert-never "^1.2.1"
+ babel-import-util "^1.1.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@0.49.0":
- version "0.49.0"
- resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.49.0.tgz#c9e179b33b3e036b064e72b69639e48d53984229"
- integrity sha512-uCDB2rw45xinctS5JOTsl7DF6yxlMc3RlZF/jkNeiGUrphCr0T1CMnUSnQvDAWkdMjvTuOEIWFb/e56h2NBWvw==
- dependencies:
- babel-import-util "^1.1.0"
- ember-rfc176-data "^0.3.17"
- fs-extra "^9.1.0"
- lodash "^4.17.21"
- resolve-package-path "^4.0.1"
- semver "^7.3.5"
- typescript-memoize "^1.0.1"
-
-"@embroider/shared-internals@^0.40.0":
- version "0.40.0"
- resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
- integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
- dependencies:
- ember-rfc176-data "^0.3.17"
- fs-extra "^7.0.1"
- lodash "^4.17.10"
- pkg-up "^3.1.0"
- resolve-package-path "^1.2.2"
- semver "^7.3.2"
- typescript-memoize "^1.0.0-alpha.3"
-
-"@embroider/shared-internals@^0.50.0":
- version "0.50.0"
- resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.50.0.tgz#e8f7474af6b8896a91da4ec700810587fa61f7c2"
- integrity sha512-pu4YQGyoTsz+KWGTKwMyCMzhoJkUI9PuWiivRilKsywiFt8Ke4ns+nFNnHtPqPKChR72xY2qFjWOP5yAqZq3kw==
+"@embroider/shared-internals@0.50.2", "@embroider/shared-internals@^0.50.0", "@embroider/shared-internals@^0.50.2":
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.50.2.tgz#567c5451db31a1f3edc2f64376ce5a0dcaaabacb"
+ integrity sha512-l3SKn1YdxTFBjY3ylYTLHxFY0dG2XxIsjbtZt7Mm6QyZFssWBDg3oWYwBoUpkw/ysjNJf8IcI7reXhB23WXwDw==
dependencies:
babel-import-util "^1.1.0"
ember-rfc176-data "^0.3.17"
@@ -1264,25 +1239,25 @@
semver "^7.3.5"
typescript-memoize "^1.0.1"
-"@embroider/test-setup@^0.50.0":
- version "0.50.0"
- resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.50.0.tgz#7394ae3edd100eb2293d9f0888d2d91b55ac45d3"
- integrity sha512-skZQpUQWvDP/AlC3SZGZf8YAJv4zLM2Q9KzaZbIoZf5Veozx/G8rrU/l+wI0uatZPQ1VjxxSNzh3u8IhEu231A==
+"@embroider/test-setup@npm:@embroider/test-setup@latest":
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.50.2.tgz#b9237db0de414649bf465616e073783967066672"
+ integrity sha512-j3H1ORmHu9xUgdRhPR0ERMc7dJb7uRcNT+c5+nxZfX9825YR0uNC8u+gjLcu9KLnrFt3wP08TrTFJmny0MB+BQ==
dependencies:
lodash "^4.17.21"
resolve "^1.20.0"
"@embroider/webpack@npm:@embroider/webpack@latest":
- version "0.49.0"
- resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.49.0.tgz#eee4b3ac2056316388e9d44786c94fab1e9c8195"
- integrity sha512-1Mj+//AlnpCsUp44JG9hqLdYLKFLU3qBGVhAlXAgLf7BHzU5fbcbFrgZGdnYqrgmPb9jGpyWNHe+Av0ChVo6VA==
+ version "0.50.2"
+ resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.50.2.tgz#c9bb2b34000a09526b0805bccdad0511275065a7"
+ integrity sha512-FVWa+a1PO+BPwi8Bp0oWIXzV+FIvBpzMGjFnxMd4in3BYHmlZm7guI1KhYwiug2e6fl0pS7vAa+E7d7mUh/wgw==
dependencies:
"@babel/core" "^7.14.5"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
- "@embroider/babel-loader-8" "0.49.0"
- "@embroider/hbs-loader" "0.49.0"
- "@embroider/shared-internals" "0.49.0"
+ "@embroider/babel-loader-8" "0.50.2"
+ "@embroider/hbs-loader" "0.50.2"
+ "@embroider/shared-internals" "0.50.2"
"@types/source-map" "^0.5.7"
"@types/supports-color" "^8.1.0"
babel-loader "^8.2.2"
@@ -1636,9 +1611,9 @@
integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
"@types/eslint-scope@^3.7.0":
- version "3.7.2"
- resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.2.tgz#11e96a868c67acf65bf6f11d10bb89ea71d5e473"
- integrity sha512-TzgYCWoPiTeRg6RQYgtuW7iODtVoKu3RVL72k3WohqhjfaOLK5Mg2T4Tg1o2bSfu0vPkoI48wdQFv5b/Xe04wQ==
+ version "3.7.3"
+ resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
+ integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
dependencies:
"@types/eslint" "*"
"@types/estree" "*"
@@ -1670,9 +1645,9 @@
integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
"@types/express-serve-static-core@^4.17.18":
- version "4.17.27"
- resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.27.tgz#7a776191e47295d2a05962ecbb3a4ce97e38b401"
- integrity sha512-e/sVallzUTPdyOTiqi8O8pMdBBphscvI6E4JYaKlja4Lm+zh7UFSSdW5VMkRbhDtmrONqOUHOXRguPsDckzxNA==
+ version "4.17.28"
+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
+ integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
dependencies:
"@types/node" "*"
"@types/qs" "*"
@@ -2769,13 +2744,13 @@ babel-plugin-polyfill-corejs2@^0.3.0:
"@babel/helper-define-polyfill-provider" "^0.3.0"
semver "^6.1.1"
-babel-plugin-polyfill-corejs3@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087"
- integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==
+babel-plugin-polyfill-corejs3@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.0.tgz#f81371be3fe499d39e074e272a1ef86533f3d268"
+ integrity sha512-Hcrgnmkf+4JTj73GbK3bBhlVPiLL47owUAnoJIf69Hakl3q+KfodbDXiZWGMM7iqCZTxCG3Z2VRfPNYES4rXqQ==
dependencies:
"@babel/helper-define-polyfill-provider" "^0.3.0"
- core-js-compat "^3.18.0"
+ core-js-compat "^3.20.0"
babel-plugin-polyfill-regenerator@^0.3.0:
version "0.3.0"
@@ -4098,9 +4073,9 @@ can-symlink@^1.0.0:
tmp "0.0.28"
caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001286:
- version "1.0.30001297"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001297.tgz#ea7776ccc4992956582cae5b8fea127fbebde430"
- integrity sha512-6bbIbowYG8vFs/Lk4hU9jFt7NknGDleVAciK916tp6ft1j+D//ZwwL6LbF1wXMQ32DMSjeuUV8suhh6dlmFjcA==
+ version "1.0.30001299"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz#d753bf6444ed401eb503cbbe17aa3e1451b5a68c"
+ integrity sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==
capture-exit@^2.0.0:
version "2.0.0"
@@ -4583,7 +4558,7 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-core-js-compat@^3.18.0, core-js-compat@^3.19.1:
+core-js-compat@^3.20.0, core-js-compat@^3.20.2:
version "3.20.2"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.2.tgz#d1ff6936c7330959b46b2e08b122a8b14e26140b"
integrity sha512-qZEzVQ+5Qh6cROaTPFLNS4lkvQ6mBzE3R6A6EEpssj7Zr2egMHgsy4XapdifqJDGC9CBiNv7s+ejI96rLNQFdg==
@@ -5025,9 +5000,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.17:
- version "1.4.38"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.38.tgz#10ea58d73d36b13e78d5024f3b74a352d3958d01"
- integrity sha512-WhHt3sZazKj0KK/UpgsbGQnUUoFeAHVishzHFExMxagpZgjiGYSC9S0ZlbhCfSH2L2i+2A1yyqOIliTctMx7KQ==
+ version "1.4.46"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.46.tgz#c88a6fedc766589826db0481602a888864ade1ca"
+ integrity sha512-UtV0xUA/dibCKKP2JMxOpDtXR74zABevuUEH4K0tvduFSIoxRVcYmQsbB51kXsFTX8MmOyWMt8tuZAlmDOqkrQ==
elliptic@^6.5.3:
version "6.5.4"
@@ -5077,17 +5052,17 @@ ember-auto-import@^1.11.3:
walk-sync "^0.3.3"
webpack "^4.43.0"
-ember-auto-import@^2.2.0, ember-auto-import@^2.2.4:
- version "2.2.4"
- resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.4.tgz#68c08cb0b7533293024c97387fc449b00561185a"
- integrity sha512-iXHH+bSMP/uWvJmIhjt+PZz4ymqOLccIxZUouVcUFLKA5EAWE7gamlA684m0pIbSE/V9zKpOul4OfIgKXFprBg==
+ember-auto-import@^2.2.0, ember-auto-import@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.3.0.tgz#ffb05e11322ea041d73cddee7c7d804ffe130913"
+ integrity sha512-38fOQ8ix3IQfFZHg99xQh/rJ1JwOhl2egauYXpCmFKdNm45rkRap3HDhkA4JtO532R7KEkaloU9Bj0oEUv520w==
dependencies:
- "@babel/core" "^7.1.6"
- "@babel/plugin-proposal-class-properties" "^7.13.0"
- "@babel/plugin-proposal-decorators" "^7.13.5"
- "@babel/preset-env" "^7.10.2"
- "@babel/traverse" "^7.1.6"
- "@embroider/shared-internals" "^0.40.0"
+ "@babel/core" "^7.16.7"
+ "@babel/plugin-proposal-class-properties" "^7.16.7"
+ "@babel/plugin-proposal-decorators" "^7.16.7"
+ "@babel/preset-env" "^7.16.7"
+ "@embroider/macros" "^0.50.0"
+ "@embroider/shared-internals" "^0.50.0"
babel-loader "^8.0.6"
babel-plugin-ember-modules-api-polyfill "^3.5.0"
babel-plugin-htmlbars-inline-precompile "^5.2.1"
@@ -5099,21 +5074,18 @@ ember-auto-import@^2.2.0, ember-auto-import@^2.2.4:
broccoli-source "^3.0.0"
css-loader "^5.2.0"
debug "^4.3.1"
- ember-cli-babel "^7.0.0"
fs-extra "^6.0.1"
fs-tree-diff "^2.0.0"
handlebars "^4.3.1"
js-string-escape "^1.0.1"
lodash "^4.17.19"
- mkdirp "^0.5.1"
parse5 "^6.0.1"
resolve "^1.20.0"
resolve-package-path "^3.1.0"
- rimraf "^2.6.2"
semver "^7.3.4"
style-loader "^2.0.0"
typescript-memoize "^1.0.0-alpha.3"
- walk-sync "^0.3.3"
+ walk-sync "^3.0.0"
"ember-cli-3.16@npm:ember-cli@~3.16.0":
version "3.16.2"
@@ -5465,12 +5437,12 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-
semver "^5.5.0"
"ember-cli-beta@npm:ember-cli@beta":
- version "4.1.0-beta.1"
- resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.1.0-beta.1.tgz#f22e10ea0a4e8566ca0e52c2c9d093114ebc07d8"
- integrity sha512-J0+EXOtW/ynNrCvbPyjaS40ol+1WBAYXFyTGXVEOGnGeoMBJnuMHQjdNFGEscYX9xeeg8rGXxcP3SLli88gugw==
+ version "4.2.0-beta.1"
+ resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.2.0-beta.1.tgz#d085103222e270ddcd2cd78f5a2871f6fb9896c1"
+ integrity sha512-UMPKFM/Imge0XMEIfGI6OjiV86SN0/tmwwj2orml5nOHZC+2YprsR4WQgQFmVQzEp/+kU1erssldRsOqKya40A==
dependencies:
- "@babel/core" "^7.16.0"
- "@babel/plugin-transform-modules-amd" "^7.12.1"
+ "@babel/core" "^7.16.7"
+ "@babel/plugin-transform-modules-amd" "^7.16.7"
amd-name-resolver "^1.3.1"
babel-plugin-module-resolver "^4.1.0"
bower-config "^1.4.3"
@@ -5510,7 +5482,7 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-
ensure-posix-path "^1.1.1"
execa "^5.1.1"
exit "^0.1.2"
- express "^4.17.1"
+ express "^4.17.2"
filesize "^8.0.6"
find-up "^5.0.0"
find-yarn-workspace-root "^2.0.0"
@@ -5552,7 +5524,7 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-
sort-package-json "^1.49.0"
symlink-or-copy "^1.3.1"
temp "0.9.4"
- testem "^3.2.0"
+ testem "^3.6.0"
tiny-lr "^2.0.0"
tree-sync "^2.1.0"
uuid "^8.3.2"
@@ -6134,11 +6106,11 @@ ember-router-generator@^2.0.0:
silent-error "^1.1.1"
"ember-source-canary@npm:ember-source@alpha":
- version "4.2.0-alpha.7"
- resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-4.2.0-alpha.7.tgz#6f3c1084d3167875ab8427c63cc35abfeb482a61"
- integrity sha512-K14HdythDGHS/WCRYhapXdADfoZFruPuy627WylZrYpX5xGx1vPOIp1sFWdYkDS73urNEL0W2p8NVd62+/y7GQ==
+ version "4.3.0-alpha.1"
+ resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-4.3.0-alpha.1.tgz#77c05e6596cb860e4a62da90e8215dbc9f66651e"
+ integrity sha512-K9/T4SbjTSOcaYr4gJgw6OOnNaWC//8fexfbhVrSVMXOG5AJF4jgy7n+O8yFuDDJL4LEnc3rulYScipfEKQHKQ==
dependencies:
- "@babel/helper-module-imports" "^7.16.0"
+ "@babel/helper-module-imports" "^7.16.7"
"@babel/plugin-transform-block-scoping" "^7.16.0"
"@ember/edition-utils" "^1.2.0"
"@glimmer/vm-babel-plugins" "0.83.1"
@@ -6147,7 +6119,7 @@ ember-router-generator@^2.0.0:
broccoli-concat "^4.2.5"
broccoli-debug "^0.6.4"
broccoli-file-creator "^2.1.1"
- broccoli-funnel "^2.0.2"
+ broccoli-funnel "^3.0.8"
broccoli-merge-trees "^4.2.0"
chalk "^4.0.0"
ember-auto-import "^2.2.0"
@@ -6157,7 +6129,7 @@ ember-router-generator@^2.0.0:
ember-cli-normalize-entity-name "^1.0.0"
ember-cli-path-utils "^1.0.0"
ember-cli-string-utils "^1.1.0"
- ember-cli-version-checker "^5.1.1"
+ ember-cli-version-checker "^5.1.2"
ember-router-generator "^2.0.0"
inflection "^1.13.1"
resolve "^1.17.0"
@@ -6352,9 +6324,9 @@ engine.io-parser@~5.0.0:
base64-arraybuffer "~1.0.1"
engine.io@~6.1.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.1.0.tgz#459eab0c3724899d7b63a20c3a6835cf92857939"
- integrity sha512-ErhZOVu2xweCjEfYcTdkCnEYUiZgkAcBBAhW4jbIvNG8SLU3orAqoJCiytZjYF7eTpVmmCrLDjLIEaPlUAs1uw==
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.1.1.tgz#2e87680feedabe380e506594f5bfd34cde955d87"
+ integrity sha512-AyMc20q8JUUdvKd46+thc9o7yCZ6iC6MoBCChG5Z1XmFMpp+2+y/oKvwpZTUJB0KCjxScw1dV9c2h5pjiYBLuQ==
dependencies:
"@types/cookie" "^0.4.1"
"@types/cors" "^2.8.12"
@@ -6838,7 +6810,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
dependencies:
homedir-polyfill "^1.0.1"
-express@^4.10.7, express@^4.16.4, express@^4.17.1:
+express@^4.10.7, express@^4.16.4, express@^4.17.1, express@^4.17.2:
version "4.17.2"
resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3"
integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==
@@ -6932,21 +6904,10 @@ fast-diff@^1.1.2:
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-fast-glob@^3.0.3, fast-glob@^3.1.1:
- version "3.2.9"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.9.tgz#8f55f664b68a236bd29fa165817fc44f2b11faba"
- integrity sha512-MBwILhhD92sziIrMQwpqcuGERF+BH99ei2a3XsGJuqEKcSycAL+w0HWokFenZXona+kjFr82Lf71eTxNRC06XQ==
- dependencies:
- "@nodelib/fs.stat" "^2.0.2"
- "@nodelib/fs.walk" "^1.2.3"
- glob-parent "^5.1.2"
- merge2 "^1.3.0"
- micromatch "^4.0.4"
-
-fast-glob@^3.2.9:
- version "3.2.10"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.10.tgz#2734f83baa7f43b7fd41e13bc34438f4ffe284ee"
- integrity sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==
+fast-glob@^3.0.3, fast-glob@^3.2.9:
+ version "3.2.11"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+ integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
@@ -7278,9 +7239,9 @@ flush-write-stream@^1.0.0:
readable-stream "^2.3.6"
follow-redirects@^1.0.0:
- version "1.14.6"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd"
- integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==
+ version "1.14.7"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+ integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
for-in@^1.0.2:
version "1.0.2"
@@ -7729,19 +7690,7 @@ globby@^10.0.1:
merge2 "^1.2.3"
slash "^3.0.0"
-globby@^11.0.3:
- version "11.0.4"
- resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
- integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
- dependencies:
- array-union "^2.1.0"
- dir-glob "^3.0.1"
- fast-glob "^3.1.1"
- ignore "^5.1.4"
- merge2 "^1.3.0"
- slash "^3.0.0"
-
-globby@^11.0.4:
+globby@^11.0.3, globby@^11.0.4:
version "11.1.0"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -7798,7 +7747,7 @@ got@^8.0.1:
url-parse-lax "^3.0.0"
url-to-options "^1.0.1"
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
version "4.2.9"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
@@ -8136,7 +8085,7 @@ ignore@^4.0.6:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0:
+ignore@^5.1.1, ignore@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -9326,9 +9275,9 @@ markdown-it@^11.0.0:
uc.micro "^1.0.5"
markdown-it@^12.0.2, markdown-it@^12.0.4:
- version "12.3.1"
- resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.1.tgz#f9d51948202590215f4f6cf96d605a480b950e46"
- integrity sha512-xu6ZyQc/W1mWRwBOZT5ePVVn77MhHYkWwiAMgy/oBwUwSD2fS5xND3oIN44RCqVMgpNbhKtzZs9B75mC7FHwTQ==
+ version "12.3.2"
+ resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+ integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
dependencies:
argparse "^2.0.1"
entities "~2.1.0"
@@ -9693,9 +9642,9 @@ nan@^2.12.1:
integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
nanoid@^3.1.30:
- version "3.1.30"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
- integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
+ version "3.1.32"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.32.tgz#8f96069e6239cc0a9ae8c0d3b41a3b4933a88c0a"
+ integrity sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==
nanomatch@^1.2.9:
version "1.2.13"
@@ -10641,9 +10590,9 @@ qs@6.9.6:
integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
qs@^6.4.0:
- version "6.10.2"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"
- integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==
+ version "6.10.3"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+ integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
dependencies:
side-channel "^1.0.4"
@@ -10885,9 +10834,9 @@ regex-not@^1.0.0, regex-not@^1.0.2:
safe-regex "^1.1.0"
regexp.prototype.flags@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
- integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307"
+ integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==
dependencies:
call-bind "^1.0.2"
define-properties "^1.1.3"
@@ -11160,9 +11109,9 @@ rollup-plugin-delete@^2.0.0:
del "^5.1.0"
rollup@^2.63.0:
- version "2.63.0"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.63.0.tgz#fe2f7fec2133f3fab9e022b9ac245628d817c6bb"
- integrity sha512-nps0idjmD+NXl6OREfyYXMn/dar3WGcyKn+KBzPdaLecub3x/LrId0wUcthcr8oZUAcZAR8NKcfGGFlNgGL1kQ==
+ version "2.64.0"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.64.0.tgz#f0f59774e21fbb56de438a37d06a2189632b207a"
+ integrity sha512-+c+lbw1lexBKSMb1yxGDVfJ+vchJH3qLbmavR+awDinTDA2C5Ug9u7lkOzj62SCu0PKUExsW36tpgW7Fmpn3yQ==
optionalDependencies:
fsevents "~2.3.2"
@@ -12105,7 +12054,7 @@ terser@^5.3.0, terser@^5.7.0, terser@^5.7.2:
source-map "~0.7.2"
source-map-support "~0.5.20"
-testem@^3.0.1, testem@^3.1.0, testem@^3.2.0:
+testem@^3.0.1, testem@^3.1.0, testem@^3.2.0, testem@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/testem/-/testem-3.6.0.tgz#bf5c86944bafd035c18f41f520195cce5eef33a8"
integrity sha512-sXwx2IlOadOhrKf0hsV1Yt/yuYhdfrtJ4dpp7T6pFN62GjMyKifjAv2SFm+4zYHee1JwxheO7JUL0+3iN0rlHw==
@@ -12824,9 +12773,9 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
source-map "~0.6.1"
webpack-sources@^3.2.2:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260"
- integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+ integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
webpack@^4.43.0:
version "4.46.0"
@@ -12858,9 +12807,9 @@ webpack@^4.43.0:
webpack-sources "^1.4.1"
webpack@^5.65.0:
- version "5.65.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.65.0.tgz#ed2891d9145ba1f0d318e4ea4f89c3fa18e6f9be"
- integrity sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==
+ version "5.66.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.66.0.tgz#789bf36287f407fc92b3e2d6f978ddff1bfc2dbb"
+ integrity sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==
dependencies:
"@types/eslint-scope" "^3.7.0"
"@types/estree" "^0.0.50"
@@ -12876,7 +12825,7 @@ webpack@^5.65.0:
eslint-scope "5.1.1"
events "^3.2.0"
glob-to-regexp "^0.4.1"
- graceful-fs "^4.2.4"
+ graceful-fs "^4.2.9"
json-parse-better-errors "^1.0.2"
loader-runner "^4.2.0"
mime-types "^2.1.27"
From 06c7f3abd84586e9b0ede776d11a04f2088c5b7f Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Sat, 15 Jan 2022 02:14:42 -0500
Subject: [PATCH 24/25] fix devdep sync
---
test-app/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-app/package.json b/test-app/package.json
index 25c3c453..3ae81bb8 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -20,7 +20,7 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
- "@embroider/test-setup": "^0.50.0",
+ "@embroider/test-setup": "npm:@embroider/test-setup@latest",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
From 18ec84928d9fcaf6a3adeb1f61cb37d6bff13850 Mon Sep 17 00:00:00 2001
From: Edward Faulkner
Date: Sat, 15 Jan 2022 02:55:33 -0500
Subject: [PATCH 25/25] documentation
---
CHANGELOG.md | 6 +++
README.md | 109 +++++++++++++++++++++++++++++----------------------
2 files changed, 69 insertions(+), 46 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a880be0..cf14d79f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### master
+
+ * [BREAKING] This addon no longer provides the `moment` library itself. Apps should depend directly on *either* `moment` or `moment-timezone` and import it via `ember-auto-import`. Apps should make sure to remove any dependencies on `ember-cli-moment-shim`. See "Using Moment in Ember Apps & Addons" in the README.
+ * [BREAKING] This is a v2 addon so your app must have `ember-auto-import` >= 2.
+ * [BREAKING] `includeTimezone`, `includeLocales`, and `localeOutputPath` options in `config/environment.js` are removed, since this addon is no longer responsible for providing `moment`.
+
### 9.0.1
* @jfdnc fix error related to not having `defaultFormat` configured #363
diff --git a/README.md b/README.md
index 1e43e033..11f2e69f 100644
--- a/README.md
+++ b/README.md
@@ -5,49 +5,6 @@
[moment.js](http://momentjs.com) template helpers for Ember.js
-## The State of Moment in Ember Apps & Addons
-
-Historically, multiple addons including `ember-moment` pushed their own copy of `moment` and/or `moment-timezone` into your app. This makes it hard to guarantee that an app won't get multiple copies and that the app will have control over the exact locale and timezone data included in those copies. Since moment is quite large, this can have an outsized negative impact.
-
-Instead, we now instruct apps to directly depend on `moment` (or `moment-timzeone`) and import it directly (via `ember-auto-import`, which is included in the default Ember app blueprint). Addons like `ember-moment` can use `peerDependencies` to guarantee that they are sharing the same `moment` (or `moment-timezone`) as the app. An addon that wants to depend on `ember-moment` should likewise declare a `peerDependency` on `moment` so the app's copy of `moment` is available to both the addon and `ember-moment`.
-
-Apps should configure their locale and timezone support (which can have a large impact on bundle size) by following Moment's documentation about Webpack:
-
- - https://momentjs.com/docs/#/use-it/webpack/
- - https://momentjs.com/timezone/docs/#/use-it/webpack/
-
-and passing the resulting webpack configuration to either ember-auto-import or Embroider. For example:
-
-```js
-const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
-const MomentTimezoneDataPlugin = require('moment-timezone-data-webpack-plugin');
-
-module.exports = function (defaults) {
- let app = new EmberApp(defaults, {
- autoImport: {
- webpack: {
- plugins: [
- // This example config cuts 390kB of Javascript from the production build.
-
- new MomentLocalesPlugin({
- // 'en' is built into moment and cannot be removed. This strips the others.
- localesToKeep: [],
- }),
-
- new MomentTimezoneDataPlugin({
- // Keep timezone data for the US, covering all possible years.
- matchCountries: 'US',
- }),
- ],
- },
- },
- });
-```
-
-You should make sure there are no copies of `ember-cli-moment-shim` in your dependencies, it will force a redundant copy into your app.
-
-Moment itself is no longer actively developed and new projects should not add it. You can look at alternative libraries like Luxon, or better yet keep an eye on [Temporal](https://github.com/tc39/proposal-temporal) which is likely to add moment-like capabilities directly to Javascript quite soon.
-
## Compatibility
* Ember.js v3.16 or above
@@ -59,6 +16,7 @@ Moment itself is no longer actively developed and new projects should not add it
+- [Using Moment in Ember Apps](#using-moment)
- [Installing](#installing)
- [Usage](#usage)
- [Helpers](#helpers)
@@ -93,15 +51,74 @@ Moment itself is no longer actively developed and new projects should not add it
- [Docs to add](#docs-to-add)
-## Installing
+## Using Moment.js in Ember Apps & Addons
+
+This addon provides Ember-specific Helpers and a Service that make it convenient to use Moment.js in your templates. If you just want to call Moment.js directly from Javascript, you don't need this addon.
+
+The recommended way to use Moment.js in an Ember **app** is:
+
+1. Add *either* `moment` or `moment-timezone` to your dependencies.
+2. Make sure you have `ember-auto-import` in your dependencies.
+3. Make sure you *don't* have `ember-cli-moment-shim` in your dependencies (it would add a redundant copy).
+3. Use imports in your Javascript like `import moment from 'moment'` or `import moment from 'moment-timezone'`.
+4. *Optional but strongly recommended*: Configure which locales and timezones will be included in your app by following the instructions below in "Controlling Locale and Timezone Data".
+
+The recommended way to use Moment.js in an Ember **addon** is:
-`ember install ember-moment`
+1. Add either `moment` or `moment-timezone` to your `peerDependencies`. This ensures that your addon and the app must use the same copy.
+2. Also add it to your `devDependencies` so your own test suite satisfies the peerDep.
+3. Make sure you *don't* depend on `ember-cli-moment-shim`.
+4. Make sure you do depend on `ember-auto-import`.
+
+
+Moment itself is no longer actively developed and new projects should not add it. You can look at alternative libraries like Luxon, or better yet keep an eye on [Temporal](https://github.com/tc39/proposal-temporal) which is likely to add moment-like capabilities directly to Javascript quite soon.
+
+## Controlling Locale and Timezone Data
+
+Apps should configure their locale and timezone support (which can have a large impact on bundle size) by following Moment's documentation about Webpack:
+
+ - https://momentjs.com/docs/#/use-it/webpack/
+ - https://momentjs.com/timezone/docs/#/use-it/webpack/
+
+and passing the resulting webpack configuration to either ember-auto-import or Embroider. For example:
+
+```js
+const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
+const MomentTimezoneDataPlugin = require('moment-timezone-data-webpack-plugin');
+
+module.exports = function (defaults) {
+ let app = new EmberApp(defaults, {
+ autoImport: {
+ webpack: {
+ plugins: [
+ new MomentLocalesPlugin({
+ // 'en' is built into moment and cannot be removed. This strips the others.
+ localesToKeep: [],
+ }),
+
+ new MomentTimezoneDataPlugin({
+ // Keep timezone data for the US, covering all possible years.
+ matchCountries: 'US',
+ }),
+ ],
+ },
+ },
+ });
+```
+
+
+
+## Installing or Upgrading ember-moment
+
+1. First, install Moment.js using the instructions above.
+2. Then you can install ember-moment: `ember install ember-moment`
Compatibility:
+ - Ember Octane+ : >= v9 // the [default](https://github.com/adopted-ember-addons/ember-moment/tree/master) branch
- Ember Classic : < v9 // the [ember-classic](https://github.com/adopted-ember-addons/ember-moment/tree/ember-classic) branch.
the `ember-classic` branch is in maintenance mode, and will only receive bugfixes
- - Ember Octane+ : >= v9 // the [default](https://github.com/adopted-ember-addons/ember-moment/tree/master) branch
+
## Usage