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

package/index.js

@@ -24,6 +24,45 @@ 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);
   },
@@ -37,7 +76,14 @@ const replacers = {
   },
   'babel.config.mjs'(locals) {
     let prefix = locals.typescript ? '_ts_' : '_js_';
-    let filePath = join(CONDITIONAL_FILES, prefix + 'babel.config.mjs');
+
+    let filePath = join(
+      ...[
+        CONDITIONAL_FILES,
+        locals.noCompat && 'no-compat',
+        prefix + 'babel.config.mjs',
+      ].filter(Boolean),
+    );
 
     let raw = readFileSync(filePath).toString();
 
@@ -80,6 +126,8 @@ 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"`,
         ]
@@ -101,6 +149,37 @@ 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,
@@ -113,14 +192,18 @@ module.exports = {
         options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
       invokeScriptPrefix,
       execBinPrefix,
-      welcome: options.welcome,
+      welcome,
       blueprint: 'app',
       blueprintOptions,
       lang: options.lang,
-      warpDrive: options.warpDrive ?? options.emberData,
+      warpDrive: warpDrive,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       packageManager: options.packageManager ?? 'npm',
+      compat,
+      noCompat,
+      minimal,
+      notMinimal,
     };
   },
 
@@ -131,6 +214,10 @@ 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);
     }
@@ -150,6 +237,43 @@ 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;
@@ -182,6 +306,92 @@ 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-alpha.7",
+  "version": "6.10.0-alpha.9",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -25,12 +25,13 @@
     "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.3.1",
+    "ember-cli": "^6.9.1",
     "eslint": "9.x",
     "eslint-config-prettier": "^9.1.0",
     "execa": "^9.1.0",
@@ -42,7 +43,7 @@
     "release-plan": "^0.17.2",
     "strip-ansi": "^7.1.0",
     "tmp-promise": "^3.0.3",
-    "vitest": "^4.0.0-beta.17"
+    "vitest": "^4.0.16"
   },
   "scripts": {
     "lint": "concurrently 'pnpm:lint:*(!fix)'",
@@ -50,6 +51,10 @@
     "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"
   }
 }

package/tests/fixtures/tests-js-no-compat-10/app/components/sweet.gjs

@@ -0,0 +1,3 @@
+<template>
+  {{yield}}
+</template>

package/tests/fixtures/tests-js-no-compat-10/app/router.js

@@ -0,0 +1,11 @@
+import EmberRouter from '@embroider/router';
+import config from 'test-app/config/environment';
+
+export default class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
+
+Router.map(function () {
+  this.route('fancy');
+});

package/tests/fixtures/tests-js-no-compat-10/app/routes/fancy.js

@@ -0,0 +1,6 @@
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
+
+export default class FancyRoute extends Route {
+  @service router;
+}

package/tests/fixtures/tests-js-no-compat-10/app/styles/app.css

@@ -0,0 +1,3 @@
+.purple {
+  color: rebeccapurple;
+}

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

@@ -0,0 +1,7 @@
+import { LinkTo } from '@ember/routing';
+
+<template>
+  {{outlet}}
+
+  <LinkTo @route="fancy" data-test-a>Fancy</LinkTo>
+</template>

package/tests/fixtures/tests-js-no-compat-10/app/templates/fancy.gjs

@@ -0,0 +1,9 @@
+import Sweet from '../components/sweet.gjs';
+
+<template>
+  <Sweet />
+
+  <p class="purple">Fancy</p>
+
+  {{outlet}}
+</template>

package/tests/fixtures/tests-js-no-compat-10/tests/acceptance/index-test.js

@@ -0,0 +1,26 @@
+import { module, test } from 'qunit';
+import { visit, currentURL, click } from '@ember/test-helpers';
+import { setupApplicationTest } from 'test-app/tests/helpers';
+
+module('Acceptance | index', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting /', async function (assert) {
+    await visit('/');
+
+    assert.strictEqual(currentURL(), '/');
+
+    await click('[data-test-a]');
+
+    assert.strictEqual(currentURL(), '/fancy');
+
+    assert.dom('p').hasText('Fancy');
+
+    assert.dom('p.purple').hasStyle(
+      {
+        'color': 'rgb(102, 51, 153)',
+      },
+      'The text should be purple if the app styles are working correctly',
+    )
+  });
+});

package/tests/fixtures/tests-js-no-compat-10/tests/integration/components/sweet-test.gjs

@@ -0,0 +1,28 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'test-app/tests/helpers';
+import { render } from '@ember/test-helpers';
+import Sweet from 'test-app/components/sweet';
+
+module('Integration | Component | sweet', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Updating values is achieved using autotracking, just like in app code. For example:
+    // class State { @tracked myProperty = 0; }; const state = new State();
+    // and update using state.myProperty = 1; await rerender();
+    // Handle any actions with function myAction(val) { ... };
+
+    await render(<template><Sweet /></template>);
+
+    assert.dom().hasText('');
+
+    // Template block usage:
+    await render(<template>
+      <Sweet>
+        template block text
+      </Sweet>
+    </template>);
+
+    assert.dom().hasText('template block text');
+  });
+});

package/tests/fixtures/tests-js-no-compat-10/tests/routes/fancy-test.js

@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'test-app/tests/helpers';
+
+module('Unit | Route | fancy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:fancy');
+    assert.ok(route);
+  });
+});

package/tests/fixtures/tests-ts-no-compat-10/app/components/sweet.gts

@@ -0,0 +1,3 @@
+<template>
+  {{yield}}
+</template>

package/tests/fixtures/tests-ts-no-compat-10/app/router.ts

@@ -0,0 +1,11 @@
+import EmberRouter from '@embroider/router';
+import config from 'test-app/config/environment';
+
+export default class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
+
+Router.map(function () {
+  this.route('fancy');
+});

package/tests/fixtures/tests-ts-no-compat-10/app/routes/fancy.ts

@@ -0,0 +1,8 @@
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
+
+import type RouterService from '@ember/routing/router-service';
+
+export default class FancyRoute extends Route {
+  @service declare router: RouterService;
+}

package/tests/fixtures/tests-ts-no-compat-10/app/styles/app.css

@@ -0,0 +1,3 @@
+.purple {
+  color: rebeccapurple;
+}

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

@@ -0,0 +1,7 @@
+import { LinkTo } from '@ember/routing';
+
+<template>
+  {{outlet}}
+
+  <LinkTo @route="fancy" data-test-a>Fancy</LinkTo>
+</template>

package/tests/fixtures/tests-ts-no-compat-10/app/templates/fancy.gts

@@ -0,0 +1,9 @@
+import Sweet from '../components/sweet.gts';
+
+<template>
+  <Sweet />
+
+  <p class="purple">Fancy</p>
+
+  {{outlet}}
+</template>

package/tests/fixtures/tests-ts-no-compat-10/tests/acceptance/index-test.ts

@@ -0,0 +1,26 @@
+import { module, test } from 'qunit';
+import { visit, currentURL, click } from '@ember/test-helpers';
+import { setupApplicationTest } from 'test-app/tests/helpers';
+
+module('Acceptance | index', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting /', async function (assert) {
+    await visit('/');
+
+    assert.strictEqual(currentURL(), '/');
+
+    await click('[data-test-a]');
+
+    assert.strictEqual(currentURL(), '/fancy');
+
+    assert.dom('p').hasText('Fancy');
+
+    assert.dom('p.purple').hasStyle(
+      {
+        'color': 'rgb(102, 51, 153)',
+      },
+      'The text should be purple if the app styles are working correctly',
+    )
+  });
+});

package/tests/fixtures/tests-ts-no-compat-10/tests/integration/components/sweet-test.gjs

@@ -0,0 +1,28 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'test-app/tests/helpers';
+import { render } from '@ember/test-helpers';
+import Sweet from 'test-app/components/sweet';
+
+module('Integration | Component | sweet', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Updating values is achieved using autotracking, just like in app code. For example:
+    // class State { @tracked myProperty = 0; }; const state = new State();
+    // and update using state.myProperty = 1; await rerender();
+    // Handle any actions with function myAction(val) { ... };
+
+    await render(<template><Sweet /></template>);
+
+    assert.dom().hasText('');
+
+    // Template block usage:
+    await render(<template>
+      <Sweet>
+        template block text
+      </Sweet>
+    </template>);
+
+    assert.dom().hasText('template block text');
+  });
+});

package/tests/fixtures/tests-ts-no-compat-10/tests/routes/fancy-test.js

@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'test-app/tests/helpers';
+
+module('Unit | Route | fancy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:fancy');
+    assert.ok(route);
+  });
+});