Changes from v11.12.0 (#2029)

* Support ESLint flat config (#2020)

* Allow ember-data type registry imports in `use-ember-data-rfc-395-imports` rule (#2027)

* Allow ember-data type registry imports

* fix lint

---------

Co-authored-by: Bryan Mishkin <[email protected]>

* fix lint

* Release 11.12.0

* fix merge mistakes

---------

Co-authored-by: Peter Wagenet <[email protected]>

Author: bmish

CHANGELOG.md

@@ -1,50 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ## v12.0.0-alpha.2 (2023-11-10)
 
 #### :bug: Bug Fix
@@ -102,6 +55,19 @@
 - Patrick Pircher ([@patricklx](https://github.com/patricklx))
 
 
+## v11.12.0 (2023-12-12)
+
+#### :rocket: Enhancement
+* [#2020](https://github.com/ember-cli/eslint-plugin-ember/pull/2020) Support ESLint flat config ([@bmish](https://github.com/bmish))
+
+#### :bug: Bug Fix
+* [#2027](https://github.com/ember-cli/eslint-plugin-ember/pull/2027) Allow ember-data type registry imports in `use-ember-data-rfc-395-imports` rule ([@wagenet](https://github.com/wagenet))
+
+#### Committers: 2
+- Bryan Mishkin ([@bmish](https://github.com/bmish))
+- Peter Wagenet ([@wagenet](https://github.com/wagenet))
+
+
 ## v11.11.1 (2023-08-22)
 
 #### :bug: Bug Fix

README.md

@@ -25,10 +25,21 @@ Or
 npm install --save-dev eslint-plugin-ember
 ```
 
-### 2. Modify your `.eslintrc.js`
+### 2. Update your config
 
 ```js
-// .eslintrc.js
+// eslint.config.js (flat config)
+const eslintPluginEmberRecommended = require('eslint-plugin-ember/configs/recommended');
+
+module.exports = [
+  ...eslintPluginEmberRecommended,
+];
+```
+
+or
+
+```js
+// .eslintrc.js (legacy config)
 module.exports = {
   plugins: ['ember'],
   extends: [

docs/rules/use-ember-data-rfc-395-imports.md

@@ -14,6 +14,8 @@ The goal of this rule is to ease the migration to the new @ember-data packages.
 
 ember-data has been split in multiple packages. For instance, its store is now released in "@ember-data/store" package. These packages have been released starting from ember-data version 3.11.
 
+For TypeScript users, imports from `ember-data/types/registries/*` are still allowed since there is currently no equivalent in the new packages.
+
 ## Examples
 
 Examples of **incorrect** code for this rule:

lib/config-legacy/base.js

@@ -0,0 +1,27 @@
+module.exports = {
+  root: true,
+
+  parserOptions: {
+    ecmaVersion: 2022,
+    sourceType: 'module',
+  },
+
+  env: {
+    browser: true,
+    es2022: true,
+  },
+
+  plugins: ['ember'],
+
+  overrides: [
+    /**
+     * We don't want to *always* have the preprocessor active,
+     * it's only relevant on gjs and gts files to detect if eslint config is correctly setup for this files.
+     */
+    {
+      files: ['**/*.{gts,gjs}'],
+      parser: 'eslint-plugin-ember/gjs-gts-parser',
+      processor: 'ember/<noop>',
+    },
+  ],
+};

lib/config-legacy/recommended-gjs.js

@@ -0,0 +1,7 @@
+const base = require('./base');
+const gjsRules = require('../recommended-rules-gjs');
+
+module.exports = {
+  ...base,
+  rules: gjsRules,
+};

lib/config-legacy/recommended-gts.js

@@ -0,0 +1,7 @@
+const base = require('./base');
+const gtsRules = require('../recommended-rules-gts');
+
+module.exports = {
+  ...base,
+  rules: gtsRules,
+};

lib/config-legacy/recommended.js

@@ -0,0 +1,7 @@
+const base = require('./base');
+const rules = require('../recommended-rules');
+
+module.exports = {
+  ...base,
+  rules,
+};

lib/config/base.js

@@ -1,27 +1,17 @@
-module.exports = {
-  root: true,
+const plugin = require('../index');
 
-  parserOptions: {
-    ecmaVersion: 2022,
-    sourceType: 'module',
+module.exports = [
+  {
+    plugins: { ember: plugin },
   },
 
-  env: {
-    browser: true,
-    es2022: true,
+  /**
+   * We don't want to *always* have the preprocessor active,
+   * it's only relevant on gjs and gts files to detect if eslint config is correctly setup for this files.
+   */
+  {
+    files: ['**/*.{gts,gjs}'],
+    parser: 'eslint-plugin-ember/gjs-gts-parser',
+    processor: 'ember/<noop>',
   },
-
-  plugins: ['ember'],
-
-  overrides: [
-    /**
-     * We don't want to *always* have the preprocessor active,
-     * it's only relevant on gjs and gts files to detect if eslint config is correctly setup for this files.
-     */
-    {
-      files: ['**/*.{gts,gjs}'],
-      parser: 'eslint-plugin-ember/gjs-gts-parser',
-      processor: 'ember/<noop>',
-    },
-  ],
-};
+];

lib/config/recommended-gjs.js

@@ -1,7 +1,4 @@
 const base = require('./base');
 const gjsRules = require('../recommended-rules-gjs');
 
-module.exports = {
-  ...base,
-  rules: gjsRules,
-};
+module.exports = [...base, { rules: gjsRules }];

lib/config/recommended-gts.js

@@ -1,7 +1,4 @@
 const base = require('./base');
 const gtsRules = require('../recommended-rules-gts');
 
-module.exports = {
-  ...base,
-  rules: gtsRules,
-};
+module.exports = [...base, { rules: gtsRules }];