ember-cli 7.1.0-alpha.3 → 7.1.0-beta.2

package/CHANGELOG.md

@@ -1,20 +1,41 @@
 # ember-cli Changelog
 
-## Release (2026-05-13)
+## Release (2026-05-30)
 
-* ember-cli 7.1.0-alpha.3 (minor)
-* @ember-tooling/classic-build-addon-blueprint 7.1.0-alpha.2 (patch)
-* @ember-tooling/classic-build-app-blueprint 7.1.0-alpha.3 (patch)
-* @ember-tooling/blueprint-model 0.6.3 (patch)
+* 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)
+* @ember-tooling/classic-build-addon-blueprint 7.1.0-beta.1 (minor)
+* @ember-tooling/classic-build-app-blueprint 7.1.0-beta.1 (minor)
 
 #### :rocket: Enhancement
+* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#11026](https://github.com/ember-cli/ember-cli/pull/11026) Prepare 7.1 beta ([@mansona](https://github.com/mansona))
 * `ember-cli`
   * [#10610](https://github.com/ember-cli/ember-cli/pull/10610) use semver-deprecate instead of internal code ([@mansona](https://github.com/mansona))
   * [#11008](https://github.com/ember-cli/ember-cli/pull/11008) update babel-remove-types to v2 ([@mansona](https://github.com/mansona))
   * [#11009](https://github.com/ember-cli/ember-cli/pull/11009) update configstore to v8 ([@mansona](https://github.com/mansona))
+* `@ember-tooling/classic-build-app-blueprint`, `ember-cli`
+  * [#11006](https://github.com/ember-cli/ember-cli/pull/11006) update ember-welcome-page to v8 in app blueprint ([@mansona](https://github.com/mansona))
+  * [#11005](https://github.com/ember-cli/ember-cli/pull/11005) update ember-cli-deprecation-workflow to v4 ([@mansona](https://github.com/mansona))
+  * [#11003](https://github.com/ember-cli/ember-cli/pull/11003) update @ember/optional-features to v3 ([@mansona](https://github.com/mansona))
 
 #### :bug: Bug Fix
-* `ember-cli`, `@ember-tooling/blueprint-model`
+* `ember-cli`
   * [#11020](https://github.com/ember-cli/ember-cli/pull/11020) Update diff to latest v8.x ([@mkszepp](https://github.com/mkszepp))
 
 #### :house: Internal
@@ -29,42 +50,15 @@
 - Katie Gengler ([@kategengler](https://github.com/kategengler))
 - Markus Sanin ([@mkszepp](https://github.com/mkszepp))
 
-## Release (2026-04-26)
-
-* ember-cli 7.1.0-alpha.2 (minor)
-* @ember-tooling/classic-build-app-blueprint 7.1.0-alpha.2 (minor)
+## Release (2026-05-15)
 
-#### :rocket: Enhancement
-* `@ember-tooling/classic-build-app-blueprint`, `ember-cli`
-  * [#11006](https://github.com/ember-cli/ember-cli/pull/11006) update ember-welcome-page to v8 in app blueprint ([@mansona](https://github.com/mansona))
-  * [#11005](https://github.com/ember-cli/ember-cli/pull/11005) update ember-cli-deprecation-workflow to v4 ([@mansona](https://github.com/mansona))
-  * [#11003](https://github.com/ember-cli/ember-cli/pull/11003) update @ember/optional-features to v3 ([@mansona](https://github.com/mansona))
-
-#### Committers: 1
-- Chris Manson ([@mansona](https://github.com/mansona))
-
-## Release (2026-04-24)
-
-* ember-cli 7.1.0-alpha.1 (minor)
-* @ember-tooling/classic-build-addon-blueprint 7.1.0-alpha.1 (minor)
-* @ember-tooling/classic-build-app-blueprint 7.1.0-alpha.1 (minor)
+* ember-cli 7.0.0 (major)
+* @ember-tooling/classic-build-addon-blueprint 7.0.0 (major)
+* @ember-tooling/classic-build-app-blueprint 7.0.0 (major)
 
-#### :rocket: Enhancement
-* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
-  * [#11001](https://github.com/ember-cli/ember-cli/pull/11001) Prepare 7.1 Alpha ([@mansona](https://github.com/mansona))
-
-#### Committers: 1
-- Chris Manson ([@mansona](https://github.com/mansona))
-
-## Release (2026-04-21)
-
-* ember-cli 7.0.0-beta.1 (minor)
-* @ember-tooling/classic-build-addon-blueprint 7.0.0-beta.1 (minor)
-* @ember-tooling/classic-build-app-blueprint 7.0.0-beta.1 (minor)
-
-#### :rocket: Enhancement
+#### :boom: Breaking Change
 * `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
-  * [#10997](https://github.com/ember-cli/ember-cli/pull/10997) Prepare 7.0 Beta ([@mansona](https://github.com/mansona))
+  * [#11022](https://github.com/ember-cli/ember-cli/pull/11022) Promote Beta and update all dependencies for 7.0 release ([@mansona](https://github.com/mansona))
 
 #### Committers: 1
 - Chris Manson ([@mansona](https://github.com/mansona))

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-alpha.3-master-cd502c1415"
+        "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-alpha.3",
+  "version": "7.1.0-beta.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -31,34 +31,36 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   },
   "dependencies": {
-    "@ember/app-blueprint": "~7.1.0-alpha.1",
-    "@pnpm/find-workspace-dir": "^1000.1.3",
+    "@ember-tooling/blueprint-blueprint": "^0.3.0",
+    "@ember-tooling/blueprint-model": "^0.6.3",
+    "@ember/app-blueprint": "~7.1.0-beta.1",
+    "@pnpm/find-workspace-dir": "^1000.1.5",
     "babel-remove-types": "^2.0.0",
     "broccoli": "^4.0.0",
-    "broccoli-concat": "^4.2.5",
+    "broccoli-concat": "^4.2.7",
     "broccoli-config-loader": "^1.0.1",
-    "broccoli-config-replace": "^1.1.2",
+    "broccoli-config-replace": "^1.1.3",
     "broccoli-debug": "^0.6.5",
     "broccoli-funnel": "^3.0.8",
     "broccoli-funnel-reducer": "^1.0.0",
     "broccoli-merge-trees": "^4.2.0",
-    "broccoli-middleware": "^2.1.1",
+    "broccoli-middleware": "^2.1.2",
     "broccoli-slow-trees": "^3.1.0",
     "broccoli-source": "^3.0.1",
     "broccoli-stew": "^3.0.0",
     "calculate-cache-key-for-tree": "^2.0.0",
     "capture-exit": "^2.0.0",
     "chalk": "^5.6.2",
-    "ci-info": "^4.3.1",
+    "ci-info": "^4.4.0",
     "clean-base-url": "^1.0.0",
     "compression": "^1.8.1",
     "configstore": "^8.0.0",
     "console-ui": "^3.1.2",
-    "content-tag": "^4.0.0",
+    "content-tag": "^4.2.0",
     "core-object": "^3.1.5",
     "dag-map": "^2.0.2",
     "diff": "^8.0.4",
@@ -70,87 +72,85 @@
     "execa": "^9.6.1",
     "exit": "^0.1.2",
     "express": "^5.2.1",
-    "filesize": "^11.0.13",
+    "filesize": "^11.0.17",
     "find-up": "^8.0.0",
     "find-yarn-workspace-root": "^2.0.0",
-    "fs-extra": "^11.3.3",
+    "fs-extra": "^11.3.5",
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
-    "glob": "^13.0.0",
+    "glob": "^13.0.6",
     "heimdalljs": "^0.2.6",
     "heimdalljs-fs-monitor": "^1.1.2",
     "heimdalljs-graph": "^1.0.0",
     "heimdalljs-logger": "^0.1.10",
     "http-proxy": "^1.18.1",
     "inflection": "^3.0.2",
-    "inquirer": "^13.1.0",
+    "inquirer": "^13.4.3",
     "is-git-url": "^1.0.0",
-    "is-language-code": "^5.1.0",
-    "lodash": "^4.17.21",
-    "markdown-it": "^14.1.0",
+    "is-language-code": "^5.1.3",
+    "lodash": "^4.18.1",
+    "markdown-it": "^14.1.1",
     "markdown-it-terminal": "^0.4.0",
-    "minimatch": "^10.1.1",
+    "minimatch": "^10.2.5",
     "morgan": "^1.10.1",
     "nopt": "^3.0.6",
     "npm-package-arg": "^13.0.2",
     "os-locale": "^6.0.2",
     "p-defer": "^4.0.1",
-    "portfinder": "^1.0.32",
+    "portfinder": "^1.0.38",
     "promise-map-series": "^0.3.0",
     "promise.hash.helper": "^1.0.8",
     "quick-temp": "^0.1.9",
-    "resolve": "^1.22.11",
+    "resolve": "^1.22.12",
     "resolve-package-path": "^4.0.3",
-    "safe-stable-stringify": "^2.4.3",
+    "safe-stable-stringify": "^2.5.0",
     "sane": "^5.0.1",
-    "semver": "^7.7.3",
+    "semver": "^7.8.0",
     "semver-deprecate": "^1.1.0",
     "silent-error": "^1.1.1",
-    "sort-package-json": "^3.6.0",
+    "sort-package-json": "^3.6.1",
     "symlink-or-copy": "^1.3.1",
-    "testem": "^3.17.0",
+    "testem": "^3.20.0",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
     "walk-sync": "^4.0.1",
     "watch-detector": "^1.0.2",
-    "workerpool": "^10.0.1",
+    "workerpool": "^10.0.2",
     "yam": "^1.0.0",
-    "@ember-tooling/blueprint-blueprint": "0.3.0",
-    "@ember-tooling/blueprint-model": "0.6.3",
-    "@ember-tooling/classic-build-app-blueprint": "7.1.0-alpha.3",
-    "@ember-tooling/classic-build-addon-blueprint": "7.1.0-alpha.2"
+    "@ember-tooling/classic-build-addon-blueprint": "7.1.0-beta.1",
+    "@ember-tooling/classic-build-app-blueprint": "7.1.0-beta.1"
   },
   "devDependencies": {
-    "broccoli-plugin": "^4.0.3",
+    "broccoli-plugin": "^4.0.7",
     "broccoli-test-helper": "^2.0.0",
-    "chai": "^6.2.1",
+    "chai": "^6.2.2",
     "chai-as-promised": "^8.0.2",
     "chai-files": "^1.4.0",
     "chai-jest-snapshot": "^2.0.0",
     "concurrently": "^9.2.1",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^8.44.0",
+    "eslint": "^8.57.1",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-chai-expect": "^3.0.0",
+    "eslint-plugin-chai-expect": "^3.1.0",
     "eslint-plugin-mocha": "^10.5.0",
-    "eslint-plugin-n": "^17.23.1",
+    "eslint-plugin-n": "^17.24.0",
     "fixturify": "^3.0.0",
     "fixturify-project": "^2.1.1",
-    "jsdom": "^21.1.1",
+    "jsdom": "^21.1.2",
     "latest-version": "^9.0.0",
     "mocha": "^11.7.5",
-    "nock": "^14.0.10",
+    "nock": "^14.0.15",
     "nyc": "^17.1.0",
     "prettier": "3.7.4",
-    "release-plan": "^0.17.2",
-    "strip-ansi": "^7.1.2",
-    "supertest": "^7.1.4",
-    "testdouble": "^3.18.0",
+    "release-plan": "^0.17.4",
+    "strip-ansi": "^7.2.0",
+    "supertest": "^7.2.2",
+    "testdouble": "^3.20.2",
     "tmp": "^0.2.5",
     "tmp-promise": "^3.0.3",
-    "websocket": "^1.0.32",
+    "websocket": "^1.0.35",
     "which": "6.0.0",
     "yuidoc-ember-cli-theme": "^1.0.4",
     "yuidocjs": "0.10.2"

package/packages/addon-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "7.1.0-alpha.2",
+  "version": "7.1.0-beta.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,11 +11,11 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "workspace:*",
+    "@ember-tooling/blueprint-model": "^0.6.3",
     "chalk": "^5.6.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
-    "fs-extra": "^11.3.4",
+    "fs-extra": "^11.3.5",
     "lodash": "^4.18.1",
     "silent-error": "^1.1.1",
     "sort-package-json": "^2.15.1",
@@ -26,7 +26,7 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   }
 }

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

@@ -42,9 +42,9 @@
     "@ember-data/store": "~5.8.2",
     "@warp-drive/ember": "~5.8.2<% } %>",
     "@ember/optional-features": "^3.0.0",
-    "@ember/test-helpers": "^5.4.1<% if (embroider) { %>",
-    "@embroider/compat": "^3.9.3",
-    "@embroider/core": "^3.5.9<% } %>",
+    "@ember/test-helpers": "^5.4.2<% if (embroider) { %>",
+    "@embroider/compat": "^3.9.4",
+    "@embroider/core": "^3.5.10<% } %>",
     "@embroider/macros": "^1.20.2<% if (embroider) { %>",
     "@embroider/webpack": "^4.1.2<% } %>",
     "@eslint/js": "^9.39.4",
@@ -54,7 +54,7 @@
     "@glint/environment-ember-template-imports": "^1.5.2",
     "@glint/template": "^1.7.7",
     "@tsconfig/ember": "^3.0.12",
-    "@types/qunit": "^2.19.13",
+    "@types/qunit": "^2.19.14",
     "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
     "@warp-drive/core": "~5.8.2",
     "@warp-drive/json-api": "~5.8.2",
@@ -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-alpha.3",
+    "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",
@@ -79,7 +79,7 @@
     "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.2.0",
-    "ember-source": "~7.1.0-alpha.3",
+    "ember-source": "~7.1.0-beta.1",
     "ember-template-imports": "^4.4.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^8.0.5<% } %>",
@@ -92,13 +92,13 @@
     "globals": "^15.15.0",
     "loader.js": "^4.7.0",
     "prettier": "^3.8.3",
-    "prettier-plugin-ember-template-tag": "^2.1.5",
+    "prettier-plugin-ember-template-tag": "^2.1.6",
     "qunit": "^2.25.0",
     "qunit-dom": "^3.5.1",
     "stylelint": "^16.26.1",
     "stylelint-config-standard": "^36.0.1<% if (typescript) { %>",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.59.0<% } %>",
+    "typescript-eslint": "^8.59.3<% } %>",
     "webpack": "^5.106.2"
   },
   "engines": {

package/packages/app-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "7.1.0-alpha.3",
+  "version": "7.1.0-beta.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,7 +11,7 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "workspace:*",
+    "@ember-tooling/blueprint-model": "^0.6.3",
     "chalk": "^5.6.2",
     "ember-cli-string-utils": "^1.1.0"
   },
@@ -20,7 +20,7 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   }
 }

package/packages/blueprint-blueprint/files/blueprints/__name__/index.js

@@ -1,16 +0,0 @@
-'use strict';
-
-module.exports = {
-  description: ''
-
-  // locals(options) {
-  //   // Return custom template variables here.
-  //   return {
-  //     foo: options.entity.options.foo
-  //   };
-  // }
-
-  // afterInstall(options) {
-  //   // Perform extra work here.
-  // }
-};

package/packages/blueprint-blueprint/index.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = {
-  description: 'Generates a blueprint and definition.',
-};

package/packages/blueprint-blueprint/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "@ember-tooling/blueprint-blueprint",
-  "version": "0.3.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ember-cli/ember-cli.git",
-    "directory": "packages/blueprint-blueprint"
-  },
-  "license": "MIT",
-  "keywords": [
-    "ember-blueprint"
-  ]
-}

package/packages/blueprint-model/package.json

@@ -1,19 +0,0 @@
-{
-  "name": "@ember-tooling/blueprint-model",
-  "version": "0.6.3",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ember-cli/ember-cli.git",
-    "directory": "packages/blueprint-model"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "chalk": "^5.6.2",
-    "diff": "^8.0.4",
-    "isbinaryfile": "^5.0.7",
-    "lodash": "^4.17.23",
-    "promise.hash.helper": "^1.0.8",
-    "quick-temp": "^0.1.9",
-    "silent-error": "^1.1.1"
-  }
-}

package/packages/blueprint-model/utilities/directory-for-package-name.js

@@ -1,31 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-/**
- * Derive a directory name from a package name.
- * Takes scoped packages into account.
- *
- * @method directoryForPackageName
- * @param {String} packageName
- * @return {String} Derived directory name.
- */
-module.exports = function directoryForPackageName(packageName) {
-  let isScoped = packageName[0] === '@' && packageName.includes('/');
-
-  if (isScoped) {
-    let slashIndex = packageName.indexOf('/');
-    let scopeName = packageName.substring(1, slashIndex);
-    let packageNameWithoutScope = packageName.substring(slashIndex + 1);
-    let pathParts = process.cwd().split(path.sep);
-    let parentDirectoryContainsScopeName = pathParts.includes(scopeName);
-
-    if (parentDirectoryContainsScopeName) {
-      return packageNameWithoutScope;
-    } else {
-      return `${scopeName}-${packageNameWithoutScope}`;
-    }
-  } else {
-    return packageName;
-  }
-};

package/packages/blueprint-model/utilities/edit-file-diff.js

@@ -1,64 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const util = require('util');
-const { applyPatch, createPatch } = require('diff');
-const quickTemp = require('quick-temp');
-const path = require('path');
-const SilentError = require('silent-error');
-const openEditor = require('./open-editor');
-const hash = require('promise.hash.helper');
-
-const readFile = util.promisify(fs.readFile);
-const writeFile = util.promisify(fs.writeFile);
-
-class EditFileDiff {
-  constructor(options) {
-    this.info = options.info;
-
-    quickTemp.makeOrRemake(this, 'tmpDifferenceDir');
-  }
-
-  edit() {
-    return hash({
-      input: this.info.render(),
-      output: readFile(this.info.outputPath),
-    })
-      .then(this.invokeEditor.bind(this))
-      .then(this.applyPatch.bind(this))
-      .finally(this.cleanUp.bind(this));
-  }
-
-  cleanUp() {
-    quickTemp.remove(this, 'tmpDifferenceDir');
-  }
-
-  applyPatch(resultHash) {
-    return hash({
-      diffString: readFile(resultHash.diffPath),
-      currentString: readFile(resultHash.outputPath),
-    }).then((result) => {
-      let appliedDiff = applyPatch(result.currentString.toString(), result.diffString.toString());
-
-      if (!appliedDiff) {
-        let message = 'Patch was not cleanly applied.';
-        this.info.ui.writeLine(`${message} Please choose another action.`);
-        throw new SilentError(message);
-      }
-
-      return writeFile(resultHash.outputPath, appliedDiff);
-    });
-  }
-
-  invokeEditor(result) {
-    let info = this.info;
-    let diff = createPatch(info.outputPath, result.output.toString(), result.input);
-    let diffPath = path.join(this.tmpDifferenceDir, 'currentDiff.diff');
-
-    return writeFile(diffPath, diff)
-      .then(() => openEditor(diffPath))
-      .then(() => ({ outputPath: info.outputPath, diffPath }));
-  }
-}
-
-module.exports = EditFileDiff;

package/packages/blueprint-model/utilities/experiments.js

@@ -1,63 +0,0 @@
-'use strict';
-
-const { default: chalk } = require('chalk');
-
-/*
-  If you're here to remove the VITE experiment flag in favor of it being
-  permanently on, you can't do that until addressing
-  https://github.com/ember-cli/ember-cli/pull/10781#pullrequestreview-3230644293
-
-  A lot of test coverage would otherwise be lost, because valid tests are being
-  run only when the VITE experiment is off.
-*/
-const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC', 'VITE']);
-
-const deprecatedExperiments = Object.freeze([]);
-const enabledExperiments = Object.freeze(['VITE']);
-const deprecatedExperimentsDeprecationsIssued = [];
-
-function isExperimentEnabled(experimentName) {
-  if (!availableExperiments.includes(experimentName)) {
-    return false;
-  }
-
-  if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS && deprecatedExperiments.includes(experimentName)) {
-    return false;
-  }
-
-  if (process.env.EMBER_CLI_ENABLE_ALL_EXPERIMENTS) {
-    return true;
-  }
-
-  if (process.env.EMBER_CLI_CLASSIC && experimentName === 'EMBROIDER') {
-    return false;
-  }
-
-  let experimentEnvironmentVariable = `EMBER_CLI_${experimentName}`;
-  let experimentValue = process.env[experimentEnvironmentVariable];
-
-  if (deprecatedExperiments.includes(experimentName)) {
-    let deprecationPreviouslyIssued = deprecatedExperimentsDeprecationsIssued.includes(experimentName);
-    let isSpecifiedByUser = experimentValue !== undefined;
-
-    if (!deprecationPreviouslyIssued && isSpecifiedByUser) {
-      console.warn(
-        chalk.yellow(`The ${experimentName} experiment in ember-cli has been deprecated and will be removed.`)
-      );
-      deprecatedExperimentsDeprecationsIssued.push(experimentName);
-    }
-  }
-
-  if (enabledExperiments.includes(experimentName)) {
-    return experimentValue !== 'false';
-  } else {
-    return experimentValue !== undefined && experimentValue !== 'false';
-  }
-}
-
-module.exports = {
-  isExperimentEnabled,
-
-  // exported for testing purposes
-  _deprecatedExperimentsDeprecationsIssued: deprecatedExperimentsDeprecationsIssued,
-};

package/packages/blueprint-model/utilities/file-info.js

@@ -1,170 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const util = require('util');
-const { default: chalk } = require('chalk');
-const EditFileDiff = require('./edit-file-diff');
-const EOL = require('os').EOL;
-const rxEOL = new RegExp(EOL, 'g');
-const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
-const hash = require('promise.hash.helper');
-const canEdit = require('./open-editor').canEdit;
-const processTemplate = require('./process-template');
-
-const readFile = util.promisify(fs.readFile);
-const lstat = util.promisify(fs.stat);
-
-function diffHighlight(line) {
-  if (line[0] === '+') {
-    return chalk.green(line);
-  } else if (line[0] === '-') {
-    return chalk.red(line);
-  } else if (/^@@/.test(line)) {
-    return chalk.cyan(line);
-  } else {
-    return line;
-  }
-}
-
-const NOOP = (_) => _;
-class FileInfo {
-  constructor(options) {
-    this.action = options.action;
-    this.outputBasePath = options.outputBasePath;
-    this.outputPath = options.outputPath;
-    this.displayPath = options.displayPath;
-    this.inputPath = options.inputPath;
-    this.templateVariables = options.templateVariables;
-    this.replacer = options.replacer || NOOP;
-    this.ui = options.ui;
-  }
-
-  confirmOverwrite(path) {
-    let promptOptions = {
-      type: 'expand',
-      name: 'answer',
-      default: false,
-      message: `${chalk.red('Overwrite')} ${path}?`,
-      choices: [
-        { key: 'y', name: 'Yes, overwrite', value: 'overwrite' },
-        { key: 'n', name: 'No, skip', value: 'skip' },
-      ],
-    };
-
-    let outputPathIsFile = false;
-    try {
-      outputPathIsFile = fs.statSync(this.outputPath).isFile();
-    } catch (err) {
-      /* ignore */
-    }
-
-    let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath));
-
-    if (canDiff) {
-      promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' });
-
-      if (canEdit()) {
-        promptOptions.choices.push({ key: 'e', name: 'Edit', value: 'edit' });
-      }
-    }
-
-    return this.ui.prompt(promptOptions).then((response) => response.answer);
-  }
-
-  displayDiff() {
-    let info = this,
-      { createPatch } = require('diff');
-    return hash({
-      input: this.render(),
-      output: readFile(info.outputPath),
-    }).then((result) => {
-      let diff = createPatch(
-        info.outputPath,
-        result.output.toString().replace(rxEOL, '\n'),
-        result.input.replace(rxEOL, '\n')
-      );
-      let lines = diff.split('\n');
-
-      for (let i = 0; i < lines.length; i++) {
-        info.ui.write(diffHighlight(lines[i] + EOL));
-      }
-    });
-  }
-
-  async render() {
-    if (!this.rendered) {
-      let result = await this._render();
-      this.rendered = this.replacer(result, this);
-    }
-
-    return this.rendered;
-  }
-
-  _render() {
-    let path = this.inputPath;
-    let context = this.templateVariables;
-
-    return readFile(path).then((content) =>
-      lstat(path).then((fileStat) => {
-        if (isBinaryFile(content, fileStat.size)) {
-          return content;
-        } else {
-          try {
-            return processTemplate(content.toString(), context);
-          } catch (err) {
-            err.message += ` (Error in blueprint template: ${path})`;
-            throw err;
-          }
-        }
-      })
-    );
-  }
-
-  checkForConflict() {
-    return this.render().then((input) => {
-      input = input.toString().replace(rxEOL, '\n');
-
-      return readFile(this.outputPath)
-        .then((output) => {
-          output = output.toString().replace(rxEOL, '\n');
-
-          return input === output ? 'identical' : 'confirm';
-        })
-        .catch((e) => {
-          if (e.code === 'ENOENT') {
-            return 'none';
-          }
-
-          throw e;
-        });
-    });
-  }
-
-  confirmOverwriteTask() {
-    let info = this;
-
-    return function () {
-      function doConfirm() {
-        return info.confirmOverwrite(info.displayPath).then((action) => {
-          if (action === 'diff') {
-            return info.displayDiff().then(doConfirm);
-          } else if (action === 'edit') {
-            let editFileDiff = new EditFileDiff({ info });
-            return editFileDiff
-              .edit()
-              .then(() => (info.action = action))
-              .catch(() => doConfirm())
-              .then(() => info);
-          } else {
-            info.action = action;
-            return info;
-          }
-        });
-      }
-
-      return doConfirm();
-    };
-  }
-}
-
-module.exports = FileInfo;

package/packages/blueprint-model/utilities/open-editor.js

@@ -1,44 +0,0 @@
-'use strict';
-
-const spawn = require('child_process').spawn;
-
-function openEditor(file) {
-  if (!openEditor.canEdit()) {
-    throw new Error('EDITOR environment variable is not set');
-  }
-
-  if (!file) {
-    throw new Error('No `file` option provided');
-  }
-
-  let editorArgs = openEditor._env().EDITOR.split(' ');
-  let editor = editorArgs.shift();
-  const args = [file].concat(editorArgs);
-  let editProcess = openEditor._spawn(editor, args, { stdio: 'inherit' });
-
-  return new Promise((resolve, reject) => {
-    editProcess.on('close', (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(
-          new Error(`Spawn('${editor}', [${args.join(',')}]) exited with a non zero error status code: '${code}'`)
-        );
-      }
-    });
-  });
-}
-
-openEditor.canEdit = function () {
-  return openEditor._env().EDITOR !== undefined;
-};
-
-openEditor._env = function () {
-  return process.env;
-};
-
-openEditor._spawn = function () {
-  return spawn.apply(this, arguments);
-};
-
-module.exports = openEditor;

package/packages/blueprint-model/utilities/prepend-emoji.js

@@ -1,12 +0,0 @@
-'use strict';
-
-function supportEmoji() {
-  const hasEmojiTurnedOff = process.argv.indexOf('--no-emoji') > -1;
-  return process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff;
-}
-
-const areEmojiSupported = supportEmoji();
-
-module.exports = function prependEmoji(emoji, msg) {
-  return areEmojiSupported ? `${emoji}  ${msg}` : msg;
-};

package/packages/blueprint-model/utilities/process-template.js

@@ -1,10 +0,0 @@
-'use strict';
-
-module.exports = function processTemplate(content, context) {
-  let options = {
-    evaluate: /<%([\s\S]+?)%>/g,
-    interpolate: /<%=([\s\S]+?)%>/g,
-    escape: /<%-([\s\S]+?)%>/g,
-  };
-  return require('lodash/template')(content, options)(context);
-};