From 4cda9f9d1bc463b3c2ce361326664c594aad67ca Mon Sep 17 00:00:00 2001 From: Ralph Mack Date: Tue, 9 Apr 2024 16:00:50 -0400 Subject: [PATCH 01/10] Bumped @embroider/webpack dependency from babel-preset-env to @babel/preset-env to address critical security audit. --- packages/webpack/package.json | 2 +- pnpm-lock.yaml | 942 ++++++++++++---------------------- 2 files changed, 333 insertions(+), 611 deletions(-) diff --git a/packages/webpack/package.json b/packages/webpack/package.json index ca5e3b4d3..1854dff84 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -19,13 +19,13 @@ "scripts": {}, "dependencies": { "@babel/core": "^7.14.5", + "@babel/preset-env": "^7.14.5", "@embroider/babel-loader-9": "workspace:*", "@embroider/hbs-loader": "workspace:*", "@embroider/shared-internals": "workspace:*", "@types/supports-color": "^8.1.0", "assert-never": "^1.2.1", "babel-loader": "^8.2.2", - "babel-preset-env": "^1.7.0", "css-loader": "^5.2.6", "csso": "^4.2.0", "debug": "^4.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 28ff7a638..750791d45 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -942,6 +942,9 @@ importers: '@babel/core': specifier: ^7.14.5 version: 7.23.9(supports-color@8.1.1) + '@babel/preset-env': + specifier: ^7.14.5 + version: 7.23.9(@babel/core@7.23.9)(supports-color@8.1.1) '@embroider/babel-loader-9': specifier: workspace:* version: link:../babel-loader-9 @@ -960,9 +963,6 @@ importers: babel-loader: specifier: ^8.2.2 version: 8.3.0(@babel/core@7.23.9)(webpack@5.90.3) - babel-preset-env: - specifier: ^1.7.0 - version: 1.7.0(supports-color@8.1.1) css-loader: specifier: ^5.2.6 version: 5.2.7(webpack@5.90.3) @@ -1150,7 +1150,7 @@ importers: version: 1.1.2(@babel/core@7.23.9) babel-preset-env: specifier: ^1.7.0 - version: 1.7.0(supports-color@8.1.1) + version: 1.7.0 broccoli: specifier: ^3.4.2 version: 3.5.2 @@ -1594,7 +1594,7 @@ importers: version: 3.1.1 '@ember/test-helpers-3': specifier: npm:@ember/test-helpers@^3.2.0 - version: /@ember/test-helpers@3.3.0(ember-source@3.28.12) + version: /@ember/test-helpers@3.2.0(ember-source@3.28.12) '@embroider/addon-shim': specifier: workspace:* version: link:../../packages/addon-shim @@ -1657,13 +1657,13 @@ importers: version: /ember-cli@4.4.1(lodash@4.17.21) ember-cli-beta: specifier: npm:ember-cli@beta - version: /ember-cli@5.7.0-beta.0(lodash@4.17.21) + version: /ember-cli@5.2.0-beta.0(lodash@4.17.21) ember-cli-fastboot: specifier: ^4.1.1 version: 4.1.2 ember-cli-latest: specifier: npm:ember-cli@latest - version: /ember-cli@5.6.0(lodash@4.17.21) + version: /ember-cli@5.1.0(lodash@4.17.21) ember-composable-helpers: specifier: ^4.4.1 version: 4.5.0 @@ -1687,7 +1687,7 @@ importers: version: 4.1.0(ember-source@3.28.12) ember-qunit-7: specifier: npm:ember-qunit@^7.0.0 - version: /ember-qunit@7.0.0(@ember/test-helpers@3.3.0)(ember-source@3.28.12)(qunit@2.20.1) + version: /ember-qunit@7.0.0(@ember/test-helpers@3.2.0)(ember-source@3.28.12)(qunit@2.20.1) ember-source: specifier: ~3.28.11 version: 3.28.12(@babel/core@7.23.9) @@ -1696,10 +1696,10 @@ importers: version: /ember-source@4.4.5(@babel/core@7.23.9) ember-source-beta: specifier: npm:ember-source@beta - version: /ember-source@5.7.0-beta.2(@babel/core@7.23.9) + version: /ember-source@5.2.0-beta.4(@babel/core@7.23.9) ember-source-latest: specifier: npm:ember-source@latest - version: /ember-source@5.6.0(@babel/core@7.23.9) + version: /ember-source@5.1.2(@babel/core@7.23.9) ember-truth-helpers: specifier: ^3.0.0 version: 3.1.1 @@ -1969,7 +1969,7 @@ importers: version: 10.1.1(@ember/string@3.1.1)(ember-source@5.1.2) ember-source: specifier: ~5.1.0 - version: 5.1.2(@babel/core@7.24.0)(@glimmer/component@1.1.2) + version: 5.1.2(@babel/core@7.24.0) ember-template-lint: specifier: ^5.10.3 version: 5.13.0 @@ -2175,7 +2175,7 @@ packages: resolution: {integrity: sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.9 + '@babel/types': 7.24.0 /@babel/helper-compilation-targets@7.23.6: resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==} @@ -2243,7 +2243,7 @@ packages: regexpu-core: 5.3.2 semver: 6.3.1 - /@babel/helper-define-polyfill-provider@0.5.0(@babel/core@7.23.9): + /@babel/helper-define-polyfill-provider@0.5.0(@babel/core@7.23.9)(supports-color@8.1.1): resolution: {integrity: sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 @@ -2415,8 +2415,8 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/helper-function-name': 7.23.0 - '@babel/template': 7.23.9 - '@babel/types': 7.23.9 + '@babel/template': 7.24.0 + '@babel/types': 7.24.0 /@babel/helpers@7.23.9(supports-color@8.1.1): resolution: {integrity: sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==} @@ -3172,7 +3172,7 @@ packages: dependencies: '@babel/core': 7.23.9(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.22.5 - '@babel/template': 7.23.9 + '@babel/template': 7.24.0 /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.24.0): resolution: {integrity: sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==} @@ -3182,7 +3182,7 @@ packages: dependencies: '@babel/core': 7.24.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/template': 7.23.9 + '@babel/template': 7.24.0 /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==} @@ -4161,6 +4161,97 @@ packages: transitivePeerDependencies: - supports-color + /@babel/preset-env@7.23.9(@babel/core@7.23.9)(supports-color@8.1.1): + resolution: {integrity: sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/compat-data': 7.23.5 + '@babel/core': 7.23.9(supports-color@8.1.1) + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-validator-option': 7.23.5 + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.7(@babel/core@7.23.9) + '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.9) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.9) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.9) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.9) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.9) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.9) + '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.9) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.9) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.9) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.9) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.9) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.9) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.9) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.9) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.9) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.9) + '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.9) + '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-async-generator-functions': 7.23.9(@babel/core@7.23.9) + '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.23.9) + '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.23.9) + '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-modules-systemjs': 7.23.9(@babel/core@7.23.9) + '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.9) + '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.23.9) + '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.9) + babel-plugin-polyfill-corejs2: 0.4.8(@babel/core@7.23.9)(supports-color@8.1.1) + babel-plugin-polyfill-corejs3: 0.9.0(@babel/core@7.23.9)(supports-color@8.1.1) + babel-plugin-polyfill-regenerator: 0.5.5(@babel/core@7.23.9)(supports-color@8.1.1) + core-js-compat: 3.36.0 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + dev: false + /@babel/preset-env@7.23.9(@babel/core@7.24.0): resolution: {integrity: sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==} engines: {node: '>=6.9.0'} @@ -4258,7 +4349,7 @@ packages: dependencies: '@babel/core': 7.23.9(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.22.5 - '@babel/types': 7.23.9 + '@babel/types': 7.24.0 esutils: 2.0.3 /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.0): @@ -4268,7 +4359,7 @@ packages: dependencies: '@babel/core': 7.24.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/types': 7.23.9 + '@babel/types': 7.24.0 esutils: 2.0.3 /@babel/regjsgen@0.8.0: @@ -4335,15 +4426,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/types@7.23.0: - resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-string-parser': 7.23.4 - '@babel/helper-validator-identifier': 7.22.20 - to-fast-properties: 2.0.0 - dev: true - /@babel/types@7.23.9: resolution: {integrity: sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==} engines: {node: '>=6.9.0'} @@ -5461,8 +5543,8 @@ packages: - supports-color dev: true - /@ember/test-helpers@3.3.0(@glint/template@1.3.0)(ember-source@5.3.0)(webpack@5.90.3): - resolution: {integrity: sha512-HEI28wtjnQuEj9+DstHUEEKPtqPAEVN9AAVr4EifVCd3DyEDy0m6hFT4qbap1WxAIktLja2QXGJg50lVWzZc5g==} + /@ember/test-helpers@3.2.0(ember-source@3.28.12): + resolution: {integrity: sha512-3yWpPsK5O77tUdCwW3HayrAcdlRitIRYMvLIG69Pkal1JMIGdNYVTvJ2R1lenhQh2syd/WFmGM07vQuDAtotQw==} engines: {node: 16.* || >= 18} peerDependencies: ember-source: ^4.0.0 || ^5.0.0 @@ -5472,18 +5554,17 @@ packages: '@simple-dom/interface': 1.4.0 broccoli-debug: 0.6.5 broccoli-funnel: 3.0.8 - dom-element-descriptors: 0.5.0 ember-auto-import: 2.7.2(@glint/template@1.3.0)(webpack@5.90.3) ember-cli-babel: 7.26.11 ember-cli-htmlbars: 6.3.0 - ember-source: 5.3.0(@babel/core@7.23.9)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3) + ember-source: 3.28.12(@babel/core@7.23.9) transitivePeerDependencies: - '@glint/template' - supports-color - webpack dev: true - /@ember/test-helpers@3.3.0(ember-source@3.28.12): + /@ember/test-helpers@3.3.0(@glint/template@1.3.0)(ember-source@5.3.0)(webpack@5.90.3): resolution: {integrity: sha512-HEI28wtjnQuEj9+DstHUEEKPtqPAEVN9AAVr4EifVCd3DyEDy0m6hFT4qbap1WxAIktLja2QXGJg50lVWzZc5g==} engines: {node: 16.* || >= 18} peerDependencies: @@ -5498,7 +5579,7 @@ packages: ember-auto-import: 2.7.2(@glint/template@1.3.0)(webpack@5.90.3) ember-cli-babel: 7.26.11 ember-cli-htmlbars: 6.3.0 - ember-source: 3.28.12(@babel/core@7.23.9) + ember-source: 5.3.0(@babel/core@7.23.9)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3) transitivePeerDependencies: - '@glint/template' - supports-color @@ -5520,7 +5601,7 @@ packages: ember-auto-import: 2.7.2(@glint/template@1.3.0)(webpack@5.90.3) ember-cli-babel: 7.26.11 ember-cli-htmlbars: 6.3.0 - ember-source: 5.1.2(@babel/core@7.24.0)(@glimmer/component@1.1.2) + ember-source: 5.1.2(@babel/core@7.24.0) transitivePeerDependencies: - '@glint/template' - supports-color @@ -5948,28 +6029,6 @@ packages: '@simple-dom/interface': 1.4.0 dev: true - /@glimmer/compiler@0.85.13: - resolution: {integrity: sha512-To8a+yScHAHE9/PpwuHyz2yYTBM2+m1Z6l4B9A6LgjkKeu0K7plv2c03V9JpsA3mMJBROJ1mfxOUuQsvTidEkg==} - engines: {node: '>= 16.0.0'} - dependencies: - '@glimmer/interfaces': 0.85.13 - '@glimmer/syntax': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/vm': 0.85.13 - '@glimmer/wire-format': 0.85.13 - dev: true - - /@glimmer/compiler@0.87.1: - resolution: {integrity: sha512-7qXrOv55cH/YW+Vs4dFkNJsNXAW/jP+7kZLhKcH8wCduPfBCQxb9HNh1lBESuFej2rCks6h9I1qXeZHkc/oWxQ==} - engines: {node: '>= 16.0.0'} - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/syntax': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/vm': 0.87.1 - '@glimmer/wire-format': 0.87.1 - dev: true - /@glimmer/component@1.1.2(@babel/core@7.23.9): resolution: {integrity: sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A==} engines: {node: 6.* || 8.* || >= 10.*} @@ -6015,22 +6074,6 @@ packages: - supports-color dev: true - /@glimmer/debug@0.85.13: - resolution: {integrity: sha512-BguKA6RXbCskyRHfJn+Tm/z0aBwefgYQ4RFz/0lVqYB3lJz8Oo02SDrtHQTwBMC9x/nF9GVA//60R4P47aryWg==} - dependencies: - '@glimmer/interfaces': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/vm': 0.85.13 - dev: true - - /@glimmer/debug@0.87.1: - resolution: {integrity: sha512-rja9/Hofv1NEjIqp8P2eQuHY3+orlS3BL4fbFyvrE+Pw4lRwQPLm6UdgCMHZGGe9yweZAGvNVH6CimDBq7biwA==} - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/vm': 0.87.1 - dev: true - /@glimmer/destroyable@0.84.2: resolution: {integrity: sha512-74L4+jlGUhzhUe87lTxjFdYEEfcDWcza+jqLXoyIb/p4cS0hWsTGlyF+OcuUbHO4yqJd4bXchGOVocoajmSp6w==} dependencies: @@ -6040,24 +6083,6 @@ packages: '@glimmer/util': 0.84.2 dev: true - /@glimmer/destroyable@0.85.13: - resolution: {integrity: sha512-fE3bhjDAzYsYQ+rm1qlu+6kP8f0CClHYynp1CWhskDc+qM0Jt7Up08htZK8/Ttaw7RXgi43Fe7FrQtOMUlrVlg==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.85.13 - '@glimmer/interfaces': 0.85.13 - '@glimmer/util': 0.85.13 - dev: true - - /@glimmer/destroyable@0.87.1: - resolution: {integrity: sha512-v9kdMq/FCSMcXK4gIKxPCSEcYXjDAnapKVY2o9fCgqky+mbpd0XuGoxaXa35nFwDk69L/9/8B3vXQOpa6ThikA==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.87.1 - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - dev: true - /@glimmer/di@0.1.11: resolution: {integrity: sha512-moRwafNDwHTnTHzyyZC9D+mUSvYrs1Ak0tRPjjmCghdoHHIvMshVbEnwKb/1WmW5CUlKc2eL9rlAV32n3GiItg==} @@ -6069,20 +6094,6 @@ packages: '@glimmer/vm': 0.84.2 dev: true - /@glimmer/encoder@0.85.13: - resolution: {integrity: sha512-GukVAeHxDAucbiExjl8lV8BYQXTkV2Co8IXnX5vKaomcZ+fwudGmvzbo2myq+WZ1llqnkZ45DVcqa9BVh9eNWg==} - dependencies: - '@glimmer/interfaces': 0.85.13 - '@glimmer/vm': 0.85.13 - dev: true - - /@glimmer/encoder@0.87.1: - resolution: {integrity: sha512-5oZEkdtYcAbkiWuXFQ8ofSEGH5uzqi86WK9/IXb7Qn4t6o7ixadWk8nhtORRpVS1u4FpAjhsAysnzRFoNqJwbQ==} - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/vm': 0.87.1 - dev: true - /@glimmer/env@0.1.7: resolution: {integrity: sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==} @@ -6104,14 +6115,6 @@ packages: '@glimmer/env': 0.1.7 dev: true - /@glimmer/global-context@0.85.13: - resolution: {integrity: sha512-JY/TQ+9dyukQVuTwKlF3jVXaWUwxx676KtclYf6SphtJQu2/mysxqj9XIAowOahhi9m7E7hzHkxAl9bm2FXXjQ==} - dev: true - - /@glimmer/global-context@0.87.1: - resolution: {integrity: sha512-Mitr7pBeVDTplFWlohyzxWLpFll7ffMZN+fnkBmUj8HiDLbD790Lb8lR9B2nL3t4RGnh6W9kDkCnZB+hvDm/eQ==} - dev: true - /@glimmer/interfaces@0.65.4: resolution: {integrity: sha512-R0kby79tGNKZOojVJa/7y0JH9Eq4SV+L1s6GcZy30QUZ1g1AAGS5XwCIXc9Sc09coGcv//q+6NLeSw7nlx1y4A==} dependencies: @@ -6129,24 +6132,6 @@ packages: dependencies: '@simple-dom/interface': 1.4.0 - /@glimmer/interfaces@0.85.13: - resolution: {integrity: sha512-qOEdvFgCQX1g+Gfi/nA2zbKYPmEkEbhFgzZ5esgmlQNOSQx4j8nyGiBvnG/vepHrh4wUzTvIynrCQpfr3SiKXg==} - dependencies: - '@simple-dom/interface': 1.4.0 - dev: true - - /@glimmer/interfaces@0.87.1: - resolution: {integrity: sha512-2lbwLY4Bt9i2SvwT4hhY0TgEYKhOMQBgYvRiraq2BYHwO8iLKh3lC8iO3d+rQ3VgDtQ9i/sP6HG848VNRyVHxA==} - dependencies: - '@simple-dom/interface': 1.4.0 - dev: true - - /@glimmer/interfaces@0.88.1: - resolution: {integrity: sha512-BOcN8xFNX/eppGxwS9Rm1+PlQaFX+tK91cuQLHj2sRwB+qVbL/WeutIa3AUQYr0VVEzMm2S6bYCLvG6p0a8v9A==} - dependencies: - '@simple-dom/interface': 1.4.0 - dev: true - /@glimmer/low-level@0.78.2: resolution: {integrity: sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==} dev: true @@ -6163,34 +6148,6 @@ packages: '@glimmer/validator': 0.84.2 dev: true - /@glimmer/manager@0.85.13: - resolution: {integrity: sha512-HwJoD9qAVPQ6hHNMUFTvQtJi5NIO1JzOT0kauyln754G6ggT07IFmi+b1R4WeJJJndZpuR3Ad4PS4usRnI89Zw==} - dependencies: - '@glimmer/debug': 0.85.13 - '@glimmer/destroyable': 0.85.13 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.85.13 - '@glimmer/interfaces': 0.85.13 - '@glimmer/reference': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/validator': 0.85.13 - '@glimmer/vm': 0.85.13 - dev: true - - /@glimmer/manager@0.87.1: - resolution: {integrity: sha512-jEUZZQWcuxKg+Ri/A1HGURm9pBrx13JDHx1djYCnPo96yjtQFYxEG0VcwLq2EtAEpFrekwfO1b6m3JZiFqmtGg==} - dependencies: - '@glimmer/debug': 0.87.1 - '@glimmer/destroyable': 0.87.1 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.87.1 - '@glimmer/interfaces': 0.87.1 - '@glimmer/reference': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/validator': 0.87.1 - '@glimmer/vm': 0.87.1 - dev: true - /@glimmer/node@0.84.2: resolution: {integrity: sha512-kefGxH+0N0xNyb6QovdPzmIBefZwu8TID45qsASgVbFx7mfFiXjQiyaxbRUyam4MAEb8Nzzx1Byxn1FQCYyLdA==} dependencies: @@ -6201,24 +6158,6 @@ packages: '@simple-dom/interface': 1.4.0 dev: true - /@glimmer/node@0.85.13: - resolution: {integrity: sha512-Lb/0zPoucm8hQ/qd6A8RYgdoLSC5tulZJ7LahAq1/bpG42vJyQMGYBjxVL2ffQv+Yxao/nEQxUP5ssoLXS+gvw==} - dependencies: - '@glimmer/interfaces': 0.85.13 - '@glimmer/runtime': 0.85.13 - '@glimmer/util': 0.85.13 - '@simple-dom/document': 1.4.0 - dev: true - - /@glimmer/node@0.87.1: - resolution: {integrity: sha512-peESyArA08Va9f3gpBnhO+RNkK4Oe0Q8sMPQILCloAukNe2+DQOhTvDgVjRUKmVXMJCWoSgmJtxkiB3ZE193vw==} - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/runtime': 0.87.1 - '@glimmer/util': 0.87.1 - '@simple-dom/document': 1.4.0 - dev: true - /@glimmer/opcode-compiler@0.84.2: resolution: {integrity: sha512-KwTH9cWEW4Neu3jmD9ANMIQYBiEqPsLx+h55G+wYp5djyjiYwSJ7KhgMAB+wEHuvB6izp3XdSO6jDMgp3pp49A==} dependencies: @@ -6231,54 +6170,12 @@ packages: '@glimmer/wire-format': 0.84.2 dev: true - /@glimmer/opcode-compiler@0.85.13: - resolution: {integrity: sha512-EySW/IsMoO+lWW2TC31zsHqanST/5lTGoZOrB9zy7FmiUaPGD0RxeOEBU8rTRHzYxNzoJAsX7l3Hv6Y0y2ABZg==} - dependencies: - '@glimmer/debug': 0.85.13 - '@glimmer/encoder': 0.85.13 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.85.13 - '@glimmer/interfaces': 0.85.13 - '@glimmer/manager': 0.85.13 - '@glimmer/reference': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/vm': 0.85.13 - '@glimmer/wire-format': 0.85.13 - dev: true - - /@glimmer/opcode-compiler@0.87.1: - resolution: {integrity: sha512-D9OFrH3CrGNXfGtgcVWvu3xofpQZPoYFkqj3RrcDwnsSIYPSqUYTIOO6dwpxTbPlzkASidq0B2htXK7WkCERVw==} - dependencies: - '@glimmer/debug': 0.87.1 - '@glimmer/encoder': 0.87.1 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.87.1 - '@glimmer/interfaces': 0.87.1 - '@glimmer/manager': 0.87.1 - '@glimmer/reference': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/vm': 0.87.1 - '@glimmer/wire-format': 0.87.1 - dev: true - /@glimmer/owner@0.84.2: resolution: {integrity: sha512-maZn642eXRImp/hOSa4nQmzMLEIywXwgahS/ZMuzD4HTTsA2SlEdjXSrVbRQYarYF8LkiJ7fpcKHkyNCe8SHrQ==} dependencies: '@glimmer/util': 0.84.2 dev: true - /@glimmer/owner@0.85.13: - resolution: {integrity: sha512-4FhMR9qHuKu7sZIIsulqBvzP9UWYFtjxzF+eQ5cxmr+0uxjJN8/rZbRG8vPbJs3OoV2k+vHj4BYhLyflSjRaZw==} - dependencies: - '@glimmer/util': 0.85.13 - dev: true - - /@glimmer/owner@0.87.1: - resolution: {integrity: sha512-ayYjznPMSGpgygNT7XlTXeel6Cl/fafm4WJeRRgdPxG1EZMjKPlfpfAyNzf9peEIlW3WMbPu3RAIYrf54aThWQ==} - dependencies: - '@glimmer/util': 0.87.1 - dev: true - /@glimmer/program@0.84.2: resolution: {integrity: sha512-Ohx+7H3+CSVHbC08trUK7fXC6ti9x0SQDC2Lwd7BMXmMyoOZHxdaKNrTJ+CsQ8nV1JkLfXhnvRDG08TqD5VHJw==} dependencies: @@ -6290,32 +6187,6 @@ packages: '@glimmer/util': 0.84.2 dev: true - /@glimmer/program@0.85.13: - resolution: {integrity: sha512-E+89jmD+52fB2/HqeOW2vim1x8wNTkpfPpzsGeVFlyZHxBaMR95zw1+rgl2aE1pyRoZR3csL4qSBaJb26Sp6Pw==} - dependencies: - '@glimmer/encoder': 0.85.13 - '@glimmer/env': 0.1.7 - '@glimmer/interfaces': 0.85.13 - '@glimmer/manager': 0.85.13 - '@glimmer/opcode-compiler': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/vm': 0.85.13 - '@glimmer/wire-format': 0.85.13 - dev: true - - /@glimmer/program@0.87.1: - resolution: {integrity: sha512-+r1Dz5Da0zyYwBhPmqoXiw3qmDamqqhVmSCtJLLcZ6exXXC2ZjGoNdynfos80A91dx+PFqYgHg+5lfa5STT9iQ==} - dependencies: - '@glimmer/encoder': 0.87.1 - '@glimmer/env': 0.1.7 - '@glimmer/interfaces': 0.87.1 - '@glimmer/manager': 0.87.1 - '@glimmer/opcode-compiler': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/vm': 0.87.1 - '@glimmer/wire-format': 0.87.1 - dev: true - /@glimmer/reference@0.65.4: resolution: {integrity: sha512-yuRVE4qyqrlCndDMrHKDWUbDmGDCjPzsFtlTmxxnhDMJAdQsnr2cRLITHvQRDm1tXfigVvyKnomeuYhRRbBqYQ==} dependencies: @@ -6346,26 +6217,6 @@ packages: '@glimmer/validator': 0.84.3 dev: true - /@glimmer/reference@0.85.13: - resolution: {integrity: sha512-rkMlY6RUkwZwfO7fQodKQw5WOLCKNZPkVAloaVJSqpyKjHRNjMaD3TZhfNmlGIVdNgVRRsOWSWdTL5CUUzDlwQ==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.85.13 - '@glimmer/interfaces': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/validator': 0.85.13 - dev: true - - /@glimmer/reference@0.87.1: - resolution: {integrity: sha512-KJwKYDnds6amsmVB1YxmFhJGI/TNCNmsFBWKUH8K0odmiggUCjt3AwUoOKztkwh3xxy/jpq+5AahIuV+uBgW7A==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.87.1 - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/validator': 0.87.1 - dev: true - /@glimmer/runtime@0.84.2: resolution: {integrity: sha512-mUefYwq8l4df61iWYsRKVYQUqAeCgeZ3fuYNRNbvKDudnT9bQXayJLqr6ZxwTVaDoeKjg+7lMjkDSDSvqoxfsA==} dependencies: @@ -6384,40 +6235,6 @@ packages: '@simple-dom/interface': 1.4.0 dev: true - /@glimmer/runtime@0.85.13: - resolution: {integrity: sha512-jum5u2mX0WOAAF3L0pVZ/AOAMjJRKfGIqcStUYldmnf/xCFucKsh2WzSBS5KxlHDt4OGs00GflkpoTZkqPnCmg==} - dependencies: - '@glimmer/destroyable': 0.85.13 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.85.13 - '@glimmer/interfaces': 0.85.13 - '@glimmer/manager': 0.85.13 - '@glimmer/owner': 0.85.13 - '@glimmer/program': 0.85.13 - '@glimmer/reference': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/validator': 0.85.13 - '@glimmer/vm': 0.85.13 - '@glimmer/wire-format': 0.85.13 - dev: true - - /@glimmer/runtime@0.87.1: - resolution: {integrity: sha512-7QBONxRFesnHzelCiUahZjRj3nhbUxPg0F+iD+3rALrXaWfB1pkhngMTK2DYEmsJ7kq04qVzwBnTSrqsmLzOTg==} - dependencies: - '@glimmer/destroyable': 0.87.1 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.87.1 - '@glimmer/interfaces': 0.87.1 - '@glimmer/manager': 0.87.1 - '@glimmer/owner': 0.87.1 - '@glimmer/program': 0.87.1 - '@glimmer/reference': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/validator': 0.87.1 - '@glimmer/vm': 0.87.1 - '@glimmer/wire-format': 0.87.1 - dev: true - /@glimmer/syntax@0.65.4: resolution: {integrity: sha512-y+/C3e8w96efk3a/Z5If9o4ztKJwrr8RtDpbhV2J8X+DUsn5ic2N3IIdlThbt/Zn6tkP1K3dY6uaFUx3pGTvVQ==} dependencies: @@ -6444,36 +6261,6 @@ packages: '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 - /@glimmer/syntax@0.85.13: - resolution: {integrity: sha512-zMGkJh6JcHdCTx1emmBbhBrGO04gqD6CS5khmDwSJCIpVHnGH0Ejxp9rpnSMc5IW71/hFoQY6RlMgVYF2hrHhA==} - dependencies: - '@glimmer/interfaces': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/wire-format': 0.85.13 - '@handlebars/parser': 2.0.0 - simple-html-tokenizer: 0.5.11 - dev: true - - /@glimmer/syntax@0.87.1: - resolution: {integrity: sha512-zYzZT6LgpSF0iv5iuxmMV5Pf52aE8dukNC2KfrHC6gXJfM4eLZMZcyk76NW5m+SEetZSOXX6AWv/KwLnoxiMfQ==} - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/wire-format': 0.87.1 - '@handlebars/parser': 2.0.0 - simple-html-tokenizer: 0.5.11 - dev: true - - /@glimmer/syntax@0.88.1: - resolution: {integrity: sha512-tucexG0j5SSbk3d4ayCOnvjg5FldvWyrZbzxukZOBhDgAYhGWUnGFAqdoXjpr3w6FkD4xIVliVD9GFrH4lI8DA==} - dependencies: - '@glimmer/interfaces': 0.88.1 - '@glimmer/util': 0.88.1 - '@glimmer/wire-format': 0.88.1 - '@handlebars/parser': 2.0.0 - simple-html-tokenizer: 0.5.11 - dev: true - /@glimmer/tracking@1.1.2: resolution: {integrity: sha512-cyV32zsHh+CnftuRX84ALZpd2rpbDrhLhJnTXn9W//QpqdRZ5rdMsxSY9fOsj0CKEc706tmEU299oNnDc0d7tA==} dependencies: @@ -6507,27 +6294,6 @@ packages: '@glimmer/interfaces': 0.84.3 '@simple-dom/interface': 1.4.0 - /@glimmer/util@0.85.13: - resolution: {integrity: sha512-ogj65iukNKEPPqQ2bOD6CLsqxsFwmiGvTQbAsg1eh1MoPjxhNZMpLsT5CdQ10XE7yUALHGJ71SwxBSpAOGDmxg==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/interfaces': 0.85.13 - dev: true - - /@glimmer/util@0.87.1: - resolution: {integrity: sha512-Duxi2JutaIewfIWp8PJl7U5n12yasKWtZFHNLSrg+C8TKeMXdRyJtI7uqtqg0Z/6F9JwdJe/IPhTvdsTTfzAuA==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/interfaces': 0.87.1 - dev: true - - /@glimmer/util@0.88.1: - resolution: {integrity: sha512-PV/24+vBmsReR78UQXJlEHDblU6QBAeIJa8MwKhQoxSD6WgvQHP4KmX23rvlCz11GxApTwyPm/2qyp/SwVvX2A==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/interfaces': 0.88.1 - dev: true - /@glimmer/validator@0.44.0: resolution: {integrity: sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==} dev: true @@ -6553,24 +6319,6 @@ packages: '@glimmer/global-context': 0.84.3 dev: true - /@glimmer/validator@0.85.13: - resolution: {integrity: sha512-vWSHpYq1gbnssxwyW0t7JrSbfZj8jZUAUdqp9bymHZOgru7QZn0mYCuJbfYDvF9pzsTQ+i0zZBMxZRHeAWbasQ==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.85.13 - '@glimmer/interfaces': 0.85.13 - '@glimmer/util': 0.85.13 - dev: true - - /@glimmer/validator@0.87.1: - resolution: {integrity: sha512-GqzULgK9m2QPfPswhyV30tZmsUegowv9Tyfz2l15cLDFX9L5GcEORpzKXjR0TzCplffuqOC1g8rnMaPsP55apw==} - dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.87.1 - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - dev: true - /@glimmer/vm-babel-plugins@0.77.5(@babel/core@7.23.9): resolution: {integrity: sha512-jTBM7fJMrIEy4/bCeI8e7ypR+AuWYzLA+KORCGbnTJtL/NYg4G8qwhQAZBtg1d3KmoqyqaCsyqE6f4/tzJO4eQ==} dependencies: @@ -6618,24 +6366,6 @@ packages: - '@babel/core' dev: true - /@glimmer/vm-babel-plugins@0.85.13(@babel/core@7.23.9): - resolution: {integrity: sha512-B5R+t7o0Dlfz7GYu6liQ/GERAq/Fb775KZJeEaIwX2odJDKyIfOU+m/bLHpoVevY4V/x+qB8tVCA4Nv5LXu3Kg==} - engines: {node: '>=16'} - dependencies: - babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.9) - transitivePeerDependencies: - - '@babel/core' - dev: true - - /@glimmer/vm-babel-plugins@0.87.1(@babel/core@7.23.9): - resolution: {integrity: sha512-VbhYHa+HfGFiTIOOkvFuYPwBTaDvWTAR1Q55RI25JI6Nno0duBLB3UVRTDgHM+iOfbgRN7OSR5XCe/C5X5C5LA==} - engines: {node: '>=16'} - dependencies: - babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.9) - transitivePeerDependencies: - - '@babel/core' - dev: true - /@glimmer/vm@0.84.2: resolution: {integrity: sha512-IuQeDlh+AUOOX8QXc+ehPv5uFnqstQVZGplqqvPQRcKvsEalog88RC34dAEwFdB756SKjgRSw+N+nT3ZDNVlvA==} dependencies: @@ -6643,20 +6373,6 @@ packages: '@glimmer/util': 0.84.2 dev: true - /@glimmer/vm@0.85.13: - resolution: {integrity: sha512-x/FwTAFnoIzu/TzJYuqWI1rWoIJUthKZ6n37q5Nr8TVoFqOVXk7q9k53etcAhxLEwBjX/cox6i1FxCuv5vpc8Q==} - dependencies: - '@glimmer/interfaces': 0.85.13 - '@glimmer/util': 0.85.13 - dev: true - - /@glimmer/vm@0.87.1: - resolution: {integrity: sha512-JSFr85ASZmuN4H72px7GHtnW79PPRHpqHw6O/6UUZd+ocwWHy+nG9JGbo8kntvqN5xP0SdCipjv/c0u7nkc8tg==} - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - dev: true - /@glimmer/wire-format@0.84.2: resolution: {integrity: sha512-/FmbXSPFJAoIZ6qu28xVXpAdy2Ln++Ewe6mRHFpnudV1lUrBN+Q09A4j/RN/hpAkyz/8ai5W+5rHKuaWxoi4Dg==} dependencies: @@ -6664,27 +6380,6 @@ packages: '@glimmer/util': 0.84.2 dev: true - /@glimmer/wire-format@0.85.13: - resolution: {integrity: sha512-q6bHPfjSYE9jH27L75lUzyhSpBA+iONzsJVXewdwO4GdYYCC4s+pfUaJg7ZYNFDcHDuVKUcLhBb/NICDzMA5Uw==} - dependencies: - '@glimmer/interfaces': 0.85.13 - '@glimmer/util': 0.85.13 - dev: true - - /@glimmer/wire-format@0.87.1: - resolution: {integrity: sha512-O3W1HDfRGX7wHZqvP8UzI/nWyZ2GIMFolU7l6WcLGU9HIdzqfxsc7ae2Icob/fq2kV9meHti4yDEdTMlBVK9AQ==} - dependencies: - '@glimmer/interfaces': 0.87.1 - '@glimmer/util': 0.87.1 - dev: true - - /@glimmer/wire-format@0.88.1: - resolution: {integrity: sha512-DPM2UiYRNzcWdOUrSa8/IFbWKovH+c2JPnbvtk04DpfQapU7+hteBj34coEN/pW3FJiP3WMvx/EuPfWROkeDsg==} - dependencies: - '@glimmer/interfaces': 0.88.1 - '@glimmer/util': 0.88.1 - dev: true - /@glint/environment-ember-loose@1.3.0(@glimmer/component@1.1.2)(@glint/template@1.3.0)(ember-cli-htmlbars@6.3.0): resolution: {integrity: sha512-kURIttax2zG1oYniJ4bd3rhJRuP588Ld4YAG5EFzjg4s01oLQKpfNskxwSwox07PUkygm2D+9v3Foo2TlYJSSg==} peerDependencies: @@ -8327,6 +8022,9 @@ packages: /ajv-formats@2.1.1: resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} + peerDependenciesMeta: + ajv: + optional: true dependencies: ajv: 8.12.0 @@ -8667,7 +8365,7 @@ packages: /async-disk-cache@1.3.5: resolution: {integrity: sha512-VZpqfR0R7CEOJZ/0FOTgWq70lCrZyS1rkI8PXugDUkTKyyAUgZ2zQ09gLhMkEn+wN8LYeUTPxZdXtlX/kmbXKQ==} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 heimdalljs: 0.2.6 istextorbinary: 2.1.0 mkdirp: 0.5.6 @@ -8695,7 +8393,7 @@ packages: resolution: {integrity: sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==} dependencies: async: 2.6.4 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 transitivePeerDependencies: - supports-color @@ -8741,12 +8439,12 @@ packages: babel-messages: 6.23.0 babel-register: 6.26.0 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 + babel-traverse: 6.26.0 babel-types: 6.26.0 babylon: 6.18.0 convert-source-map: 1.9.0 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 json5: 0.5.1 lodash: 4.17.21 minimatch: 3.1.2 @@ -8789,51 +8487,51 @@ packages: trim-right: 1.0.1 dev: true - /babel-helper-builder-binary-assignment-operator-visitor@6.24.1(supports-color@8.1.1): + /babel-helper-builder-binary-assignment-operator-visitor@6.24.1: resolution: {integrity: sha512-gCtfYORSG1fUMX4kKraymq607FWgMWg+j42IFPc18kFQEsmtaibP4UrqsXt8FlEJle25HUd4tsoDR7H2wDhe9Q==} dependencies: - babel-helper-explode-assignable-expression: 6.24.1(supports-color@8.1.1) + babel-helper-explode-assignable-expression: 6.24.1 babel-runtime: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color - /babel-helper-call-delegate@6.24.1(supports-color@8.1.1): + /babel-helper-call-delegate@6.24.1: resolution: {integrity: sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ==} dependencies: babel-helper-hoist-variables: 6.24.1 babel-runtime: 6.26.0 - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-traverse: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color - /babel-helper-define-map@6.26.0(supports-color@8.1.1): + /babel-helper-define-map@6.26.0: resolution: {integrity: sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA==} dependencies: - babel-helper-function-name: 6.24.1(supports-color@8.1.1) + babel-helper-function-name: 6.24.1 babel-runtime: 6.26.0 babel-types: 6.26.0 lodash: 4.17.21 transitivePeerDependencies: - supports-color - /babel-helper-explode-assignable-expression@6.24.1(supports-color@8.1.1): + /babel-helper-explode-assignable-expression@6.24.1: resolution: {integrity: sha512-qe5csbhbvq6ccry9G7tkXbzNtcDiH4r51rrPUbwwoTzZ18AqxWYRZT6AOmxrpxKnQBW0pYlBI/8vh73Z//78nQ==} dependencies: babel-runtime: 6.26.0 - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-traverse: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color - /babel-helper-function-name@6.24.1(supports-color@8.1.1): + /babel-helper-function-name@6.24.1: resolution: {integrity: sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q==} dependencies: babel-helper-get-function-arity: 6.24.1 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 + babel-traverse: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color @@ -8863,25 +8561,25 @@ packages: babel-types: 6.26.0 lodash: 4.17.21 - /babel-helper-remap-async-to-generator@6.24.1(supports-color@8.1.1): + /babel-helper-remap-async-to-generator@6.24.1: resolution: {integrity: sha512-RYqaPD0mQyQIFRu7Ho5wE2yvA/5jxqCIj/Lv4BXNq23mHYu/vxikOy2JueLiBxQknwapwrJeNCesvY0ZcfnlHg==} dependencies: - babel-helper-function-name: 6.24.1(supports-color@8.1.1) + babel-helper-function-name: 6.24.1 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 + babel-traverse: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color - /babel-helper-replace-supers@6.24.1(supports-color@8.1.1): + /babel-helper-replace-supers@6.24.1: resolution: {integrity: sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw==} dependencies: babel-helper-optimise-call-expression: 6.24.1 babel-messages: 6.23.0 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 + babel-traverse: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color @@ -8890,7 +8588,7 @@ packages: resolution: {integrity: sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==} dependencies: babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 transitivePeerDependencies: - supports-color dev: true @@ -9122,11 +8820,24 @@ packages: dependencies: '@babel/compat-data': 7.23.5 '@babel/core': 7.23.9(supports-color@8.1.1) - '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9) + '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)(supports-color@8.1.1) semver: 6.3.1 transitivePeerDependencies: - supports-color + /babel-plugin-polyfill-corejs2@0.4.8(@babel/core@7.23.9)(supports-color@8.1.1): + resolution: {integrity: sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + dependencies: + '@babel/compat-data': 7.23.5 + '@babel/core': 7.23.9(supports-color@8.1.1) + '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)(supports-color@8.1.1) + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + dev: false + /babel-plugin-polyfill-corejs2@0.4.8(@babel/core@7.24.0): resolution: {integrity: sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==} peerDependencies: @@ -9145,10 +8856,22 @@ packages: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: '@babel/core': 7.23.9(supports-color@8.1.1) - '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9) + '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)(supports-color@8.1.1) + core-js-compat: 3.36.0 + transitivePeerDependencies: + - supports-color + + /babel-plugin-polyfill-corejs3@0.9.0(@babel/core@7.23.9)(supports-color@8.1.1): + resolution: {integrity: sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + dependencies: + '@babel/core': 7.23.9(supports-color@8.1.1) + '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)(supports-color@8.1.1) core-js-compat: 3.36.0 transitivePeerDependencies: - supports-color + dev: false /babel-plugin-polyfill-corejs3@0.9.0(@babel/core@7.24.0): resolution: {integrity: sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==} @@ -9167,10 +8890,21 @@ packages: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: '@babel/core': 7.23.9(supports-color@8.1.1) - '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9) + '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)(supports-color@8.1.1) transitivePeerDependencies: - supports-color + /babel-plugin-polyfill-regenerator@0.5.5(@babel/core@7.23.9)(supports-color@8.1.1): + resolution: {integrity: sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + dependencies: + '@babel/core': 7.23.9(supports-color@8.1.1) + '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + dev: false + /babel-plugin-polyfill-regenerator@0.5.5(@babel/core@7.24.0): resolution: {integrity: sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==} peerDependencies: @@ -9193,10 +8927,10 @@ packages: /babel-plugin-syntax-trailing-function-commas@6.22.0: resolution: {integrity: sha512-Gx9CH3Q/3GKbhs07Bszw5fPTlU+ygrOGfAhEt7W2JICwufpC4SuO0mG0+4NykPBSYPMJhqvVlDBU17qB1D+hMQ==} - /babel-plugin-transform-async-to-generator@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-async-to-generator@6.24.1: resolution: {integrity: sha512-7BgYJujNCg0Ti3x0c/DL3tStvnKS6ktIYOmo9wginv/dfZOrbSZ+qG4IRRHMBOzZ5Awb1skTiAsQXg/+IWkZYw==} dependencies: - babel-helper-remap-async-to-generator: 6.24.1(supports-color@8.1.1) + babel-helper-remap-async-to-generator: 6.24.1 babel-plugin-syntax-async-functions: 6.13.0 babel-runtime: 6.26.0 transitivePeerDependencies: @@ -9212,37 +8946,37 @@ packages: dependencies: babel-runtime: 6.26.0 - /babel-plugin-transform-es2015-block-scoping@6.26.0(supports-color@8.1.1): + /babel-plugin-transform-es2015-block-scoping@6.26.0: resolution: {integrity: sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw==} dependencies: babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 + babel-traverse: 6.26.0 babel-types: 6.26.0 lodash: 4.17.21 transitivePeerDependencies: - supports-color - /babel-plugin-transform-es2015-classes@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-es2015-classes@6.24.1: resolution: {integrity: sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag==} dependencies: - babel-helper-define-map: 6.26.0(supports-color@8.1.1) - babel-helper-function-name: 6.24.1(supports-color@8.1.1) + babel-helper-define-map: 6.26.0 + babel-helper-function-name: 6.24.1 babel-helper-optimise-call-expression: 6.24.1 - babel-helper-replace-supers: 6.24.1(supports-color@8.1.1) + babel-helper-replace-supers: 6.24.1 babel-messages: 6.23.0 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 + babel-traverse: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color - /babel-plugin-transform-es2015-computed-properties@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-es2015-computed-properties@6.24.1: resolution: {integrity: sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw==} dependencies: babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 transitivePeerDependencies: - supports-color @@ -9262,10 +8996,10 @@ packages: dependencies: babel-runtime: 6.26.0 - /babel-plugin-transform-es2015-function-name@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-es2015-function-name@6.24.1: resolution: {integrity: sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg==} dependencies: - babel-helper-function-name: 6.24.1(supports-color@8.1.1) + babel-helper-function-name: 6.24.1 babel-runtime: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: @@ -9276,59 +9010,59 @@ packages: dependencies: babel-runtime: 6.26.0 - /babel-plugin-transform-es2015-modules-amd@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-es2015-modules-amd@6.24.1: resolution: {integrity: sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA==} dependencies: - babel-plugin-transform-es2015-modules-commonjs: 6.26.2(supports-color@8.1.1) + babel-plugin-transform-es2015-modules-commonjs: 6.26.2 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 transitivePeerDependencies: - supports-color - /babel-plugin-transform-es2015-modules-commonjs@6.26.2(supports-color@8.1.1): + /babel-plugin-transform-es2015-modules-commonjs@6.26.2: resolution: {integrity: sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==} dependencies: babel-plugin-transform-strict-mode: 6.24.1 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color - /babel-plugin-transform-es2015-modules-systemjs@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-es2015-modules-systemjs@6.24.1: resolution: {integrity: sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg==} dependencies: babel-helper-hoist-variables: 6.24.1 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 transitivePeerDependencies: - supports-color - /babel-plugin-transform-es2015-modules-umd@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-es2015-modules-umd@6.24.1: resolution: {integrity: sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw==} dependencies: - babel-plugin-transform-es2015-modules-amd: 6.24.1(supports-color@8.1.1) + babel-plugin-transform-es2015-modules-amd: 6.24.1 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 transitivePeerDependencies: - supports-color - /babel-plugin-transform-es2015-object-super@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-es2015-object-super@6.24.1: resolution: {integrity: sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA==} dependencies: - babel-helper-replace-supers: 6.24.1(supports-color@8.1.1) + babel-helper-replace-supers: 6.24.1 babel-runtime: 6.26.0 transitivePeerDependencies: - supports-color - /babel-plugin-transform-es2015-parameters@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-es2015-parameters@6.24.1: resolution: {integrity: sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ==} dependencies: - babel-helper-call-delegate: 6.24.1(supports-color@8.1.1) + babel-helper-call-delegate: 6.24.1 babel-helper-get-function-arity: 6.24.1 babel-runtime: 6.26.0 - babel-template: 6.26.0(supports-color@8.1.1) - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-template: 6.26.0 + babel-traverse: 6.26.0 babel-types: 6.26.0 transitivePeerDependencies: - supports-color @@ -9368,10 +9102,10 @@ packages: babel-runtime: 6.26.0 regexpu-core: 2.0.0 - /babel-plugin-transform-exponentiation-operator@6.24.1(supports-color@8.1.1): + /babel-plugin-transform-exponentiation-operator@6.24.1: resolution: {integrity: sha512-LzXDmbMkklvNhprr20//RStKVcT8Cu+SQtX18eMHLhjHf2yFzwtQ0S2f0jQ+89rokoNdmwoSqYzAhq86FxlLSQ==} dependencies: - babel-helper-builder-binary-assignment-operator-visitor: 6.24.1(supports-color@8.1.1) + babel-helper-builder-binary-assignment-operator-visitor: 6.24.1 babel-plugin-syntax-exponentiation-operator: 6.13.0 babel-runtime: 6.26.0 transitivePeerDependencies: @@ -9416,35 +9150,35 @@ packages: '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.0) dev: true - /babel-preset-env@1.7.0(supports-color@8.1.1): + /babel-preset-env@1.7.0: resolution: {integrity: sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==} dependencies: babel-plugin-check-es2015-constants: 6.22.0 babel-plugin-syntax-trailing-function-commas: 6.22.0 - babel-plugin-transform-async-to-generator: 6.24.1(supports-color@8.1.1) + babel-plugin-transform-async-to-generator: 6.24.1 babel-plugin-transform-es2015-arrow-functions: 6.22.0 babel-plugin-transform-es2015-block-scoped-functions: 6.22.0 - babel-plugin-transform-es2015-block-scoping: 6.26.0(supports-color@8.1.1) - babel-plugin-transform-es2015-classes: 6.24.1(supports-color@8.1.1) - babel-plugin-transform-es2015-computed-properties: 6.24.1(supports-color@8.1.1) + babel-plugin-transform-es2015-block-scoping: 6.26.0 + babel-plugin-transform-es2015-classes: 6.24.1 + babel-plugin-transform-es2015-computed-properties: 6.24.1 babel-plugin-transform-es2015-destructuring: 6.23.0 babel-plugin-transform-es2015-duplicate-keys: 6.24.1 babel-plugin-transform-es2015-for-of: 6.23.0 - babel-plugin-transform-es2015-function-name: 6.24.1(supports-color@8.1.1) + babel-plugin-transform-es2015-function-name: 6.24.1 babel-plugin-transform-es2015-literals: 6.22.0 - babel-plugin-transform-es2015-modules-amd: 6.24.1(supports-color@8.1.1) - babel-plugin-transform-es2015-modules-commonjs: 6.26.2(supports-color@8.1.1) - babel-plugin-transform-es2015-modules-systemjs: 6.24.1(supports-color@8.1.1) - babel-plugin-transform-es2015-modules-umd: 6.24.1(supports-color@8.1.1) - babel-plugin-transform-es2015-object-super: 6.24.1(supports-color@8.1.1) - babel-plugin-transform-es2015-parameters: 6.24.1(supports-color@8.1.1) + babel-plugin-transform-es2015-modules-amd: 6.24.1 + babel-plugin-transform-es2015-modules-commonjs: 6.26.2 + babel-plugin-transform-es2015-modules-systemjs: 6.24.1 + babel-plugin-transform-es2015-modules-umd: 6.24.1 + babel-plugin-transform-es2015-object-super: 6.24.1 + babel-plugin-transform-es2015-parameters: 6.24.1 babel-plugin-transform-es2015-shorthand-properties: 6.24.1 babel-plugin-transform-es2015-spread: 6.22.0 babel-plugin-transform-es2015-sticky-regex: 6.24.1 babel-plugin-transform-es2015-template-literals: 6.22.0 babel-plugin-transform-es2015-typeof-symbol: 6.23.0 babel-plugin-transform-es2015-unicode-regex: 6.24.1 - babel-plugin-transform-exponentiation-operator: 6.24.1(supports-color@8.1.1) + babel-plugin-transform-exponentiation-operator: 6.24.1 babel-plugin-transform-regenerator: 6.26.0 browserslist: 4.23.0 invariant: 2.2.4 @@ -9483,18 +9217,18 @@ packages: core-js: 2.6.12 regenerator-runtime: 0.11.1 - /babel-template@6.26.0(supports-color@8.1.1): + /babel-template@6.26.0: resolution: {integrity: sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==} dependencies: babel-runtime: 6.26.0 - babel-traverse: 6.26.0(supports-color@8.1.1) + babel-traverse: 6.26.0 babel-types: 6.26.0 babylon: 6.18.0 lodash: 4.17.21 transitivePeerDependencies: - supports-color - /babel-traverse@6.26.0(supports-color@8.1.1): + /babel-traverse@6.26.0: resolution: {integrity: sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==} dependencies: babel-code-frame: 6.26.0 @@ -9502,7 +9236,7 @@ packages: babel-runtime: 6.26.0 babel-types: 6.26.0 babylon: 6.18.0 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 globals: 9.18.0 invariant: 2.2.4 lodash: 4.17.21 @@ -9617,7 +9351,7 @@ packages: dependencies: bytes: 3.1.2 content-type: 1.0.5 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 depd: 2.0.0 destroy: 1.2.0 http-errors: 2.0.0 @@ -9819,7 +9553,7 @@ packages: dependencies: broccoli-kitchen-sink-helpers: 0.2.9 broccoli-plugin: 1.1.0 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 rimraf: 2.7.1 rsvp: 3.6.2 walk-sync: 0.2.7 @@ -9832,7 +9566,7 @@ packages: dependencies: broccoli-kitchen-sink-helpers: 0.3.1 broccoli-plugin: 1.3.1 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 rimraf: 2.7.1 rsvp: 3.6.2 walk-sync: 0.3.4 @@ -9899,7 +9633,7 @@ packages: dependencies: broccoli-kitchen-sink-helpers: 0.3.1 broccoli-plugin: 1.3.1 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 fs-extra: 0.24.0 transitivePeerDependencies: - supports-color @@ -9946,7 +9680,7 @@ packages: broccoli-kitchen-sink-helpers: 0.3.1 broccoli-plugin: 1.3.1 copy-dereference: 1.0.0 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 mkdirp: 0.5.6 promise-map-series: 0.2.3 rsvp: 3.6.2 @@ -9973,7 +9707,7 @@ packages: array-equal: 1.0.2 blank-object: 1.0.2 broccoli-plugin: 1.3.1 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 fast-ordered-set: 1.0.3 fs-tree-diff: 0.5.9 heimdalljs: 0.2.6 @@ -9994,7 +9728,7 @@ packages: array-equal: 1.0.2 blank-object: 1.0.2 broccoli-plugin: 1.3.1 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 fast-ordered-set: 1.0.3 fs-tree-diff: 0.5.9 heimdalljs: 0.2.6 @@ -10977,7 +10711,7 @@ packages: accepts: 1.3.8 bytes: 3.0.0 compressible: 2.0.18 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 on-headers: 1.0.2 safe-buffer: 5.1.2 vary: 1.1.2 @@ -11034,7 +10768,7 @@ packages: resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==} engines: {node: '>= 0.10.0'} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 finalhandler: 1.1.2 parseurl: 1.3.3 utils-merge: 1.0.1 @@ -11507,7 +11241,7 @@ packages: time-zone: 1.0.0 dev: true - /debug@2.6.9(supports-color@8.1.1): + /debug@2.6.9: resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} peerDependencies: supports-color: '*' @@ -11516,7 +11250,6 @@ packages: optional: true dependencies: ms: 2.0.0 - supports-color: 8.1.1 /debug@3.2.7: resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} @@ -12025,7 +11758,7 @@ packages: ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.24.0) ember-cli-babel: 7.26.11 ember-cli-babel-plugin-helpers: 1.1.1 - ember-source: 5.1.2(@babel/core@7.24.0)(@glimmer/component@1.1.2) + ember-source: 5.1.2(@babel/core@7.24.0) transitivePeerDependencies: - '@babel/core' - '@glint/template' @@ -12049,7 +11782,7 @@ packages: ember-source: ^3.28.0 || >= 4.0.0 dependencies: ember-cli-babel: 7.26.11 - ember-source: 5.1.2(@babel/core@7.24.0)(@glimmer/component@1.1.2) + ember-source: 5.1.2(@babel/core@7.24.0) git-repo-info: 2.1.1 transitivePeerDependencies: - supports-color @@ -12079,9 +11812,9 @@ packages: amd-name-resolver: 1.2.0 babel-plugin-debug-macros: 0.2.0(@babel/core@7.23.9) babel-plugin-ember-modules-api-polyfill: 2.13.4 - babel-plugin-transform-es2015-modules-amd: 6.24.1(supports-color@8.1.1) + babel-plugin-transform-es2015-modules-amd: 6.24.1 babel-polyfill: 6.26.0 - babel-preset-env: 1.7.0(supports-color@8.1.1) + babel-preset-env: 1.7.0 broccoli-babel-transpiler: 6.5.1 broccoli-debug: 0.6.5 broccoli-funnel: 2.0.2 @@ -13268,8 +13001,8 @@ packages: - whiskers dev: true - /ember-cli@5.3.0: - resolution: {integrity: sha512-Om19C49hAYFgVduidtfQPbZcR3bmdHhYJ4XxEEEvW+sP1WAXNOPWf5e3W6HGDarjIeg04bZxOMkMZy28bubOBA==} + /ember-cli@5.1.0(lodash@4.17.21): + resolution: {integrity: sha512-TlnfO+V5lZqRQ7eGXt+P8q24Cu90GSXXAS/2NasaCtC1WY7eVzhfMsoNZiOw3Pe1CaB7i5fPDR8jAMsTwx8Tpg==} engines: {node: '>= 16'} hasBin: true dependencies: @@ -13327,6 +13060,7 @@ packages: is-git-url: 1.0.0 is-language-code: 3.1.0 isbinaryfile: 5.0.2 + js-yaml: 4.1.0 leek: 0.0.24 lodash.template: 4.5.0 markdown-it: 13.0.2 @@ -13418,11 +13152,12 @@ packages: - whiskers dev: true - /ember-cli@5.6.0(lodash@4.17.21): - resolution: {integrity: sha512-9ARiTnNgQDX6RPC37PjlEc58/e8p7pgmNu6GcmARq4iBLeTWWW+2mgw3HKoFd91ob1EdRiglskLYzgboRxtBBw==} - engines: {node: '>= 18'} + /ember-cli@5.2.0-beta.0(lodash@4.17.21): + resolution: {integrity: sha512-4iiRyV6DJVsIcZMbUzBnNkUHjV5P4UYGJ1mecFP2IX8aFvsYLCzE370L4gsfUnans3l43JXiwPPu+tSIbTO9ZQ==} + engines: {node: '>= 16'} hasBin: true dependencies: + '@babel/core': 7.24.0 '@pnpm/find-workspace-dir': 6.0.3 broccoli: 3.5.2 broccoli-builder: 0.18.14 @@ -13453,7 +13188,6 @@ packages: ember-cli-normalize-entity-name: 1.0.0 ember-cli-preprocess-registry: 5.0.1 ember-cli-string-utils: 1.1.0 - ember-template-tag: 2.3.16 ensure-posix-path: 1.1.1 execa: 5.1.1 exit: 0.1.2 @@ -13477,6 +13211,8 @@ packages: is-git-url: 1.0.0 is-language-code: 3.1.0 isbinaryfile: 5.0.2 + js-yaml: 4.1.0 + leek: 0.0.24 lodash.template: 4.5.0 markdown-it: 13.0.2 markdown-it-terminal: 0.4.0(markdown-it@13.0.2) @@ -13503,6 +13239,7 @@ packages: testem: 3.12.0(lodash@4.17.21) tiny-lr: 2.0.0 tree-sync: 2.1.0 + uuid: 9.0.1 walk-sync: 3.0.0 watch-detector: 1.0.2 workerpool: 6.5.1 @@ -13566,11 +13303,12 @@ packages: - whiskers dev: true - /ember-cli@5.7.0-beta.0(lodash@4.17.21): - resolution: {integrity: sha512-peJzRJJWr/BZ0qmmNJltYZJWwncdAcXXrvtU3wYuXA0V2EAcWTKo83wPXiu8pPELgu2NVQ0Mc2AOKDJwoVNw0g==} - engines: {node: '>= 18'} + /ember-cli@5.3.0: + resolution: {integrity: sha512-Om19C49hAYFgVduidtfQPbZcR3bmdHhYJ4XxEEEvW+sP1WAXNOPWf5e3W6HGDarjIeg04bZxOMkMZy28bubOBA==} + engines: {node: '>= 16'} hasBin: true dependencies: + '@babel/core': 7.24.0 '@pnpm/find-workspace-dir': 6.0.3 broccoli: 3.5.2 broccoli-builder: 0.18.14 @@ -13601,7 +13339,6 @@ packages: ember-cli-normalize-entity-name: 1.0.0 ember-cli-preprocess-registry: 5.0.1 ember-cli-string-utils: 1.1.0 - ember-template-tag: 2.3.16 ensure-posix-path: 1.1.1 execa: 5.1.1 exit: 0.1.2 @@ -13625,6 +13362,7 @@ packages: is-git-url: 1.0.0 is-language-code: 3.1.0 isbinaryfile: 5.0.2 + leek: 0.0.24 lodash.template: 4.5.0 markdown-it: 13.0.2 markdown-it-terminal: 0.4.0(markdown-it@13.0.2) @@ -13651,6 +13389,7 @@ packages: testem: 3.12.0(lodash@4.17.21) tiny-lr: 2.0.0 tree-sync: 2.1.0 + uuid: 9.0.1 walk-sync: 3.0.0 watch-detector: 1.0.2 workerpool: 6.5.1 @@ -13758,7 +13497,7 @@ packages: engines: {node: 10.* || 12.* || 14.* || >= 16} dependencies: '@babel/helper-plugin-utils': 7.22.5 - '@babel/types': 7.23.9 + '@babel/types': 7.24.0 '@glimmer/tracking': 1.1.2 ember-cli-babel: 7.26.11 ember-cli-babel-plugin-helpers: 1.1.1 @@ -14181,7 +13920,7 @@ packages: '@embroider/addon-shim': 1.8.7 ember-cli-normalize-entity-name: 1.0.0 ember-cli-string-utils: 1.1.0 - ember-source: 5.1.2(@babel/core@7.24.0)(@glimmer/component@1.1.2) + ember-source: 5.1.2(@babel/core@7.24.0) transitivePeerDependencies: - supports-color dev: true @@ -14337,7 +14076,7 @@ packages: - webpack dev: true - /ember-qunit@7.0.0(@ember/test-helpers@3.3.0)(ember-source@3.28.12)(qunit@2.20.1): + /ember-qunit@7.0.0(@ember/test-helpers@3.2.0)(ember-source@3.28.12)(qunit@2.20.1): resolution: {integrity: sha512-KhrndHYEXsHnXvmsGyJLJQ6VCudXaRs5dzPZBsdttZJIhsB6PmYAvq2Q+mh3GRDT/59T/sRDrB3FD3/lATS8aA==} engines: {node: 16.* || >= 18} peerDependencies: @@ -14345,7 +14084,7 @@ packages: ember-source: '>=4.0.0' qunit: ^2.13.0 dependencies: - '@ember/test-helpers': 3.3.0(ember-source@3.28.12) + '@ember/test-helpers': 3.2.0(ember-source@3.28.12) broccoli-funnel: 3.0.8 broccoli-merge-trees: 3.0.2 common-tags: 1.8.2 @@ -14378,7 +14117,7 @@ packages: ember-auto-import: 2.7.2(@glint/template@1.3.0)(webpack@5.90.3) ember-cli-babel: 7.26.11 ember-cli-test-loader: 3.1.0 - ember-source: 5.1.2(@babel/core@7.24.0)(@glimmer/component@1.1.2) + ember-source: 5.1.2(@babel/core@7.24.0) qunit: 2.20.1 resolve-package-path: 4.0.3 silent-error: 1.1.1 @@ -14475,7 +14214,7 @@ packages: dependencies: '@ember/string': 3.1.1 ember-cli-babel: 7.26.11 - ember-source: 5.1.2(@babel/core@7.24.0)(@glimmer/component@1.1.2) + ember-source: 5.1.2(@babel/core@7.24.0) transitivePeerDependencies: - supports-color dev: true @@ -14744,17 +14483,15 @@ packages: - webpack dev: true - /ember-source@5.1.2(@babel/core@7.24.0)(@glimmer/component@1.1.2): + /ember-source@5.1.2(@babel/core@7.23.9): resolution: {integrity: sha512-HTh8CANROxGuBIy/x3c42v4u4255IA55E40KXI3YABww/tV9N1vBRiXolkPcR8aSRDdl32UxL3wBV6/v8npxDQ==} engines: {node: '>= 16.*'} - peerDependencies: - '@glimmer/component': ^1.1.2 dependencies: '@babel/helper-module-imports': 7.22.15 - '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.24.0) + '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.9) '@ember/edition-utils': 1.2.0 '@glimmer/compiler': 0.84.2 - '@glimmer/component': 1.1.2(@babel/core@7.24.0) + '@glimmer/component': 1.1.2(@babel/core@7.23.9) '@glimmer/destroyable': 0.84.2 '@glimmer/env': 0.1.7 '@glimmer/global-context': 0.84.3 @@ -14768,9 +14505,9 @@ packages: '@glimmer/runtime': 0.84.2 '@glimmer/syntax': 0.84.2 '@glimmer/validator': 0.84.2 - '@glimmer/vm-babel-plugins': 0.84.2(@babel/core@7.24.0) + '@glimmer/vm-babel-plugins': 0.84.2(@babel/core@7.23.9) '@simple-dom/interface': 1.4.0 - babel-plugin-debug-macros: 0.3.4(@babel/core@7.24.0) + babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.9) babel-plugin-filter-imports: 4.0.0 backburner.js: 2.8.0 broccoli-concat: 4.2.5 @@ -14803,17 +14540,15 @@ packages: - webpack dev: true - /ember-source@5.3.0(@babel/core@7.23.9)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3): - resolution: {integrity: sha512-MnsPEYo2gArYzlY0uu5bBH60oNYcgcayYQEd27nJumuaceN1sMLMu1jGQmjiQzZ4b6U5edEUNQbCIZ/9TXbASw==} + /ember-source@5.1.2(@babel/core@7.24.0): + resolution: {integrity: sha512-HTh8CANROxGuBIy/x3c42v4u4255IA55E40KXI3YABww/tV9N1vBRiXolkPcR8aSRDdl32UxL3wBV6/v8npxDQ==} engines: {node: '>= 16.*'} - peerDependencies: - '@glimmer/component': ^1.1.2 dependencies: '@babel/helper-module-imports': 7.22.15 - '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.24.0) '@ember/edition-utils': 1.2.0 '@glimmer/compiler': 0.84.2 - '@glimmer/component': 1.1.2(@babel/core@7.23.9) + '@glimmer/component': 1.1.2(@babel/core@7.24.0) '@glimmer/destroyable': 0.84.2 '@glimmer/env': 0.1.7 '@glimmer/global-context': 0.84.3 @@ -14827,9 +14562,9 @@ packages: '@glimmer/runtime': 0.84.2 '@glimmer/syntax': 0.84.2 '@glimmer/validator': 0.84.2 - '@glimmer/vm-babel-plugins': 0.84.3(@babel/core@7.23.9) + '@glimmer/vm-babel-plugins': 0.84.2(@babel/core@7.24.0) '@simple-dom/interface': 1.4.0 - babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.9) + babel-plugin-debug-macros: 0.3.4(@babel/core@7.24.0) babel-plugin-filter-imports: 4.0.0 backburner.js: 2.8.0 broccoli-concat: 4.2.5 @@ -14848,7 +14583,7 @@ packages: ember-cli-typescript-blueprint-polyfill: 0.1.0 ember-cli-version-checker: 5.1.2 ember-router-generator: 2.0.0 - inflection: 2.0.1 + inflection: 1.13.4 resolve: 1.22.8 route-recognizer: 0.3.4 router_js: 8.0.3(route-recognizer@0.3.4) @@ -14862,33 +14597,31 @@ packages: - webpack dev: true - /ember-source@5.6.0(@babel/core@7.23.9): - resolution: {integrity: sha512-dtxi3cVPT4/+NyhA+a+4UL/i+ut4Fuu3uJAgkVqrN1XlK4TXpyVp9I6VbH7DjD5+LJdF1+UqIn8GJ50dIdoH2Q==} + /ember-source@5.2.0-beta.4(@babel/core@7.23.9): + resolution: {integrity: sha512-b1Obm3gCkOk5KimtEoXTMbzxXemU8N+WT2mTTa4+9cMxv2qCO8ZVBpkyEmZvQl+W6BrF7tFVl+k6pUDQvuwWKA==} engines: {node: '>= 16.*'} dependencies: '@babel/helper-module-imports': 7.22.15 + '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.9) '@ember/edition-utils': 1.2.0 - '@glimmer/compiler': 0.85.13 + '@glimmer/compiler': 0.84.2 '@glimmer/component': 1.1.2(@babel/core@7.23.9) - '@glimmer/destroyable': 0.85.13 + '@glimmer/destroyable': 0.84.2 '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.85.13 - '@glimmer/interfaces': 0.85.13 - '@glimmer/manager': 0.85.13 - '@glimmer/node': 0.85.13 - '@glimmer/opcode-compiler': 0.85.13 - '@glimmer/owner': 0.85.13 - '@glimmer/program': 0.85.13 - '@glimmer/reference': 0.85.13 - '@glimmer/runtime': 0.85.13 - '@glimmer/syntax': 0.85.13 - '@glimmer/util': 0.85.13 - '@glimmer/validator': 0.85.13 - '@glimmer/vm': 0.85.13 - '@glimmer/vm-babel-plugins': 0.85.13(@babel/core@7.23.9) + '@glimmer/global-context': 0.84.3 + '@glimmer/interfaces': 0.84.2 + '@glimmer/manager': 0.84.2 + '@glimmer/node': 0.84.2 + '@glimmer/opcode-compiler': 0.84.2 + '@glimmer/owner': 0.84.2 + '@glimmer/program': 0.84.2 + '@glimmer/reference': 0.84.2 + '@glimmer/runtime': 0.84.2 + '@glimmer/syntax': 0.84.2 + '@glimmer/validator': 0.84.2 + '@glimmer/vm-babel-plugins': 0.84.2(@babel/core@7.23.9) '@simple-dom/interface': 1.4.0 babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.9) - babel-plugin-ember-template-compilation: 2.2.1 babel-plugin-filter-imports: 4.0.0 backburner.js: 2.8.0 broccoli-concat: 4.2.5 @@ -14907,12 +14640,12 @@ packages: ember-cli-typescript-blueprint-polyfill: 0.1.0 ember-cli-version-checker: 5.1.2 ember-router-generator: 2.0.0 - inflection: 2.0.1 + inflection: 1.13.4 + resolve: 1.22.8 route-recognizer: 0.3.4 router_js: 8.0.3(route-recognizer@0.3.4) semver: 7.6.0 silent-error: 1.1.1 - simple-html-tokenizer: 0.5.11 transitivePeerDependencies: - '@babel/core' - '@glint/template' @@ -14921,33 +14654,33 @@ packages: - webpack dev: true - /ember-source@5.7.0-beta.2(@babel/core@7.23.9): - resolution: {integrity: sha512-Ep/oOmkYhtV/xv4lhqH+XucU6ioKEcaR7BWzaCGzjG2S4ly+yJwfm8hwticBFGGpDxxm4WZrSABvwe87SHA5zQ==} + /ember-source@5.3.0(@babel/core@7.23.9)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3): + resolution: {integrity: sha512-MnsPEYo2gArYzlY0uu5bBH60oNYcgcayYQEd27nJumuaceN1sMLMu1jGQmjiQzZ4b6U5edEUNQbCIZ/9TXbASw==} engines: {node: '>= 16.*'} + peerDependencies: + '@glimmer/component': ^1.1.2 dependencies: '@babel/helper-module-imports': 7.22.15 + '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.9) '@ember/edition-utils': 1.2.0 - '@glimmer/compiler': 0.87.1 + '@glimmer/compiler': 0.84.2 '@glimmer/component': 1.1.2(@babel/core@7.23.9) - '@glimmer/destroyable': 0.87.1 + '@glimmer/destroyable': 0.84.2 '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.87.1 - '@glimmer/interfaces': 0.87.1 - '@glimmer/manager': 0.87.1 - '@glimmer/node': 0.87.1 - '@glimmer/opcode-compiler': 0.87.1 - '@glimmer/owner': 0.87.1 - '@glimmer/program': 0.87.1 - '@glimmer/reference': 0.87.1 - '@glimmer/runtime': 0.87.1 - '@glimmer/syntax': 0.87.1 - '@glimmer/util': 0.87.1 - '@glimmer/validator': 0.87.1 - '@glimmer/vm': 0.87.1 - '@glimmer/vm-babel-plugins': 0.87.1(@babel/core@7.23.9) + '@glimmer/global-context': 0.84.3 + '@glimmer/interfaces': 0.84.2 + '@glimmer/manager': 0.84.2 + '@glimmer/node': 0.84.2 + '@glimmer/opcode-compiler': 0.84.2 + '@glimmer/owner': 0.84.2 + '@glimmer/program': 0.84.2 + '@glimmer/reference': 0.84.2 + '@glimmer/runtime': 0.84.2 + '@glimmer/syntax': 0.84.2 + '@glimmer/validator': 0.84.2 + '@glimmer/vm-babel-plugins': 0.84.3(@babel/core@7.23.9) '@simple-dom/interface': 1.4.0 babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.9) - babel-plugin-ember-template-compilation: 2.2.1 babel-plugin-filter-imports: 4.0.0 backburner.js: 2.8.0 broccoli-concat: 4.2.5 @@ -14967,11 +14700,11 @@ packages: ember-cli-version-checker: 5.1.2 ember-router-generator: 2.0.0 inflection: 2.0.1 + resolve: 1.22.8 route-recognizer: 0.3.4 router_js: 8.0.3(route-recognizer@0.3.4) semver: 7.6.0 silent-error: 1.1.1 - simple-html-tokenizer: 0.5.11 transitivePeerDependencies: - '@babel/core' - '@glint/template' @@ -15125,17 +14858,6 @@ packages: - supports-color dev: true - /ember-template-tag@2.3.16: - resolution: {integrity: sha512-G6bIBcT4VnLlBUogkXxEXIzVvdYXhmLe+Io2yJzRYYZeHrdxKa6u2ZHXF4qII298grgqnqGo6tNqqgtD4AAS5g==} - dependencies: - '@babel/generator': 7.23.6 - '@babel/traverse': 7.23.9(supports-color@8.1.1) - '@babel/types': 7.23.0 - '@glimmer/syntax': 0.88.1 - transitivePeerDependencies: - - supports-color - dev: true - /ember-tracked-storage-polyfill@1.0.0: resolution: {integrity: sha512-eL7lZat68E6P/D7b9UoTB5bB5Oh/0aju0Z7PCMi3aTwhaydRaxloE7TGrTRYU+NdJuyNVZXeGyxFxn2frvd3TA==} engines: {node: 12.* || >= 14} @@ -16153,7 +15875,7 @@ packages: resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==} engines: {node: '>=0.10.0'} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 define-property: 0.2.5 extend-shallow: 2.0.1 posix-character-classes: 0.1.1 @@ -16190,7 +15912,7 @@ packages: content-type: 1.0.5 cookie: 0.5.0 cookie-signature: 1.0.6 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 depd: 2.0.0 encodeurl: 1.0.2 escape-html: 1.0.3 @@ -16454,7 +16176,7 @@ packages: resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==} engines: {node: '>= 0.8'} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 encodeurl: 1.0.2 escape-html: 1.0.3 on-finished: 2.3.0 @@ -16468,7 +16190,7 @@ packages: resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} engines: {node: '>= 0.8'} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 encodeurl: 1.0.2 escape-html: 1.0.3 on-finished: 2.4.1 @@ -17380,7 +17102,7 @@ packages: /heimdalljs-logger@0.1.10: resolution: {integrity: sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 heimdalljs: 0.2.6 transitivePeerDependencies: - supports-color @@ -18902,7 +18624,7 @@ packages: /leek@0.0.24: resolution: {integrity: sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 lodash.assign: 3.2.0 rsvp: 3.6.2 transitivePeerDependencies: @@ -19715,7 +19437,7 @@ packages: engines: {node: '>= 0.8.0'} dependencies: basic-auth: 2.0.1 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 depd: 2.0.0 on-finished: 2.3.0 on-headers: 1.0.2 @@ -21608,7 +21330,7 @@ packages: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 depd: 2.0.0 destroy: 1.2.0 encodeurl: 1.0.2 @@ -21725,7 +21447,7 @@ packages: /silent-error@1.1.1: resolution: {integrity: sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 transitivePeerDependencies: - supports-color @@ -21808,7 +21530,7 @@ packages: engines: {node: '>=0.10.0'} dependencies: base: 0.11.2 - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 define-property: 0.2.5 extend-shallow: 2.0.1 map-cache: 0.2.2 @@ -22437,7 +22159,7 @@ packages: /sync-disk-cache@1.3.4: resolution: {integrity: sha512-GlkGeM81GPPEKz/lH7QUTbvqLq7K/IUTuaKDSMulP9XQ42glqNJIN/RKgSOw4y8vxL1gOVvj+W7ruEO4s36eCw==} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 heimdalljs: 0.2.6 mkdirp: 0.5.6 rimraf: 2.7.1 @@ -22855,7 +22577,7 @@ packages: /tree-sync@1.4.0: resolution: {integrity: sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==} dependencies: - debug: 2.6.9(supports-color@8.1.1) + debug: 2.6.9 fs-tree-diff: 0.5.9 mkdirp: 0.5.6 quick-temp: 0.1.8 @@ -23162,7 +22884,7 @@ packages: resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: - browserslist: ^4.14.0 + browserslist: '>= 4.21.0' dependencies: browserslist: 4.23.0 escalade: 3.1.2 From 8e64043b3f55abb25625f82b70d4cde2fc298166 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Wed, 10 Apr 2024 17:25:26 +0100 Subject: [PATCH 02/10] with namespace in publicAssets don't include path When you provide a namespace to the options of `addon.publicAssets()` don't include the folder path in the file names. It was likely included as a bug originally but we need to only out out of it when namespace is used to prevent the need for a major release --- packages/addon-dev/README.md | 2 +- packages/addon-dev/src/rollup-public-assets.ts | 6 +++--- tests/scenarios/v2-addon-dev-test.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/addon-dev/README.md b/packages/addon-dev/README.md index 1c63cb344..bcb121123 100644 --- a/packages/addon-dev/README.md +++ b/packages/addon-dev/README.md @@ -20,7 +20,7 @@ For a guide on porting a V1 addon to V2, see https://github.com/embroider-build/ ### addon.publicAssets(path , options) -A rollup plugin to expose a folder of assets. `path` is a required to define which folder to expose. `options.include` is a glob pattern passed to `walkSync.include` to pick files. `options.exlude` is a glob pattern passed to `walkSync.ignore` to exclude files. `options.namespace` is the namespace to expose files, defaults to the package name +A rollup plugin to expose a folder of assets. `path` is a required to define which folder to expose. `options.include` is a glob pattern passed to `walkSync.include` to pick files. `options.exlude` is a glob pattern passed to `walkSync.ignore` to exclude files. `options.namespace` is the namespace to expose files, defaults to the package name + the path that you provided e.g. if you call `addon.publicAssets('public')` in a v2 addon named `super-addon` then your namespace will default to `super-addon/public`. ## addon-dev command diff --git a/packages/addon-dev/src/rollup-public-assets.ts b/packages/addon-dev/src/rollup-public-assets.ts index 2c59834d7..10aabb5bb 100644 --- a/packages/addon-dev/src/rollup-public-assets.ts +++ b/packages/addon-dev/src/rollup-public-assets.ts @@ -51,9 +51,9 @@ export default function publicAssets( }); const publicAssets: Record = filenames.reduce( (acc: Record, v): Record => { - acc[`./${path}/${v}`] = resolve( - '/' + join(opts?.namespace ?? pkg.name, path, v) - ); + const namespace = opts?.namespace ?? join(pkg.name, path); + + acc[`./${path}/${v}`] = resolve('/' + join(namespace, v)); return acc; }, {} diff --git a/tests/scenarios/v2-addon-dev-test.ts b/tests/scenarios/v2-addon-dev-test.ts index cbf9f1b73..7f2dba9ce 100644 --- a/tests/scenarios/v2-addon-dev-test.ts +++ b/tests/scenarios/v2-addon-dev-test.ts @@ -396,7 +396,7 @@ export { SingleFileComponent as default }; './public/thing.txt': '/v2-addon/public/thing.txt', }); expectNoNamespaceFile('package.json').json('ember-addon.public-assets').deepEquals({ - './public/other.txt': '/public/other.txt', + './public/other.txt': '/other.txt', }); }); }); From 8a8eacf12f28bf11a59c247e7d85766226e7587f Mon Sep 17 00:00:00 2001 From: ef4 <319282+ef4@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:45:16 +0000 Subject: [PATCH 03/10] Prepare Release using 'release-plan' --- .release-plan.json | 75 +++++---------------------------- CHANGELOG.md | 11 +++++ packages/addon-dev/package.json | 2 +- 3 files changed, 23 insertions(+), 65 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index d529ceebf..757a4c431 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -1,13 +1,13 @@ { "solution": { "@embroider/addon-dev": { - "impact": "minor", - "oldVersion": "4.2.1", - "newVersion": "4.3.0", + "impact": "patch", + "oldVersion": "4.3.0", + "newVersion": "4.3.1", "constraints": [ { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" + "impact": "patch", + "reason": "Appears in changelog section :bug: Bug Fix" } ], "pkgJSONPath": "./packages/addon-dev/package.json" @@ -19,51 +19,16 @@ "oldVersion": "3.1.1" }, "@embroider/compat": { - "impact": "patch", - "oldVersion": "3.4.6", - "newVersion": "3.4.7", - "constraints": [ - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @embroider/macros" - }, - { - "impact": "patch", - "reason": "Appears in changelog section :house: Internal" - } - ], - "pkgJSONPath": "./packages/compat/package.json" + "oldVersion": "3.4.7" }, "@embroider/core": { - "impact": "patch", - "oldVersion": "3.4.6", - "newVersion": "3.4.7", - "constraints": [ - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @embroider/shared-internals" - }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @embroider/macros" - } - ], - "pkgJSONPath": "./packages/core/package.json" + "oldVersion": "3.4.7" }, "@embroider/hbs-loader": { "oldVersion": "3.0.3" }, "@embroider/macros": { - "impact": "patch", - "oldVersion": "1.15.0", - "newVersion": "1.15.1", - "constraints": [ - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @embroider/shared-internals" - } - ], - "pkgJSONPath": "./packages/macros/package.json" + "oldVersion": "1.15.1" }, "@embroider/reverse-exports": { "oldVersion": "0.1.0" @@ -72,16 +37,7 @@ "oldVersion": "2.1.6" }, "@embroider/shared-internals": { - "impact": "minor", - "oldVersion": "2.5.2", - "newVersion": "2.6.0", - "constraints": [ - { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" - } - ], - "pkgJSONPath": "./packages/shared-internals/package.json" + "oldVersion": "2.6.0" }, "@embroider/test-setup": { "oldVersion": "3.0.3" @@ -93,17 +49,8 @@ "oldVersion": "0.2.0" }, "@embroider/webpack": { - "impact": "patch", - "oldVersion": "3.2.2", - "newVersion": "3.2.3", - "constraints": [ - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @embroider/shared-internals" - } - ], - "pkgJSONPath": "./packages/webpack/package.json" + "oldVersion": "3.2.3" } }, - "description": "## Release (2024-04-10)\n\n@embroider/addon-dev 4.3.0 (minor)\n@embroider/compat 3.4.7 (patch)\n@embroider/core 3.4.7 (patch)\n@embroider/macros 1.15.1 (patch)\n@embroider/shared-internals 2.6.0 (minor)\n@embroider/webpack 3.2.3 (patch)\n\n#### :rocket: Enhancement\n* `@embroider/addon-dev`, `@embroider/shared-internals`, `@embroider/test-scenarios`\n * [#1856](https://github.com/embroider-build/embroider/pull/1856) Compile Hbs route templates correctly ([@BlueCutOfficial](https://github.com/BlueCutOfficial))\n* `@embroider/addon-dev`, `@embroider/test-scenarios`\n * [#1867](https://github.com/embroider-build/embroider/pull/1867) add a namespace option for public-assets plugin ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* Other\n * [#1871](https://github.com/embroider-build/embroider/pull/1871) fix release-plan unlabelled changes PR ([@mansona](https://github.com/mansona))\n * [#1869](https://github.com/embroider-build/embroider/pull/1869) update release plan ([@mansona](https://github.com/mansona))\n* `@embroider/compat`, `@embroider/test-scenarios`\n * [#1806](https://github.com/embroider-build/embroider/pull/1806) resolver transform to emit imports for helper and modifiers that need… ([@void-mAlex](https://github.com/void-mAlex))\n\n#### Committers: 3\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Marine Dunstetter ([@BlueCutOfficial](https://github.com/BlueCutOfficial))\n" + "description": "## Release (2024-04-10)\n\n@embroider/addon-dev 4.3.1 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/addon-dev`, `@embroider/test-scenarios`\n * [#1874](https://github.com/embroider-build/embroider/pull/1874) with namespace in publicAssets don't include path ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 768305a98..6bcd4d136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ ## Release (2024-04-10) +@embroider/addon-dev 4.3.1 (patch) + +#### :bug: Bug Fix +* `@embroider/addon-dev`, `@embroider/test-scenarios` + * [#1874](https://github.com/embroider-build/embroider/pull/1874) with namespace in publicAssets don't include path ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + +## Release (2024-04-10) + @embroider/addon-dev 4.3.0 (minor) @embroider/compat 3.4.7 (patch) @embroider/core 3.4.7 (patch) diff --git a/packages/addon-dev/package.json b/packages/addon-dev/package.json index 6254d7221..20fd8b22b 100644 --- a/packages/addon-dev/package.json +++ b/packages/addon-dev/package.json @@ -1,6 +1,6 @@ { "name": "@embroider/addon-dev", - "version": "4.3.0", + "version": "4.3.1", "description": "Utilities for addon authors", "repository": { "type": "git", From 6d2baffff16e31a35cb61d36aeaa25bc30c061b0 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Thu, 28 Mar 2024 15:25:44 +0100 Subject: [PATCH 04/10] Add support for `{{unless}}` to the `macroCondition` macro --- packages/macros/src/glimmer/ast-transform.ts | 28 +++- .../macros/src/glimmer/macro-condition.ts | 64 ++++++++ .../components/macro-unless-test.js | 139 ++++++++++++++++++ 3 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 tests/fixtures/macro-test/tests/integration/components/macro-unless-test.js diff --git a/packages/macros/src/glimmer/ast-transform.ts b/packages/macros/src/glimmer/ast-transform.ts index 8fb071e96..b1e8832a0 100644 --- a/packages/macros/src/glimmer/ast-transform.ts +++ b/packages/macros/src/glimmer/ast-transform.ts @@ -2,7 +2,14 @@ import literal from './literal'; import getConfig from './get-config'; import dependencySatisfies from './dependency-satisfies'; import { maybeAttrs } from './macro-maybe-attrs'; -import { macroIfBlock, macroIfExpression, macroIfMustache } from './macro-condition'; +import { + macroIfBlock, + macroIfExpression, + macroIfMustache, + macroUnlessBlock, + macroUnlessExpression, + macroUnlessMustache, +} from './macro-condition'; import { failBuild } from './fail-build'; import { RewrittenPackageCache } from '@embroider/shared-internals'; @@ -181,6 +188,9 @@ export function makeSecondTransform() { if (node.path.original === 'if') { return macroIfBlock(node); } + if (node.path.original === 'unless') { + return macroUnlessBlock(node); + } }, SubExpression(node: any) { if (node.path.type !== 'PathExpression') { @@ -192,6 +202,9 @@ export function makeSecondTransform() { if (node.path.original === 'if') { return macroIfExpression(node, env.syntax.builders); } + if (node.path.original === 'unless') { + return macroUnlessExpression(node, env.syntax.builders); + } if (node.path.original === 'macroFailBuild') { failBuild(node); } @@ -208,6 +221,16 @@ export function makeSecondTransform() { return false; } } + if ( + modifier.path.type === 'SubExpression' && + modifier.path.path.type === 'PathExpression' && + modifier.path.path.original === 'unless' + ) { + modifier.path = macroUnlessExpression(modifier.path, env.syntax.builders); + if (modifier.path.type === 'UndefinedLiteral') { + return true; + } + } if (modifier.path.type !== 'PathExpression') { return true; } @@ -231,6 +254,9 @@ export function makeSecondTransform() { if (node.path.original === 'if') { return macroIfMustache(node, env.syntax.builders); } + if (node.path.original === 'unless') { + return macroUnlessMustache(node, env.syntax.builders); + } if (node.path.original === 'macroFailBuild') { failBuild(node); } diff --git a/packages/macros/src/glimmer/macro-condition.ts b/packages/macros/src/glimmer/macro-condition.ts index 0e1c0c931..2bf488720 100644 --- a/packages/macros/src/glimmer/macro-condition.ts +++ b/packages/macros/src/glimmer/macro-condition.ts @@ -63,3 +63,67 @@ export function macroIfMustache(node: any, builders: any) { return builders.mustache(result); } + +export function macroUnlessBlock(node: any) { + let condition = node.params[0]; + + if (!condition || condition.type !== 'SubExpression' || condition.path.original !== 'macroCondition') { + return node; + } + + if (condition.params.length !== 1) { + throw new Error(`macroCondition requires one arguments, you passed ${node.params.length}`); + } + + let result = evaluate(condition.params[0]); + if (!result.confident) { + throw new Error(`argument to macroCondition must be statically analyzable`); + } + + if (result.value) { + if (node.inverse) { + return node.inverse.body; + } else { + return []; + } + } else { + return node.program.body; + } +} + +export function macroUnlessExpression(node: any, builders: any) { + let condition = node.params[0]; + + if (!condition || condition.type !== 'SubExpression' || condition.path.original !== 'macroCondition') { + return node; + } + + if (condition.params.length !== 1) { + throw new Error(`macroCondition requires one arguments, you passed ${node.params.length}`); + } + + let result = evaluate(condition.params[0]); + if (!result.confident) { + throw new Error(`argument to macroCondition must be statically analyzable`); + } + + if (result.value) { + return node.params[2] || builders.undefined(); + } else { + return node.params[1]; + } +} + +export function macroUnlessMustache(node: any, builders: any) { + let result = macroUnlessExpression(node, builders); + + if (result === node) { + return node; + } + + if (result.type === 'SubExpression') { + return builders.mustache(result.path, result.params, result.hash); + } + + return builders.mustache(result); +} diff --git a/tests/fixtures/macro-test/tests/integration/components/macro-unless-test.js b/tests/fixtures/macro-test/tests/integration/components/macro-unless-test.js new file mode 100644 index 000000000..70141f277 --- /dev/null +++ b/tests/fixtures/macro-test/tests/integration/components/macro-unless-test.js @@ -0,0 +1,139 @@ +import { module, test } from 'qunit'; +import { setupRenderingTest } from 'ember-qunit'; +import { render, click } from '@ember/test-helpers'; +import hbs from 'htmlbars-inline-precompile'; +import { helper } from '@ember/component/helper'; + +module('Integration | Macro | macroCondition + {{unless}}', function (hooks) { + setupRenderingTest(hooks); + + test('macroCondition in content position when true', async function (assert) { + await render(hbs`{{#unless (macroCondition true)}}red{{else}}blue{{/unless}}`); + assert.equal(this.element.textContent.trim(), 'blue'); + }); + + test('macroCondition in content position when false', async function (assert) { + await render(hbs`{{#unless (macroCondition false)}}red{{else}}blue{{/unless}}`); + assert.equal(this.element.textContent.trim(), 'red'); + }); + + test('macroCondition in content position when true with no alternate', async function (assert) { + await render(hbs`{{#unless (macroCondition true)}}red{{/unless}}`); + assert.equal(this.element.textContent.trim(), ''); + }); + + test('macroCondition in subexpression position when true', async function (assert) { + assert.expect(1); + this.owner.register( + 'helper:my-assertion', + helper(function ([value]) { + assert.strictEqual(value, 'blue'); + }) + ); + await render(hbs`{{my-assertion (unless (macroCondition true) 'red' 'blue') }}`); + }); + + test('macroCondition inside string', async function (assert) { + assert.expect(1); + await render(hbs`
`); + assert.ok(this.element.querySelector('.target').matches('.blue')); + }); + + test('macroCondition in subexpression position when false', async function (assert) { + assert.expect(1); + this.owner.register( + 'helper:my-assertion', + helper(function ([value]) { + assert.strictEqual(value, 'red'); + }) + ); + await render(hbs`{{my-assertion (unless (macroCondition false) 'red' 'blue') }}`); + }); + + test('macroCondition in subexpression position when true with no alternate', async function (assert) { + assert.expect(1); + this.owner.register( + 'helper:my-assertion', + helper(function ([value]) { + assert.strictEqual(value, undefined); + }) + ); + await render(hbs`{{my-assertion (unless (macroCondition true) 'red') }}`); + }); + + test('macroCondition composes with other macros, true case', async function (assert) { + assert.expect(1); + this.owner.register( + 'helper:my-assertion', + helper(function ([value]) { + assert.strictEqual(value, 'blue'); + }) + ); + await render( + hbs`{{my-assertion (unless (macroCondition (macroDependencySatisfies 'ember-source' '*')) 'red' 'blue') }}` + ); + }); + + test('macroCondition composes with other macros, false case', async function (assert) { + assert.expect(1); + this.owner.register( + 'helper:my-assertion', + helper(function ([value]) { + assert.strictEqual(value, 'red'); + }) + ); + await render( + hbs`{{my-assertion (unless (macroCondition (macroDependencySatisfies 'ember-source' '10.x')) 'red' 'blue') }}` + ); + }); + + test('macroCondition composes with self', async function (assert) { + assert.expect(1); + this.owner.register( + 'helper:my-assertion', + helper(function ([value]) { + assert.strictEqual(value, 'red'); + }) + ); + await render(hbs`{{my-assertion (unless (macroCondition false) (unless (macroCondition true) 'green' 'red') 'blue') }}`); + }); + + test('macroCondition in modifier position when false', async function (assert) { + assert.expect(1); + this.doThing = function () { + assert.ok(true, 'it ran'); + }; + await render( + hbs('', { + insertRuntimeErrors: true, + }) + ); + await click('button'); + }); + + test('macroCondition in modifier position when true', async function (assert) { + assert.expect(1); + this.doThing = function () { + assert.ok(true, 'it ran'); + }; + await render( + hbs('', { + insertRuntimeErrors: true, + }) + ); + await click('button'); + }); + + test('macroCondition in modifier position when true with no alternate', async function (assert) { + assert.expect(0); + this.doThing = function () { + assert.ok(true, 'it ran'); + }; + await render( + hbs('', { + insertRuntimeErrors: true, + }) + ); + await click('button'); + }); +}); From ffee563eb8a5ff18bea1f4db69beb13f809e6dae Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 18 Apr 2024 10:09:06 +0100 Subject: [PATCH 05/10] don't use babel-plugin-module-resolver@5.0.1 --- package.json | 3 ++- pnpm-lock.yaml | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 78bab9ba8..f2dade2fa 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,8 @@ "overrides": { "browserslist": "^4.14.0", "graceful-fs": "^4.0.0", - "@types/eslint": "^8.37.0" + "@types/eslint": "^8.37.0", + "babel-plugin-module-resolver@5.0.1": "5.0.0" } }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 11c88af8f..8ef864809 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,7 @@ overrides: browserslist: ^4.14.0 graceful-fs: ^4.0.0 '@types/eslint': ^8.37.0 + babel-plugin-module-resolver@5.0.1: 5.0.0 importers: @@ -8009,9 +8010,6 @@ packages: /ajv-formats@2.1.1: resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} - peerDependenciesMeta: - ajv: - optional: true dependencies: ajv: 8.12.0 @@ -22890,7 +22888,7 @@ packages: resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: - browserslist: '>= 4.21.0' + browserslist: ^4.14.0 dependencies: browserslist: 4.23.0 escalade: 3.1.2 From 7c49f84519ede8a34fcc5476d07d63bf1b45806c Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Thu, 18 Apr 2024 07:54:08 -0400 Subject: [PATCH 06/10] Fix `pre` support in portable-babel-launcher --- packages/core/src/portable-babel-launcher.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/src/portable-babel-launcher.ts b/packages/core/src/portable-babel-launcher.ts index a7ae6b2f2..12e383845 100644 --- a/packages/core/src/portable-babel-launcher.ts +++ b/packages/core/src/portable-babel-launcher.ts @@ -34,15 +34,15 @@ export default function babelLauncher( function wrap1(original: any) { if (typeof original === 'function') { - return function (this: any, state: any) { - return original.call(this, convertState(state)); + return function (this: any, file: any) { + return original.call(convertState(this), file); }; } } function wrap2(original: Function) { return function (this: any, path: any, state: any) { - return original.call(this, path, convertState(state)); + return original.call(convertState(this), path, convertState(state)); }; } From a0d90a58c58275757a6dc0f10b693d18986bb7c8 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Thu, 18 Apr 2024 08:08:32 -0400 Subject: [PATCH 07/10] updated ember-template-compilation elides unused scope and our test had typos --- tests/scenarios/compat-resolver-test.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/scenarios/compat-resolver-test.ts b/tests/scenarios/compat-resolver-test.ts index 92a64a1e7..030f4c080 100644 --- a/tests/scenarios/compat-resolver-test.ts +++ b/tests/scenarios/compat-resolver-test.ts @@ -1406,7 +1406,7 @@ Scenarios.fromProject(() => new Project()) 'templates/application.hbs.js': ` import { precompileTemplate } from '@ember/template-compilation'; export default precompileTemplate("{{#each things as |capitalize|}} {{(capitalize)}} {{/each}}", { - scope: () => ({ thing }), + scope: () => ({ things }), }); `, }); @@ -1416,7 +1416,7 @@ Scenarios.fromProject(() => new Project()) expectTranspiled('templates/application.hbs.js').equalsCode(` import { precompileTemplate } from '@ember/template-compilation'; export default precompileTemplate("{{#each things as |capitalize|}} {{(capitalize)}} {{/each}}", { - scope: () => ({ thing }), + scope: () => ({ things }), }); `); }); @@ -1426,7 +1426,7 @@ Scenarios.fromProject(() => new Project()) 'templates/application.hbs.js': ` import { precompileTemplate } from '@ember/template-compilation'; export default precompileTemplate("{{#each things as |capitalize|}} {{/each}}", { - scope: () => ({ thing }), + scope: () => ({ things }), }); `, }); @@ -1436,7 +1436,7 @@ Scenarios.fromProject(() => new Project()) expectTranspiled('templates/application.hbs.js').equalsCode(` import { precompileTemplate } from '@ember/template-compilation'; export default precompileTemplate("{{#each things as |capitalize|}} {{/each}}", { - scope: () => ({ thing }), + scope: () => ({ things }), }); `); }); @@ -1446,7 +1446,7 @@ Scenarios.fromProject(() => new Project()) 'templates/application.hbs.js': ` import { precompileTemplate } from '@ember/template-compilation'; export default precompileTemplate("{{#each things as |capitalize|}}
{{/each}}", { - scope: () => ({ thing }), + scope: () => ({ things }), }); `, }); @@ -1456,7 +1456,7 @@ Scenarios.fromProject(() => new Project()) expectTranspiled('templates/application.hbs.js').equalsCode(` import { precompileTemplate } from '@ember/template-compilation'; export default precompileTemplate("{{#each things as |capitalize|}}
{{/each}}", { - scope: () => ({ thing }), + scope: () => ({ things }), }); `); }); @@ -1466,7 +1466,7 @@ Scenarios.fromProject(() => new Project()) 'templates/application.hbs.js': ` import { precompileTemplate } from '@ember/template-compilation'; export default precompileTemplate("{{#each things as |capitalize|}} {{capitalize 1}} {{/each}}", { - scope: () => ({ thing }), + scope: () => ({ things }), }); `, }); @@ -1476,7 +1476,7 @@ Scenarios.fromProject(() => new Project()) expectTranspiled('templates/application.hbs.js').equalsCode(` import { precompileTemplate } from '@ember/template-compilation'; export default precompileTemplate("{{#each things as |capitalize|}} {{capitalize 1}} {{/each}}", { - scope: () => ({ thing }), + scope: () => ({ things }), }); `); }); From cecb1902250bcff8af18dd87fd76f497d5bb444f Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Thu, 18 Apr 2024 08:33:43 -0400 Subject: [PATCH 08/10] inconsequential changes in output formatting --- tests/scenarios/stage1-test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scenarios/stage1-test.ts b/tests/scenarios/stage1-test.ts index c7868c5a3..a59bbd395 100644 --- a/tests/scenarios/stage1-test.ts +++ b/tests/scenarios/stage1-test.ts @@ -112,7 +112,7 @@ appScenarios ); fileContents.matches( - /hbs\(["']
Extra<\/div>["']\)/, + /precompileTemplate\(["']
Extra<\/div>["']\)/, 'called template is still hbs and custom transforms have run' ); @@ -188,7 +188,7 @@ appScenarios ); file.matches( - /hbs\(["']
Extra<\/div>["']\)/, + /precompileTemplate\(["']
Extra<\/div>["']\)/, 'called template is still hbs and custom transforms have run' ); From 6d07eab7c519c6a85da026569add958209b1c47a Mon Sep 17 00:00:00 2001 From: ef4 <319282+ef4@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:03:31 +0000 Subject: [PATCH 09/10] Prepare Release using 'release-plan' --- .release-plan.json | 72 +++++++++++++++++++++++++------- CHANGELOG.md | 25 +++++++++++ packages/compat/package.json | 2 +- packages/core/package.json | 2 +- packages/macros/package.json | 2 +- packages/test-setup/package.json | 2 +- packages/webpack/package.json | 2 +- 7 files changed, 86 insertions(+), 21 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index 757a4c431..f85471c92 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -1,16 +1,7 @@ { "solution": { "@embroider/addon-dev": { - "impact": "patch", - "oldVersion": "4.3.0", - "newVersion": "4.3.1", - "constraints": [ - { - "impact": "patch", - "reason": "Appears in changelog section :bug: Bug Fix" - } - ], - "pkgJSONPath": "./packages/addon-dev/package.json" + "oldVersion": "4.3.1" }, "@embroider/addon-shim": { "oldVersion": "1.8.7" @@ -19,16 +10,47 @@ "oldVersion": "3.1.1" }, "@embroider/compat": { - "oldVersion": "3.4.7" + "impact": "patch", + "oldVersion": "3.4.7", + "newVersion": "3.4.8", + "constraints": [ + { + "impact": "patch", + "reason": "Has dependency `workspace:*` on @embroider/macros" + } + ], + "pkgJSONPath": "./packages/compat/package.json" }, "@embroider/core": { - "oldVersion": "3.4.7" + "impact": "patch", + "oldVersion": "3.4.7", + "newVersion": "3.4.8", + "constraints": [ + { + "impact": "patch", + "reason": "Has dependency `workspace:*` on @embroider/macros" + }, + { + "impact": "patch", + "reason": "Appears in changelog section :bug: Bug Fix" + } + ], + "pkgJSONPath": "./packages/core/package.json" }, "@embroider/hbs-loader": { "oldVersion": "3.0.3" }, "@embroider/macros": { - "oldVersion": "1.15.1" + "impact": "minor", + "oldVersion": "1.15.1", + "newVersion": "1.16.0", + "constraints": [ + { + "impact": "minor", + "reason": "Appears in changelog section :rocket: Enhancement" + } + ], + "pkgJSONPath": "./packages/macros/package.json" }, "@embroider/reverse-exports": { "oldVersion": "0.1.0" @@ -40,7 +62,16 @@ "oldVersion": "2.6.0" }, "@embroider/test-setup": { - "oldVersion": "3.0.3" + "impact": "major", + "oldVersion": "3.0.3", + "newVersion": "4.0.0", + "constraints": [ + { + "impact": "major", + "reason": "Has peer dependency `workspace:^` on @embroider/webpack" + } + ], + "pkgJSONPath": "./packages/test-setup/package.json" }, "@embroider/util": { "oldVersion": "1.13.0" @@ -49,8 +80,17 @@ "oldVersion": "0.2.0" }, "@embroider/webpack": { - "oldVersion": "3.2.3" + "impact": "major", + "oldVersion": "3.2.3", + "newVersion": "4.0.0", + "constraints": [ + { + "impact": "major", + "reason": "Appears in changelog section :boom: Breaking Change" + } + ], + "pkgJSONPath": "./packages/webpack/package.json" } }, - "description": "## Release (2024-04-10)\n\n@embroider/addon-dev 4.3.1 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/addon-dev`, `@embroider/test-scenarios`\n * [#1874](https://github.com/embroider-build/embroider/pull/1874) with namespace in publicAssets don't include path ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" + "description": "## Release (2024-04-18)\n\n@embroider/compat 3.4.8 (patch)\n@embroider/core 3.4.8 (patch)\n@embroider/macros 1.16.0 (minor)\n@embroider/test-setup 4.0.0 (major)\n@embroider/webpack 4.0.0 (major)\n\n#### :boom: Breaking Change\n* `@embroider/webpack`\n * [#1868](https://github.com/embroider-build/embroider/pull/1868) Adjusting `@embroider/webpack` to use `@babel/preset-env` to avoid critical security audit ([@lupestro](https://github.com/lupestro))\n\n#### :rocket: Enhancement\n* `@embroider/macros`, `@embroider/test-fixtures`\n * [#1858](https://github.com/embroider-build/embroider/pull/1858) Add support for `{{unless}}` to the `macroCondition` macro ([@Windvis](https://github.com/Windvis))\n\n#### :bug: Bug Fix\n* `@embroider/core`, `@embroider/test-scenarios`\n * [#1885](https://github.com/embroider-build/embroider/pull/1885) Fix pre support in portable babel launcher ([@ef4](https://github.com/ef4))\n\n#### Committers: 3\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n- Ralph Mack ([@lupestro](https://github.com/lupestro))\n- Sam Van Campenhout ([@Windvis](https://github.com/Windvis))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bcd4d136..b66ee571c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ # Embroider Changelog +## Release (2024-04-18) + +@embroider/compat 3.4.8 (patch) +@embroider/core 3.4.8 (patch) +@embroider/macros 1.16.0 (minor) +@embroider/test-setup 4.0.0 (major) +@embroider/webpack 4.0.0 (major) + +#### :boom: Breaking Change +* `@embroider/webpack` + * [#1868](https://github.com/embroider-build/embroider/pull/1868) Adjusting `@embroider/webpack` to use `@babel/preset-env` to avoid critical security audit ([@lupestro](https://github.com/lupestro)) + +#### :rocket: Enhancement +* `@embroider/macros`, `@embroider/test-fixtures` + * [#1858](https://github.com/embroider-build/embroider/pull/1858) Add support for `{{unless}}` to the `macroCondition` macro ([@Windvis](https://github.com/Windvis)) + +#### :bug: Bug Fix +* `@embroider/core`, `@embroider/test-scenarios` + * [#1885](https://github.com/embroider-build/embroider/pull/1885) Fix pre support in portable babel launcher ([@ef4](https://github.com/ef4)) + +#### Committers: 3 +- Edward Faulkner ([@ef4](https://github.com/ef4)) +- Ralph Mack ([@lupestro](https://github.com/lupestro)) +- Sam Van Campenhout ([@Windvis](https://github.com/Windvis)) + ## Release (2024-04-10) @embroider/addon-dev 4.3.1 (patch) diff --git a/packages/compat/package.json b/packages/compat/package.json index 0f8400224..6abaa316e 100644 --- a/packages/compat/package.json +++ b/packages/compat/package.json @@ -1,6 +1,6 @@ { "name": "@embroider/compat", - "version": "3.4.7", + "version": "3.4.8", "private": false, "description": "Backward compatibility layer for the Embroider build system.", "repository": { diff --git a/packages/core/package.json b/packages/core/package.json index 99d28ef8f..d2678bc79 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@embroider/core", - "version": "3.4.7", + "version": "3.4.8", "private": false, "description": "A build system for EmberJS applications.", "repository": { diff --git a/packages/macros/package.json b/packages/macros/package.json index 990d90c95..613425ad8 100644 --- a/packages/macros/package.json +++ b/packages/macros/package.json @@ -1,6 +1,6 @@ { "name": "@embroider/macros", - "version": "1.15.1", + "version": "1.16.0", "private": false, "description": "Standardized build-time macros for ember apps.", "keywords": [ diff --git a/packages/test-setup/package.json b/packages/test-setup/package.json index b8ae5fede..8e6300884 100644 --- a/packages/test-setup/package.json +++ b/packages/test-setup/package.json @@ -1,6 +1,6 @@ { "name": "@embroider/test-setup", - "version": "3.0.3", + "version": "4.0.0", "repository": { "type": "git", "url": "https://github.com/embroider-build/embroider.git", diff --git a/packages/webpack/package.json b/packages/webpack/package.json index c66150bca..d24175738 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -1,6 +1,6 @@ { "name": "@embroider/webpack", - "version": "3.2.3", + "version": "4.0.0", "private": false, "description": "Builds EmberJS apps with Webpack", "repository": { From c4a8fc22e9ee9099dadb983c0fabc64993ddbdc4 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 22 Apr 2024 15:26:23 +0100 Subject: [PATCH 10/10] fix macro-unless-test to use precompileTemplate This is a new requirement for these types of tests since https://github.com/embroider-build/embroider/pull/1840 --- .../components/macro-unless-test.js | 72 ++++++++----------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/tests/fixtures/macro-test/tests/integration/components/macro-unless-test.js b/tests/fixtures/macro-test/tests/integration/components/macro-unless-test.js index 70141f277..5cb6afc65 100644 --- a/tests/fixtures/macro-test/tests/integration/components/macro-unless-test.js +++ b/tests/fixtures/macro-test/tests/integration/components/macro-unless-test.js @@ -2,7 +2,7 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; import { render, click } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -import { helper } from '@ember/component/helper'; +import { precompileTemplate } from "@ember/template-compilation"; module('Integration | Macro | macroCondition + {{unless}}', function (hooks) { setupRenderingTest(hooks); @@ -24,13 +24,12 @@ module('Integration | Macro | macroCondition + {{unless}}', function (hooks) { test('macroCondition in subexpression position when true', async function (assert) { assert.expect(1); - this.owner.register( - 'helper:my-assertion', - helper(function ([value]) { + function myAssertion(value) { assert.strictEqual(value, 'blue'); - }) - ); - await render(hbs`{{my-assertion (unless (macroCondition true) 'red' 'blue') }}`); + } + await render(precompileTemplate(`{{myAssertion (unless (macroCondition true) 'red' 'blue') }}`, { + scope: () => ({ myAssertion }) + })); }); test('macroCondition inside string', async function (assert) { @@ -41,61 +40,52 @@ module('Integration | Macro | macroCondition + {{unless}}', function (hooks) { test('macroCondition in subexpression position when false', async function (assert) { assert.expect(1); - this.owner.register( - 'helper:my-assertion', - helper(function ([value]) { + function myAssertion(value) { assert.strictEqual(value, 'red'); - }) - ); - await render(hbs`{{my-assertion (unless (macroCondition false) 'red' 'blue') }}`); + } + await render(precompileTemplate(`{{myAssertion (unless (macroCondition false) 'red' 'blue') }}`, { + scope: () => ({ myAssertion }) + })); }); test('macroCondition in subexpression position when true with no alternate', async function (assert) { assert.expect(1); - this.owner.register( - 'helper:my-assertion', - helper(function ([value]) { + function myAssertion(value) { assert.strictEqual(value, undefined); - }) - ); - await render(hbs`{{my-assertion (unless (macroCondition true) 'red') }}`); + } + await render(precompileTemplate(`{{myAssertion (unless (macroCondition true) 'red') }}`, { + scope: () => ({ myAssertion }) + })); }); test('macroCondition composes with other macros, true case', async function (assert) { assert.expect(1); - this.owner.register( - 'helper:my-assertion', - helper(function ([value]) { + function myAssertion(value) { assert.strictEqual(value, 'blue'); - }) - ); - await render( - hbs`{{my-assertion (unless (macroCondition (macroDependencySatisfies 'ember-source' '*')) 'red' 'blue') }}` - ); + } + await render(precompileTemplate(`{{myAssertion (unless (macroCondition (macroDependencySatisfies 'ember-source' '*')) 'red' 'blue') }}`, { + scope: () => ({ myAssertion }) + })); }); test('macroCondition composes with other macros, false case', async function (assert) { assert.expect(1); - this.owner.register( - 'helper:my-assertion', - helper(function ([value]) { + function myAssertion(value) { assert.strictEqual(value, 'red'); - }) - ); - await render( - hbs`{{my-assertion (unless (macroCondition (macroDependencySatisfies 'ember-source' '10.x')) 'red' 'blue') }}` - ); + } + await render(precompileTemplate(`{{myAssertion (unless (macroCondition (macroDependencySatisfies 'ember-source' '10.x')) 'red' 'blue') }}`, { + scope: () => ({ myAssertion }) + })); }); test('macroCondition composes with self', async function (assert) { assert.expect(1); - this.owner.register( - 'helper:my-assertion', - helper(function ([value]) { + function myAssertion(value) { assert.strictEqual(value, 'red'); - }) - ); - await render(hbs`{{my-assertion (unless (macroCondition false) (unless (macroCondition true) 'green' 'red') 'blue') }}`); + } + await render(precompileTemplate(`{{myAssertion (unless (macroCondition false) (unless (macroCondition true) 'green' 'red') 'blue') }}`, { + scope: () => ({ myAssertion }) + })); }); test('macroCondition in modifier position when false', async function (assert) {