ember-cli 6.8.0-beta.6 → 6.8.0

package/CHANGELOG.md

@@ -2,150 +2,99 @@
 
 ## Release (2025-10-14)
 
-* ember-cli 6.8.0-beta.6 (patch)
-* @ember-tooling/classic-build-addon-blueprint 6.8.0-beta.3 (patch)
-* @ember-tooling/classic-build-app-blueprint 6.8.0-beta.3 (patch)
-* @ember-tooling/blueprint-blueprint 0.1.1 (patch)
-* @ember-tooling/blueprint-model 0.3.1 (patch)
-
-#### :bug: Bug Fix
-* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
-  * [#10838](https://github.com/ember-cli/ember-cli/pull/10838) Add package license metadata to match repository ([@davidtaylorhq](https://github.com/davidtaylorhq))
-* `ember-cli`
-  * [#10834](https://github.com/ember-cli/ember-cli/pull/10834) [bugfix release] Fix tests using wrong versions ([@mansona](https://github.com/mansona))
-
-#### :house: Internal
-* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`, `@ember-tooling/blueprint-model`
-  * [#10848](https://github.com/ember-cli/ember-cli/pull/10848) merge origin/release into beta ([@mansona](https://github.com/mansona))
-
-#### Committers: 2
-- Chris Manson ([@mansona](https://github.com/mansona))
-- David Taylor ([@davidtaylorhq](https://github.com/davidtaylorhq))
-
-## Release (2025-10-13)
-
-* ember-cli 6.8.0-beta.5 (patch)
-
-#### :bug: Bug Fix
-* `ember-cli`
-  * [#10846](https://github.com/ember-cli/ember-cli/pull/10846) [beta bugfix] allow build --watch only in EMBROIDER_PREBUILD ([@mansona](https://github.com/mansona))
-
-#### Committers: 1
-- Chris Manson ([@mansona](https://github.com/mansona))
-
-## Release (2025-10-13)
-
-* ember-cli 6.8.0-beta.4 (minor)
-* @ember-tooling/classic-build-addon-blueprint 6.8.0-beta.2 (minor)
-* @ember-tooling/classic-build-app-blueprint 6.8.0-beta.2 (minor)
+* ember-cli 6.8.0 (minor)
+* @ember-tooling/classic-build-addon-blueprint 6.8.0 (minor)
+* @ember-tooling/classic-build-app-blueprint 6.8.0 (minor)
 
 #### :rocket: Enhancement
-* `ember-cli`
-  * [#10844](https://github.com/ember-cli/ember-cli/pull/10844) [beta] Error when `ember (generate|destroy) (http-proxy|http-mock|server)` is used in a Vite-based project ([@kategengler](https://github.com/kategengler))
 * `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10853](https://github.com/ember-cli/ember-cli/pull/10853) Promote Beta and update all dependencies for 6.8 release ([@mansona](https://github.com/mansona))
   * [#10831](https://github.com/ember-cli/ember-cli/pull/10831) [bugfix beta] enable `--strict` by default to match new app blueprint ([@mansona](https://github.com/mansona))
-
-#### :memo: Documentation
-* `ember-cli`
-  * [#10843](https://github.com/ember-cli/ember-cli/pull/10843) Further contextualize help output and error when options and commands that are no longer supported in Vite-based projects are used ([@kategengler](https://github.com/kategengler))
-  * [#10840](https://github.com/ember-cli/ember-cli/pull/10840) [beta] fix help for vite-based projects ([@kategengler](https://github.com/kategengler))
-  * [#10835](https://github.com/ember-cli/ember-cli/pull/10835) Update deprecation message for --embroider option ([@kategengler](https://github.com/kategengler))
-
-#### :house: Internal
-* `ember-cli`
-  * [#10845](https://github.com/ember-cli/ember-cli/pull/10845) [beta] update @ember/app-blueprint to latest beta ([@mansona](https://github.com/mansona))
-  * [#10833](https://github.com/ember-cli/ember-cli/pull/10833) [bugfix beta] bump the @ember/app-blueprint version ([@mansona](https://github.com/mansona))
-
-#### Committers: 2
-- Chris Manson ([@mansona](https://github.com/mansona))
-- Katie Gengler ([@kategengler](https://github.com/kategengler))
-
-## Release (2025-10-03)
-
-* ember-cli 6.8.0-beta.3 (patch)
-
-#### :bug: Bug Fix
-* `ember-cli`
-  * [#10826](https://github.com/ember-cli/ember-cli/pull/10826) move resolution of @ember/app-blueprint to prevent loading latest ([@mansona](https://github.com/mansona))
-
-#### Committers: 1
-- Chris Manson ([@mansona](https://github.com/mansona))
-
-## Release (2025-10-02)
-
-* ember-cli 6.8.0-beta.2 (patch)
-
-#### :house: Internal
-* `ember-cli`
-  * [#10823](https://github.com/ember-cli/ember-cli/pull/10823) fix incorrect ember-cli-update version in tests ([@mansona](https://github.com/mansona))
-  * [#10819](https://github.com/ember-cli/ember-cli/pull/10819) update @ember/app-blueprint beta version ([@mansona](https://github.com/mansona))
-
-#### Committers: 1
-- Chris Manson ([@mansona](https://github.com/mansona))
-
-## Release (2025-09-10)
-
-* ember-cli 6.8.0-beta.1 (minor)
-* @ember-tooling/classic-build-addon-blueprint 6.8.0-beta.1 (minor)
-* @ember-tooling/classic-build-app-blueprint 6.8.0-beta.1 (minor)
-* @ember-tooling/blueprint-blueprint 0.1.0 (minor)
-* @ember-tooling/blueprint-model 0.3.0 (minor)
-
-#### :rocket: Enhancement
-* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`, `@ember-tooling/blueprint-model`
   * [#10808](https://github.com/ember-cli/ember-cli/pull/10808) Prepare 6.8 Beta ([@mansona](https://github.com/mansona))
-* `@ember-tooling/blueprint-model`
-  * [#10802](https://github.com/ember-cli/ember-cli/pull/10802) enable Vite by default ([@mansona](https://github.com/mansona))
 * `ember-cli`
+  * [#10844](https://github.com/ember-cli/ember-cli/pull/10844) [beta] Error when `ember (generate|destroy) (http-proxy|http-mock|server)` is used in a Vite-based project ([@kategengler](https://github.com/kategengler))
+  * [#10802](https://github.com/ember-cli/ember-cli/pull/10802) enable Vite by default ([@mansona](https://github.com/mansona))
   * [#10804](https://github.com/ember-cli/ember-cli/pull/10804) Support a `--ts` alias for the `addon`, `init` and `new` commands ([@bertdeblock](https://github.com/bertdeblock))
+  * [#10781](https://github.com/ember-cli/ember-cli/pull/10781) Add new `VITE` experiment to generate app with new Vite blueprint ([@pichfl](https://github.com/pichfl))
   * [#10785](https://github.com/ember-cli/ember-cli/pull/10785) Depracate passing filenames and globs to `init` ([@pichfl](https://github.com/pichfl))
   * [#10776](https://github.com/ember-cli/ember-cli/pull/10776) Add deprecation warning for the `--embroider` argument ([@pichfl](https://github.com/pichfl))
-* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
-  * [#10796](https://github.com/ember-cli/ember-cli/pull/10796) Promote Beta and update all dependencies for 6.7 release ([@mansona](https://github.com/mansona))
-* `ember-cli`, `@ember-tooling/blueprint-model`
-  * [#10781](https://github.com/ember-cli/ember-cli/pull/10781) Add new `VITE` experiment to generate app with new Vite blueprint ([@pichfl](https://github.com/pichfl))
 * `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli`
   * [#10791](https://github.com/ember-cli/ember-cli/pull/10791) update the format of the ember-cli-update.json ([@mansona](https://github.com/mansona))
 
 #### :bug: Bug Fix
-* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`
+* `ember-cli`
+  * [#10846](https://github.com/ember-cli/ember-cli/pull/10846) [beta bugfix] allow build --watch only in EMBROIDER_PREBUILD ([@mansona](https://github.com/mansona))
+  * [#10826](https://github.com/ember-cli/ember-cli/pull/10826) move resolution of @ember/app-blueprint to prevent loading latest ([@mansona](https://github.com/mansona))
+  * [#10782](https://github.com/ember-cli/ember-cli/pull/10782) update heimdall-fs-monitor ([@mansona](https://github.com/mansona))
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli`
   * [#10803](https://github.com/ember-cli/ember-cli/pull/10803) Add "ember-blueprint" to keywords in `package.json` for the classic blueprints ([@pichfl](https://github.com/pichfl))
 * `@ember-tooling/classic-build-app-blueprint`
   * [#10798](https://github.com/ember-cli/ember-cli/pull/10798) Add import from ember-data breakage/deprecation ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
-* `ember-cli`
-  * [#10794](https://github.com/ember-cli/ember-cli/pull/10794) Fix potential NPE ([@boris-petrov](https://github.com/boris-petrov))
-  * [#10782](https://github.com/ember-cli/ember-cli/pull/10782) update heimdall-fs-monitor ([@mansona](https://github.com/mansona))
 * `@ember-tooling/classic-build-app-blueprint`, `ember-cli`
   * [#10707](https://github.com/ember-cli/ember-cli/pull/10707) Enabled recommended configs from eslint-plugin-n and eslint-plugin-qunit ([@ijlee2](https://github.com/ijlee2))
 
+#### :memo: Documentation
+* `ember-cli`
+  * [#10843](https://github.com/ember-cli/ember-cli/pull/10843) Further contextualize help output and error when options and commands that are no longer supported in Vite-based projects are used ([@kategengler](https://github.com/kategengler))
+  * [#10840](https://github.com/ember-cli/ember-cli/pull/10840) [beta] fix help for vite-based projects ([@kategengler](https://github.com/kategengler))
+  * [#10835](https://github.com/ember-cli/ember-cli/pull/10835) Update deprecation message for --embroider option ([@kategengler](https://github.com/kategengler))
+
 #### :house: Internal
-* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-model`
-  * [#10807](https://github.com/ember-cli/ember-cli/pull/10807) Prepare Alpha Release ([@mansona](https://github.com/mansona))
-  * [#10795](https://github.com/ember-cli/ember-cli/pull/10795) Prepare Alpha Release ([@mansona](https://github.com/mansona))
+* `ember-cli`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10847](https://github.com/ember-cli/ember-cli/pull/10847) Prepare Beta Release ([@mansona](https://github.com/mansona))
+  * [#10825](https://github.com/ember-cli/ember-cli/pull/10825) Prepare Beta Release ([@mansona](https://github.com/mansona))
+  * [#10820](https://github.com/ember-cli/ember-cli/pull/10820) Prepare Beta Release ([@mansona](https://github.com/mansona))
 * `ember-cli`
+  * [#10845](https://github.com/ember-cli/ember-cli/pull/10845) [beta] update @ember/app-blueprint to latest beta ([@mansona](https://github.com/mansona))
+  * [#10833](https://github.com/ember-cli/ember-cli/pull/10833) [bugfix beta] bump the @ember/app-blueprint version ([@mansona](https://github.com/mansona))
+  * [#10823](https://github.com/ember-cli/ember-cli/pull/10823) fix incorrect ember-cli-update version in tests ([@mansona](https://github.com/mansona))
+  * [#10819](https://github.com/ember-cli/ember-cli/pull/10819) update @ember/app-blueprint beta version ([@mansona](https://github.com/mansona))
   * [#10806](https://github.com/ember-cli/ember-cli/pull/10806) skip build watch tests when vite is enabled ([@mansona](https://github.com/mansona))
-  * [#10801](https://github.com/ember-cli/ember-cli/pull/10801) update github-changelog ([@mansona](https://github.com/mansona))
   * [#10790](https://github.com/ember-cli/ember-cli/pull/10790) Reorganize tests for `new` and `addon` commands ([@pichfl](https://github.com/pichfl))
   * [#10783](https://github.com/ember-cli/ember-cli/pull/10783) remove unused changelog script ([@mansona](https://github.com/mansona))
   * [#10764](https://github.com/ember-cli/ember-cli/pull/10764) fix double CI run on release-plan PR ([@mansona](https://github.com/mansona))
   * [#10750](https://github.com/ember-cli/ember-cli/pull/10750) Add more notes to the Release.md ([@mansona](https://github.com/mansona))
-* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-blueprint`
-  * [#10799](https://github.com/ember-cli/ember-cli/pull/10799) Prepare Alpha Release ([@mansona](https://github.com/mansona))
 * `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
-  * [#10797](https://github.com/ember-cli/ember-cli/pull/10797) Prepare Stable Release ([@mansona](https://github.com/mansona))
-  * [#10800](https://github.com/ember-cli/ember-cli/pull/10800) fix release-plan for stable release ([@mansona](https://github.com/mansona))
+  * [#10799](https://github.com/ember-cli/ember-cli/pull/10799) Prepare Alpha Release ([@mansona](https://github.com/mansona))
   * [#10778](https://github.com/ember-cli/ember-cli/pull/10778) Prepare Alpha Release ([@mansona](https://github.com/mansona))
   * [#10756](https://github.com/ember-cli/ember-cli/pull/10756) Prepare Alpha Release ([@mansona](https://github.com/mansona))
   * [#10763](https://github.com/ember-cli/ember-cli/pull/10763) Prepare 6.8-alpha ([@mansona](https://github.com/mansona))
 
 #### Committers: 6
 - Bert De Block ([@bertdeblock](https://github.com/bertdeblock))
-- Boris Petrov ([@boris-petrov](https://github.com/boris-petrov))
 - Chris Manson ([@mansona](https://github.com/mansona))
 - Florian Pichler ([@pichfl](https://github.com/pichfl))
 - Isaac Lee ([@ijlee2](https://github.com/ijlee2))
+- Katie Gengler ([@kategengler](https://github.com/kategengler))
 - [@NullVoxPopuli](https://github.com/NullVoxPopuli)
 
+## Release (2025-10-08)
+
+* ember-cli 6.7.2 (patch)
+* @ember-tooling/classic-build-addon-blueprint 6.7.1 (patch)
+* @ember-tooling/classic-build-app-blueprint 6.7.2 (patch)
+
+#### :bug: Bug Fix
+* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10838](https://github.com/ember-cli/ember-cli/pull/10838) Add package license metadata to match repository ([@davidtaylorhq](https://github.com/davidtaylorhq))
+
+#### Committers: 1
+- David Taylor ([@davidtaylorhq](https://github.com/davidtaylorhq))
+
+## Release (2025-10-06)
+
+* ember-cli 6.7.1 (patch)
+* @ember-tooling/classic-build-app-blueprint 6.7.1 (patch)
+
+#### :bug: Bug Fix
+* `ember-cli`
+  * [#10834](https://github.com/ember-cli/ember-cli/pull/10834) [bugfix release] Fix tests using wrong versions ([@mansona](https://github.com/mansona))
+* `@ember-tooling/classic-build-app-blueprint`
+  * [#10824](https://github.com/ember-cli/ember-cli/pull/10824) [bugfix release] fix app-blueprint being considered a blueprint ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
 ## Release (2025-09-06)
 
 * ember-cli 6.7.0 (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": "6.8.0-beta.6-beta-d886305dc5"
+        "version": "6.8.0-release-8de00124a8"
     },
     "files": {
         "lib/broccoli/default-packager.js": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.8.0-beta.6",
+  "version": "6.8.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -26,16 +26,10 @@
   "bin": {
     "ember": "./bin/ember"
   },
-  "release-plan": {
-    "semverIncrementAs": {
-      "minor": "prerelease",
-      "patch": "prerelease"
-    },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
-  },
   "dependencies": {
-    "@ember/app-blueprint": "~6.8.0-beta.7",
+    "@ember-tooling/blueprint-blueprint": "^0.2.1",
+    "@ember-tooling/blueprint-model": "^0.4.1",
+    "@ember/app-blueprint": "~6.8.0",
     "@pnpm/find-workspace-dir": "^1000.1.0",
     "babel-remove-types": "^1.0.1",
     "broccoli": "^3.5.2",
@@ -118,10 +112,8 @@
     "watch-detector": "^1.0.2",
     "workerpool": "^9.2.0",
     "yam": "^1.0.0",
-    "@ember-tooling/blueprint-blueprint": "0.1.1",
-    "@ember-tooling/classic-build-app-blueprint": "6.8.0-beta.3",
-    "@ember-tooling/blueprint-model": "0.3.1",
-    "@ember-tooling/classic-build-addon-blueprint": "6.8.0-beta.3"
+    "@ember-tooling/classic-build-addon-blueprint": "6.8.0",
+    "@ember-tooling/classic-build-app-blueprint": "6.8.0"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.3",

package/packages/addon-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "6.8.0-beta.3",
+  "version": "6.8.0",
   "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.4.1",
     "chalk": "^4.1.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
@@ -20,13 +20,5 @@
     "silent-error": "^1.1.1",
     "sort-package-json": "^2.12.0",
     "walk-sync": "^3.0.0"
-  },
-  "release-plan": {
-    "semverIncrementAs": {
-      "minor": "prerelease",
-      "patch": "prerelease"
-    },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
   }
 }

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

@@ -45,22 +45,22 @@
     "@ember/test-helpers": "^5.3.0<% if (embroider) { %>",
     "@embroider/compat": "^3.9.1",
     "@embroider/core": "^3.5.7<% } %>",
-    "@embroider/macros": "^1.18.1<% if (embroider) { %>",
+    "@embroider/macros": "^1.19.1<% if (embroider) { %>",
     "@embroider/webpack": "^4.1.1<% } %>",
-    "@eslint/js": "^9.35.0",
+    "@eslint/js": "^9.37.0",
     "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
-    "@glint/template": "^1.5.2",
+    "@glint/template": "^1.6.1",
     "@tsconfig/ember": "^3.0.11",
     "@types/qunit": "^2.19.13",
     "@types/rsvp": "^4.0.9<% if (emberData) {%>",
     "@warp-drive/core-types": "~5.7.0<% }} %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.1",
-    "ember-auto-import": "^2.10.0",
-    "ember-cli": "~6.8.0-beta.6",
+    "ember-auto-import": "^2.11.1",
+    "ember-cli": "~6.8.0",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.0",
@@ -74,29 +74,29 @@
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.2",
     "ember-page-title": "^9.0.3",
-    "ember-qunit": "^9.0.3",
+    "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.8.0-beta.2",
+    "ember-source": "~6.8.0",
     "ember-template-imports": "^4.3.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^9.35.0",
+    "eslint": "^9.37.0",
     "eslint-config-prettier": "^9.1.2",
-    "eslint-plugin-ember": "^12.7.3",
-    "eslint-plugin-n": "^17.21.3",
+    "eslint-plugin-ember": "^12.7.4",
+    "eslint-plugin-n": "^17.23.1",
     "eslint-plugin-qunit": "^8.2.5",
     "globals": "^15.15.0",
     "loader.js": "^4.7.0",
     "prettier": "^3.6.2",
     "prettier-plugin-ember-template-tag": "^2.1.0",
-    "qunit": "^2.24.1",
+    "qunit": "^2.24.2",
     "qunit-dom": "^3.5.0",
-    "stylelint": "^16.24.0",
+    "stylelint": "^16.25.0",
     "stylelint-config-standard": "^36.0.1",
     "tracked-built-ins": "^3.4.0<% if (typescript) { %>",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.43.0<% } %>",
-    "webpack": "^5.101.3"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.1<% } %>",
+    "webpack": "^5.102.1"
   },
   "engines": {
     "node": ">= 20.11"

package/packages/app-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "6.8.0-beta.3",
+  "version": "6.8.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,16 +11,8 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "workspace:*",
+    "@ember-tooling/blueprint-model": "^0.4.1",
     "chalk": "^4.1.2",
     "ember-cli-string-utils": "^1.1.0"
-  },
-  "release-plan": {
-    "semverIncrementAs": {
-      "minor": "prerelease",
-      "patch": "prerelease"
-    },
-    "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.1.1",
-  "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.3.1",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ember-cli/ember-cli.git",
-    "directory": "packages/blueprint-model"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "chalk": "^4.1.2",
-    "diff": "^7.0.0",
-    "isbinaryfile": "^5.0.4",
-    "lodash": "^4.17.21",
-    "promise.hash.helper": "^1.0.8",
-    "quick-temp": "^0.1.8",
-    "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 jsdiff = 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 = jsdiff.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 = jsdiff.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,54 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-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 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,
-      jsdiff = require('diff');
-    return hash({
-      input: this.render(),
-      output: readFile(info.outputPath),
-    }).then((result) => {
-      let diff = jsdiff.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);
-};