From 6d338418e993fc1ac1fd84a431c731ddb84f74a4 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Fri, 15 Dec 2023 13:57:47 -0500 Subject: [PATCH] [BUGFIX beta] move babel-plugin-ember-template-compilation to dependencies This is a bugfix to https://github.com/emberjs/ember.js/pull/20587. We need to have an explicit dependency (not devDependency) on babel-plugin-ember-template-compilation because it's used from our addon main, which runs inside apps builds. --- lib/index.js | 2 +- package.json | 2 +- pnpm-lock.yaml | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/index.js b/lib/index.js index 22d4dfdc9ba..3ae413d3963 100644 --- a/lib/index.js +++ b/lib/index.js @@ -166,7 +166,7 @@ module.exports = { plugins: [ babelHelperPlugin, buildDebugMacroPlugin(!isProduction), - ['babel-plugin-ember-template-compilation', { compilerPath }], + [require.resolve('babel-plugin-ember-template-compilation'), { compilerPath }], ...vmBabelPlugins({ isDebug: !isProduction }), ], }), diff --git a/package.json b/package.json index 2721c96d8ff..643b50d6813 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "@glimmer/vm-babel-plugins": "0.85.13", "@simple-dom/interface": "^1.4.0", "babel-plugin-debug-macros": "^0.3.4", + "babel-plugin-ember-template-compilation": "^2.1.1", "babel-plugin-filter-imports": "^4.0.0", "backburner.js": "^2.8.0", "broccoli-concat": "^4.2.5", @@ -122,7 +123,6 @@ "@typescript-eslint/parser": "^5.62.0", "ast-types": "^0.14.2", "auto-dist-tag": "^2.1.1", - "babel-plugin-ember-template-compilation": "^2.1.1", "babel-template": "^6.26.0", "broccoli-babel-transpiler": "^7.8.1", "broccoli-persistent-filter": "^2.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7300cc0c585..59732c0cec5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -78,6 +78,9 @@ importers: babel-plugin-debug-macros: specifier: ^0.3.4 version: 0.3.4(@babel/core@7.23.2) + babel-plugin-ember-template-compilation: + specifier: ^2.1.1 + version: 2.2.0 babel-plugin-filter-imports: specifier: ^4.0.0 version: 4.0.0 @@ -205,9 +208,6 @@ importers: auto-dist-tag: specifier: ^2.1.1 version: 2.1.1 - babel-plugin-ember-template-compilation: - specifier: ^2.1.1 - version: 2.2.0 babel-template: specifier: ^6.26.0 version: 6.26.0 @@ -3829,6 +3829,7 @@ packages: /@glimmer/env@0.1.7: resolution: {integrity: sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==} + dev: false /@glimmer/global-context@0.85.13: resolution: {integrity: sha512-JY/TQ+9dyukQVuTwKlF3jVXaWUwxx676KtclYf6SphtJQu2/mysxqj9XIAowOahhi9m7E7hzHkxAl9bm2FXXjQ==} @@ -3838,6 +3839,7 @@ packages: resolution: {integrity: sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==} dependencies: '@simple-dom/interface': 1.4.0 + dev: false /@glimmer/interfaces@0.85.13: resolution: {integrity: sha512-qOEdvFgCQX1g+Gfi/nA2zbKYPmEkEbhFgzZ5esgmlQNOSQx4j8nyGiBvnG/vepHrh4wUzTvIynrCQpfr3SiKXg==} @@ -3936,6 +3938,7 @@ packages: '@glimmer/util': 0.84.3 '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 + dev: false /@glimmer/syntax@0.85.13: resolution: {integrity: sha512-zMGkJh6JcHdCTx1emmBbhBrGO04gqD6CS5khmDwSJCIpVHnGH0Ejxp9rpnSMc5IW71/hFoQY6RlMgVYF2hrHhA==} @@ -3957,6 +3960,7 @@ packages: '@glimmer/env': 0.1.7 '@glimmer/interfaces': 0.84.3 '@simple-dom/interface': 1.4.0 + dev: false /@glimmer/util@0.85.13: resolution: {integrity: sha512-ogj65iukNKEPPqQ2bOD6CLsqxsFwmiGvTQbAsg1eh1MoPjxhNZMpLsT5CdQ10XE7yUALHGJ71SwxBSpAOGDmxg==} @@ -3999,6 +4003,7 @@ packages: /@handlebars/parser@2.0.0: resolution: {integrity: sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==} + dev: false /@humanwhocodes/config-array@0.11.13: resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==} @@ -5709,6 +5714,7 @@ packages: dependencies: '@glimmer/syntax': 0.84.3 babel-import-util: 2.0.1 + dev: false /babel-plugin-filter-imports@4.0.0: resolution: {integrity: sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==} @@ -12969,6 +12975,7 @@ packages: /simple-html-tokenizer@0.5.11: resolution: {integrity: sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==} + dev: false /slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}