@ember/app-blueprint 6.10.0-alpha.5 → 6.10.0-alpha.7

package/.github/workflows/ci.yml

@@ -4,6 +4,8 @@ on:
   workflow_dispatch:
   pull_request:
   push:
+    paths-ignore:
+      - '**/*.md'
     branches:
       - main
 
@@ -30,13 +32,17 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
+        node:
+          - 20
+          - 22
+          - 24
 
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: ${{ matrix.node }}
           cache: pnpm
       - name: Set TEMP to D:/Temp on windows
         if: ${{matrix.os}} == windows-latest

package/.prettierignore

@@ -1,4 +1,5 @@
 files/
+conditional-files/
 node_modules/
 tests/fixtures/
 

package/.release-plan.json

@@ -1,26 +1,22 @@
 {
   "solution": {
     "@ember/app-blueprint": {
-      "impact": "minor",
-      "oldVersion": "6.10.0-alpha.4",
-      "newVersion": "6.10.0-alpha.5",
+      "impact": "patch",
+      "oldVersion": "6.10.0-alpha.6",
+      "newVersion": "6.10.0-alpha.7",
       "tagName": "alpha",
       "constraints": [
-        {
-          "impact": "minor",
-          "reason": "Appears in changelog section :rocket: Enhancement"
-        },
         {
           "impact": "patch",
           "reason": "Appears in changelog section :bug: Bug Fix"
         },
         {
           "impact": "patch",
-          "reason": "Appears in changelog section :memo: Documentation"
+          "reason": "Appears in changelog section :house: Internal"
         }
       ],
       "pkgJSONPath": "./package.json"
     }
   },
-  "description": "## Release (2025-11-21)\n\n* @ember/app-blueprint 6.10.0-alpha.5 (minor)\n\n#### :rocket: Enhancement\n* `@ember/app-blueprint`\n  * [#140](https://github.com/ember-cli/ember-app-blueprint/pull/140) Use an `.mjs` file for configuring Stylelint ([@bertdeblock](https://github.com/bertdeblock))\n  * [#142](https://github.com/ember-cli/ember-app-blueprint/pull/142) Use pnpm v10 ([@bertdeblock](https://github.com/bertdeblock))\n  * [#138](https://github.com/ember-cli/ember-app-blueprint/pull/138) Update generated ESLint config ([@bertdeblock](https://github.com/bertdeblock))\n  * [#44](https://github.com/ember-cli/ember-app-blueprint/pull/44) Use ESM for the babel config ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#139](https://github.com/ember-cli/ember-app-blueprint/pull/139) Remove `/declarations/` entry in `.gitignore` file ([@bertdeblock](https://github.com/bertdeblock))\n\n#### :memo: Documentation\n* `@ember/app-blueprint`\n  * [#141](https://github.com/ember-cli/ember-app-blueprint/pull/141) Update some links to use https ([@bertdeblock](https://github.com/bertdeblock))\n\n#### Committers: 2\n- Bert De Block ([@bertdeblock](https://github.com/bertdeblock))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
+  "description": "## Release (2025-12-09)\n\n* @ember/app-blueprint 6.10.0-alpha.7 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#153](https://github.com/ember-cli/ember-app-blueprint/pull/153) Pass extension to WelcomePage component ([@evoactivity](https://github.com/evoactivity))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n  * [#159](https://github.com/ember-cli/ember-app-blueprint/pull/159) don't run CI when you only change markdown files ([@mansona](https://github.com/mansona))\n\n#### Committers: 2\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Liam Potter ([@evoactivity](https://github.com/evoactivity))\n"
 }

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## Release (2025-12-09)
+
+* @ember/app-blueprint 6.10.0-alpha.7 (patch)
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#153](https://github.com/ember-cli/ember-app-blueprint/pull/153) Pass extension to WelcomePage component ([@evoactivity](https://github.com/evoactivity))
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#159](https://github.com/ember-cli/ember-app-blueprint/pull/159) don't run CI when you only change markdown files ([@mansona](https://github.com/mansona))
+
+#### Committers: 2
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Liam Potter ([@evoactivity](https://github.com/evoactivity))
+
+## Release (2025-11-26)
+
+* @ember/app-blueprint 6.10.0-alpha.6 (minor)
+
+#### :rocket: Enhancement
+* `@ember/app-blueprint`
+  * [#145](https://github.com/ember-cli/ember-app-blueprint/pull/145) Update generated workflow files ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#149](https://github.com/ember-cli/ember-app-blueprint/pull/149) Fix the full path display during project generation ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#146](https://github.com/ember-cli/ember-app-blueprint/pull/146) Test against our supported node versions (and fix the babel config for the maintenance-node version (20)) ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#148](https://github.com/ember-cli/ember-app-blueprint/pull/148) Sort the package.json, using the replacers strategy ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### Committers: 1
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## Release (2025-11-21)
 
 * @ember/app-blueprint 6.10.0-alpha.5 (minor)

package/{files → conditional-files}/_js_babel.config.mjs

@@ -1,3 +1,5 @@
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import {
   babelCompatSupport,
   templateCompatSupport,
@@ -28,7 +30,7 @@ export default {
     [
       '@babel/plugin-transform-runtime',
       {
-        absoluteRuntime: import.meta.dirname,
+        absoluteRuntime: dirname(fileURLToPath(import.meta.url)),
         useESModules: true,
         regenerator: false,
       },

package/{files → conditional-files}/_ts_babel.config.mjs

@@ -1,3 +1,5 @@
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import {
   babelCompatSupport,
   templateCompatSupport,
@@ -36,7 +38,7 @@ export default {
     [
       '@babel/plugin-transform-runtime',
       {
-        absoluteRuntime: import.meta.dirname,
+        absoluteRuntime: dirname(fileURLToPath(import.meta.url)),
         useESModules: true,
         regenerator: false,
       },

package/eslint.config.mjs

@@ -28,8 +28,8 @@ export default [
     ignores: [
       'tests/fixtures/*',
       'files/ember-cli-build.js',
-      'files/_js_*',
-      'files/_ts_*',
+      'conditional-files/_js_*',
+      'conditional-files/_ts_*',
     ],
   },
 ];

package/files/.github/workflows/ci.yml

@@ -18,14 +18,14 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3<% if (pnpm) { %>
+      - uses: actions/checkout@v6<% if (pnpm) { %>
       - uses: pnpm/action-setup@v4
         with:
           version: 10<% } %>
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 22
           cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
         run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
@@ -38,14 +38,14 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3<% if (pnpm) { %>
+      - uses: actions/checkout@v6<% if (pnpm) { %>
       - uses: pnpm/action-setup@v4
         with:
           version: 10<% } %>
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 22
           cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
         run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>

package/files/app/templates/{_js_application.gjs → application.gts}

@@ -7,7 +7,7 @@ import { pageTitle } from 'ember-page-title';
   {{outlet}}
 
   {{! The following component displays Ember's default welcome message. }}
-  <WelcomePage />
+  <WelcomePage @extension="<% if (typescript) {%>gts<% } else { %>gjs<% } %>" />
   {{! Feel free to remove this! }}<% } else { %>
   <h2 id="title">Welcome to Ember</h2>
 

package/files/babel.config.mjs

@@ -0,0 +1 @@
+// See: conditional-files

package/files/eslint.config.mjs

@@ -0,0 +1 @@
+// See: conditional-files

package/files/package.json

@@ -74,7 +74,7 @@
     "ember-resolver": "^13.1.1",
     "ember-source": "~6.10.0-alpha.1",
     "ember-template-lint": "^7.9.3<% if (welcome) { %>",
-    "ember-welcome-page": "^7.0.2<% } %>",
+    "ember-welcome-page": "^8.0.4<% } %>",
     "eslint": "^9.37.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-ember": "^12.7.4",

package/index.js

@@ -3,6 +3,47 @@
 const stringUtil = require('ember-cli-string-utils');
 const chalk = require('chalk');
 const directoryForPackageName = require('./lib/directory-for-package-name');
+const { sortPackageJson } = require('sort-package-json');
+const { join } = require('path');
+const { readFileSync } = require('fs');
+const ejs = require('ejs');
+
+const CONDITIONAL_FILES = join(__dirname, 'conditional-files');
+
+function stringifyAndNormalize(contents) {
+  return `${JSON.stringify(contents, null, 2)}\n`;
+}
+
+/**
+ * This overrides ember-cli's default replace function,
+ * which is a call to ejs with the template locals.
+ *
+ * If we want to continue using ejs in any of these,
+ * we _may_ need to call ejs ourselves
+ * (in the case where we ignore the "contents" passed to these functions)
+ * (see `conditional-files`)
+ */
+const replacers = {
+  'package.json'(...args) {
+    return this.updatePackageJson(...args);
+  },
+  'eslint.config.mjs'(locals) {
+    let prefix = locals.typescript ? '_ts_' : '_js_';
+    let filePath = join(CONDITIONAL_FILES, prefix + 'eslint.config.mjs');
+
+    let raw = readFileSync(filePath).toString();
+
+    return ejs.render(raw, locals);
+  },
+  'babel.config.mjs'(locals) {
+    let prefix = locals.typescript ? '_ts_' : '_js_';
+    let filePath = join(CONDITIONAL_FILES, prefix + 'babel.config.mjs');
+
+    let raw = readFileSync(filePath).toString();
+
+    return ejs.render(raw, locals);
+  },
+};
 
 module.exports = {
   description: 'The default blueprint for ember-cli projects.',
@@ -127,44 +168,20 @@ module.exports = {
 
   /**
    * @override
-   *
-   * This modification of buildFileInfo allows our differing
-   * input files to output to a single file, depending on the options.
-   * For example:
-   *
-   *   for javascript,
-   *     _ts_eslint.config.mjs is deleted
-   *     _js_eslint.config.mjs is renamed to eslint.config.mjs
-   *
-   *   for typescript,
-   *     _js_eslint.config.mjs is deleted
-   *     _ts_eslint.config.mjs is renamed to eslint.config.mjs
    */
-  buildFileInfo(intoDir, templateVariables, file, options) {
+  buildFileInfo(intoDir, templateVariables, file) {
     let fileInfo = this._super.buildFileInfo.apply(this, arguments);
 
-    if (file.includes('_js_')) {
-      if (options.typescript) {
-        return null;
-      }
-
-      fileInfo.outputBasePath = fileInfo.outputPath.replace('_js_', '');
-      fileInfo.outputPath = fileInfo.outputPath.replace('_js_', '');
-      fileInfo.displayPath = fileInfo.outputPath.replace('_js_', '');
-      return fileInfo;
+    if (file in replacers) {
+      fileInfo.replacer = replacers[file].bind(this, templateVariables);
     }
 
-    if (file.includes('_ts_')) {
-      if (!options.typescript) {
-        return null;
-      }
+    return fileInfo;
+  },
 
-      fileInfo.outputBasePath = fileInfo.outputPath.replace('_ts_', '');
-      fileInfo.outputPath = fileInfo.outputPath.replace('_ts_', '');
-      fileInfo.displayPath = fileInfo.outputPath.replace('_ts_', '');
-      return fileInfo;
-    }
+  updatePackageJson(options, content) {
+    let contents = JSON.parse(content);
 
-    return fileInfo;
+    return stringifyAndNormalize(sortPackageJson(contents));
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "6.10.0-alpha.5",
+  "version": "6.10.0-alpha.7",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
+    "ejs": "^3.1.10",
     "ember-cli-string-utils": "^1.1.0",
     "lodash": "^4.17.21",
     "walk-sync": "^3.0.0"

package/tests/arguments.test.mjs

@@ -154,7 +154,7 @@ describe('Blueprint Arguments', function () {
       expect(parse(files['package.json']).devDependencies['ember-welcome-page'])
         .to.not.be.undefined;
       expect(files.app.templates['application.gjs']).to.contain(
-        '<WelcomePage />',
+        '<WelcomePage @extension="gjs" />',
       );
     });
 
@@ -164,7 +164,7 @@ describe('Blueprint Arguments', function () {
       expect(parse(files['package.json']).devDependencies['ember-welcome-page'])
         .to.be.undefined;
       expect(files.app.templates['application.gjs']).not.to.contain(
-        '<WelcomePage />',
+        '<WelcomePage @extension="gjs" />',
       );
     });
   });

package/tests/fixtures/tests-js-10/app/templates/application.gjs

@@ -8,7 +8,7 @@ import { LinkTo } from '@ember/routing';
   {{outlet}}
 
   {{! The following component displays Ember's default welcome message. }}
-  <WelcomePage />
+  <WelcomePage @extension="gjs" />
   {{! Feel free to remove this! }}
 
   <LinkTo @route="fancy" data-test-a>Fancy</LinkTo>

package/tests/fixtures/tests-ts-10/app/templates/application.gts

@@ -8,7 +8,7 @@ import { LinkTo } from '@ember/routing';
   {{outlet}}
 
   {{! The following component displays Ember's default welcome message. }}
-  <WelcomePage />
+  <WelcomePage @extension="gts" />
   {{! Feel free to remove this! }}
 
   <LinkTo @route="fancy" data-test-a>Fancy</LinkTo>

package/files/app/templates/_ts_application.gts

@@ -1,15 +0,0 @@
-import { pageTitle } from 'ember-page-title';
-<% if (welcome) {%>import { WelcomePage } from 'ember-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>