Merge pull request #76 from ember-cli/merge-beta

Prepare 6.9-alpha

Author: mansona

.github/workflows/plan-release.yml .github/workflows/plan-alpha-release.yml.github/workflows/plan-release.yml renamed to .github/workflows/plan-alpha-release.yml

@@ -1,17 +1,16 @@
-name: Plan Release
+name: Plan Alpha Release
 on:
   workflow_dispatch:
   push:
     branches:
       - main
-      - master
   pull_request_target: # This workflow has permissions on the repo, do NOT run code from PRs in this workflow. See https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
     types:
       - labeled
       - unlabeled
 
 concurrency:
-  group: plan-release # only the latest one of these should ever be running
+  group: plan-release-alpha # only the latest one of these should ever be running
   cancel-in-progress: true
 
 jobs:
@@ -85,7 +84,7 @@ jobs:
           commit-message: "Prepare Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'"
           labels: "internal"
           branch: release-preview
-          title: Prepare Release ${{ steps.explanation.outputs.new_version }}
+          title: Prepare Alpha Release ${{ steps.explanation.outputs.new_version }}
           body: |
             This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍
 

.github/workflows/publish.yml .github/workflows/publish-alpha.yml.github/workflows/publish.yml renamed to .github/workflows/publish-alpha.yml

@@ -1,14 +1,13 @@
 # For every push to the primary branch with .release-plan.json modified,
 # runs release-plan.
 
-name: Publish Stable
+name: Publish Alpha
 
 on:
   workflow_dispatch:
   push:
     branches:
       - main
-      - master
     paths:
       - '.release-plan.json'
 
@@ -37,7 +36,7 @@ jobs:
           cache: pnpm
       - run: pnpm install --frozen-lockfile
       - name: Publish to NPM
-        run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish
+        run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish --github-prerelease
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,50 @@
 # Changelog
 
+## Release (2025-09-05)
+
+* @ember/app-blueprint 6.8.0-beta.1 (minor)
+
+#### :rocket: Enhancement
+* `@ember/app-blueprint`
+  * [#73](https://github.com/ember-cli/ember-app-blueprint/pull/73) Prepare 6.8 beta ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#75](https://github.com/ember-cli/ember-app-blueprint/pull/75) update the beta version ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
+## Release (2025-09-04)
+
+* @ember/app-blueprint 6.7.1 (patch)
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#71](https://github.com/ember-cli/ember-app-blueprint/pull/71) fix publish-branch for pnpm publish ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
+## Release (2025-09-04)
+
+* @ember/app-blueprint 6.7.0 (minor)
+
+#### :rocket: Enhancement
+* `@ember/app-blueprint`
+  * [#65](https://github.com/ember-cli/ember-app-blueprint/pull/65) Update all dependencies for 6.7 release ([@mansona](https://github.com/mansona))
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#67](https://github.com/ember-cli/ember-app-blueprint/pull/67) make sure that release-plan publishes from release branch ([@mansona](https://github.com/mansona))
+
+#### :memo: Documentation
+* `@ember/app-blueprint`
+  * [#70](https://github.com/ember-cli/ember-app-blueprint/pull/70) add a basic readme ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
 ## Release (2025-09-04)
 
 * @ember/app-blueprint 6.6.0 (minor)

README.md

@@ -0,0 +1,10 @@
+# @ember/app-blueprint 
+
+This is the blueprint that is used to generate a **new** Ember app using [Vite](https://vite.dev/) as the primary build system.
+
+If you have an existing app that you would like to upgrade to use Vite consider using the [ember-vite-codemod](https://github.com/mainmatter/ember-vite-codemod)
+
+## Usage
+
+pnpm dlx ember-cli@latest app my-app-name -b @ember/app-blueprint --pnpm
+

files/package.json

@@ -71,7 +71,7 @@
     "concurrently": "^9.2.1",
     "decorator-transforms": "^2.3.0",
     "ember-auto-import": "^2.10.0",
-    "ember-cli": "~6.6.0",
+    "ember-cli": "^6.6.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-deprecation-workflow": "^3.4.0<% if (emberData) { %>",
     "ember-data": "~5.6.0<% } %>",
@@ -80,7 +80,7 @@
     "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.3",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.6.0",
+    "ember-source": "~6.8.0-alpha.7",
     "ember-template-lint": "^7.9.3<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
     "eslint": "^9.34.0",
@@ -98,7 +98,7 @@
     "testem": "^3.16.0",
     "tracked-built-ins": "^4.0.0<% if (typescript) { %>",
     "typescript": "^5.9.2",
-    "typescript-eslint": "^8.41.0<% } %>",
+    "typescript-eslint": "^8.42.0<% } %>",
     "vite": "^6.3.5"
   },
   "engines": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "6.6.0",
+  "version": "6.9.0-alpha.0",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -20,6 +20,14 @@
     "format": "prettier . --write",
     "test": "vitest"
   },
+  "release-plan": {
+    "semverIncrementAs": {
+      "minor": "prerelease",
+      "patch": "prerelease"
+    },
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
+  },
   "dependencies": {
     "chalk": "^4.1.2",
     "ember-cli-string-utils": "^1.1.0",

tests/lint.test.mjs

@@ -3,13 +3,17 @@ import { beforeAll, describe, it, expect } from 'vitest';
 import { generateApp } from './helpers.mjs';
 
 describe('linting & formatting', function () {
-  let app;
+  describe('JavaScript', function () {
+    let app;
 
-  beforeAll(async function () {
-    app = await generateApp({ flags: ['--typescript'], skipNpm: false });
-  });
+    beforeAll(async function () {
+      /**
+       * We are passing --pnpm here because it's just faster to run in CI and realistically
+       * we don't need to worry about the differences between pnpm and npm at this level
+       */
+      app = await generateApp({ flags: ['--pnpm'], skipNpm: false });
+    });
 
-  describe('JavaScript', function () {
     it('yields output without errors', async function () {
       let { exitCode } = await app.execa('pnpm', ['lint']);
 
@@ -21,7 +25,14 @@ describe('linting & formatting', function () {
     let app;
 
     beforeAll(async function () {
-      app = await generateApp({ flags: ['--typescript'], skipNpm: false });
+      /**
+       * We are passing --pnpm here because it's just faster to run in CI and realistically
+       * we don't need to worry about the differences between pnpm and npm at this level
+       */
+      app = await generateApp({
+        flags: ['--typescript', '--pnpm'],
+        skipNpm: false,
+      });
     });
 
     it('yields output without errors', async function () {