Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8f2f392
update blueprint dependencies to latest
mansona Sep 4, 2025
09d9bef
convert ember-cli to a ^ dependency
mansona Sep 4, 2025
7fac6b0
Merge pull request #65 from ember-cli/release-plan-6-7
mansona Sep 4, 2025
b9d3c7e
Prepare Release v6.7.0 using 'release-plan'
mansona Sep 4, 2025
f0d87ad
Merge pull request #66 from ember-cli/release-preview
mansona Sep 4, 2025
6ef1f61
make sure that release-plan publishes from release branch
mansona Sep 4, 2025
e5afe81
Merge pull request #67 from ember-cli/fix-release-plan
mansona Sep 4, 2025
cd82f43
Revert "Prepare Stable Release v6.7.0"
mansona Sep 4, 2025
1bdd104
Merge pull request #69 from ember-cli/revert-66-release-preview
mansona Sep 4, 2025
8d093c1
add a basic readme
mansona Sep 4, 2025
7f95eba
Merge pull request #70 from ember-cli/create-readme
mansona Sep 4, 2025
cdc6709
Prepare Release v6.7.0 using 'release-plan'
mansona Sep 4, 2025
3b22ba2
Merge pull request #68 from ember-cli/release-preview
mansona Sep 4, 2025
990eb7d
fix publish-branch for pnpm publish
mansona Sep 4, 2025
051bd73
Merge pull request #71 from ember-cli/fix-publish-branch
mansona Sep 4, 2025
c1e6967
Prepare Release v6.7.1 using 'release-plan'
mansona Sep 4, 2025
c168ca3
Merge pull request #72 from ember-cli/release-preview
mansona Sep 4, 2025
96e5a3f
Merge remote-tracking branch 'origin/release' into merge-release
mansona Sep 5, 2025
7a719b7
update blueprint dependencies to beta
mansona Sep 5, 2025
29e78fd
use --pnpm for testing lints
mansona Sep 5, 2025
688f82e
Merge pull request #73 from ember-cli/merge-release
mansona Sep 5, 2025
6a0c14e
update the beta version
mansona Sep 5, 2025
9aaaf48
Merge pull request #75 from ember-cli/update-beta-version
mansona Sep 5, 2025
8d87431
Prepare Release v6.8.0-beta.1 using 'release-plan'
mansona Sep 5, 2025
e14c28b
Merge pull request #74 from ember-cli/release-preview
mansona Sep 5, 2025
34d9d85
Merge remote-tracking branch 'origin/beta' into merge-beta
mansona Sep 5, 2025
00ab71c
update blueprint dependencies to alpha
mansona Sep 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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 👍

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -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 }}
45 changes: 45 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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<% } %>",
Expand All @@ -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",
Expand All @@ -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": {
Expand Down
10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand Down
23 changes: 17 additions & 6 deletions tests/lint.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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']);

Expand All @@ -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 () {
Expand Down