@ember/app-blueprint 6.10.0-beta.3 → 6.10.0-beta.4

package/.release-plan.json

@@ -2,8 +2,8 @@
   "solution": {
     "@ember/app-blueprint": {
       "impact": "patch",
-      "oldVersion": "6.10.0-beta.2",
-      "newVersion": "6.10.0-beta.3",
+      "oldVersion": "6.10.0-beta.3",
+      "newVersion": "6.10.0-beta.4",
       "tagName": "beta",
       "constraints": [
         {
@@ -14,5 +14,5 @@
       "pkgJSONPath": "./package.json"
     }
   },
-  "description": "## Release (2026-01-12)\n\n* @ember/app-blueprint 6.10.0-beta.3 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#180](https://github.com/ember-cli/ember-app-blueprint/pull/180) [bugfix beta] don't turn warp-drive linksMode on by default for now ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n"
+  "description": "## Release (2026-01-13)\n\n* @ember/app-blueprint 6.10.0-beta.4 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#187](https://github.com/ember-cli/ember-app-blueprint/pull/187) [bugfix beta] Revert \"Add --minimal and --no-compat\" ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
 }

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Release (2026-01-13)
+
+* @ember/app-blueprint 6.10.0-beta.4 (patch)
+
+#### :bug: Bug Fix
+* `@ember/app-blueprint`
+  * [#187](https://github.com/ember-cli/ember-app-blueprint/pull/187) [bugfix beta] Revert "Add --minimal and --no-compat" ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### Committers: 1
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## Release (2026-01-12)
 
 * @ember/app-blueprint 6.10.0-beta.3 (patch)

package/README.md

@@ -9,46 +9,3 @@ If you have an existing app that you would like to upgrade to use Vite consider
 ```
 pnpm dlx ember-cli@latest new my-app-name -b @ember/app-blueprint --pnpm
 ```
-
-## Options
-
-### `--no-compat`
-
-```
-pnpm dlx ember-cli@latest new my-app-name \
-  --blueprint @ember/app-blueprint@alpha \
-  --pnpm \
-  --no-compat
-```
-
-Does the following:
-- enables `type=module` in package.json (required for vite-ssr, and many ESM tools)
-- makes the build and boot _MUCH FASTER_   
-  (in large apps, this can have your app's boot be up to 1 minute faster)
-- removes `@embroider/compat`
-  - removes support for:
-    - hbs (both for component files, and testing)
-    - content-for (in the HTML files)
-    - v1 addons
-    - node-land config/environment.js
-- removes `ember-cli`
-  - ember-cli brings in a ton of old dependencies, so removing it makes installs much faster
-  - downside though is that you no longer have scaffolding (`ember g`) -- however, you could use `pnpm dlx ember-cli g ...` (or `npx ember-cli g`)
-
-### `--minimal`
-
-```
-pnpm dlx ember-cli@latest new my-app-name \
-  --blueprint @ember/app-blueprint@alpha \
-  --pnpm \
-  --minimal
-```
-
-Does the following
-- everything listed under `--no-compat`
-- Removes all linting, formatting, and testing support
-  - leaves you with a minimal app that you can use for demos, and PRing to other repositories that have multi-framework support (and probably use other testing tools for that multi-framework support)
-- different defaults:
-  - warp-drive becomes _opt-in_ (pass `--warp-drive` if you want it -- normally requires `--no-warp-drive` to remove)
-  - ember-welcome-page becomes _opt-in_ (normally requires `--no-welcome` to remove)
-

package/eslint.config.mjs

@@ -26,15 +26,10 @@ export default [
   eslintConfigPrettier,
   {
     ignores: [
-      'my-app/**',
       'tests/fixtures/*',
-      'files/vite.config.*',
       'files/ember-cli-build.js',
-      'files/testem.cjs',
       'conditional-files/_js_*',
       'conditional-files/_ts_*',
-      'conditional-files/no-compat/_js_*',
-      'conditional-files/no-compat/_ts_*',
     ],
   },
 ];

package/files/app/templates/application.gts

@@ -1,5 +1,5 @@
-import { pageTitle } from 'ember-page-title';<% if (welcome) {%>
-import { WelcomePage } from 'ember-welcome-page';<% } %>
+import { pageTitle } from 'ember-page-title';
+<% if (welcome) {%>import { WelcomePage } from 'ember-welcome-page';<% } %>
 
 <template>
   {{pageTitle "<%= namespace %>"}}<% if (welcome) { %>

package/files/index.html

@@ -5,28 +5,25 @@
     <title><%= namespace %></title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-<% if (compat) { %>
 
     {{content-for "head"}}
+
     <link integrity="" rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link integrity="" rel="stylesheet" href="/@embroider/virtual/app.css">
 
     {{content-for "head-footer"}}
-<% } else { %>
-    <link rel="stylesheet" href="/app/styles/app.css">  
-<% } %></head>
+  </head>
   <body>
-<% if (compat) { %>{{content-for "body"}}
+    {{content-for "body"}}
 
     <script src="/@embroider/virtual/vendor.js"></script>
-<% } %>  <script type="module">
+    <script type="module">
       import Application from './app/app';
       import environment from './app/config/environment';
 
       Application.create(environment.APP);
     </script>
-<% if (compat) { %>{{content-for "body"}}
 
     {{content-for "body-footer"}}
-<% } %> </body>
+  </body>
 </html>

package/files/package.json

@@ -66,7 +66,7 @@
     "decorator-transforms": "^2.3.0",
     "ember-cli": "~6.9.1",
     "ember-cli-babel": "^8.2.0",
-    "ember-cli-deprecation-workflow": "^4.0.0",
+    "ember-cli-deprecation-workflow": "^3.4.0",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.2",
     "ember-page-title": "^9.0.3",

package/files/testem.cjs

@@ -2,8 +2,7 @@
 
 if (typeof module !== 'undefined') {
   module.exports = {
-    test_page: 'tests/index.html?hidepassed',<% if (noCompat) {%>
-    cwd: 'dist',<% } %>
+    test_page: 'tests/index.html?hidepassed',
     disable_watching: true,
     launch_in_ci: ['Chrome'],
     launch_in_dev: ['Chrome'],

package/files/tests/index.html

@@ -5,7 +5,7 @@
     <title><%= namespace %> Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-<% if (compat) { %>
+
     {{content-for "head"}}
     {{content-for "test-head"}}
 
@@ -15,15 +15,12 @@
 
     {{content-for "head-footer"}}
     {{content-for "test-head-footer"}}
-<% } else { %>
-    <link rel="stylesheet" href="/app/styles/app.css">      
-<% } %>  </head>
+  </head>
   <body>
-<% if (compat) { %>
     {{content-for "body"}}
     {{content-for "test-body"}}
 
- <% } %>   <div id="qunit"></div>
+    <div id="qunit"></div>
     <div id="qunit-fixture">
       <div id="ember-testing-container">
         <div id="ember-testing"></div>
@@ -31,10 +28,8 @@
     </div>
 
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
-<% if (compat) { %>
     <script src="/@embroider/virtual/vendor.js"></script>
     <script src="/@embroider/virtual/test-support.js"></script>
-<% } %>
     <script type="module">import "ember-testing";</script>
 
     <script type="module">
@@ -43,8 +38,6 @@
       start();
     </script>
 
-<% if (compat) { %>
     {{content-for "body-footer"}}
-<% } %>
   </body>
 </html>

package/files/tests/test-helper.ts

@@ -1,14 +1,13 @@
 <% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
 import Application from '<%= modulePrefix %>/app';
-import config<% if (noCompat) {%>, { enterTestMode }<% } %> from '<%= modulePrefix %>/config/environment';
+import config from '<%= modulePrefix %>/config/environment';
 import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
 import { setup } from 'qunit-dom';
 import { start as qunitStart, setupEmberOnerrorValidation } from 'ember-qunit';
 
 export function start() {
-  <% if (noCompat) { %>enterTestMode();
-  <% } %>setApplication(Application.create(config.APP));
+  setApplication(Application.create(config.APP));
 
   setup(QUnit.assert);
   setupEmberOnerrorValidation();

package/files/vite.config.mjs

@@ -1,10 +1,10 @@
 import { defineConfig } from 'vite';
-import { extensions<% if (!noCompat) { %>, classicEmberSupport<% } %>, ember } from '@embroider/vite';
+import { extensions, classicEmberSupport, ember } from '@embroider/vite';
 import { babel } from '@rollup/plugin-babel';
 
 export default defineConfig({
-  plugins: [<% if (!noCompat) { %>
-    classicEmberSupport(),<% } %>
+  plugins: [
+    classicEmberSupport(),
     ember(),
     // extra plugins here
     babel({

package/index.js

@@ -24,45 +24,6 @@ function stringifyAndNormalize(contents) {
  * (see `conditional-files`)
  */
 const replacers = {
-  'app/app.ts'(locals, contents) {
-    if (locals.minimal) {
-      let filePath = join(CONDITIONAL_FILES, 'minimal', 'app/app.ts');
-      let raw = readFileSync(filePath).toString();
-      return ejs.render(raw, locals);
-    } else if (locals.noCompat) {
-      let filePath = join(CONDITIONAL_FILES, 'no-compat', 'app/app.ts');
-      let raw = readFileSync(filePath).toString();
-      return ejs.render(raw, locals);
-    }
-
-    return ejs.render(contents, locals);
-  },
-  'app/config/environment.ts'(locals, contents) {
-    if (locals.noCompat) {
-      let filePath = join(
-        CONDITIONAL_FILES,
-        'no-compat',
-        'app/config/environment.ts',
-      );
-      let raw = readFileSync(filePath).toString();
-      return ejs.render(raw, locals);
-    }
-
-    return ejs.render(contents, locals);
-  },
-  'app/templates/application.gts'(locals, contents) {
-    if (locals.minimal) {
-      let filePath = join(
-        CONDITIONAL_FILES,
-        'minimal',
-        'app/templates/application.gts',
-      );
-      let raw = readFileSync(filePath).toString();
-      return ejs.render(raw, locals);
-    }
-
-    return ejs.render(contents, locals);
-  },
   'package.json'(...args) {
     return this.updatePackageJson(...args);
   },
@@ -76,14 +37,7 @@ const replacers = {
   },
   'babel.config.mjs'(locals) {
     let prefix = locals.typescript ? '_ts_' : '_js_';
-
-    let filePath = join(
-      ...[
-        CONDITIONAL_FILES,
-        locals.noCompat && 'no-compat',
-        prefix + 'babel.config.mjs',
-      ].filter(Boolean),
-    );
+    let filePath = join(CONDITIONAL_FILES, prefix + 'babel.config.mjs');
 
     let raw = readFileSync(filePath).toString();
 
@@ -126,8 +80,6 @@ module.exports = {
           options.packageManager === 'pnpm' && '"--pnpm"',
           options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
           options.typescript && `"--typescript"`,
-          options.minimal && `"--minimal"`,
-          options.noCompat && `"--no-compat"`,
           !options.emberData && `"--no-ember-data"`,
           !options.warpDrive && `"--no-warp-drive"`,
         ]
@@ -149,37 +101,6 @@ module.exports = {
       execBinPrefix = 'pnpm';
     }
 
-    let welcome = options.welcome;
-    let warpDrive = options.warpDrive ?? options.emberData;
-    let minimal = false;
-    let compat = true;
-    /**
-     * --minimal overrides compat/no-compat
-     */
-    if (options.minimal) {
-      minimal = true;
-      compat = false;
-
-      // Invert defaults
-      {
-        welcome = options.welcome = process.argv.includes('--welcome');
-        warpDrive =
-          options.emberData =
-          options.warpDrive =
-            process.argv.includes('--ember-data') ||
-            process.argv.includes('--warp-drive');
-      }
-    }
-
-    if (!minimal) {
-      if (options.noCompat || options.compat === false) {
-        compat = false;
-      }
-    }
-
-    let noCompat = !compat;
-    let notMinimal = !minimal;
-
     return {
       appDirectory: directoryForPackageName(name),
       name,
@@ -192,18 +113,14 @@ module.exports = {
         options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
       invokeScriptPrefix,
       execBinPrefix,
-      welcome,
+      welcome: options.welcome,
       blueprint: 'app',
       blueprintOptions,
       lang: options.lang,
-      warpDrive: warpDrive,
+      warpDrive: options.warpDrive ?? options.emberData,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       packageManager: options.packageManager ?? 'npm',
-      compat,
-      noCompat,
-      minimal,
-      notMinimal,
     };
   },
 
@@ -214,10 +131,6 @@ module.exports = {
 
     let files = this._super();
 
-    // Locals is where we calculate defaults and such.
-    // Let's not duplicate that work here
-    options = this.locals(options);
-
     if (options.ciProvider !== 'github') {
       files = files.filter((file) => file.indexOf('.github') < 0);
     }
@@ -237,43 +150,6 @@ module.exports = {
       files = files.filter((file) => !file.includes('services/.gitkeep'));
     }
 
-    if (options.noCompat) {
-      files = files.filter((file) => {
-        return (
-          !file.includes('ember-cli') &&
-          !file.includes('ember-cli-build.js') &&
-          !file.includes('controllers/') &&
-          !file.includes('config/environment.js') &&
-          !file.includes('config/optional-features') &&
-          !file.includes('config/targets') &&
-          !file.includes('app/helpers/')
-        );
-      });
-    }
-
-    if (options.minimal) {
-      files = files.filter((file) => {
-        return (
-          !file.includes('.github/') &&
-          !file.includes('.prettierignore') &&
-          !file.includes('README') &&
-          !file.includes('deprecation-workflow') &&
-          !file.includes('components/') &&
-          !file.includes('eslint.config') &&
-          !file.includes('prettierrc') &&
-          !file.includes('public/') &&
-          !file.includes('routes/') &&
-          !file.includes('services/') &&
-          !file.includes('stylelint') &&
-          !file.includes('styles/') &&
-          !file.includes('template-lintrc') &&
-          !file.includes('testem') &&
-          !file.includes('tests/') &&
-          !file.includes('watchman')
-        );
-      });
-    }
-
     this._files = files;
 
     return this._files;
@@ -306,92 +182,6 @@ module.exports = {
   updatePackageJson(options, content) {
     let contents = JSON.parse(content);
 
-    if (options.minimal) {
-      // Remove linting
-      {
-        delete contents.scripts['format'];
-        delete contents.scripts['lint'];
-        delete contents.scripts['lint:format'];
-        delete contents.scripts['lint:fix'];
-        delete contents.scripts['lint:js'];
-        delete contents.scripts['lint:js:fix'];
-        delete contents.scripts['lint:css'];
-        delete contents.scripts['lint:css:fix'];
-        delete contents.scripts['lint:hbs'];
-        delete contents.scripts['lint:hbs:fix'];
-
-        delete contents.devDependencies['@babel/eslint-parser'];
-        delete contents.devDependencies['@eslint/js'];
-        delete contents.devDependencies['concurrently'];
-        delete contents.devDependencies['ember-template-lint'];
-        delete contents.devDependencies['eslint'];
-        delete contents.devDependencies['eslint-config-prettier'];
-        delete contents.devDependencies['eslint-plugin-ember'];
-        delete contents.devDependencies['eslint-plugin-n'];
-        delete contents.devDependencies['eslint-plugin-qunit'];
-        delete contents.devDependencies['eslint-plugin-warp-drive'];
-        delete contents.devDependencies['globals'];
-        delete contents.devDependencies['prettier'];
-        delete contents.devDependencies['prettier-plugin-ember-template-tag'];
-        delete contents.devDependencies['stylelint'];
-        delete contents.devDependencies['stylelint-config-standard'];
-        delete contents.devDependencies['typescript-eslint'];
-      }
-      // Remove testing
-      {
-        delete contents.scripts['test'];
-        delete contents.devDependencies['@ember/test-helpers'];
-        delete contents.devDependencies['@ember/test-waiters'];
-        delete contents.devDependencies['ember-qunit'];
-        delete contents.devDependencies['qunit'];
-        delete contents.devDependencies['qunit-dom'];
-        delete contents.devDependencies['testem'];
-      }
-      // Extraneous / non-core deps.
-      // if folks go minimal, they know what they are doing
-      {
-        delete contents.devDependencies['ember-welcome-page'];
-        delete contents.devDependencies['tracked-built-ins'];
-        delete contents.devDependencies['ember-page-title'];
-        delete contents.devDependencies['ember-modifier'];
-        delete contents.devDependencies['ember-cli-deprecation-workflow'];
-        delete contents.devDependencies['ember-resolver'];
-      }
-      // common-in-the-vite-ecosystem alias
-      {
-        contents.scripts.dev = contents.scripts.start;
-      }
-
-      contents.devDependencies['ember-strict-application-resolver'] = '^0.1.0';
-    }
-    if (options.noCompat) {
-      contents.type = 'module';
-      contents.engines.node = '>= 24';
-      delete contents.directories;
-      delete contents.devDependencies['@ember/string'];
-      delete contents.devDependencies['@ember/optional-features'];
-      delete contents.devDependencies['@embroider/compat'];
-      delete contents.devDependencies['@embroider/config-meta-loader'];
-      // Users should use npx ember-cli instead
-      delete contents.devDependencies['ember-cli'];
-      delete contents.devDependencies['ember-cli-babel'];
-      delete contents.devDependencies['ember-load-initializers'];
-
-      // A nice feature of modern apps is using sub-path imports
-      // Why specify the whole app name, when you can use `#`?
-      contents.imports = {
-        '#app/*': './app/*',
-        '#config': './app/config/environment',
-        '#components/*': './app/components/*',
-      };
-
-      if (contents.scripts.test) {
-        contents.scripts.test =
-          'vite build --mode development && testem ci --port 0';
-        contents.devDependencies['testem'] = '^3.17.0';
-      }
-    }
-
     return stringifyAndNormalize(sortPackageJson(contents));
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "6.10.0-beta.3",
+  "version": "6.10.0-beta.4",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -25,13 +25,12 @@
     "ejs": "^3.1.10",
     "ember-cli-string-utils": "^1.1.0",
     "lodash": "^4.17.21",
-    "sort-package-json": "^3.5.1",
     "walk-sync": "^3.0.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.3.0",
     "concurrently": "^9.1.2",
-    "ember-cli": "^6.9.1",
+    "ember-cli": "^6.3.1",
     "eslint": "9.x",
     "eslint-config-prettier": "^9.1.0",
     "execa": "^9.1.0",
@@ -43,7 +42,7 @@
     "release-plan": "^0.17.2",
     "strip-ansi": "^7.1.0",
     "tmp-promise": "^3.0.3",
-    "vitest": "^4.0.16"
+    "vitest": "^4.0.0-beta.17"
   },
   "scripts": {
     "lint": "concurrently 'pnpm:lint:*(!fix)'",
@@ -51,10 +50,7 @@
     "lint:eslint": "eslint .",
     "lint:prettier": "prettier . --check",
     "format": "prettier . --write",
-    "new:app": "pnpm dlx ember-cli@latest new my-app --blueprint .",
-    "update:all": "pnpm dlx update-blueprint-deps --filter . ./files/package.json",
-    "update:alpha": "pnpm dlx update-blueprint-deps --ember-source alpha --ember-cli alpha --ember-data alpha ./files/package.json",
-    "update:beta": "pnpm dlx update-blueprint-deps --ember-source beta --ember-cli beta --ember-data beta ./files/package.json",
-    "test": "vitest"
+    "test": "vitest",
+    "new:app": "pnpm dlx ember-cli@latest new my-app --blueprint ."
   }
 }

package/conditional-files/minimal/app/app.ts

@@ -1,10 +0,0 @@
-<% if (warpDrive) { %>import '@warp-drive/ember/install';
-<% } %>import Application from 'ember-strict-application-resolver';
-
-export default class App extends Application {
-  modules = {
-    ...import.meta.glob('./router.*', { eager: true }),
-    ...import.meta.glob('./templates/**/*', { eager: true }),
-    ...import.meta.glob('./services/**/*', { eager: true }),
-  }
-}

package/conditional-files/minimal/app/templates/application.gts

@@ -1,7 +0,0 @@
-
-<template>
-  <h1>Welcome to Ember</h1>
-
-  {{outlet}}
-
-</template>

package/conditional-files/no-compat/_js_babel.config.mjs

@@ -1,47 +0,0 @@
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-<% if (warpDrive) { %>import { setConfig } from '@warp-drive/core/build-config';
-<% } %>import { buildMacros } from '@embroider/macros/babel';
-
-<% if (warpDrive) { %>const macros = buildMacros({
-  configure: (config) => {
-    setConfig(config, {
-      // for universal apps this MUST be at least 5.6
-      compatWith: '5.6',
-    });
-  },
-});
-<% } else { %>const macros = buildMacros();
-<% } %>
-export default {
-  plugins: [
-    [
-      'babel-plugin-ember-template-compilation',
-      {
-        compilerPath: 'ember-source/dist/ember-template-compiler.js',
-        transforms: [...macros.templateMacros],
-      },
-    ],
-    [
-      'module:decorator-transforms',
-      {
-        runtime: {
-          import: import.meta.resolve('decorator-transforms/runtime-esm'),
-        },
-      },
-    ],
-    [
-      '@babel/plugin-transform-runtime',
-      {
-        absoluteRuntime: dirname(fileURLToPath(import.meta.url)),
-        useESModules: true,
-        regenerator: false,
-      },
-    ],
-    ...macros.babelMacros,
-  ],
-
-  generatorOpts: {
-    compact: false,
-  },
-};