diff --git a/packages/ember-l10n/package.json b/packages/ember-l10n/package.json index 816b132..3e2858e 100644 --- a/packages/ember-l10n/package.json +++ b/packages/ember-l10n/package.json @@ -41,8 +41,8 @@ "@ember-gettext/gettext-parser": "0.10.0", "@ember/optional-features": "~2.0.0", "@ember/test-helpers": "~2.9.3", - "@embroider/compat": "~1.9.0", - "@embroider/core": "~1.9.0", + "@embroider/compat": "~2.0.2", + "@embroider/core": "~2.0.2", "@embroider/webpack": "~1.8.0", "broccoli-asset-rev": "~3.0.0", "ember-auto-import": "~2.5.0", diff --git a/yarn.lock b/yarn.lock index c3901c5..7a36094 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1468,21 +1468,21 @@ "@embroider/core" "1.8.0" babel-loader "8" -"@embroider/compat@~1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-1.9.0.tgz#b2fd764de14b9efec6fe769fa46f7e0f8d63d625" - integrity sha512-4BMW8frZ5RZJY54jmhDNe7cdRqosWynJ6bPTVfL+jvE0Z8o2ROtneMOojj7jouhyRE9XfAnIioI/RenZTei3kg== +"@embroider/compat@~2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-2.0.2.tgz#b1eb1b0593007bb2e75786a989b11fc5a06b40a6" + integrity sha512-F/jqXlfiXT9Vl06lSVbwkv2ixTftgqnbE5A34LCcOEBwzUKn47yTYTlNofB+D0Gyhw1MOwUm6utbF9oKpdTyYg== dependencies: "@babel/code-frame" "^7.14.5" "@babel/core" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/preset-env" "^7.14.5" "@babel/traverse" "^7.14.5" - "@embroider/macros" "1.9.0" - "@embroider/shared-internals" "1.8.3" + "@embroider/macros" "1.10.0" "@types/babel__code-frame" "^7.0.2" "@types/yargs" "^17.0.3" assert-never "^1.1.0" + babel-plugin-ember-template-compilation "^2.0.0" babel-plugin-syntax-dynamic-import "^6.18.0" babylon "^6.18.0" bind-decorator "^1.0.11" @@ -1586,10 +1586,10 @@ walk-sync "^3.0.0" wrap-legacy-hbs-plugin-if-needed "^1.0.1" -"@embroider/core@~1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@embroider/core/-/core-1.9.0.tgz#7a5f1612a89be1f8de47dd520ccb8d6304f5eeae" - integrity sha512-fjPb1pU7a+V9clpfBCa8CHdxbz7hr6azwNw/DqRQIMM272nrOPml65YVsBE24z7NrHdkqHjvmvDQ+qtl6oBhPw== +"@embroider/core@~2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@embroider/core/-/core-2.0.2.tgz#73532d248def5833b7af4e55350e1561a3189667" + integrity sha512-noxrIOTiOI8ZW9s7hLCOhSHfsttgkPXN1on/2aovCHza0lQ9DNi4V5Ybpd4QMaTh+OzsrLGnV9qdj7kd9GpWSg== dependencies: "@babel/core" "^7.14.5" "@babel/parser" "^7.14.5" @@ -1597,11 +1597,11 @@ "@babel/plugin-transform-runtime" "^7.14.5" "@babel/runtime" "^7.14.5" "@babel/traverse" "^7.14.5" - "@embroider/macros" "1.9.0" - "@embroider/shared-internals" "1.8.3" + "@embroider/macros" "1.10.0" + "@embroider/shared-internals" "2.0.0" assert-never "^1.2.1" babel-import-util "^1.1.0" - babel-plugin-ember-template-compilation "^1.0.0" + babel-plugin-ember-template-compilation "^2.0.0" broccoli-node-api "^1.7.0" broccoli-persistent-filter "^3.1.2" broccoli-plugin "^4.0.7" @@ -1618,10 +1618,8 @@ lodash "^4.17.21" resolve "^1.20.0" resolve-package-path "^4.0.1" - strip-bom "^4.0.0" typescript-memoize "^1.0.1" walk-sync "^3.0.0" - wrap-legacy-hbs-plugin-if-needed "^1.0.1" "@embroider/hbs-loader@1.8.0": version "1.8.0" @@ -1643,26 +1641,12 @@ resolve "^1.8.1" semver "^7.3.2" -"@embroider/macros@1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.8.0.tgz#9e947e6292f0d7768a0f743d883c3e794457eaec" - integrity sha512-jeRoUMPbZ/ADBU0FsyBGS1UgV5vQmwIPnpbVUsJ0XcZFZq/8ZHV6Ts4yeubvH/lePnUpHaKogs4dDvGk5tpQKw== - dependencies: - "@embroider/shared-internals" "1.8.0" - assert-never "^1.2.1" - babel-import-util "^1.1.0" - ember-cli-babel "^7.26.6" - find-up "^5.0.0" - lodash "^4.17.21" - resolve "^1.20.0" - semver "^7.3.2" - -"@embroider/macros@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.9.0.tgz#0df2a56fdd93f11fddea450b6ca83cc2119b5008" - integrity sha512-12ElrRT+mX3aSixGHjHnfsnyoH1hw5nM+P+Ax0ITZdp6TaAvWZ8dENnVHltdnv4ssHiX0EsVEXmqbIIdMN4nLA== +"@embroider/macros@1.10.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.9.0": + version "1.10.0" + resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e" + integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg== dependencies: - "@embroider/shared-internals" "1.8.3" + "@embroider/shared-internals" "2.0.0" assert-never "^1.2.1" babel-import-util "^1.1.0" ember-cli-babel "^7.26.6" @@ -1671,12 +1655,12 @@ resolve "^1.20.0" semver "^7.3.2" -"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.9.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e" - integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg== +"@embroider/macros@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.8.0.tgz#9e947e6292f0d7768a0f743d883c3e794457eaec" + integrity sha512-jeRoUMPbZ/ADBU0FsyBGS1UgV5vQmwIPnpbVUsJ0XcZFZq/8ZHV6Ts4yeubvH/lePnUpHaKogs4dDvGk5tpQKw== dependencies: - "@embroider/shared-internals" "2.0.0" + "@embroider/shared-internals" "1.8.0" assert-never "^1.2.1" babel-import-util "^1.1.0" ember-cli-babel "^7.26.6" @@ -1699,20 +1683,6 @@ semver "^7.3.5" typescript-memoize "^1.0.1" -"@embroider/shared-internals@1.8.3": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.8.3.tgz#52d868dc80016e9fe983552c0e516f437bf9b9f9" - integrity sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w== - dependencies: - babel-import-util "^1.1.0" - ember-rfc176-data "^0.3.17" - fs-extra "^9.1.0" - js-string-escape "^1.0.1" - lodash "^4.17.21" - resolve-package-path "^4.0.1" - semver "^7.3.5" - typescript-memoize "^1.0.1" - "@embroider/shared-internals@2.0.0", "@embroider/shared-internals@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316" @@ -3571,10 +3541,10 @@ babel-import-util@^0.2.0: resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23" integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag== -babel-import-util@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93" - integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA== +babel-import-util@^1.1.0, babel-import-util@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e" + integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g== babel-loader@8, babel-loader@^8.0.6, babel-loader@^8.2.2: version "8.2.3" @@ -3645,6 +3615,13 @@ babel-plugin-ember-template-compilation@^1.0.0: magic-string "^0.25.7" string.prototype.matchall "^4.0.5" +babel-plugin-ember-template-compilation@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.0.tgz#41d895874ba6119dd461f61993c16d1154bf8a57" + integrity sha512-d+4jaB2ik0rt9TH0K9kOlKJeRBHEb373FgFMcU9ZaJL2zYuVXe19bqy+cWlLpLf1tpOBcBG9QTlFBCoImlOt1g== + dependencies: + babel-import-util "^1.3.0" + babel-plugin-filter-imports@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4"