Upgrade to 6.7

kategengler · kategengler · commit 75f010e225f4 · 2026-03-11T15:24:29.000-04:00
diff --git a/.ember-cli b/.ember-cli
@@ -3,5 +3,17 @@
     Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
     rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
   */
-  "isTypeScriptProject": false
+  "isTypeScriptProject": false,
+
+  /**
+    Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
+    or GTS files for the component and the component rendering test. "loose" is the default.
+  */
+  "componentAuthoringFormat": "loose",
+
+  /**
+    Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
+    or GTS templates for routes. "loose" is the default
+  */
+  "routeAuthoringFormat": "loose"
 }
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
       - name: Lint
-        run: pnpm run lint
+        run: pnpm lint
 
   test:
     name: "Test"
diff --git a/.gitignore b/.gitignore
@@ -14,13 +14,6 @@
 /testem.log
 /yarn-error.log
 
-# ember-try
-/.node_modules.ember-try/
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
 # broccoli-debug
 /DEBUG/
 
diff --git a/.prettierignore b/.prettierignore
@@ -7,9 +7,10 @@
 # misc
 /coverage/
 !.*
-
-# ember-try
-/.node_modules.ember-try/
+.*/
+/pnpm-lock.yaml
+ember-cli-update.json
+*.html
 
 
 .eslintcache
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -4,9 +4,10 @@ module.exports = {
   plugins: ['prettier-plugin-ember-template-tag'],
   overrides: [
     {
-      files: '*.{js,ts,gjs,gts}',
+      files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
       options: {
         singleQuote: true,
+        templateSingleQuote: false,
       },
     },
   ],
diff --git a/.stylelintignore b/.stylelintignore
@@ -3,6 +3,3 @@
 
 # compiled output
 /dist/
-
-# addons
-/.node_modules.ember-try/
diff --git a/app/app.js b/app/app.js
@@ -4,6 +4,8 @@ import loadInitializers from 'ember-load-initializers';
 import config from 'ember-api-docs/config/environment';
 import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
 import { setConfig } from 'ember-basic-dropdown/config';
+import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
+
 import 'ember-power-select/styles';
 import './assets/styles.css';
 
@@ -19,6 +21,7 @@ export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
   Resolver = Resolver;
+  inspector = setupInspector(this);
 }
 
 loadInitializers(App, config.modulePrefix);
diff --git a/app/controllers/project-version.js b/app/controllers/project-version.js
@@ -104,12 +104,9 @@ export default class ProjectVersionController extends Controller {
       : this.publicNamespaceIDs;
   }
 
-  @computed('metaStore.availableProjectVersions', 'model.project.id')
   get projectVersions() {
-    const projectVersions =
-      this.metaStore.availableProjectVersions[
-        this.model.belongsTo('project').id()
-      ];
+    const id = this.model.belongsTo('project').id();
+    const projectVersions = this.metaStore.availableProjectVersions[id];
     let versions = projectVersions.sort((a, b) => semverCompare(b, a));
 
     versions = versions.map((version) => {
diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "5.12.0",
+      "version": "6.7.0",
       "blueprints": [
         {
           "name": "app",
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -36,6 +36,15 @@ module.exports = function (defaults) {
         // NOTE: put any code coverage plugins last, after the transform.
       ],
     },
+    emberData: {
+      deprecations: {
+        // New projects can safely leave this deprecation disabled.
+        // If upgrading, to opt-into the deprecated behavior, set this to true and then follow:
+        // https://deprecations.emberjs.com/id/ember-data-deprecate-store-extends-ember-object
+        // before upgrading to Ember Data 6.0
+        DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: true,
+      },
+    },
   });
 
   const { Webpack } = require('@embroider/webpack');
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,123 @@
+/**
+ * Debugging:
+ *   https://eslint.org/docs/latest/use/configure/debug
+ *  ----------------------------------------------------
+ *
+ *   Print a file's calculated configuration
+ *
+ *     npx eslint --print-config path/to/file.js
+ *
+ *   Inspecting the config
+ *
+ *     npx eslint --inspect-config
+ *
+ */
+import globals from 'globals';
+import js from '@eslint/js';
+
+import ember from 'eslint-plugin-ember/recommended';
+import eslintConfigPrettier from 'eslint-config-prettier';
+import qunit from 'eslint-plugin-qunit';
+import n from 'eslint-plugin-n';
+
+import babelParser from '@babel/eslint-parser';
+
+const esmParserOptions = {
+  ecmaFeatures: { modules: true },
+  ecmaVersion: 'latest',
+  requireConfigFile: false,
+  babelOptions: {
+    plugins: [
+      ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+    ],
+  },
+};
+
+export default [
+  js.configs.recommended,
+  eslintConfigPrettier,
+  ember.configs.base,
+  ember.configs.gjs,
+  /**
+   * Ignores must be in their own object
+   * https://eslint.org/docs/latest/use/configure/ignore
+   */
+  {
+    ignores: ['dist/', 'node_modules/', 'coverage/', '!**/.*'],
+  },
+  /**
+   * https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
+   */
+  {
+    linterOptions: {
+      reportUnusedDisableDirectives: 'error',
+    },
+  },
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      parser: babelParser,
+    },
+  },
+  {
+    files: ['**/*.{js,gjs}'],
+    languageOptions: {
+      parserOptions: esmParserOptions,
+      globals: {
+        ...globals.browser,
+      },
+    },
+  },
+  {
+    files: ['tests/**/*-test.{js,gjs}'],
+    plugins: {
+      qunit,
+    },
+  },
+  /**
+   * CJS node files
+   */
+  {
+    files: [
+      '**/*.cjs',
+      'config/**/*.js',
+      'tests/dummy/config/**/*.js',
+      'testem.js',
+      'testem*.js',
+      'index.js',
+      '.prettierrc.js',
+      '.stylelintrc.js',
+      '.template-lintrc.js',
+      'ember-cli-build.js',
+    ],
+    plugins: {
+      n,
+    },
+
+    languageOptions: {
+      sourceType: 'script',
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+  /**
+   * ESM node files
+   */
+  {
+    files: ['**/*.mjs'],
+    plugins: {
+      n,
+    },
+
+    languageOptions: {
+      sourceType: 'module',
+      ecmaVersion: 'latest',
+      parserOptions: esmParserOptions,
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+];
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/test-helper.js b/tests/test-helper.js
