bring back no compat

eslint.config.mjs

@@ -27,7 +27,15 @@ export default [
   {
     ignores: [
       'tests/fixtures/*',
+<<<<<<< HEAD
       'files/ember-cli-build.mjs',
+||||||| 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
+      'files/vite.config.*',
+      'files/ember-cli-build.js',
+      'files/testem.cjs',
+=======
+      'files/ember-cli-build.js',
+>>>>>>> parent of 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
       'conditional-files/_js_*',
       'conditional-files/_ts_*',
     ],

files/package.json

@@ -63,10 +63,22 @@
     "@warp-drive/utilities": "~5.8.2<% } %>",
     "babel-plugin-ember-template-compilation": "^4.0.0",
     "concurrently": "^9.2.1",
+<<<<<<< HEAD
     "decorator-transforms": "^2.3.1",
     "ember-cli": "~6.12.0",
     "ember-cli-babel": "^8.3.1",
     "ember-cli-deprecation-workflow": "^4.0.1",
+||||||| 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
+    "decorator-transforms": "^2.3.0",
+    "ember-cli": "~6.9.0-alpha.1",
+    "ember-cli-babel": "^8.2.0",
+    "ember-cli-deprecation-workflow": "^4.0.0",
+=======
+    "decorator-transforms": "^2.3.0",
+    "ember-cli": "~6.9.0-alpha.1",
+    "ember-cli-babel": "^8.2.0",
+    "ember-cli-deprecation-workflow": "^3.4.0",
+>>>>>>> parent of 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.3.0",
     "ember-page-title": "^9.0.3",

files/tests/test-helper.ts

@@ -1,6 +1,16 @@
+<<<<<<< HEAD
 <% if (warpDrive) { %>import '@warp-drive/ember/install';
 <% } %>import Application from '<%= modulePrefix %>/app';
 import config from '<%= modulePrefix %>/config/environment';
+||||||| 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
+<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
+import Application from '<%= modulePrefix %>/app';
+import config<% if (noCompat) {%>, { enterTestMode }<% } %> from '<%= modulePrefix %>/config/environment';
+=======
+<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
+import Application from '<%= modulePrefix %>/app';
+import config from '<%= modulePrefix %>/config/environment';
+>>>>>>> parent of 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
 import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
 import { setup } from 'qunit-dom';

index.js

@@ -85,7 +85,17 @@ module.exports = {
           options.packageManager === 'pnpm' && '"--pnpm"',
           options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
           options.typescript && `"--typescript"`,
+<<<<<<< HEAD
           warpDrive === false && `"--no-warp-drive"`,
+||||||| 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
+          options.minimal && `"--minimal"`,
+          options.noCompat && `"--no-compat"`,
+          !options.emberData && `"--no-ember-data"`,
+          !options.warpDrive && `"--no-warp-drive"`,
+=======
+          !options.emberData && `"--no-ember-data"`,
+          !options.warpDrive && `"--no-warp-drive"`,
+>>>>>>> parent of 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
         ]
           .filter(Boolean)
           .join(',\n            ') +
@@ -121,7 +131,13 @@ module.exports = {
       blueprint: 'app',
       blueprintOptions,
       lang: options.lang,
+<<<<<<< HEAD
       warpDrive,
+||||||| 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
+      warpDrive: warpDrive,
+=======
+      warpDrive: options.warpDrive ?? options.emberData,
+>>>>>>> parent of 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       packageManager: options.packageManager ?? 'npm',

package.json

@@ -18,8 +18,7 @@
     "lint:eslint": "eslint .",
     "lint:prettier": "prettier . --check",
     "format": "prettier . --write",
-    "test": "vitest",
-    "new:app": "pnpm dlx ember-cli@latest new my-app --blueprint ."
+    "test": "vitest"
   },
   "release-plan": {
     "semverIncrementAs": {
@@ -33,8 +32,15 @@
     "ejs": "^3.1.10",
     "ember-cli-string-utils": "^1.1.0",
     "lodash": "^4.17.21",
+<<<<<<< HEAD
     "sort-package-json": "^3.6.0",
     "walk-sync": "^4.0.1"
+||||||| 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
+    "sort-package-json": "^3.5.1",
+    "walk-sync": "^3.0.0"
+=======
+    "walk-sync": "^3.0.0"
+>>>>>>> parent of 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
   },
   "devDependencies": {
     "@eslint/js": "^9.3.0",
@@ -51,8 +57,14 @@
     "release-plan": "^0.17.2",
     "strip-ansi": "^7.1.0",
     "tmp-promise": "^3.0.3",
+<<<<<<< HEAD
     "vitest": "^4.0.0-beta.17",
     "vitest-matrix": "^0.2.0"
+||||||| 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
+    "vitest": "^4.0.16"
+=======
+    "vitest": "^4.0.0-beta.17"
+>>>>>>> parent of 87dd08b (Merge pull request #49 from ember-cli/nvp/minimal-flag-non-default)
   },
   "packageManager": "pnpm@10.20.0"
 }