Merge branch 'main' into fix-width-fix-no-code-doc

Author: MehulKChaudhari

content/ember-data/v5/ember-data-deprecate-store-extends-ember-object.md

@@ -0,0 +1,31 @@
+---
+title: Store will no longer extend EmberObject in 6.0
+until: '6.0'
+since: '5.4'
+displayId: ember-data:deprecate-store-extends-ember-object
+---
+
+The Store class extending from EmberObject is deprecated and the class will no 
+longer extend from EmberObject in 6.0.
+
+Please remove usage of [EmberObject APIs](https://api.emberjs.com/ember/release/modules/@ember%2Fobject) 
+in your Store class.
+
+To mark the class as no longer extending from EmberObject, in ember-cli-build.js
+set the following config:
+
+```js
+const app = new EmberApp(defaults, {
+  emberData: {
+    deprecations: {
+      DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false
+    }
+ }
+});
+```
+
+If you are unsure whether your Store class uses EmberObject APIs, set this 
+config and uses of those APIs will throw exceptions. The most common API that 
+may have been used is `Store.extend({...`.
+
+This deprecation is from RFC [#1026](https://rfcs.emberjs.com/id/1026-ember-data-deprecate-store-extends-ember-object).

content/ember/v6/importing-inject-from-ember-service.md

@@ -19,3 +19,10 @@ export default class MyRoute extends Route {
 ```
 
 You can use the [ember-codemod-remove-inject-as-service](https://github.com/ijlee2/ember-codemod-remove-inject-as-service) codemod, to fix all violations.
+
+If you're working on a library that needs to support ember-source prior to 4.1, you can support both styles of `service` via:
+```js
+import * as emberService from '@ember/service';
+
+const service = emberService.service ?? emberService.inject;
+```

node-tests/index.mjs

@@ -24,6 +24,16 @@ describe('Json Tests', function () {
           `You don't need to define a displayId if it's the same as the file name`
         );
       }
+
+      // since is manditory and must be a string
+      if (typeof contents.since !== 'string') {
+        throw new Error('since frontmatter must be a string');
+      }
+
+      // if you define an until then it must be a string
+      if (contents.until && typeof contents.until !== 'string') {
+        throw new Error('until frontmatter must be a string');
+      }
     });
   });
 });