From 9b506075cb2eea8eb73aa4b2e78e0b0fefebcdaf Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Wed, 24 Apr 2024 13:51:08 +0200 Subject: [PATCH 1/3] Resolve some issues with `babel-plugin-ember-template-compilation v2.2.2` The v2.2.2+ releases breaks our ember-template-imports v3 based setup. We need to update to v4 to fix those and also fix the scope issues we accidentally depended on. ember-template-imports v4 also requires some extra babel configuration to ensure component imports aren't stripped out. This is the same setup that the v2 blueprint uses as well. --- addon/components/au-icon.gts | 2 +- index.js | 13 +- package-lock.json | 249 ++++++++++++++---- package.json | 4 +- .../modifiers/au-date-input-test.gts | 4 +- 5 files changed, 209 insertions(+), 63 deletions(-) diff --git a/addon/components/au-icon.gts b/addon/components/au-icon.gts index b67c72831..3549170b7 100644 --- a/addon/components/au-icon.gts +++ b/addon/components/au-icon.gts @@ -1,6 +1,6 @@ import { getOwner } from '@ember/owner'; import Component from '@glimmer/component'; -import { type ComponentLike } from '@glint/template'; +import type { ComponentLike } from '@glint/template'; export interface AuIconSignature { Args: { diff --git a/index.js b/index.js index 60b601150..f7d8dd4e5 100644 --- a/index.js +++ b/index.js @@ -6,7 +6,18 @@ module.exports = { options: { babel: { // This is needed for dynamic imports to work: https://github.com/ef4/ember-auto-import#installing-ember-auto-import-in-an-addon - plugins: [require.resolve('ember-auto-import/babel-plugin')], + plugins: [ + require.resolve('ember-auto-import/babel-plugin'), + // Copied from the v2 addon blueprint: https://github.com/embroider-build/addon-blueprint/blob/eef35575e7130ffe3b588ecd83c637f35fa56220/files/__addonLocation__/babel.config.json#L3 + [ + '@babel/plugin-transform-typescript', + { + allExtensions: true, + onlyRemoveTypeImports: true, + allowDeclareFields: true, + }, + ], + ], }, 'ember-cli-babel': { enableTypeScriptTransform: true }, }, diff --git a/package-lock.json b/package-lock.json index 7732af73b..6d7482003 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "ember-file-upload": "^8.4.0", "ember-focus-trap": "^1.1.0", "ember-modifier": "^4.1.0", - "ember-template-imports": "^3.4.2", + "ember-template-imports": "^4.1.1", "ember-test-selectors": "^6.0.0", "ember-truth-helpers": "^3.1.1 || ^4.0.3", "inputmask": "^5.0.9-beta.45", @@ -3384,9 +3384,9 @@ } }, "node_modules/@embroider/addon-shim/node_modules/babel-import-util": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.1.tgz", - "integrity": "sha512-N1ZfNprtf/37x0R05J0QCW/9pCAcuI+bjZIK9tlu0JEkwEST7ssdD++gxHRbD58AiG5QE5OuNYhRoEFsc1wESw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.3.tgz", + "integrity": "sha512-Bo3kHO12Zf846FA9/Riqmrm1OasWf81uD1QXJJ02q6pDSWTIIeESrr7cWgKUGvtuJOEjw8XjR48pWKC4gIdK0g==", "engines": { "node": ">= 12.*" } @@ -3534,9 +3534,9 @@ } }, "node_modules/@embroider/macros/node_modules/babel-import-util": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.1.tgz", - "integrity": "sha512-N1ZfNprtf/37x0R05J0QCW/9pCAcuI+bjZIK9tlu0JEkwEST7ssdD++gxHRbD58AiG5QE5OuNYhRoEFsc1wESw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.3.tgz", + "integrity": "sha512-Bo3kHO12Zf846FA9/Riqmrm1OasWf81uD1QXJJ02q6pDSWTIIeESrr7cWgKUGvtuJOEjw8XjR48pWKC4gIdK0g==", "engines": { "node": ">= 12.*" } @@ -5179,6 +5179,58 @@ } } }, + "node_modules/@glint/environment-ember-template-imports/node_modules/babel-import-util": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-0.2.0.tgz", + "integrity": "sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==", + "dev": true, + "engines": { + "node": ">= 12.*" + } + }, + "node_modules/@glint/environment-ember-template-imports/node_modules/ember-template-imports": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/ember-template-imports/-/ember-template-imports-3.4.2.tgz", + "integrity": "sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==", + "dev": true, + "dependencies": { + "babel-import-util": "^0.2.0", + "broccoli-stew": "^3.0.0", + "ember-cli-babel-plugin-helpers": "^1.1.1", + "ember-cli-version-checker": "^5.1.2", + "line-column": "^1.0.2", + "magic-string": "^0.25.7", + "parse-static-imports": "^1.1.0", + "string.prototype.matchall": "^4.0.6", + "validate-peer-dependencies": "^1.1.0" + }, + "engines": { + "node": "12.* || >= 14" + } + }, + "node_modules/@glint/environment-ember-template-imports/node_modules/resolve-package-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz", + "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==", + "dev": true, + "dependencies": { + "path-root": "^0.1.1", + "resolve": "^1.17.0" + }, + "engines": { + "node": "10.* || >= 12" + } + }, + "node_modules/@glint/environment-ember-template-imports/node_modules/validate-peer-dependencies": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz", + "integrity": "sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==", + "dev": true, + "dependencies": { + "resolve-package-path": "^3.1.0", + "semver": "^7.3.2" + } + }, "node_modules/@glint/template": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@glint/template/-/template-1.3.0.tgz", @@ -14012,21 +14064,21 @@ } }, "node_modules/babel-plugin-ember-template-compilation": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.2.0.tgz", - "integrity": "sha512-1I7f5gf06h5wKdKUvaYEIaoSFur5RLUvTMQG4ak0c5Y11DWUxcoX9hrun1xe9fqfY2dtGFK+ZUM6sn6z8sqK/w==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.2.5.tgz", + "integrity": "sha512-NQ2DT0DsYyHVrEpFQIy2U8S91JaKSE8NOSZzMd7KZFJVgA6KodJq3Uj852HcH9LsSfvwppnM+dRo1G8bzTnnFw==", "dependencies": { "@glimmer/syntax": "^0.84.3", - "babel-import-util": "^2.0.0" + "babel-import-util": "^3.0.0" }, "engines": { "node": ">= 12.*" } }, "node_modules/babel-plugin-ember-template-compilation/node_modules/babel-import-util": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.1.tgz", - "integrity": "sha512-N1ZfNprtf/37x0R05J0QCW/9pCAcuI+bjZIK9tlu0JEkwEST7ssdD++gxHRbD58AiG5QE5OuNYhRoEFsc1wESw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-3.0.0.tgz", + "integrity": "sha512-4YNPkuVsxAW5lnSTa6cn4Wk49RX6GAB6vX+M6LqEtN0YePqoFczv1/x0EyLK/o+4E1j9jEuYj5Su7IEPab5JHQ==", "engines": { "node": ">= 12.*" } @@ -19859,9 +19911,9 @@ } }, "node_modules/ember-auto-import/node_modules/babel-import-util": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.1.tgz", - "integrity": "sha512-N1ZfNprtf/37x0R05J0QCW/9pCAcuI+bjZIK9tlu0JEkwEST7ssdD++gxHRbD58AiG5QE5OuNYhRoEFsc1wESw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.3.tgz", + "integrity": "sha512-Bo3kHO12Zf846FA9/Riqmrm1OasWf81uD1QXJJ02q6pDSWTIIeESrr7cWgKUGvtuJOEjw8XjR48pWKC4gIdK0g==", "engines": { "node": ">= 12.*" } @@ -29208,52 +29260,22 @@ } }, "node_modules/ember-template-imports": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/ember-template-imports/-/ember-template-imports-3.4.2.tgz", - "integrity": "sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ember-template-imports/-/ember-template-imports-4.1.1.tgz", + "integrity": "sha512-mnbL3hjo/Ctg7rkBtuYkBRJUn5bDYRQCEZQxmNozRnfoEp2RLSbT6SFJRAFDYXT2OrY+8i821S4kPL1i0QuGIw==", "dependencies": { - "babel-import-util": "^0.2.0", "broccoli-stew": "^3.0.0", - "ember-cli-babel-plugin-helpers": "^1.1.1", - "ember-cli-version-checker": "^5.1.2", - "line-column": "^1.0.2", - "magic-string": "^0.25.7", - "parse-static-imports": "^1.1.0", - "string.prototype.matchall": "^4.0.6", - "validate-peer-dependencies": "^1.1.0" - }, - "engines": { - "node": "12.* || >= 14" - } - }, - "node_modules/ember-template-imports/node_modules/babel-import-util": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-0.2.0.tgz", - "integrity": "sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==", - "engines": { - "node": ">= 12.*" - } - }, - "node_modules/ember-template-imports/node_modules/resolve-package-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz", - "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==", - "dependencies": { - "path-root": "^0.1.1", - "resolve": "^1.17.0" + "content-tag": "^2.0.1", + "ember-cli-version-checker": "^5.1.2" }, "engines": { - "node": "10.* || >= 12" + "node": "16.* || >= 18" } }, - "node_modules/ember-template-imports/node_modules/validate-peer-dependencies": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz", - "integrity": "sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==", - "dependencies": { - "resolve-package-path": "^3.1.0", - "semver": "^7.3.2" - } + "node_modules/ember-template-imports/node_modules/content-tag": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/content-tag/-/content-tag-2.0.1.tgz", + "integrity": "sha512-jxsETSDs5NbNwyiDuIp672fUMhUyu8Qxc5MOBOJOcgW/fQESI6o5K1LBDrnEE7Bh810a685lWEZHTF4jQYGEEw==" }, "node_modules/ember-template-lint": { "version": "5.13.0", @@ -29305,6 +29327,15 @@ "dequal": "^2.0.3" } }, + "node_modules/ember-template-lint/node_modules/babel-import-util": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-0.2.0.tgz", + "integrity": "sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==", + "dev": true, + "engines": { + "node": ">= 12.*" + } + }, "node_modules/ember-template-lint/node_modules/braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -29356,6 +29387,26 @@ "node": ">=8" } }, + "node_modules/ember-template-lint/node_modules/ember-template-imports": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/ember-template-imports/-/ember-template-imports-3.4.2.tgz", + "integrity": "sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==", + "dev": true, + "dependencies": { + "babel-import-util": "^0.2.0", + "broccoli-stew": "^3.0.0", + "ember-cli-babel-plugin-helpers": "^1.1.1", + "ember-cli-version-checker": "^5.1.2", + "line-column": "^1.0.2", + "magic-string": "^0.25.7", + "parse-static-imports": "^1.1.0", + "string.prototype.matchall": "^4.0.6", + "validate-peer-dependencies": "^1.1.0" + }, + "engines": { + "node": "12.* || >= 14" + } + }, "node_modules/ember-template-lint/node_modules/fast-glob": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", @@ -29516,6 +29567,19 @@ "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, + "node_modules/ember-template-lint/node_modules/resolve-package-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz", + "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==", + "dev": true, + "dependencies": { + "path-root": "^0.1.1", + "resolve": "^1.17.0" + }, + "engines": { + "node": "10.* || >= 12" + } + }, "node_modules/ember-template-lint/node_modules/slash": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", @@ -29540,6 +29604,16 @@ "node": ">=8.0" } }, + "node_modules/ember-template-lint/node_modules/validate-peer-dependencies": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz", + "integrity": "sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==", + "dev": true, + "dependencies": { + "resolve-package-path": "^3.1.0", + "semver": "^7.3.2" + } + }, "node_modules/ember-template-lint/node_modules/yocto-queue": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", @@ -31819,6 +31893,44 @@ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, + "node_modules/eslint-plugin-ember/node_modules/babel-import-util": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-0.2.0.tgz", + "integrity": "sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==", + "dev": true, + "engines": { + "node": ">= 12.*" + } + }, + "node_modules/eslint-plugin-ember/node_modules/ember-template-imports": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/ember-template-imports/-/ember-template-imports-3.4.2.tgz", + "integrity": "sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==", + "dev": true, + "dependencies": { + "babel-import-util": "^0.2.0", + "broccoli-stew": "^3.0.0", + "ember-cli-babel-plugin-helpers": "^1.1.1", + "ember-cli-version-checker": "^5.1.2", + "line-column": "^1.0.2", + "magic-string": "^0.25.7", + "parse-static-imports": "^1.1.0", + "string.prototype.matchall": "^4.0.6", + "validate-peer-dependencies": "^1.1.0" + }, + "engines": { + "node": "12.* || >= 14" + } + }, + "node_modules/eslint-plugin-ember/node_modules/ember-template-imports/node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, "node_modules/eslint-plugin-ember/node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", @@ -31840,6 +31952,29 @@ "node": ">=12" } }, + "node_modules/eslint-plugin-ember/node_modules/resolve-package-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz", + "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==", + "dev": true, + "dependencies": { + "path-root": "^0.1.1", + "resolve": "^1.17.0" + }, + "engines": { + "node": "10.* || >= 12" + } + }, + "node_modules/eslint-plugin-ember/node_modules/validate-peer-dependencies": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz", + "integrity": "sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==", + "dev": true, + "dependencies": { + "resolve-package-path": "^3.1.0", + "semver": "^7.3.2" + } + }, "node_modules/eslint-plugin-es-x": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.5.0.tgz", diff --git a/package.json b/package.json index b8e9d0592..cb34b11a0 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "ember-file-upload": "^8.4.0", "ember-focus-trap": "^1.1.0", "ember-modifier": "^4.1.0", - "ember-template-imports": "^3.4.2", + "ember-template-imports": "^4.1.1", "ember-test-selectors": "^6.0.0", "ember-truth-helpers": "^3.1.1 || ^4.0.3", "inputmask": "^5.0.9-beta.45", @@ -214,6 +214,6 @@ } }, "volta": { - "node": "18.18.0" + "node": "18.20.2" } } diff --git a/tests/integration/modifiers/au-date-input-test.gts b/tests/integration/modifiers/au-date-input-test.gts index ebb0a0db7..3eb671fc9 100644 --- a/tests/integration/modifiers/au-date-input-test.gts +++ b/tests/integration/modifiers/au-date-input-test.gts @@ -67,9 +67,9 @@ module('Integration | Modifier | au-date-input', function (hooks) { , ); - const input = find('input'); + const inputElement = find('input'); - await clearInput(input!); + await clearInput(inputElement!); assert.verifySteps( ['true', 'true'], '`@onChange` returns `null` if the input is cleared', From 1fd83b69e7c03bb1f98ecbb43c135b6206309dc0 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Mon, 13 May 2024 09:17:57 +0200 Subject: [PATCH 2/3] Update to `@embroider/test-setup` v4 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d7482003..0741e7333 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^3.2.1", - "@embroider/test-setup": "^3.0.3", + "@embroider/test-setup": "^4.0.0", "@etchteam/storybook-addon-status": "^4.2.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -3780,9 +3780,9 @@ } }, "node_modules/@embroider/test-setup": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-3.0.3.tgz", - "integrity": "sha512-3K5KSyTdnxAkZQill6+TdC/XTRr6226LNwZMsrhRbBM0FFZXw2D8qmJSHPvZLheQx3A1jnF9t1lyrAzrKlg6Yw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-4.0.0.tgz", + "integrity": "sha512-1S3Ebk0CEh3XDqD93AWSwQZBCk+oGv03gtkaGgdgyXGIR7jrVyDgEnEuslN/hJ0cuU8TqhiXrzHMw7bJwIGhWw==", "dev": true, "dependencies": { "lodash": "^4.17.21", @@ -3792,9 +3792,9 @@ "node": "12.* || 14.* || >= 16" }, "peerDependencies": { - "@embroider/compat": "^3.3.0", - "@embroider/core": "^3.4.0", - "@embroider/webpack": "^3.2.1" + "@embroider/compat": "^3.4.8", + "@embroider/core": "^3.4.8", + "@embroider/webpack": "^4.0.0" }, "peerDependenciesMeta": { "@embroider/compat": { diff --git a/package.json b/package.json index cb34b11a0..c1bc16030 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^3.2.1", - "@embroider/test-setup": "^3.0.3", + "@embroider/test-setup": "^4.0.0", "@etchteam/storybook-addon-status": "^4.2.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", From 8360be70dd5b9bdba5956880a8af57d615d35516 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Mon, 13 May 2024 09:27:42 +0200 Subject: [PATCH 3/3] Update the Glint environment packages --- package-lock.json | 86 +++++++++++------------------------------------ package.json | 4 +-- 2 files changed, 22 insertions(+), 68 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0741e7333..b1474967b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,8 +38,8 @@ "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@glint/core": "^1.3.0", - "@glint/environment-ember-loose": "^1.3.0", - "@glint/environment-ember-template-imports": "^1.3.0", + "@glint/environment-ember-loose": "^1.4.0", + "@glint/environment-ember-template-imports": "^1.4.0", "@glint/template": "^1.3.0", "@storybook/addon-a11y": "^6.5.7", "@storybook/addon-actions": "^6.5.7", @@ -5109,13 +5109,13 @@ } }, "node_modules/@glint/environment-ember-loose": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@glint/environment-ember-loose/-/environment-ember-loose-1.3.0.tgz", - "integrity": "sha512-kURIttax2zG1oYniJ4bd3rhJRuP588Ld4YAG5EFzjg4s01oLQKpfNskxwSwox07PUkygm2D+9v3Foo2TlYJSSg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@glint/environment-ember-loose/-/environment-ember-loose-1.4.0.tgz", + "integrity": "sha512-vFR3qgPTisGzS36e04195wTUrtUc6GuVwm6hsC/XXx6PeRw/6rtMxhK08Aw/VtDc00UqQzM9sIEghPVKHwqVVQ==", "dev": true, "peerDependencies": { "@glimmer/component": "^1.1.2", - "@glint/template": "^1.3.0", + "@glint/template": "^1.4.0", "@types/ember__array": "^4.0.2", "@types/ember__component": "^4.0.10", "@types/ember__controller": "^4.0.2", @@ -5149,16 +5149,16 @@ } }, "node_modules/@glint/environment-ember-template-imports": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@glint/environment-ember-template-imports/-/environment-ember-template-imports-1.3.0.tgz", - "integrity": "sha512-ynSc3AeFE4ZocvjI4rTS55L5sSrMexMvRtOYbVuY/u9t0PGXDjFuH/OiRiSCbHIL/jYH5Ie5uASZxs7TTCT8dw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@glint/environment-ember-template-imports/-/environment-ember-template-imports-1.4.0.tgz", + "integrity": "sha512-VXcUgea92l7NFShU26rpQn+hYUZ7ex/rNtU9vnw2BAVZaPfxZROokW8ABj8aMaCUDe60CoMVZ1/QSeONSCln3w==", "dev": true, "dependencies": { - "ember-template-imports": "^3.0.0" + "content-tag": "^2.0.1" }, "peerDependencies": { - "@glint/environment-ember-loose": "^1.3.0", - "@glint/template": "^1.3.0", + "@glint/environment-ember-loose": "^1.4.0", + "@glint/template": "^1.4.0", "@types/ember__component": "^4.0.10", "@types/ember__helper": "^4.0.1", "@types/ember__modifier": "^4.0.3", @@ -5179,62 +5179,16 @@ } } }, - "node_modules/@glint/environment-ember-template-imports/node_modules/babel-import-util": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-0.2.0.tgz", - "integrity": "sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==", - "dev": true, - "engines": { - "node": ">= 12.*" - } - }, - "node_modules/@glint/environment-ember-template-imports/node_modules/ember-template-imports": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/ember-template-imports/-/ember-template-imports-3.4.2.tgz", - "integrity": "sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==", - "dev": true, - "dependencies": { - "babel-import-util": "^0.2.0", - "broccoli-stew": "^3.0.0", - "ember-cli-babel-plugin-helpers": "^1.1.1", - "ember-cli-version-checker": "^5.1.2", - "line-column": "^1.0.2", - "magic-string": "^0.25.7", - "parse-static-imports": "^1.1.0", - "string.prototype.matchall": "^4.0.6", - "validate-peer-dependencies": "^1.1.0" - }, - "engines": { - "node": "12.* || >= 14" - } - }, - "node_modules/@glint/environment-ember-template-imports/node_modules/resolve-package-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz", - "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==", - "dev": true, - "dependencies": { - "path-root": "^0.1.1", - "resolve": "^1.17.0" - }, - "engines": { - "node": "10.* || >= 12" - } - }, - "node_modules/@glint/environment-ember-template-imports/node_modules/validate-peer-dependencies": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz", - "integrity": "sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==", - "dev": true, - "dependencies": { - "resolve-package-path": "^3.1.0", - "semver": "^7.3.2" - } + "node_modules/@glint/environment-ember-template-imports/node_modules/content-tag": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/content-tag/-/content-tag-2.0.1.tgz", + "integrity": "sha512-jxsETSDs5NbNwyiDuIp672fUMhUyu8Qxc5MOBOJOcgW/fQESI6o5K1LBDrnEE7Bh810a685lWEZHTF4jQYGEEw==", + "dev": true }, "node_modules/@glint/template": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@glint/template/-/template-1.3.0.tgz", - "integrity": "sha512-FUfbXSyh+KnwUaMTG4skESPPYL6trwAIKOp9yMwDo+Uw4LxCJjQ9/RCAJTTXZ0/kiTHLr7S2P4vsIbHeorOvaA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@glint/template/-/template-1.4.0.tgz", + "integrity": "sha512-yD271NhLei/HSQ6utm6hKgoU+B5D5DY+B1irPvgI4KsDEcZI7v/INf5HAMJfzCg92bP1sIxSOuXu5DU6VsY7Mw==", "devOptional": true }, "node_modules/@handlebars/parser": { diff --git a/package.json b/package.json index c1bc16030..f6cfefe42 100644 --- a/package.json +++ b/package.json @@ -112,8 +112,8 @@ "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@glint/core": "^1.3.0", - "@glint/environment-ember-loose": "^1.3.0", - "@glint/environment-ember-template-imports": "^1.3.0", + "@glint/environment-ember-loose": "^1.4.0", + "@glint/environment-ember-template-imports": "^1.4.0", "@glint/template": "^1.3.0", "@storybook/addon-a11y": "^6.5.7", "@storybook/addon-actions": "^6.5.7",