ember-cli 7.1.0-beta.1 → 7.1.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ember-cli Changelog
 
+## Release (2026-05-30)
+
+* ember-cli 7.1.0-beta.2 (patch)
+
+#### :bug: Bug Fix
+* `ember-cli`
+  * [#11028](https://github.com/ember-cli/ember-cli/pull/11028) [BUGFIX release] fix require(esm) of blueprint indexes ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* `ember-cli`
+  * [#11033](https://github.com/ember-cli/ember-cli/pull/11033) Merge release into beta ([@mansona](https://github.com/mansona))
+
+#### Committers: 2
+- Chris Manson ([@mansona](https://github.com/mansona))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## Release (2026-05-22)
 
 * ember-cli 7.1.0-beta.1 (minor)

package/docs/build/data.json

@@ -3,7 +3,7 @@
         "logo": "https://ember-cli.com/assets/images/ember-cli-logo-small-dark.png",
         "name": "ember-cli",
         "description": "Command line tool for developing ambitious ember.js apps",
-        "version": "7.1.0-beta.1-beta-d7278bc2cc"
+        "version": "7.1.0-beta.2-beta-27b546bfdd"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -4624,7 +4624,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1490,
+            "line": 1494,
             "static": 1,
             "itemtype": "method",
             "name": "list",
@@ -4654,7 +4654,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1554,
+            "line": 1558,
             "description": "Files that are renamed when installed into the target directory.\nThis allows including files in the blueprint that would have an effect\non another process, such as a file named `.gitignore`.\n\nThe keys are the filenames used in the files folder.\nThe values are the filenames used in the target directory.",
             "static": 1,
             "itemtype": "property",
@@ -4665,7 +4665,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1569,
+            "line": 1573,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredFiles",
@@ -4675,7 +4675,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1575,
+            "line": 1579,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredUpdateFiles",
@@ -4685,7 +4685,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1581,
+            "line": 1585,
             "static": 1,
             "itemtype": "property",
             "name": "defaultLookupPaths",
@@ -4695,7 +4695,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1589,
+            "line": 1593,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4717,7 +4717,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1602,
+            "line": 1606,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4735,7 +4735,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1613,
+            "line": 1617,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4753,7 +4753,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1622,
+            "line": 1626,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4780,7 +4780,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1636,
+            "line": 1640,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4802,7 +4802,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1648,
+            "line": 1652,
             "description": "Combines provided lookup paths with defaults and removes\nduplicates.",
             "access": "private",
             "tagname": "",
@@ -4825,7 +4825,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1663,
+            "line": 1667,
             "description": "Looks for a __path__ token in the files folder. Must be present for\nthe blueprint to support pod tokens.",
             "access": "private",
             "tagname": "",
@@ -4848,7 +4848,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1702,
+            "line": 1706,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4870,7 +4870,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1716,
+            "line": 1720,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4892,7 +4892,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1726,
+            "line": 1730,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4907,7 +4907,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1739,
+            "line": 1743,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4929,7 +4929,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1789,
+            "line": 1793,
             "description": "Takes a substring of a string based on byte offsets.",
             "access": "private",
             "tagname": "",

package/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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "7.1.0-beta.1",
+  "version": "7.1.0-beta.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",

package/packages/app-blueprint/files/package.json

@@ -63,7 +63,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.1",
     "ember-auto-import": "^2.13.1",
-    "ember-cli": "~7.1.0-beta.1",
+    "ember-cli": "~7.1.0-beta.2",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.3.1",
     "ember-cli-clean-css": "^3.0.0",