ember-cli · mansona · May 30, 2026 · May 22, 2026 · May 22, 2026 · May 22, 2026
diff --git a/lib/models/blueprint.js b/lib/models/blueprint.js
@@ -1474,7 +1474,11 @@ Blueprint.load = function (blueprintPath, blueprintOptions) {
 
     let constructorPath = path.resolve(blueprintPath, 'index.js');
     if (Blueprint._existsSync(constructorPath)) {
-      const blueprintModule = require(constructorPath);
+      let blueprintModule = require(constructorPath);
+
+      if (blueprintModule.__esModule) {
+        blueprintModule = blueprintModule.default;
+      }
 
       if (typeof blueprintModule === 'function') {
         Constructor = blueprintModule;

diff --git a/tests/fixtures/blueprints/basic-esm/files/.ember-cli b/tests/fixtures/blueprints/basic-esm/files/.ember-cli
@@ -0,0 +1,7 @@
+{
+  "port": 4200,
+  "host": "0.0.0.0",
+  "live-reload": true,
+  "environment": "development",
+  "checkForUpdates": false
+}
diff --git a/tests/fixtures/blueprints/basic-esm/files/.gitignore b/tests/fixtures/blueprints/basic-esm/files/.gitignore
diff --git a/tests/fixtures/blueprints/basic-esm/files/__root__/__path__/__name__.txt b/tests/fixtures/blueprints/basic-esm/files/__root__/__path__/__name__.txt
@@ -0,0 +1 @@
+a file
diff --git a/tests/fixtures/blueprints/basic-esm/files/bar b/tests/fixtures/blueprints/basic-esm/files/bar
diff --git a/tests/fixtures/blueprints/basic-esm/files/file-to-remove.txt b/tests/fixtures/blueprints/basic-esm/files/file-to-remove.txt
diff --git a/tests/fixtures/blueprints/basic-esm/files/foo.txt b/tests/fixtures/blueprints/basic-esm/files/foo.txt
@@ -0,0 +1 @@
+foo
diff --git a/tests/fixtures/blueprints/basic-esm/files/test.txt b/tests/fixtures/blueprints/basic-esm/files/test.txt
@@ -0,0 +1 @@
+I AM <%= replacementTest %>
diff --git a/tests/fixtures/blueprints/basic-esm/index.js b/tests/fixtures/blueprints/basic-esm/index.js
@@ -0,0 +1,12 @@
+'use strict';
+
+import Blueprint from '../../../../lib/models/blueprint.js';
+
+export default Blueprint.extend({
+  description: 'A basic blueprint',
+  beforeInstall(options, locals){
+      return Promise.resolve().then(function(){
+          locals.replacementTest = 'TESTY';
+      });
+  }
+});
diff --git a/tests/fixtures/blueprints/basic-esm/package.json b/tests/fixtures/blueprints/basic-esm/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "basic-esm",
+  "type": "module"
+}
diff --git a/tests/fixtures/help/classic/generate-with-addon.txt b/tests/fixtures/help/classic/generate-with-addon.txt
@@ -25,6 +25,8 @@ ember generate [33m<blueprint>[39m [36m<options...>[39m
     fixtures:
       basic [33m<name>[39m
         [90mA basic blueprint[39m
+      basic-esm [33m<name>[39m
+        [90mA basic blueprint[39m
       basic_2 [33m<name>[39m
         [90mAnother basic blueprint[39m
       exporting-object [33m<name>[39m

diff --git a/tests/fixtures/help/classic/with-addon-blueprints.js b/tests/fixtures/help/classic/with-addon-blueprints.js
@@ -318,6 +318,13 @@ module.exports = {
               anonymousOptions: ['name'],
               overridden: false
             },
+            {
+              name: 'basic-esm',
+              description: 'A basic blueprint',
+              availableOptions: [],
+              anonymousOptions: ['name'],
+              overridden: false
+            },
             {
               name: 'basic_2',
               description: 'Another basic blueprint',

diff --git a/tests/fixtures/help/generate-with-addon.txt b/tests/fixtures/help/generate-with-addon.txt
@@ -23,6 +23,8 @@ ember generate [33m<blueprint>[39m [36m<options...>[39m
     fixtures:
       basic [33m<name>[39m
         [90mA basic blueprint[39m
+      basic-esm [33m<name>[39m
+        [90mA basic blueprint[39m
       basic_2 [33m<name>[39m
         [90mAnother basic blueprint[39m
       exporting-object [33m<name>[39m

diff --git a/tests/fixtures/help/with-addon-blueprints.js b/tests/fixtures/help/with-addon-blueprints.js
@@ -269,6 +269,13 @@ module.exports = {
               anonymousOptions: ['name'],
               overridden: false
             },
+            {
+              name: 'basic-esm',
+              description: 'A basic blueprint',
+              availableOptions: [],
+              anonymousOptions: ['name'],
+              overridden: false
+            },
             {
               name: 'basic_2',
               description: 'Another basic blueprint',

diff --git a/tests/integration/models/blueprint-test.js b/tests/integration/models/blueprint-test.js
@@ -82,6 +82,7 @@ let instrumented = {
 let fixtureBlueprints = path.resolve(__dirname, '..', '..', 'fixtures', 'blueprints');
 let basicBlueprint = path.join(fixtureBlueprints, 'basic');
 let basicNewBlueprint = path.join(fixtureBlueprints, 'basic_2');
+let basicEsmBlueprint = path.join(fixtureBlueprints, 'basic-esm');
 
 let basicBlueprintFiles = [
   '.ember-cli',
@@ -1259,6 +1260,12 @@ describe('Blueprint', function () {
       expect(blueprint.name).to.equal('basic');
     });
 
+    it('loads and returns a blueprint object (from esm)', function () {
+      let blueprint = Blueprint.load(basicEsmBlueprint);
+      expect(blueprint).to.be.an('object');
+      expect(blueprint.name).to.equal('basic-esm');
+    });
+
     it('loads only blueprints with an index.js', function () {
       expect(Blueprint.load(path.join(fixtureBlueprints, '.notablueprint'))).to.not.exist;
     });