From eaa266a5e52fe3154aed966f687844e572a29720 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sat, 9 Nov 2024 14:23:48 -0500 Subject: [PATCH 1/4] ember-source is required for babel-plugin-ember-template-compilation --- files/__addonLocation__/package.json | 4 ++++ index.js | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/files/__addonLocation__/package.json b/files/__addonLocation__/package.json index 4e850d8..7ffb334 100644 --- a/files/__addonLocation__/package.json +++ b/files/__addonLocation__/package.json @@ -36,6 +36,9 @@ "@embroider/addon-shim": "^1.8.7", "decorator-transforms": "^2.0.0" }, + "peerDependencies": { + "ember-source": ">= <%= latestEmberSource %>" + }, "devDependencies": { "@babel/core": "^7.24.4", <% if (typescript) { %>"@babel/plugin-transform-typescript": "^7.24.4"<% } else { %>"@babel/eslint-parser": "^7.24.1"<% } %>, @@ -72,6 +75,7 @@ "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.2.5", "concurrently": "^8.2.2", + "ember-source": "^<%= latestEmberSource %>", "ember-template-lint": "^6.0.0",<% if (packageManager === 'npm') { %> "ember-eslint-parser": "^0.4.2", <% } %>"eslint": "^8.56.0", diff --git a/index.js b/index.js index 4297a0e..ff9560d 100644 --- a/index.js +++ b/index.js @@ -286,6 +286,7 @@ module.exports = { pnpm: isPnpm(options), npm: isNpm(options), typescript: options.typescript, + latestEmberSource: '5.12.0', ext: options.typescript ? 'ts' : 'js', blueprint: 'addon', blueprintOptions: buildBlueprintOptions({ @@ -309,7 +310,11 @@ module.exports = { let files = this._super.files.apply(this, arguments); if (options.addonOnly) { - files = files.filter((filename) => filename.includes('__addonLocation__') || filesToCopyFromRootToAddonInAddonOnlyMode.includes(filename)); + files = files.filter( + (filename) => + filename.includes('__addonLocation__') || + filesToCopyFromRootToAddonInAddonOnlyMode.includes(filename), + ); } else { // filter out the addon-specific npmrc, as it // is only applicable during --addon-only @@ -386,4 +391,3 @@ function isYarn(options) { function isNpm(options) { return options.packageManager === 'npm' || options.npm; } - From 1f4e56286639cdcc3f136377cd5a8e7307ba6838 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sun, 10 Nov 2024 09:22:09 -0500 Subject: [PATCH 2/4] Update index.js --- index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/index.js b/index.js index ff9560d..565b494 100644 --- a/index.js +++ b/index.js @@ -286,7 +286,6 @@ module.exports = { pnpm: isPnpm(options), npm: isNpm(options), typescript: options.typescript, - latestEmberSource: '5.12.0', ext: options.typescript ? 'ts' : 'js', blueprint: 'addon', blueprintOptions: buildBlueprintOptions({ From 32a896c0eb36d4f78a1d464ff4fb46da90c51613 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sun, 10 Nov 2024 09:23:09 -0500 Subject: [PATCH 3/4] Update package.json --- files/__addonLocation__/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/__addonLocation__/package.json b/files/__addonLocation__/package.json index 7ffb334..35f6d65 100644 --- a/files/__addonLocation__/package.json +++ b/files/__addonLocation__/package.json @@ -37,7 +37,7 @@ "decorator-transforms": "^2.0.0" }, "peerDependencies": { - "ember-source": ">= <%= latestEmberSource %>" + "ember-source": ">= 5.4.0" }, "devDependencies": { "@babel/core": "^7.24.4", @@ -75,7 +75,7 @@ "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.2.5", "concurrently": "^8.2.2", - "ember-source": "^<%= latestEmberSource %>", + "ember-source": "^5.4.0", "ember-template-lint": "^6.0.0",<% if (packageManager === 'npm') { %> "ember-eslint-parser": "^0.4.2", <% } %>"eslint": "^8.56.0", From 58d2907f1f47e4d0a638e0e871515e73361e34bb Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sun, 10 Nov 2024 11:00:11 -0500 Subject: [PATCH 4/4] Update package.json --- files/__addonLocation__/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/__addonLocation__/package.json b/files/__addonLocation__/package.json index 35f6d65..b725f4f 100644 --- a/files/__addonLocation__/package.json +++ b/files/__addonLocation__/package.json @@ -37,7 +37,7 @@ "decorator-transforms": "^2.0.0" }, "peerDependencies": { - "ember-source": ">= 5.4.0" + "ember-source": ">= 4.12.0" }, "devDependencies": { "@babel/core": "^7.24.4",