ember-cli 6.5.0-beta.0 → 6.5.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # ember-cli Changelog
 
+## Release (2025-06-11)
+
+* ember-cli 6.5.0-beta.2 (minor)
+
+#### :rocket: Enhancement
+* `ember-cli`
+  * [#10705](https://github.com/ember-cli/ember-cli/pull/10705) add `--strict` flag for new app and addon generation ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `ember-cli`
+  * [#10717](https://github.com/ember-cli/ember-cli/pull/10717) pass --publish-branch to release-plan publish ([@mansona](https://github.com/mansona))
+  * [#10716](https://github.com/ember-cli/ember-cli/pull/10716) Prepare Beta Release v6.5.0-beta.1 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#10715](https://github.com/ember-cli/ember-cli/pull/10715) [Backport beta]: Set up release-plan ([@mansona](https://github.com/mansona))
+
+#### Committers: 2
+- Chris Manson ([@mansona](https://github.com/mansona))
+- [@github-actions[bot]](https://github.com/apps/github-actions)
+
+## Release (2025-06-11)
+
+* ember-cli 6.5.0-beta.1 (minor)
+
+#### :rocket: Enhancement
+* `ember-cli`
+  * [#10705](https://github.com/ember-cli/ember-cli/pull/10705) add `--strict` flag for new app and addon generation ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `ember-cli`
+  * [#10715](https://github.com/ember-cli/ember-cli/pull/10715) [Backport beta]: Set up release-plan ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
 ## v6.5.0-beta.0
 
 #### Blueprint Changes

package/RELEASE.md

@@ -1,221 +1,3 @@
 # Release Process
 
-ember-cli follows the same channel based release process that Ember does:
-
-* `release` - This branch represents the `latest` dist-tag on NPM
-* `beta` - This branch represents the `beta` dist-tag on NPM
-* `master` - The branch is not released to the NPM registry, but (generally speaking) can be used directly
-
-## Initial Stable Release
-
-* Update blueprint dependencies to latest
-
-```
-node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=latest
-```
-
-* Commit
-* Send pull request to `beta` branch
-* Wait for PR (for updating blueprint dependencies) to be merged
-
-* Checkout the `release` branch
-
-```
-git fetch origin
-git checkout -B release --track origin/release
-```
-
-* Merge `beta` branch into `release`
-
-```
-git fetch origin
-git merge origin/beta
-git push origin release
-```
-
-* Ensure you have the correct dependencies
-
-```
-git clean -fdx
-pnpm install
-```
-
-* Update the CHANGELOG.md
-  * Run `node ./dev/changelog`
-  * Copy output into `CHANGELOG.md`
-  * Edit to make clearer for consumers (remove non-consumer facing entries, etc)
-  * Ensure blueprint change diff URLs are correct
-  * Merge any prior beta entries together
-  * Update changelog header for current release
-  * Commit
-* Release: `npx release-it`
-* Update GitHub Release with changelog contents
-* Merge `release` into `beta` branch
-
-```
-git checkout -B beta --track origin/beta
-git merge origin/release
-git push origin beta
-```
-
-## Stable Patch Release
-
-* Checkout the `release` branch
-
-```
-git fetch origin
-git checkout -B release --track origin/release
-```
-
-* Ensure you have the correct dependencies
-
-```
-git clean -fdx
-pnpm install
-```
-
-* Update the CHANGELOG.md
-  * Run `node ./dev/changelog`
-  * Copy output into `CHANGELOG.md`
-  * Edit to make clearer for consumers (remove non-consumer facing entries, etc)
-  * Ensure blueprint change diff URLs are correct
-  * Update changelog header for current release
-  * Commit
-* Release: `npx release-it`
-* Update GitHub Release with changelog contents
-* Merge `release` into `beta` branch
-
-```
-git checkout -B beta --track origin/beta
-git merge origin/release
-git push origin beta
-```
-
-## Initial Beta Release
-
-* Update `ember-source` and `ember-data` to latest beta
-
-```
-node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data=beta
-```
-
-* Commit
-* Send pull request to `master` branch
-* Wait for PR (for updating blueprint dependencies) to be merged
-* Checkout the `beta` branch
-
-```
-git fetch origin
-git checkout -B beta --track origin/beta
-```
-
-* Merge `master` branch into `beta`
-
-```
-git fetch origin
-git merge origin/master
-git push origin beta
-```
-
-* Ensure you have the correct dependencies
-
-```
-git clean -fdx
-pnpm install
-```
-
-* Update the CHANGELOG.md
-  * Run `node ./dev/changelog`
-  * Copy output into `CHANGELOG.md`
-  * Edit to make clearer for consumers (remove non-consumer facing entries, etc)
-  * Ensure blueprint change diff URLs are correct
-  * Update changelog header for current release
-  * Commit
-* Release: `npx release-it`
-* Update GitHub Release with changelog contents
-* Merge `beta` into `master` branch
-
-```
-git checkout master
-git merge origin/beta
-git push origin master
-```
-
-## Subsequent Beta Release
-
-* Checkout the `beta` branch
-
-```
-git fetch origin
-git checkout -B beta --track origin/beta
-```
-
-* Ensure you have the correct dependencies
-
-```
-git clean -fdx
-pnpm install
-```
-
-* Update the CHANGELOG.md
-  * Run `node ./dev/changelog`
-  * Copy output into `CHANGELOG.md`
-  * Edit to make clearer for consumers (remove non-consumer facing entries, etc)
-  * Ensure blueprint change diff URLs are correct
-  * Update changelog header for current release
-  * Commit
-* Release: `npx release-it`
-* Update GitHub Release with changelog contents
-* Merge `beta` into `master` branch
-
-```
-git checkout master
-git merge origin/beta
-git push origin master
-```
-
-## Post-release Automation
-
-There is a GitHub Actions workflow, https://github.com/ember-cli/ember-cli/actions/workflows/sync-output-repos.yml that pushes various invocations of the blueprint generator to "output repos".
-After release, make sure that all the jobs are "green" / succeeded.
-
-<details><summary>What to check afterwards</summary>
-
-- Apps: https://github.com/ember-cli/ember-app-output
-- Addons: https://github.com/ember-cli/ember-addon-output
-
-Both of these have a git-tag per release version
-
-### Online Editors
-
-Multiple editors could be supported, but right now, we only "customize" for stackblitz.
-
-https://github.com/ember-cli/editor-output/
-- [a branch for each scenario + release version](https://github.com/ember-cli/editor-output/branches/active)
-  - `${editorName}-{addon,app}-output{-'typescript'?}{-version}`
-  - and the "latest release" (non beta) will not have a version at the end
-  - This includes [app, addon] X [javascript, typescript]
-
-#### StackBlitz
-
-To make sure StackBlitz runs in their supported browsers (Chrome and FireFox, as of 2023-08-15)
-
-- App + JS: https://stackblitz.com/github/ember-cli/editor-output/tree/stackblitz-app-output
-- App + TS: https://stackblitz.com/github/ember-cli/editor-output/tree/stackblitz-app-output-typescript
-- Addon + JS: https://stackblitz.com/github/ember-cli/editor-output/tree/stackblitz-addon-output
-- Addon + TS: https://stackblitz.com/github/ember-cli/editor-output/tree/stackblitz-addon-output-typescript
-
-The App + JS, and App + TS are linked from Stackblitz's frontend templates UI: https://stackblitz.com/?starters=frontend
-
-</details>
-
-<details><summary>if problems arise</summary>
-
-Script for updating addon/app repos: https://github.com/ember-cli/ember-cli/blob/master/dev/update-output-repos.js
-Script for updating editors: https://github.com/ember-cli/ember-cli/blob/master/dev/update-editor-output-repos.js
-
-Customizations on top of the default blueprint(s) are found here: https://github.com/ember-cli/ember-cli/tree/master/dev/online-editors/stackblitz
-The intent for these customizations is to either be very light, or not needed at all.
-If an online editor breaks with our default blueprint, then it's most likely that _we_ have a bug (or something _very goofy_).
-
-</details>
+This document has been updated and is being actively managed on the default branch of this repo. Please refer to the version on the default branch to follow the release process: https://github.com/ember-cli/ember-cli/blob/master/RELEASE.md

package/blueprints/addon/index.js

@@ -246,6 +246,7 @@ module.exports = {
       emberData: options.emberData,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
+      strict: options.strict,
       packageManager: options.packageManager ?? 'npm',
     };
   },

package/blueprints/app/files/.ember-cli

@@ -3,5 +3,17 @@
     Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
     rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
   */
-  "isTypeScriptProject": <%= typescript ? 'true' : 'false' %>
+  "isTypeScriptProject": <%= typescript ? 'true' : 'false' %>,
+
+  /**
+    Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
+    or GTS files for the component and the component rendering test. "loose" is the default.
+  */
+  "componentAuthoringFormat": <%= strict ? '"strict"' : '"loose"' %>,
+
+  /**
+    Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
+    or GTS templates for routes. "loose" is the default
+  */
+  "routeAuthoringFormat": <%= strict ? '"strict"' : '"loose"' %>
 }

package/blueprints/app/files/app/templates/_js_application.gjs

@@ -0,0 +1,15 @@
+import pageTitle from 'ember-page-title/helpers/page-title';<% if (welcome) { %>
+import WelcomePage from 'ember-welcome-page/components/welcome-page';<% } %>
+
+<template>
+  {{pageTitle "<%= namespace %>"}}
+<% if (welcome) { %>
+  {{outlet}}
+
+  {{! The following component displays Ember's default welcome message. }}
+  <WelcomePage />
+  {{! Feel free to remove this! }}<% } else { %>
+  <h2 id="title">Welcome to Ember</h2>
+
+  {{outlet}}<% } %>
+</template>

package/blueprints/app/files/app/templates/_ts_application.gts

@@ -0,0 +1,15 @@
+import pageTitle from 'ember-page-title/helpers/page-title';<% if (welcome) { %>
+import WelcomePage from 'ember-welcome-page/components/welcome-page';<% } %>
+
+<template>
+  {{pageTitle "<%= namespace %>"}}
+<% if (welcome) { %>
+  {{outlet}}
+
+  {{! The following component displays Ember's default welcome message. }}
+  <WelcomePage />
+  {{! Feel free to remove this! }}<% } else { %>
+  <h2 id="title">Welcome to Ember</h2>
+
+  {{outlet}}<% } %>
+</template>

package/blueprints/app/index.js

@@ -80,6 +80,7 @@ module.exports = {
       emberData: options.emberData,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
+      strict: options.strict,
       packageManager: options.packageManager ?? 'npm',
     };
   },
@@ -106,6 +107,12 @@ module.exports = {
       files = files.filter((file) => !file.includes('ember-data/'));
     }
 
+    if (options.strict) {
+      files = files.filter((file) => !file.endsWith('.hbs'));
+    } else {
+      files = files.filter((file) => !file.endsWith('.gjs') && !file.endsWith('.gts'));
+    }
+
     this._files = files;
 
     return this._files;