Add some flagging

Author: NullVoxPopuli

files/_js_babel.config.cjs

@@ -1,7 +1,13 @@
+<% if (compat) { %>
 const {
   babelCompatSupport,
   templateCompatSupport,
 } = require('@embroider/compat/babel');
+<% } else { %>
+const { buildMacros } = require('@embroider/macros/babel');
+
+const macros = buildMacros();
+<% } %>
 
 module.exports = {
   plugins: [
@@ -13,8 +19,9 @@ module.exports = {
           'ember-cli-htmlbars',
           'ember-cli-htmlbars-inline-precompile',
           'htmlbars-inline-precompile',
-        ],
-        transforms: [...templateCompatSupport()],
+        ],<% if (compat) { %>
+        transforms: [...templateCompatSupport()],<% } else { %>
+        transforms: [...macros.templateMacros],<% } %>
       },
     ],
     [
@@ -32,8 +39,9 @@ module.exports = {
         useESModules: true,
         regenerator: false,
       },
-    ],
-    ...babelCompatSupport(),
+    ],<% if (compat) { %>
+    ...babelCompatSupport(),<% } else { %>
+    ...macros.babelMacros,<% } %>
   ],
 
   generatorOpts: {

files/_ts_babel.config.cjs

@@ -1,7 +1,13 @@
+<% if (compat) { %>
 const {
   babelCompatSupport,
   templateCompatSupport,
 } = require('@embroider/compat/babel');
+<% } else { %>
+const { buildMacros } = require('@embroider/macros/babel');
+
+const macros = buildMacros();
+<% } %>
 
 module.exports = {
   plugins: [
@@ -21,8 +27,9 @@ module.exports = {
           'ember-cli-htmlbars',
           'ember-cli-htmlbars-inline-precompile',
           'htmlbars-inline-precompile',
-        ],
-        transforms: [...templateCompatSupport()],
+        ],<% if (compat) { %>
+        transforms: [...templateCompatSupport()],<% } else { %>
+        transforms: [...macros.templateMacros],<% } %>
       },
     ],
     [
@@ -40,8 +47,9 @@ module.exports = {
         useESModules: true,
         regenerator: false,
       },
-    ],
-    ...babelCompatSupport(),
+    ],<% if (compat) { %>
+    ...babelCompatSupport(),<% } else { %>
+    ...macros.babelMacros,<% } %>
   ],
 
   generatorOpts: {

files/package.json

@@ -53,10 +53,10 @@
     "@ember/test-waiters": "^4.1.0",
     "@embroider/macros": "^1.18.0",
     "@embroider/core": "^4.1.0",
-    "@embroider/vite": "^1.1.5",
-    "@embroider/compat": "^4.1.0",
-    "@embroider/router": "^3.0.1",
-    "@embroider/config-meta-loader": "^1.0.0",
+    "@embroider/vite": "^1.1.5",<% if (compat) { %>
+    "@embroider/compat": "^4.1.0",<% } %>
+    "@embroider/router": "^3.0.1",<% if (compat) { %>
+    "@embroider/config-meta-loader": "^1.0.0",<% } %>
     "@eslint/js": "^9.27.0",
     "@glimmer/component": "^2.0.0<% if (typescript) { %>",
     "@glint/core": "^1.5.2",
@@ -75,8 +75,8 @@
     "ember-cli": "~6.5.0-beta.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-deprecation-workflow": "^3.3.0<% if (emberData) { %>",
-    "ember-data": "~5.5.0<% } %>",
-    "ember-load-initializers": "^3.0.1",
+    "ember-data": "~5.5.0<% } %>",<% if (compat) { %>
+    "ember-load-initializers": "^3.0.1",<% } %>
     "ember-modifier": "^4.2.2",
     "ember-page-title": "^9.0.2",
     "ember-qunit": "^9.0.3",

files/vite.config.mjs

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

index.js

@@ -4,6 +4,16 @@ const stringUtil = require('ember-cli-string-utils');
 const chalk = require('chalk');
 const directoryForPackageName = require('./lib/directory-for-package-name');
 
+function hasCompat(options) {
+  let compat = options.compat ?? true;
+
+  if (options.noCompat) {
+    compat = false;
+  }
+
+  return compat;
+}
+
 module.exports = {
   description: 'The default blueprint for ember-cli projects.',
 
@@ -59,6 +69,8 @@ module.exports = {
       execBinPrefix = 'pnpm';
     }
 
+    let compat = hasCompat(options);
+
     return {
       appDirectory: directoryForPackageName(name),
       name,
@@ -79,6 +91,8 @@ module.exports = {
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       packageManager: options.packageManager ?? 'npm',
+      compat: compat,
+      noCompat: !compat,
     };
   },
 
@@ -106,6 +120,10 @@ module.exports = {
       files = files.filter((file) => !file.includes('ember-data/'));
     }
 
+    if (hasCompat(options)) {
+      files = files.filter((file) => !file.includes('ember-cli-build.js'));
+    }
+
     this._files = files;
 
     return this._files;