diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d33c19ce..7f36acdd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -203,16 +203,16 @@ importers: version: 2.9.3(@babel/core@7.23.0)(ember-source@5.3.0) '@embroider/compat': specifier: ^2.1.1 - version: 2.1.1(@embroider/core@2.1.1) + version: 2.1.1(@embroider/core@3.3.0) '@embroider/core': - specifier: ^2.1.1 - version: 2.1.1 + specifier: ^3.3.0 + version: 3.3.0 '@embroider/test-setup': specifier: ^3.0.2 - version: 3.0.2(@embroider/compat@2.1.1)(@embroider/core@2.1.1)(@embroider/webpack@2.1.1) + version: 3.0.2(@embroider/compat@2.1.1)(@embroider/core@3.3.0)(@embroider/webpack@2.1.1) '@embroider/webpack': specifier: ^2.1.1 - version: 2.1.1(@embroider/core@2.1.1)(webpack@5.78.0) + version: 2.1.1(@embroider/core@3.3.0)(webpack@5.78.0) '@glimmer/component': specifier: ^1.1.2 version: 1.1.2(@babel/core@7.23.0) @@ -476,10 +476,6 @@ packages: '@babel/highlight': 7.22.20 chalk: 2.4.2 - /@babel/compat-data@7.21.4: - resolution: {integrity: sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==} - engines: {node: '>=6.9.0'} - /@babel/compat-data@7.22.20: resolution: {integrity: sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==} engines: {node: '>=6.9.0'} @@ -551,33 +547,6 @@ packages: '@babel/helper-explode-assignable-expression': 7.18.6 '@babel/types': 7.23.0 - /@babel/helper-compilation-targets@7.21.4(@babel/core@7.21.3): - resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/compat-data': 7.22.20 - '@babel/core': 7.21.3(supports-color@8.1.1) - '@babel/helper-validator-option': 7.22.15 - browserslist: 4.22.1 - lru-cache: 5.1.1 - semver: 6.3.1 - dev: true - - /@babel/helper-compilation-targets@7.21.4(@babel/core@7.23.0): - resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/compat-data': 7.22.20 - '@babel/core': 7.23.0(supports-color@8.1.1) - '@babel/helper-validator-option': 7.22.15 - browserslist: 4.22.1 - lru-cache: 5.1.1 - semver: 6.3.1 - /@babel/helper-compilation-targets@7.22.15: resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==} engines: {node: '>=6.9.0'} @@ -596,8 +565,8 @@ packages: dependencies: '@babel/core': 7.21.3(supports-color@8.1.1) '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.5 - '@babel/helper-function-name': 7.22.5 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 '@babel/helper-member-expression-to-functions': 7.22.5 '@babel/helper-optimise-call-expression': 7.22.5 '@babel/helper-replace-supers': 7.22.20(@babel/core@7.21.3) @@ -613,8 +582,8 @@ packages: dependencies: '@babel/core': 7.23.0(supports-color@8.1.1) '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.5 - '@babel/helper-function-name': 7.22.5 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 '@babel/helper-member-expression-to-functions': 7.22.5 '@babel/helper-optimise-call-expression': 7.22.5 '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.0) @@ -630,7 +599,7 @@ packages: '@babel/core': 7.21.3(supports-color@8.1.1) '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-function-name': 7.22.5 + '@babel/helper-function-name': 7.23.0 '@babel/helper-member-expression-to-functions': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 '@babel/helper-replace-supers': 7.22.20(@babel/core@7.21.3) @@ -648,7 +617,7 @@ packages: '@babel/core': 7.23.0(supports-color@8.1.1) '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-function-name': 7.22.5 + '@babel/helper-function-name': 7.23.0 '@babel/helper-member-expression-to-functions': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.0) @@ -712,23 +681,12 @@ packages: resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==} engines: {node: '>=6.9.0'} - /@babel/helper-environment-visitor@7.22.5: - resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==} - engines: {node: '>=6.9.0'} - /@babel/helper-explode-assignable-expression@7.18.6: resolution: {integrity: sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.23.0 - /@babel/helper-function-name@7.22.5: - resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/template': 7.22.15 - '@babel/types': 7.23.0 - /@babel/helper-function-name@7.23.0: resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==} engines: {node: '>=6.9.0'} @@ -815,7 +773,7 @@ packages: dependencies: '@babel/core': 7.21.3(supports-color@8.1.1) '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-wrap-function': 7.20.5 '@babel/types': 7.23.0 transitivePeerDependencies: @@ -830,7 +788,7 @@ packages: dependencies: '@babel/core': 7.23.0(supports-color@8.1.1) '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-wrap-function': 7.20.5 '@babel/types': 7.23.0 transitivePeerDependencies: @@ -1008,7 +966,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.3(supports-color@8.1.1) - '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.21.3) '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.3) @@ -1023,7 +981,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.23.0(supports-color@8.1.1) - '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.23.0) '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.0) @@ -1263,9 +1221,9 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/compat-data': 7.21.4 + '@babel/compat-data': 7.22.20 '@babel/core': 7.21.3(supports-color@8.1.1) - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.3) + '@babel/helper-compilation-targets': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.3) '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.21.3) @@ -1277,9 +1235,9 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/compat-data': 7.21.4 + '@babel/compat-data': 7.22.20 '@babel/core': 7.23.0(supports-color@8.1.1) - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.23.0) + '@babel/helper-compilation-targets': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.0) '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.23.0) @@ -3064,7 +3022,7 @@ packages: resolution: {integrity: sha512-sFhfWC0vI18KxVenmswQ/ShIvBg4juL8ubI+Q3NTSdkCTeaPQ/DIOUF6oR5DCQ8eO/TkIaw+kdG3FkTY6yNJqA==} engines: {node: 12.* || 14.* || >= 16} dependencies: - '@embroider/shared-internals': 2.0.0 + '@embroider/shared-internals': 2.5.0 broccoli-funnel: 3.0.8 semver: 7.5.4 transitivePeerDependencies: @@ -3081,21 +3039,21 @@ packages: - supports-color dev: true - /@embroider/babel-loader-8@2.0.0(@embroider/core@2.1.1)(supports-color@8.1.1)(webpack@5.78.0): + /@embroider/babel-loader-8@2.0.0(@embroider/core@3.3.0)(supports-color@8.1.1)(webpack@5.78.0): resolution: {integrity: sha512-a1bLodfox8JEgNHuhiIBIcXJ4b8NNnKWYkMIpJx216pn80Jf1jcFosQpxnqC8hYHrnG0XRKzQ9zJYgJXoa1wfg==} engines: {node: 12.* || 14.* || >= 16} peerDependencies: '@embroider/core': ^2.0.0 dependencies: '@babel/core': 7.23.0(supports-color@8.1.1) - '@embroider/core': 2.1.1 + '@embroider/core': 3.3.0 babel-loader: 8.3.0(@babel/core@7.23.0)(webpack@5.78.0) transitivePeerDependencies: - supports-color - webpack dev: true - /@embroider/compat@2.1.1(@embroider/core@2.1.1): + /@embroider/compat@2.1.1(@embroider/core@3.3.0): resolution: {integrity: sha512-HNq5vv7NpQ1Jr+4slzmLBqsy5NDsIHilYeQiWboMrPAyHr5NHlKYWciIcmxdgPgz2kf/8D5nDiANgJznZedlyw==} engines: {node: 12.* || 14.* || >= 16} hasBin: true @@ -3107,7 +3065,7 @@ packages: '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.3) '@babel/preset-env': 7.21.4(@babel/core@7.21.3) '@babel/traverse': 7.21.4 - '@embroider/core': 2.1.1 + '@embroider/core': 3.3.0 '@embroider/macros': 1.10.0 '@types/babel__code-frame': 7.0.3 '@types/yargs': 17.0.24 @@ -3186,14 +3144,50 @@ packages: - utf-8-validate dev: true - /@embroider/hbs-loader@2.0.0(@embroider/core@2.1.1)(webpack@5.78.0): + /@embroider/core@3.3.0: + resolution: {integrity: sha512-QkOLFB3DUuDg6DU7qNAKFNJUyzgmjWNiRLcyrhThYgWeN5h8ilatG3sl5atBN6Jh3wCIJmhjXagafkA82a0abQ==} + engines: {node: 12.* || 14.* || >= 16} + dependencies: + '@babel/core': 7.23.0(supports-color@8.1.1) + '@babel/parser': 7.23.0 + '@babel/traverse': 7.23.0(supports-color@8.1.1) + '@embroider/macros': 1.13.2(@glint/template@1.2.1) + '@embroider/shared-internals': 2.5.0 + assert-never: 1.2.1 + babel-plugin-ember-template-compilation: 2.2.0 + broccoli-node-api: 1.7.0 + broccoli-persistent-filter: 3.1.3 + broccoli-plugin: 4.0.7 + broccoli-source: 3.0.1 + debug: 4.3.4(supports-color@8.1.1) + fast-sourcemap-concat: 1.4.0 + filesize: 10.0.7 + fs-extra: 9.1.0 + fs-tree-diff: 2.0.1 + handlebars: 4.7.7 + js-string-escape: 1.0.1 + jsdom: 16.7.0(supports-color@8.1.1) + lodash: 4.17.21 + resolve: 1.22.6 + resolve-package-path: 4.0.3 + typescript-memoize: 1.1.1 + walk-sync: 3.0.0 + transitivePeerDependencies: + - '@glint/template' + - bufferutil + - canvas + - supports-color + - utf-8-validate + dev: true + + /@embroider/hbs-loader@2.0.0(@embroider/core@3.3.0)(webpack@5.78.0): resolution: {integrity: sha512-rWcZyZ3n35LwlPTS6/fYsdHqPWUh4QO/cVTIJOSeLqJCATNTho7tjBXS6pBvV9cZgvqP/Xph/08xjdUyOWUOxQ==} engines: {node: 12.* || 14.* || >= 16} peerDependencies: '@embroider/core': ^2.0.0 webpack: ^5 dependencies: - '@embroider/core': 2.1.1 + '@embroider/core': 3.3.0 webpack: 5.78.0 dev: true @@ -3246,6 +3240,7 @@ packages: resolve-package-path: 4.0.3 semver: 7.5.4 typescript-memoize: 1.1.1 + dev: true /@embroider/shared-internals@2.5.0: resolution: {integrity: sha512-7qzrb7GVIyNqeY0umxoeIvjDC+ay1b+wb2yCVuYTUYrFfLAkLEy9FNI3iWCi3RdQ9OFjgcAxAnwsAiPIMZZ3pQ==} @@ -3263,7 +3258,7 @@ packages: transitivePeerDependencies: - supports-color - /@embroider/test-setup@3.0.2(@embroider/compat@2.1.1)(@embroider/core@2.1.1)(@embroider/webpack@2.1.1): + /@embroider/test-setup@3.0.2(@embroider/compat@2.1.1)(@embroider/core@3.3.0)(@embroider/webpack@2.1.1): resolution: {integrity: sha512-cq/xp06CAB8rAGnObeJux7qALnAX2MatMVLjWyGDr3ogS5lHTNXZVCv4ltTM3pJ8EsZWpPM32dtUZqSJFkGibQ==} engines: {node: 12.* || 14.* || >= 16} peerDependencies: @@ -3278,9 +3273,9 @@ packages: '@embroider/webpack': optional: true dependencies: - '@embroider/compat': 2.1.1(@embroider/core@2.1.1) - '@embroider/core': 2.1.1 - '@embroider/webpack': 2.1.1(@embroider/core@2.1.1)(webpack@5.78.0) + '@embroider/compat': 2.1.1(@embroider/core@3.3.0) + '@embroider/core': 3.3.0 + '@embroider/webpack': 2.1.1(@embroider/core@3.3.0)(webpack@5.78.0) lodash: 4.17.21 resolve: 1.22.2 dev: true @@ -3303,7 +3298,7 @@ packages: - supports-color dev: true - /@embroider/webpack@2.1.1(@embroider/core@2.1.1)(webpack@5.78.0): + /@embroider/webpack@2.1.1(@embroider/core@3.3.0)(webpack@5.78.0): resolution: {integrity: sha512-1IzXXexv/QxDyk4N6kamtiTk92HszlaQZXGB+xhnRCMY4F7Hgxad4gSPvnSy/oSkbHTMWSGjCTS5e4tQcUC8Cg==} engines: {node: 12.* || 14.* || >= 16} peerDependencies: @@ -3311,9 +3306,9 @@ packages: webpack: ^5.0.0 dependencies: '@babel/core': 7.21.3(supports-color@8.1.1) - '@embroider/babel-loader-8': 2.0.0(@embroider/core@2.1.1)(supports-color@8.1.1)(webpack@5.78.0) - '@embroider/core': 2.1.1 - '@embroider/hbs-loader': 2.0.0(@embroider/core@2.1.1)(webpack@5.78.0) + '@embroider/babel-loader-8': 2.0.0(@embroider/core@3.3.0)(supports-color@8.1.1)(webpack@5.78.0) + '@embroider/core': 3.3.0 + '@embroider/hbs-loader': 2.0.0(@embroider/core@3.3.0)(webpack@5.78.0) '@embroider/shared-internals': 2.0.0 '@types/source-map': 0.5.7 '@types/supports-color': 8.1.1 @@ -3456,7 +3451,6 @@ packages: resolution: {integrity: sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==} dependencies: '@simple-dom/interface': 1.4.0 - dev: true /@glimmer/low-level@0.78.2: resolution: {integrity: sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==} @@ -3558,7 +3552,6 @@ packages: '@glimmer/util': 0.84.3 '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 - dev: true /@glimmer/tracking@1.1.2: resolution: {integrity: sha512-cyV32zsHh+CnftuRX84ALZpd2rpbDrhLhJnTXn9W//QpqdRZ5rdMsxSY9fOsj0CKEc706tmEU299oNnDc0d7tA==} @@ -3583,7 +3576,6 @@ packages: '@glimmer/env': 0.1.7 '@glimmer/interfaces': 0.84.3 '@simple-dom/interface': 1.4.0 - dev: true /@glimmer/validator@0.44.0: resolution: {integrity: sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==} @@ -5621,6 +5613,13 @@ packages: dependencies: babel-import-util: 1.3.0 + /babel-plugin-ember-template-compilation@2.2.0: + resolution: {integrity: sha512-1I7f5gf06h5wKdKUvaYEIaoSFur5RLUvTMQG4ak0c5Y11DWUxcoX9hrun1xe9fqfY2dtGFK+ZUM6sn6z8sqK/w==} + engines: {node: '>= 12.*'} + dependencies: + '@glimmer/syntax': 0.84.3 + babel-import-util: 2.0.1 + /babel-plugin-filter-imports@4.0.0: resolution: {integrity: sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==} engines: {node: '>=8'} @@ -8091,7 +8090,7 @@ packages: '@babel/plugin-proposal-decorators': 7.23.0(@babel/core@7.23.0) '@babel/preset-env': 7.21.4(@babel/core@7.23.0) '@embroider/macros': 1.13.2(@glint/template@1.2.1) - '@embroider/shared-internals': 2.0.0 + '@embroider/shared-internals': 2.5.0 babel-loader: 8.3.0(@babel/core@7.23.0)(webpack@5.78.0) babel-plugin-ember-modules-api-polyfill: 3.5.0 babel-plugin-ember-template-compilation: 2.0.2 @@ -8296,7 +8295,7 @@ packages: engines: {node: 12.* || 14.* || >= 16} dependencies: '@ember/edition-utils': 1.2.0 - babel-plugin-ember-template-compilation: 2.0.2 + babel-plugin-ember-template-compilation: 2.2.0 babel-plugin-htmlbars-inline-precompile: 5.3.1 broccoli-debug: 0.6.5 broccoli-persistent-filter: 3.1.3 @@ -11227,7 +11226,7 @@ packages: engines: {node: '>=14.18.0'} dependencies: ansi-escapes: 4.3.2 - chalk: 5.2.0 + chalk: 5.3.0 cli-cursor: 3.1.0 cli-width: 4.0.0 external-editor: 3.1.0 @@ -13295,7 +13294,7 @@ packages: resolution: {integrity: sha512-ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: - chalk: 5.2.0 + chalk: 5.3.0 cli-cursor: 4.0.0 cli-spinners: 2.8.0 is-interactive: 2.0.0 @@ -15943,7 +15942,7 @@ packages: engines: {node: '>=14.16'} dependencies: boxen: 7.0.2 - chalk: 5.2.0 + chalk: 5.3.0 configstore: 6.0.0 has-yarn: 3.0.0 import-lazy: 4.0.0 diff --git a/test-app/package.json b/test-app/package.json index 730d3a3f..9ed67eaa 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -32,7 +32,7 @@ "@ember/string": "^3.0.1", "@ember/test-helpers": "^2.9.3", "@embroider/compat": "^2.1.1", - "@embroider/core": "^2.1.1", + "@embroider/core": "^3.3.0", "@embroider/test-setup": "^3.0.2", "@embroider/webpack": "^2.1.1", "@glimmer/component": "^1.1.2",